Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-13 19:57:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

webui(server): export web & ws settings in the respective module

Browse Source 
cors setup does not have to be in ws, move to web setup routine
actually set up ws auth setting, don't just report it in the ui
This commit is contained in:
Maxim Prokhorov
2025-04-02 05:34:33 +03:00
parent 6622c6d3ab
commit a7d084206b
2 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/espurna/web.cpp
View File

@@ -71,6 +71,8 @@ namespace {
namespace build {
STRING_VIEW_INLINE(WebRemoteDomain, WEB_REMOTE_DOMAIN);
constexpr auto DefaultPort = uint16_t{
#if WEB_SSL_ENABLED
443
@@ -96,19 +98,24 @@ namespace keys {
STRING_VIEW_INLINE(Prefix, "web");
STRING_VIEW_INLINE(Port, "webPort");
STRING_VIEW_INLINE(AccessLog, "webAccessLog");
STRING_VIEW_INLINE(Domain, "webDomain");
STRING_VIEW_INLINE(Port, "webPort");
} // namespace keys
uint16_t port() {
return getSetting(keys::Port, build::port());
}
bool access_log() {
return getSetting(keys::AccessLog, build::access_log());
}
String domain() {
return getSetting(keys::Domain, build::WebRemoteDomain);
}
uint16_t port() {
return getSetting(keys::Port, build::port());
}
} // namespace settings
} // namespace
@@ -368,6 +375,16 @@ void _onDiscover(AsyncWebServerRequest *request) {
request->send(response);
}
void _setupAccessControlHeaders() {
const auto domain = espurna::web::settings::domain();
auto& headers = DefaultHeaders::Instance();
headers.addHeader(F("Access-Control-Allow-Origin"), domain);
if (!domain.equals("*")) {
headers.addHeader(F("Access-Control-Allow-Credentials"), F("true"));
}
}
void _addSecurityHeaders(AsyncWebServerResponse* response) {
response->addHeader(F("X-XSS-Protection"), F("1; mode=block"));
response->addHeader(F("X-Content-Type-Options"), F("nosniff"));
@@ -649,6 +666,10 @@ void _onBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t i
}
void _onVisible(JsonObject& root) {
root[espurna::web::settings::keys::Port] = _port;
}
bool _onKeyCheck(espurna::StringView key, const JsonVariant& value) {
return key.startsWith(espurna::web::settings::keys::Prefix);
}
@@ -759,8 +780,12 @@ void webSetup() {
DEBUG_MSG_P(PSTR("[WEBSERVER] Webserver running on port %hu\n"), _port);
// CORS setup
_setupAccessControlHeaders();
// Handle ws server settings updates
wsRegister()
.onVisible(_onVisible)
.onKeyCheck(_onKeyCheck);
}