mirror of
https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git
synced 2025-08-05 00:30:39 +08:00

### Maintenance page * Add add tab color for mobile view * Add spellcheck off / autocorect off in input * Add disconnect button when authenticate enabled * Add Invalid user or password message when authentication failed ### Board support * Add ESP32 S2 support * Add ESP32 S3 support * Add ESP32 C3 support ### ESP commands * Add command 701 to control GCODE streaming * Remove command 901 as duplicate * Update command 420 to add more details * Use text as default output * All json on all commands for formated output ### Core * Add benchmak function to check transfer speed (for test only-not production) * Merge code for ESP3DLib support * Add better printer display support (M117 / Serial TFT) * Use ESP32 analogWrite instead of emulated one ### Modules * Display * Refactor code * Remove SPI ILI 9341 / 9488 support as not suitable * Add ST7789 support (135x240 / 240x240) * Filesystem * Bug fixes due to esp core updates * Better SD sharing mecanism * Better global FS management * FTP * Add SD sharing support * Better global FS management * GCODE Host * Add basic support for macro files * Add ESP command support * Use not blocking method to stream commands / handle response * Notifications * Add IFTTT notification service * Add WebUI notification * Add ESP3D display notification * WebDav * Add SD sharing support * Add bug fix from https://github.com/d-a-v/ESPWebDAV * Better global FS management * Websocket * Add function to handle zombies connections * WiFi * Fix connection to AP sometime fail * Fix low signal not diplayed in ESP420 even connected * Add AP Setup mode ### Libraries * Update SDFat-2.0.6 to 2.1.2 * Update ESP32SSDP 1.1.1 to 1.2.0 * Update TFT_eSPI-1.4.11 to 2.4.61 * Update arduinoWebSockets-2.3.5 to 2.3.6 * Update esp8266-oled-ssd1306-4.0.0 to 4.3.0 * Remove lvgl support ### Tools * Add I2C scanner script * Add python script to simulate/stress printer serial communication ### PlatformIO * Use latest 4.4.0 Espressif32 release (ESP32-arduino core 2.0.3) * Add fix for Flash more than 4MB * Add Esp32 S2/S3/C3 env * Add ESP32-ST7789 / esp32-TTGO_T_Display env
87 lines
2.3 KiB
C++
87 lines
2.3 KiB
C++
/*
|
|
* WebSocketServerHttpHeaderValidation.ino
|
|
*
|
|
* Created on: 08.06.2016
|
|
*
|
|
*/
|
|
|
|
#include <Arduino.h>
|
|
|
|
#include <ESP8266WiFi.h>
|
|
#include <ESP8266WiFiMulti.h>
|
|
#include <WebSocketsServer.h>
|
|
#include <Hash.h>
|
|
|
|
ESP8266WiFiMulti WiFiMulti;
|
|
|
|
WebSocketsServer webSocket = WebSocketsServer(81);
|
|
|
|
#define USE_SERIAL Serial1
|
|
|
|
const unsigned long int validSessionId = 12345; //some arbitrary value to act as a valid sessionId
|
|
|
|
/*
|
|
* Returns a bool value as an indicator to describe whether a user is allowed to initiate a websocket upgrade
|
|
* based on the value of a cookie. This function expects the rawCookieHeaderValue to look like this "sessionId=<someSessionIdNumberValue>|"
|
|
*/
|
|
bool isCookieValid(String rawCookieHeaderValue) {
|
|
|
|
if (rawCookieHeaderValue.indexOf("sessionId") != -1) {
|
|
String sessionIdStr = rawCookieHeaderValue.substring(rawCookieHeaderValue.indexOf("sessionId=") + 10, rawCookieHeaderValue.indexOf("|"));
|
|
unsigned long int sessionId = strtoul(sessionIdStr.c_str(), NULL, 10);
|
|
return sessionId == validSessionId;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* The WebSocketServerHttpHeaderValFunc delegate passed to webSocket.onValidateHttpHeader
|
|
*/
|
|
bool validateHttpHeader(String headerName, String headerValue) {
|
|
|
|
//assume a true response for any headers not handled by this validator
|
|
bool valid = true;
|
|
|
|
if(headerName.equalsIgnoreCase("Cookie")) {
|
|
//if the header passed is the Cookie header, validate it according to the rules in 'isCookieValid' function
|
|
valid = isCookieValid(headerValue);
|
|
}
|
|
|
|
return valid;
|
|
}
|
|
|
|
void setup() {
|
|
// USE_SERIAL.begin(921600);
|
|
USE_SERIAL.begin(115200);
|
|
|
|
//Serial.setDebugOutput(true);
|
|
USE_SERIAL.setDebugOutput(true);
|
|
|
|
USE_SERIAL.println();
|
|
USE_SERIAL.println();
|
|
USE_SERIAL.println();
|
|
|
|
for(uint8_t t = 4; t > 0; t--) {
|
|
USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
|
|
USE_SERIAL.flush();
|
|
delay(1000);
|
|
}
|
|
|
|
WiFiMulti.addAP("SSID", "passpasspass");
|
|
|
|
while(WiFiMulti.run() != WL_CONNECTED) {
|
|
delay(100);
|
|
}
|
|
|
|
//connecting clients must supply a valid session cookie at websocket upgrade handshake negotiation time
|
|
const char * headerkeys[] = { "Cookie" };
|
|
size_t headerKeyCount = sizeof(headerkeys) / sizeof(char*);
|
|
webSocket.onValidateHttpHeader(validateHttpHeader, headerkeys, headerKeyCount);
|
|
webSocket.begin();
|
|
}
|
|
|
|
void loop() {
|
|
webSocket.loop();
|
|
}
|
|
|