Skip to content

Update ESPAsyncHTTPUpdateServer.cpp #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update ESPAsyncHTTPUpdateServer.cpp #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions src/ESPAsyncHTTPUpdateServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <Arduino.h>
#include "StreamString.h"
#include "ESPAsyncHTTPUpdateServer.h"
#include <Ticker.h>

#ifdef ESP32
#ifdef ESPASYNCHTTPUPDATESERVER_LITTLEFS
Expand All @@ -13,6 +12,7 @@
#elif defined(ESP8266)
#include <flash_hal.h>
#include <FS.h>
#include <Ticker.h>
#else
#error "This library only supports boards with an ESP8266 or ESP32 processor."
#endif
Expand Down Expand Up @@ -56,14 +56,18 @@
static const char successResponse[] PROGMEM =
R"(<meta content="15;URL=/"http-equiv=refresh>Update Success! Rebooting...)";

#ifdef ESP8266
Ticker restartTimer;
#endif

ESPAsyncHTTPUpdateServer::ESPAsyncHTTPUpdateServer()
{
_server = NULL;
_username = emptyString;
_password = emptyString;
_authenticated = false;
_updateType = UpdateType::FIRMWARE;
_updateResult = UpdateResult::UPDATE_OK;
}

void ESPAsyncHTTPUpdateServer::setup(AsyncWebServer *server, const String &path, const String &username, const String &password)
Expand All @@ -75,7 +79,7 @@ void ESPAsyncHTTPUpdateServer::setup(AsyncWebServer *server, const String &path,
// handler for the /update form page
_server->on(path.c_str(), HTTP_GET, [&](AsyncWebServerRequest *request)
{
if(_username != emptyString && _password != emptyString)
if(!_username.isEmpty() && !_password.isEmpty())
if( !request->authenticate(_username.c_str(), _password.c_str()))
return request->requestAuthentication();
#ifdef ESP32
Expand All @@ -94,7 +98,7 @@ void ESPAsyncHTTPUpdateServer::setup(AsyncWebServer *server, const String &path,
response->addHeader("Access-Control-Allow-Origin", "*");
request->send(response);

_authenticated = (_username == emptyString || _password == emptyString || request -> authenticate(_username.c_str(), _password.c_str()));
_authenticated = (_username.isEmpty() || _password.isEmpty() || request -> authenticate(_username.c_str(), _password.c_str()));
if (!_authenticated)
{
Log("Unauthenticated Update\n");
Expand All @@ -119,31 +123,35 @@ void ESPAsyncHTTPUpdateServer::setup(AsyncWebServer *server, const String &path,
}
else
{
Log("Rebooting...\n");
#ifdef ESP32
request->send(200, PSTR("text/html"), successResponse);
xTaskCreate([](void *){ vTaskDelay(pdMS_TO_TICKS(1000)); ESP.restart(); }, NULL, 2048, NULL, 2, NULL);
#else
request->send_P(200, PSTR("text/html"), successResponse);
restartTimer.once_ms(1000, []{ ESP.restart(); });
#endif
Log("Rebooting...\n");
restartTimer.once_ms(1000,[]{ ESP.restart(); });
} },
[&](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final)
{
// handler for the file upload, gets the sketch bytes, and writes
// them through the Update object

_updateType = request->getParam("name")->value() == "filesystem"?
UpdateType::FILE_SYSTEM :
UpdateType::FIRMWARE;
(void) filename; // filename not used: Compiler warning

if (!index)
{
_updateType = request->getParam("name")->value() == "filesystem"?
UpdateType::FILE_SYSTEM :
UpdateType::FIRMWARE;
_updateResult = UpdateResult::UPDATE_OK;

_updaterError.clear();

#ifdef ESPASYNCHTTPUPDATESERVER_DEBUG
ESPASYNCHTTPUPDATESERVER_SerialOutput.setDebugOutput(true);
#endif
_authenticated = (_username == emptyString || _password == emptyString || request->authenticate(_username.c_str(), _password.c_str()));
_authenticated = (_username.isEmpty() || _password.isEmpty() || request->authenticate(_username.c_str(), _password.c_str()));
if (!_authenticated)
{
Log("Unauthenticated Update\n");
Expand All @@ -152,7 +160,6 @@ void ESPAsyncHTTPUpdateServer::setup(AsyncWebServer *server, const String &path,

if (onUpdateBegin)
{
_updateResult = UpdateResult::UPDATE_OK;
onUpdateBegin(_updateType, _updateResult);
if (_updateResult != UpdateResult::UPDATE_OK)
{
Expand Down Expand Up @@ -237,4 +244,4 @@ void ESPAsyncHTTPUpdateServer::_setUpdaterError()
_updateResult = UpdateResult::UPDATE_ERROR;
if(onUpdateEnd)
onUpdateEnd(_updateType, _updateResult);
}
}