wirtz
/
MiniDexed
mirror of https://github.com/probonopd/MiniDexed
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply patch to prevent wpa_supplicant.conf from being downloaded

Browse Source
network
probonopd 1 week ago
parent a9921e47b2
commit 2fbb9d238f
1 changed files with 8 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      src/net/ftpworker.cpp

20
src/net/ftpworker.cpp
Unescape View File

@ -44,10 +44,11 @@ constexpr unsigned int SocketTimeout = 20;
constexpr unsigned int NumRetries = 3; constexpr unsigned int NumRetries = 3;
#ifndef MT32_PI_VERSION #ifndef MT32_PI_VERSION
#define MT32_PI_VERSION "alpha version" #define MT32_PI_VERSION "(version unknown)"
#endif #endif
const char MOTDBanner[] = "Welcome to the minidexed " MT32_PI_VERSION " embedded FTP server!"; const char MOTDBanner[] = "Welcome to the MiniDexed " MT32_PI_VERSION " embedded FTP server!";
const char* exclude_filename = "SD:/wpa_supplicant.conf";
enum class TDirectoryListEntryType enum class TDirectoryListEntryType
{ {
@ -62,7 +63,6 @@ struct TDirectoryListEntry
u32 nSize; u32 nSize;
u16 nLastModifedDate; u16 nLastModifedDate;
u16 nLastModifedTime; u16 nLastModifedTime;
//bool bHid;
}; };
using TCommandHandler = bool (CFTPWorker::*)(const char* pArgs); using TCommandHandler = bool (CFTPWorker::*)(const char* pArgs);
@ -424,7 +424,6 @@ const TDirectoryListEntry* CFTPWorker::BuildDirectoryList(size_t& nOutEntries) c
{ {
Entry.Type = TDirectoryListEntryType::File; Entry.Type = TDirectoryListEntryType::File;
Entry.nSize = FileInfo.fsize; Entry.nSize = FileInfo.fsize;
//Entry.bHid = (FileInfo.fattrib & AM_HID) ? true : false;
} }
Entry.nLastModifedDate = FileInfo.fdate; Entry.nLastModifedDate = FileInfo.fdate;
@ -617,11 +616,12 @@ bool CFTPWorker::Retrieve(const char* pArgs)
FIL File; FIL File;
CString Path = RealPath(pArgs); CString Path = RealPath(pArgs);
typedef const char* LPCTSTR;
// If the filename is "wpa_supplicant.conf", don't allow it to be retrieved //printf("%s\n", (LPCTSTR)Path);
if (strcmp(Path, "wpa_supplicant.conf") == 0) //printf("%s\n", exclude_filename );
if (strcmp((LPCTSTR)Path, exclude_filename) == 0)
{ {
SendStatus(TFTPStatus::FileActionNotTaken, "File action not taken."); SendStatus(TFTPStatus::FileNameNotAllowed, "Reading this file is not allowed");
return false; return false;
} }
@ -994,10 +994,6 @@ bool CFTPWorker::ListFileNames(const char* pArgs)
const TDirectoryListEntry& Entry = pDirEntries[i]; const TDirectoryListEntry& Entry = pDirEntries[i];
if (Entry.Type == TDirectoryListEntryType::Directory) if (Entry.Type == TDirectoryListEntryType::Directory)
continue; continue;
if (strcmp(Entry.Name, "wpa_supplicant.conf") == 0)
{
continue;
}
const int nLength = snprintf(Buffer, sizeof(Buffer), "%s\r\n", Entry.Name); const int nLength = snprintf(Buffer, sizeof(Buffer), "%s\r\n", Entry.Name);
if (pDataSocket->Send(Buffer, nLength, 0) < 0) if (pDataSocket->Send(Buffer, nLength, 0) < 0)
{ {

Write Preview
Loading…
Cancel
Save