Prevent wpa_supplicant.conf from being downloaded

To be tested
omersiar · Nov 16, 2024 · decd737 · decd737
1 parent f8a5ee5
commit decd737
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/circle-stdlib b/circle-stdlib
diff --git a/src/net/ftpworker.cpp b/src/net/ftpworker.cpp
@@ -617,6 +617,13 @@ bool CFTPWorker::Retrieve(const char* pArgs)
 	FIL File;
 	CString Path = RealPath(pArgs);
 
+	// If the filename is "wpa_supplicant.conf", don't allow it to be retrieved
+	if (strcmp(Path, "/wpa_supplicant.conf") == 0)
+	{
+		SendStatus(TFTPStatus::FileActionNotTaken, "File action not taken.");
+		return false;
+	}
+
 	if (f_open(&File, Path, FA_READ) != FR_OK)
 	{
 		SendStatus(TFTPStatus::FileActionNotTaken, "Could not open file for reading.");
@@ -986,10 +993,10 @@ bool CFTPWorker::ListFileNames(const char* pArgs)
 			const TDirectoryListEntry& Entry = pDirEntries[i];
 			if (Entry.Type == TDirectoryListEntryType::Directory)
 				continue;
-			/*if (Entry.Name == "wpa_supplicant.conf")
+			if (strcmp(Entry.Name, "wpa_supplicant.conf") == 0)
 			{
 				continue;
-			}*/
+			}
 			const int nLength = snprintf(Buffer, sizeof(Buffer), "%s\r\n", Entry.Name);
 			if (pDataSocket->Send(Buffer, nLength, 0) < 0)
 			{
+6 −6		.github/workflows/smoketest.yaml
+10 −0		CHANGELOG.md
+7 −7		README.md
+6 −2		circle-mbedtls.md
+1 −1		include/circle-mbedtls/adaptedsocket.h
+174 −110		include/circle-mbedtls/config-circle-mbedtls.h
+1 −1		include/circle-mbedtls/tlssocket.h
+16 −12		include/circle_stdlib_app.h
+1 −1		libs/circle
+1 −1		libs/circle-newlib
+1 −1		libs/mbedtls
+12 −0		samples/05-smoketest/kernel.cpp
+1 −1		src/circle-mbedtls/adaptedsocket.cpp
+1 −1		src/circle-mbedtls/tlssocket.cpp