Update DFTE dependency to 1.0.2

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.0.2
+
+- Update the pinned DFTE dependency to the iterator-lifecycle and configuration-safe 1.0.2 release.
+
+## 3.0.1
+
+- Redact WiFi, AP, portal-form, and custom-parameter values from diagnostic logs.
+
 ## 3.0.0
 
 - Establish `device-framework` as the independently maintained canonical branch.

lib/WiFiManager/src/WiFiManager.cpp

@@ -986,7 +986,7 @@ bool WiFiManager::wifiConnectNew(String ssid, String pass,bool connect){
   bool ret = false;
   #ifndef WM_NO_LOG
   log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("Connecting to NEW AP:"),ssid);
-  log(WiFiManagerLogLevel::Trace, kWiFiMgrLogSubsystem,F("Using Password:"),pass);
+  log(WiFiManagerLogLevel::Trace, kWiFiMgrLogSubsystem, F("WiFi password supplied: [redacted]"));
   #endif
   WiFi_enableSTA(true,storeSTAmode); // storeSTAmode will also toggle STA on in default opmode (persistent) if true (default)
   WiFi.persistent(true);
@@ -1007,7 +1007,7 @@ bool WiFiManager::wifiConnectDefault(){
 
   #ifndef WM_NO_LOG
   log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("Connecting to SAVED AP:"),WiFi_SSID(true));
-  log(WiFiManagerLogLevel::Trace, kWiFiMgrLogSubsystem,F("Using Password:"),WiFi_psk(true));
+  log(WiFiManagerLogLevel::Trace, kWiFiMgrLogSubsystem, F("Using saved WiFi credentials"));
   #endif
 
   ret = WiFi_enableSTA(true,storeSTAmode);
@@ -2443,7 +2443,7 @@ void WiFiManager::debugSoftAPConfig(){
     log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("SoftAP Configuration"));
     log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("--------------------"));
     log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("ssid:            "),(char *) config.ssid);
-    log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("password:        "),(char *) config.password);
+    log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("password:        [redacted]"));
     log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("ssid_len:        "),config.ssid_len);
     log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("channel:         "),config.channel);
     log(WiFiManagerLogLevel::Info, kWiFiMgrLogSubsystem, F("authmode:        "),config.authmode);
@@ -2518,7 +2518,7 @@ boolean WiFiManager::validApPassword(){
     }
     #ifndef WM_NO_LOG
     log(WiFiManagerLogLevel::Debug, kWiFiMgrLogSubsystem,F("AccessPoint set password is VALID"));
-    log(WiFiManagerLogLevel::Trace, kWiFiMgrLogSubsystem,"ap pass",_apPassword);
+    log(WiFiManagerLogLevel::Trace, kWiFiMgrLogSubsystem, F("Access point password: [redacted]"));
     #endif
   }
   return true;

lib/WiFiManager/src/WiFiManagerHandlers.cpp

@@ -739,7 +739,7 @@ void WiFiManagerHandlers::applyWifiAndParamsFromRequest(AsyncWebServerRequest *r
   requestinfo += "\n";
   for (size_t i = 0; i < request->params(); i++) {
     const AsyncWebParameter* p = request->getParam(i);
-    requestinfo += " " + p->name() + ": " + p->value() + "\n";
+    requestinfo += " " + p->name() + ": [redacted, " + String(p->value().length()) + " chars]\n";
   }
 
   _wm->log(WiFiManagerLogLevel::Trace, kWiFiMgrLogSubsystem, requestinfo);
@@ -823,7 +823,8 @@ void WiFiManagerHandlers::doParamSave(WiFiManager::WiFiManagerRequestArgs reques
 
       _wm->_params[i]->setValue(value.c_str(), value.length());
       #ifndef WM_NO_LOG
-      _wm->log(WiFiManagerLogLevel::Debug, kWiFiMgrLogSubsystem,(String)_wm->_params[i]->getID() + ":",value);
+      _wm->log(WiFiManagerLogLevel::Debug, kWiFiMgrLogSubsystem,
+          (String)_wm->_params[i]->getID() + F(": [redacted, ") + String(value.length()) + F(" chars]"));
       #endif
     }
     #ifndef WM_NO_LOG

library.json

@@ -1,6 +1,6 @@
 {
   "name": "WiFiManager",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "keywords": [
     "wifi",
     "wi-fi",
@@ -40,7 +40,7 @@
   ],
   "dependencies": {
     "ESP32Async/ESPAsyncWebServer": "3.9.1",
-    "DeviceFrameworkTemplateEngine": "https://github.com/alexhopeoconnor/DFTE.git#v1.0.1"
+    "DeviceFrameworkTemplateEngine": "https://github.com/alexhopeoconnor/DFTE.git#v1.0.2"
   },
   "build": {
     "includeDir": "lib/WiFiManager/include",

platformio.ini

@@ -16,7 +16,7 @@ build_flags =
     -DUNIT_TEST
 lib_deps = 
     ESP32Async/ESPAsyncWebServer@3.9.1
-    DeviceFrameworkTemplateEngine=https://github.com/alexhopeoconnor/DFTE.git#v1.0.1
+    DeviceFrameworkTemplateEngine=https://github.com/alexhopeoconnor/DFTE.git#v1.0.2
 
 [env:esp32]
 platform = espressif32@6.13.0
@@ -33,7 +33,7 @@ build_flags =
     -DUNIT_TEST
 lib_deps = 
     ESP32Async/ESPAsyncWebServer@3.9.1
-    DeviceFrameworkTemplateEngine=https://github.com/alexhopeoconnor/DFTE.git#v1.0.1
+    DeviceFrameworkTemplateEngine=https://github.com/alexhopeoconnor/DFTE.git#v1.0.2
 
 ; Optional: compile tests with DFTE logs bridged into WiFiManager::log (see README)
 [env:esp8266_dfte_log]