mh
/
mhsw-espurna
1
0
Fork 0
Code Releases 0 Activity
Browse Source

Authentication chanllenge only in /auth request

fastled
Xose Pérez 7 years ago
parent
35c1b9a338
commit
ec811f72df
4 changed files with 29 additions and 15 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -14
      code/espurna/web.ino
  2. +11
    -0
      code/html/custom.css
  3. +7
    -1
      code/html/custom.js
  4. +4
    -0
      code/html/index.html

+ 7
- 14
code/espurna/web.ino View File

@ -508,9 +508,7 @@ void _wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTy
// First packet // First packet
if (info->index == 0) { if (info->index == 0) {
//Serial.printf("Before malloc: %d\n", ESP.getFreeHeap());
message = (uint8_t*) malloc(info->len); message = (uint8_t*) malloc(info->len);
//Serial.printf("After malloc: %d\n", ESP.getFreeHeap());
} }
// Store data // Store data
@ -519,9 +517,7 @@ void _wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTy
// Last packet // Last packet
if (info->index + len == info->len) { if (info->index + len == info->len) {
_wsParse(client->id(), message, info->len); _wsParse(client->id(), message, info->len);
//Serial.printf("Before free: %d\n", ESP.getFreeHeap());
free(message); free(message);
//Serial.printf("After free: %d\n", ESP.getFreeHeap());
} }
} }
@ -683,16 +679,9 @@ void _onRPC(AsyncWebServerRequest *request) {
} }
void _onHome(AsyncWebServerRequest *request) {
webLogRequest(request);
if (!_authenticate(request)) return request->requestAuthentication();
request->send(SPIFFS, "/index.html");
}
void _onAuth(AsyncWebServerRequest *request) { void _onAuth(AsyncWebServerRequest *request) {
webLogRequest(request); webLogRequest(request);
if (!_authenticate(request)) return request->requestAuthentication(); if (!_authenticate(request)) return request->requestAuthentication();
IPAddress ip = request->client()->remoteIP(); IPAddress ip = request->client()->remoteIP();
@ -726,8 +715,6 @@ void webSetup() {
_server->addHandler(&ws); _server->addHandler(&ws);
// Serve home (basic authentication protection) // Serve home (basic authentication protection)
_server->on("/", HTTP_GET, _onHome);
_server->on("/index.html", HTTP_GET, _onHome);
_server->on("/auth", HTTP_GET, _onAuth); _server->on("/auth", HTTP_GET, _onAuth);
_server->on("/apis", HTTP_GET, _onAPIs); _server->on("/apis", HTTP_GET, _onAPIs);
_server->on("/rpc", HTTP_GET, _onRPC); _server->on("/rpc", HTTP_GET, _onRPC);
@ -735,7 +722,13 @@ void webSetup() {
// Serve static files // Serve static files
char lastModified[50]; char lastModified[50];
sprintf(lastModified, "%s %s GMT", __DATE__, __TIME__); sprintf(lastModified, "%s %s GMT", __DATE__, __TIME__);
_server->serveStatic("/", SPIFFS, "/").setLastModified(lastModified);
_server->rewrite("/", "/index.html");
_server->serveStatic("/", SPIFFS, "/")
.setLastModified(lastModified)
.setFilter([](AsyncWebServerRequest *request) -> bool {
webLogRequest(request);
return true;
});
// 404 // 404
_server->onNotFound([](AsyncWebServerRequest *request){ _server->onNotFound([](AsyncWebServerRequest *request){


+ 11
- 0
code/html/custom.css View File

@ -90,3 +90,14 @@ div.hint {
.webmode { .webmode {
display: none; display: none;
} }
#credentials {
font-size: 200%;
text-align: center;
height: 100px;
width: 400px;
position: fixed;
top: 50%;
left: 50%;
margin-top: -50px;
margin-left: -200px;
}

+ 7
- 1
code/html/custom.js View File

@ -216,6 +216,7 @@ function processData(data) {
password = data.webMode == 1; password = data.webMode == 1;
$("#layout").toggle(data.webMode == 0); $("#layout").toggle(data.webMode == 0);
$("#password").toggle(data.webMode == 1); $("#password").toggle(data.webMode == 1);
$("#credentials").hide();
} }
// Actions // Actions
@ -393,11 +394,16 @@ function init() {
$("div.more", addNetwork()).toggle(); $("div.more", addNetwork()).toggle();
}); });
var host = window.location.hostname;
var port = location.port;
$.ajax({ $.ajax({
'method': 'GET', 'method': 'GET',
'url': '/auth'
'url': 'http://' + host + ':' + port + '/auth'
}).done(function(data) { }).done(function(data) {
connect(); connect();
}).fail(function(){
$("#credentials").show();
}); });
} }


+ 4
- 0
code/html/index.html View File

@ -19,6 +19,10 @@
<body> <body>
<div id="credentials" class="webmode">
Wrong credentials
</div>
<div id="password" class="webmode"> <div id="password" class="webmode">
<div class="content"> <div class="content">


Write Preview
Loading…
Cancel
Save