mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-26 07:02:15 +03:00
a7ced9cabb
* make HTTP Update Server more secure * added option for authentication * added option to change the url for upload * move to overloaded setup * remove delay in both examples * Get better result responses * fix strings interesting, the meta did not refresh if the successResponse is put in "R"
88 lines
3.3 KiB
C++
88 lines
3.3 KiB
C++
#include <Arduino.h>
|
|
#include <WiFiClient.h>
|
|
#include <WiFiServer.h>
|
|
#include <ESP8266WebServer.h>
|
|
#include <WiFiUdp.h>
|
|
#include "ESP8266HTTPUpdateServer.h"
|
|
|
|
|
|
const char* ESP8266HTTPUpdateServer::_serverIndex =
|
|
R"(<html><body><form method='POST' action='' enctype='multipart/form-data'>
|
|
<input type='file' name='update'>
|
|
<input type='submit' value='Update'>
|
|
</form>
|
|
</body></html>)";
|
|
const char* ESP8266HTTPUpdateServer::_failedResponse = R"(Update Failed!)";
|
|
const char* ESP8266HTTPUpdateServer::_successResponse = "<META http-equiv=\"refresh\" content=\"15;URL=\">Update Success! Rebooting...";
|
|
|
|
ESP8266HTTPUpdateServer::ESP8266HTTPUpdateServer(bool serial_debug)
|
|
{
|
|
_serial_output = serial_debug;
|
|
_server = NULL;
|
|
_username = NULL;
|
|
_password = NULL;
|
|
_authenticated = false;
|
|
}
|
|
|
|
void ESP8266HTTPUpdateServer::setup(ESP8266WebServer *server, const char * path, const char * username, const char * password)
|
|
{
|
|
_server = server;
|
|
_username = (char *)username;
|
|
_password = (char *)password;
|
|
|
|
// handler for the /update form page
|
|
_server->on(path, HTTP_GET, [&](){
|
|
if(_username != NULL && _password != NULL && !_server->authenticate(_username, _password))
|
|
return _server->requestAuthentication();
|
|
_server->send(200, "text/html", _serverIndex);
|
|
});
|
|
|
|
// handler for the /update form POST (once file upload finishes)
|
|
_server->on(path, HTTP_POST, [&](){
|
|
if(!_authenticated)
|
|
return _server->requestAuthentication();
|
|
_server->send(200, "text/html", Update.hasError() ? _failedResponse : _successResponse);
|
|
ESP.restart();
|
|
},[&](){
|
|
// handler for the file upload, get's the sketch bytes, and writes
|
|
// them through the Update object
|
|
HTTPUpload& upload = _server->upload();
|
|
if(upload.status == UPLOAD_FILE_START){
|
|
if (_serial_output)
|
|
Serial.setDebugOutput(true);
|
|
|
|
_authenticated = (_username == NULL || _password == NULL || _server->authenticate(_username, _password));
|
|
if(!_authenticated){
|
|
if (_serial_output)
|
|
Serial.printf("Unauthenticated Update\n");
|
|
return;
|
|
}
|
|
|
|
WiFiUDP::stopAll();
|
|
if (_serial_output)
|
|
Serial.printf("Update: %s\n", upload.filename.c_str());
|
|
uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
|
|
if(!Update.begin(maxSketchSpace)){//start with max available size
|
|
if (_serial_output) Update.printError(Serial);
|
|
}
|
|
} else if(_authenticated && upload.status == UPLOAD_FILE_WRITE){
|
|
if (_serial_output) Serial.printf(".");
|
|
if(Update.write(upload.buf, upload.currentSize) != upload.currentSize){
|
|
if (_serial_output) Update.printError(Serial);
|
|
|
|
}
|
|
} else if(_authenticated && upload.status == UPLOAD_FILE_END){
|
|
if(Update.end(true)){ //true to set the size to the current progress
|
|
if (_serial_output) Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize);
|
|
} else {
|
|
if (_serial_output) Update.printError(Serial);
|
|
}
|
|
if (_serial_output) Serial.setDebugOutput(false);
|
|
} else if(_authenticated && upload.status == UPLOAD_FILE_ABORTED){
|
|
Update.end();
|
|
if (_serial_output) Serial.println("Update was aborted");
|
|
}
|
|
delay(0);
|
|
});
|
|
}
|