mirror of
https://github.com/xoseperez/espurna.git
synced 2026-03-14 04:07:08 +01:00
Convert .ino -> .cpp (#2228)
- general conversion from .ino modules into a separate .cpp files - clean-up internal headers, place libraries into .h. guard .cpp with _SUPPORT flags - fix some instances of shared variables instead of public methods - tweak build system to still build a single source file via os environment variable ESPURNA_BUILD_SINGLE_SOURCE
This commit is contained in:
147
code/espurna/ota_web.cpp
Normal file
147
code/espurna/ota_web.cpp
Normal file
@@ -0,0 +1,147 @@
|
||||
/*
|
||||
|
||||
Part of the WEBSERVER module
|
||||
|
||||
Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
|
||||
Copyright (C) 2020 by Maxim Prokhorov <prokhorov dot max at outlook dot com>
|
||||
|
||||
*/
|
||||
|
||||
#include "ota.h"
|
||||
|
||||
#if WEB_SUPPORT && OTA_WEB_SUPPORT
|
||||
|
||||
#include "web.h"
|
||||
#include "ws.h"
|
||||
|
||||
void _onUpgradeResponse(AsyncWebServerRequest *request, int code, const String& payload = "") {
|
||||
|
||||
auto *response = request->beginResponseStream("text/plain", 256);
|
||||
response->addHeader("Connection", "close");
|
||||
response->addHeader("X-XSS-Protection", "1; mode=block");
|
||||
response->addHeader("X-Content-Type-Options", "nosniff");
|
||||
response->addHeader("X-Frame-Options", "deny");
|
||||
|
||||
response->setCode(code);
|
||||
|
||||
if (payload.length()) {
|
||||
response->printf("%s", payload.c_str());
|
||||
} else {
|
||||
if (!Update.hasError()) {
|
||||
response->print("OK");
|
||||
} else {
|
||||
#if defined(ARDUINO_ESP8266_RELEASE_2_3_0)
|
||||
Update.printError(reinterpret_cast<Stream&>(response));
|
||||
#else
|
||||
Update.printError(*response);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
request->send(response);
|
||||
|
||||
}
|
||||
|
||||
void _onUpgradeStatusSet(AsyncWebServerRequest *request, int code, const String& payload = "") {
|
||||
_onUpgradeResponse(request, code, payload);
|
||||
request->_tempObject = malloc(sizeof(bool));
|
||||
}
|
||||
|
||||
void _onUpgrade(AsyncWebServerRequest *request) {
|
||||
|
||||
webLog(request);
|
||||
if (!webAuthenticate(request)) {
|
||||
return request->requestAuthentication(getSetting("hostname").c_str());
|
||||
}
|
||||
|
||||
if (request->_tempObject) {
|
||||
return;
|
||||
}
|
||||
|
||||
_onUpgradeResponse(request, 200);
|
||||
|
||||
}
|
||||
|
||||
void _onUpgradeFile(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
|
||||
|
||||
if (!webAuthenticate(request)) {
|
||||
return request->requestAuthentication(getSetting("hostname").c_str());
|
||||
}
|
||||
|
||||
// We set this after we are done with the request
|
||||
// It is still possible to re-enter this callback even after connection is already closed
|
||||
// 1.14.2: TODO: see https://github.com/me-no-dev/ESPAsyncWebServer/pull/660
|
||||
// remote close or request sending some data before finishing parsing of the body will leak 1460 bytes
|
||||
// waiting a bit for upstream. fork and point to the fixed version if not resolved before 1.14.2
|
||||
if (request->_tempObject) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!index) {
|
||||
|
||||
// TODO: stop network activity completely when handling Update through ArduinoOTA or `ota` command?
|
||||
if (Update.isRunning()) {
|
||||
_onUpgradeStatusSet(request, 400, F("ERROR: Upgrade in progress"));
|
||||
return;
|
||||
}
|
||||
|
||||
// Check that header is correct and there is more data before anything is written to the flash
|
||||
if (final || !len) {
|
||||
_onUpgradeStatusSet(request, 400, F("ERROR: Invalid request"));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!otaVerifyHeader(data, len)) {
|
||||
_onUpgradeStatusSet(request, 400, F("ERROR: No magic byte / invalid flash config"));
|
||||
return;
|
||||
}
|
||||
|
||||
// Disabling EEPROM rotation to prevent writing to EEPROM after the upgrade
|
||||
eepromRotate(false);
|
||||
|
||||
DEBUG_MSG_P(PSTR("[UPGRADE] Start: %s\n"), filename.c_str());
|
||||
Update.runAsync(true);
|
||||
|
||||
// Note: cannot use request->contentLength() for multipart/form-data
|
||||
if (!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)) {
|
||||
_onUpgradeStatusSet(request, 500);
|
||||
eepromRotate(true);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (request->_tempObject) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Any error will cancel the update, but request may still be alive
|
||||
if (!Update.isRunning()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (Update.write(data, len) != len) {
|
||||
_onUpgradeStatusSet(request, 500);
|
||||
Update.end();
|
||||
eepromRotate(true);
|
||||
return;
|
||||
}
|
||||
|
||||
if (final) {
|
||||
otaFinalize(index + len, CUSTOM_RESET_UPGRADE, true);
|
||||
} else {
|
||||
otaProgress(index + len);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void otaWebSetup() {
|
||||
webServer()->on("/upgrade", HTTP_POST, _onUpgrade, _onUpgradeFile);
|
||||
wsRegister().
|
||||
onVisible([](JsonObject& root) {
|
||||
root["otaVisible"] = 1;
|
||||
});
|
||||
}
|
||||
|
||||
#endif // OTA_WEB_SUPPORT
|
||||
|
||||
Reference in New Issue
Block a user