fixes after rebase

jomjol · Mar 25, 2023 · 2e2858a · 2e2858a
1 parent 349e312
commit 2e2858a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 25 deletions.
diff --git a/code/components/jomjol_wlan/read_wlanini.cpp b/code/components/jomjol_wlan/read_wlanini.cpp
@@ -145,6 +145,29 @@ int LoadWlanFromFile(std::string fn)
                 wlan_config.dns = tmp;
                 LogFile.WriteToFile(ESP_LOG_INFO, TAG, "DNS: " + wlan_config.dns);
             }
+
+            else if ((splitted.size() > 1) && (toUpper(splitted[0]) == "HTTP_USERNAME")){
+                tmp = splitted[1];
+                if ((tmp[0] == '"') && (tmp[tmp.length()-1] == '"')){
+                    tmp = tmp.substr(1, tmp.length()-2);
+                }
+                wlan_config.http_username = tmp;
+                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP_USERNAME: " + wlan_config.http_username);                
+            }
+
+            else if ((splitted.size() > 1) && (toUpper(splitted[0]) == "HTTP_PASSWORD")){
+                tmp = splitted[1];
+                if ((tmp[0] == '"') && (tmp[tmp.length()-1] == '"')){
+                    tmp = tmp.substr(1, tmp.length()-2);
+                }
+                wlan_config.http_password = tmp;
+                #ifndef __HIDE_PASSWORD
+                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP_PASSWORD: " + wlan_config.http_password);
+                #else
+                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP_PASSWORD: XXXXXXXX");
+                #endif
+            }   
+
             #if (defined WLAN_USE_ROAMING_BY_SCANNING || (defined WLAN_USE_MESH_ROAMING && defined WLAN_USE_MESH_ROAMING_ACTIVATE_CLIENT_TRIGGERED_QUERIES))
             else if ((splitted.size() > 1) && (toUpper(splitted[0]) == "RSSITHRESHOLD")){
                 tmp = trim(splitted[1]);
@@ -157,20 +180,6 @@ int LoadWlanFromFile(std::string fn)
             #endif
         }
 
-        if ((splitted.size() > 1) && (toUpper(splitted[0]) == "HTTP_USERNAME")){
-            http_username = splitted[1];
-            if ((http_username[0] == '"') && (http_username[http_username.length()-1] == '"')){
-                http_username = http_username.substr(1, http_username.length()-2);
-            }
-        }
-
-        if ((splitted.size() > 1) && (toUpper(splitted[0]) == "HTTP_PASSWORD")){
-            http_password = splitted[1];
-            if ((http_password[0] == '"') && (http_password[http_password.length()-1] == '"')){
-                http_password = http_password.substr(1, http_password.length()-2);
-            }
-        }
-
         if (fgets(zw, 1024, pFile) == NULL)
         {
             line = "";

diff --git a/code/components/jomjol_wlan/read_wlanini.h b/code/components/jomjol_wlan/read_wlanini.h
@@ -13,6 +13,8 @@ struct wlan_config {
     std::string gateway = "";
     std::string netmask = "";
     std::string dns = "";
+    std::string http_username = "";
+    std::string http_password = "";
     int rssi_threshold = 0;                 // Default: 0 -> ROAMING disabled
 };
 extern struct wlan_config wlan_config;

diff --git a/code/include/basic_auth.h b/code/include/basic_auth.h
@@ -1,10 +1,8 @@
-#ifndef BASIC_AUTH_H
-#define BASIC_AUTH_H
+#pragma once
 
 #include <esp_http_server.h>
 
-void init_basic_auth(char *username, char *password);
+void init_basic_auth();
 esp_err_t basic_auth_request_filter(httpd_req_t *req, esp_err_t original_handler(httpd_req_t *));
 
-#define APPLY_BASIC_AUTH_FILTER(method) [](httpd_req_t *req){ return basic_auth_request_filter(req, method); }
-#endif
+#define APPLY_BASIC_AUTH_FILTER(method) [](httpd_req_t *req){ return basic_auth_request_filter(req, method); }
diff --git a/code/main/basic_auth.cpp b/code/main/basic_auth.cpp
@@ -1,21 +1,25 @@
 #include "basic_auth.h"
+#include "read_wlanini.h"
 #include <esp_tls_crypto.h>
 #include <esp_log.h>
 
+
 #define HTTPD_401      "401 UNAUTHORIZED"
 
 static const char *TAG = "HTTPAUTH";
 
 typedef struct {
-    char *username;
-    char *password;
+    const char *username;
+    const char *password;
 } basic_auth_info_t;
 
 basic_auth_info_t basic_auth_info = { NULL, NULL };
 
-void init_basic_auth(char *username, char *password) {
-    basic_auth_info.username = username;
-    basic_auth_info.password = password;
+void init_basic_auth() {
+    if (!wlan_config.http_username.empty() && !wlan_config.http_password.empty()) {
+        basic_auth_info.username = wlan_config.http_username.c_str();
+        basic_auth_info.password = wlan_config.http_password.c_str();
+    }
 }
 
 static char *http_auth_basic(const char *username, const char *password)

diff --git a/code/main/main.cpp b/code/main/main.cpp
@@ -326,6 +326,8 @@ extern "C" void app_main(void)
             StatusLED(WLAN_INIT, 3, true);
             return;
         }
+
+        init_basic_auth();
     }
     else if (iWLANStatus == -1) {  // wlan.ini not available, potentially empty or content not readable
         StatusLED(WLAN_INIT, 1, true);

diff --git a/code/platformio.ini b/code/platformio.ini
@@ -57,7 +57,6 @@ build_flags =
 	${flags:runtime.build_flags}
     ; ### Sofware options : (can be set in defines.h)
 	-D ENABLE_MQTT 
-    -D ENABLE_INFLUXDB 
     -D ENABLE_SOFTAP 
 board_build.partitions = partitions.csv
 monitor_speed = 115200