feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved webserverPassword into newSettings

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-29 06:19:09 +01:00
parent b013bbd693
commit 4e1943dbc8
6 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/webserver_displaycontrol.cpp
View File

@@ -23,6 +23,7 @@
#include "buttons.h"
#include "globals.h"
#include "webserver_lock.h"
#include "newsettings.h"
#ifdef FEATURE_WEBSERVER
using esphttpdutils::HtmlTag;
@@ -57,7 +58,7 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
char tmpBuf[256];
const auto key_result = httpd_query_key_value(wants_json_query.data(), "json", tmpBuf, 256);
if (key_result == ESP_OK && (tmpBuf == stringSettings.webserver_password || stringSettings.webserver_password.empty()))
if (key_result == ESP_OK && (configs.webserverPassword.value.empty() || configs.webserverPassword.value == tmpBuf))
{
body += "{";
@@ -148,7 +149,7 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
body = body.erase(lastEckig+1, 1);
}
else if (key_result != ESP_ERR_NOT_FOUND && tmpBuf != stringSettings.webserver_password)
else if (key_result != ESP_ERR_NOT_FOUND && tmpBuf != configs.webserverPassword.value)
{
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Unauthorized, "text/plain", "");
}