jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 04:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extra config options

Browse Source
This commit is contained in:
fvanroie 2020-03-25 13:47:29 +01:00
parent dc82075a96
commit 336ec76f08
2 changed files with 116 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hasp_config.h
View File

@ -18,6 +18,9 @@ const char F_CONFIG_USER[] PROGMEM = "user";
const char F_CONFIG_PASS[] PROGMEM = "pass"; const char F_CONFIG_PASS[] PROGMEM = "pass";
const char F_CONFIG_SSID[] PROGMEM = "ssid"; const char F_CONFIG_SSID[] PROGMEM = "ssid";
const char F_CONFIG_GROUP[] PROGMEM = "group"; const char F_CONFIG_GROUP[] PROGMEM = "group";
const char F_CONFIG_BAUD[] PROGMEM = "baud";
const char F_CONFIG_LOG[] PROGMEM = "log";
const char F_CONFIG_PROTOCOL[] PROGMEM = "proto";
const char F_GUI_ROTATION[] PROGMEM = "rotation"; const char F_GUI_ROTATION[] PROGMEM = "rotation";
const char F_GUI_TICKPERIOD[] PROGMEM = "tickperiod"; const char F_GUI_TICKPERIOD[] PROGMEM = "tickperiod";
const char F_GUI_IDLEPERIOD1[] PROGMEM = "idle1"; const char F_GUI_IDLEPERIOD1[] PROGMEM = "idle1";
@ -30,13 +33,11 @@ const char F_DEBUG_TELEPERIOD[] PROGMEM = "teleperiod";
const char HASP_CONFIG_FILE[] PROGMEM = "/config.json"; const char HASP_CONFIG_FILE[] PROGMEM = "/config.json";
void configSetup(JsonDocument & settings); void configSetup(JsonDocument & settings);
void configLoop(void);
void configStop(void); void configStop(void);
void configSetConfig(JsonObject & settings); void configSetConfig(JsonObject & settings);
void configGetConfig(JsonDocument & settings); void configGetConfig(JsonDocument & settings);
void configWriteConfig(); void configWriteConfig();
bool configChanged(void);
void configOutput(const JsonObject & settings); void configOutput(const JsonObject & settings);
bool configSet(int8_t & value, const JsonVariant & setting, const char * name); bool configSet(int8_t & value, const JsonVariant & setting, const char * name);

103
src/hasp_telnet.cpp
View File

@ -1,27 +1,31 @@
#include "hasp_conf.h"
#if HASP_USE_TELNET > 0
#include "Arduino.h" #include "Arduino.h"
#include "ArduinoJson.h" #include "ArduinoJson.h"
#include "hasp_conf.h"
#include "hasp_log.h" #include "hasp_log.h"
#include "hasp_debug.h" #include "hasp_debug.h"
#include "hasp_config.h" #include "hasp_config.h"
#include "hasp_dispatch.h" #include "hasp_dispatch.h"
#include "hasp_telnet.h" #include "hasp_telnet.h"
#if HASP_USE_TELNET > 0
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
#include <Wifi.h> #include <Wifi.h>
#else #else
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#endif #endif
//#define telnetInputMax 128; // Size of user input buffer for user telnet session #define TELNET_UNAUTHENTICATED 0
#define TELNET_USERNAME_OK 10
#define TELNET_USERNAME_NOK 99
#define TELNET_AUTHENTICATED 255
uint8_t telnetLoginState = TELNET_UNAUTHENTICATED;
WiFiServer * telnetServer; //(23); WiFiServer * telnetServer; //(23);
WiFiClient * telnetClient; WiFiClient * telnetClient;
uint8_t telnetEnabled = true; // Enable telnet debug output uint8_t telnetEnabled = true; // Enable telnet debug output
uint8_t telnetLoginAttempt = 0; // Initial attempt uint8_t telnetLoginAttempt = 0; // Initial attempt
uint8_t telnetLoginState = 0; // Unauthenticated
uint8_t telnetInputIndex = 0; // Empty buffer uint8_t telnetInputIndex = 0; // Empty buffer
char telnetInputBuffer[128]; char telnetInputBuffer[128];
@ -34,7 +38,7 @@ bool telnetExitCommand()
telnetClient->remoteIP().toString().c_str()); telnetClient->remoteIP().toString().c_str());
debugPrintln(buffer); debugPrintln(buffer);
telnetClient->stop(); telnetClient->stop();
telnetLoginState = 0; // Unauthenticated telnetLoginState = TELNET_UNAUTHENTICATED;
telnetInputIndex = 0; // Empty buffer telnetInputIndex = 0; // Empty buffer
telnetLoginAttempt = 0; // Initial attempt telnetLoginAttempt = 0; // Initial attempt
return true; return true;
@ -43,28 +47,8 @@ bool telnetExitCommand()
} }
} }
void telnetSetup(const JsonObject & settings) void telnetAcceptClient()
{ {
telnetSetConfig(settings);
if(telnetEnabled) { // Setup telnet server for remote debug output
telnetServer = new WiFiServer(23);
if(telnetServer) {
telnetClient = new WiFiClient;
telnetServer->setNoDelay(true);
telnetServer->begin();
debugPrintln(String(F("TELNET: Debug console enabled at telnet://")) + WiFi.localIP().toString());
} else {
errorPrintln(F("TELNET: %sFailed to start telnet server"));
}
}
}
void telnetLoop()
{ // Basic telnet client handling code from: https://gist.github.com/tablatronix/4793677ca748f5f584c95ec4a2b10303
if(telnetServer && telnetServer->hasClient()) { // client is connected
if(!*telnetClient || !telnetClient->connected()) {
if(telnetClient) { if(telnetClient) {
telnetClient->stop(); // client disconnected telnetClient->stop(); // client disconnected
} }
@ -75,18 +59,13 @@ void telnetLoop()
debugPrintln(buffer); debugPrintln(buffer);
snprintf_P(buffer, sizeof(buffer), PSTR("\r\nUsername: ")); snprintf_P(buffer, sizeof(buffer), PSTR("\r\nUsername: "));
telnetClient->print(buffer); telnetClient->print(buffer);
telnetLoginState = 0; // Unauthenticated telnetLoginState = TELNET_UNAUTHENTICATED;
telnetInputIndex = 0; // reset input buffer index telnetInputIndex = 0; // reset input buffer index
telnetLoginAttempt = 0; // Initial attempt telnetLoginAttempt = 0; // Initial attempt
} else {
telnetServer->available().stop(); // have client, block new connections
}
} }
// Handle client input from telnet connection. void telnetProcessInput()
if(telnetClient && telnetClient->connected() && telnetClient->available()) { // client input processing {
if(telnetClient->available()) {
char telnetInputByte = telnetClient->read(); // Read client byte char telnetInputByte = telnetClient->read(); // Read client byte
// debugPrintln(String("telnet in: 0x") + String(telnetInputByte, HEX)); // debugPrintln(String("telnet in: 0x") + String(telnetInputByte, HEX));
switch(telnetInputByte) { switch(telnetInputByte) {
@ -111,30 +90,30 @@ void telnetLoop()
case 13: case 13:
telnetInputBuffer[telnetInputIndex] = 0; // null terminate our char array telnetInputBuffer[telnetInputIndex] = 0; // null terminate our char array
switch(telnetLoginState) { switch(telnetLoginState) {
case 0: { case TELNET_UNAUTHENTICATED: {
char buffer[128]; char buffer[128];
snprintf_P(buffer, sizeof(buffer), PSTR("Password: %c%c%c"), 0xFF, 0xFB, 0x01); snprintf_P(buffer, sizeof(buffer), PSTR("Password: %c%c%c"), 0xFF, 0xFB, 0x01); // Hide characters
telnetClient->print(buffer); telnetClient->print(buffer);
snprintf_P(buffer, sizeof(buffer), PSTR("admin")); snprintf_P(buffer, sizeof(buffer), PSTR("admin"));
telnetLoginState = telnetLoginState =
strcmp(telnetInputBuffer, buffer) == 0 ? 10 : 99; // Username OK=1 or NOK=99 strcmp(telnetInputBuffer, buffer) == 0 ? TELNET_USERNAME_OK : TELNET_USERNAME_NOK;
break; break;
} }
case 10: case TELNET_USERNAME_OK:
case 99: { case TELNET_USERNAME_NOK: {
char buffer[128]; char buffer[128];
snprintf_P(buffer, sizeof(buffer), PSTR("%c%c%c"), 0xFF, 0xFC, 0x01); snprintf_P(buffer, sizeof(buffer), PSTR("%c%c%c"), 0xFF, 0xFC, 0x01); // Show characters
telnetClient->println(buffer); telnetClient->println(buffer);
snprintf_P(buffer, sizeof(buffer), PSTR("haspadmin")); snprintf_P(buffer, sizeof(buffer), PSTR("haspadmin"));
if(telnetLoginState == 10 && strcmp(telnetInputBuffer, buffer) == 0) { // Authenticated if(telnetLoginState == TELNET_AUTHENTICATED && strcmp(telnetInputBuffer, buffer) == 0) {
telnetLoginState = 255; // Authenticated telnetLoginState = TELNET_AUTHENTICATED;
telnetLoginAttempt = 0; // Initial attempt telnetLoginAttempt = 0; // Initial attempt
telnetClient->println(debugHaspHeader()); telnetClient->println(debugHaspHeader());
snprintf_P(buffer, sizeof(buffer), PSTR("TELNET: Client login from %s"), snprintf_P(buffer, sizeof(buffer), PSTR("TELNET: Client login from %s"),
telnetClient->remoteIP().toString().c_str()); telnetClient->remoteIP().toString().c_str());
debugPrintln(buffer); debugPrintln(buffer);
} else { } else {
telnetLoginState = 0; // Unauthorized telnetLoginState = TELNET_UNAUTHENTICATED;
telnetLoginAttempt++; // Subsequent attempt telnetLoginAttempt++; // Subsequent attempt
snprintf_P(buffer, sizeof(buffer), PSTR("Authorization failed!\r\n")); snprintf_P(buffer, sizeof(buffer), PSTR("Authorization failed!\r\n"));
telnetClient->println(buffer); telnetClient->println(buffer);
@ -165,19 +144,51 @@ void telnetLoop()
} }
} }
} }
void telnetSetup(const JsonObject & settings)
{
telnetSetConfig(settings);
if(telnetEnabled) { // Setup telnet server for remote debug output
telnetServer = new WiFiServer(23);
if(telnetServer) {
telnetClient = new WiFiClient;
telnetServer->setNoDelay(true);
telnetServer->begin();
debugPrintln(String(F("TELNET: Debug console enabled at telnet://")) + WiFi.localIP().toString());
} else {
errorPrintln(F("TELNET: %sFailed to start telnet server"));
}
}
}
void telnetLoop()
{ // Basic telnet client handling code from: https://gist.github.com/tablatronix/4793677ca748f5f584c95ec4a2b10303
if(telnetServer && telnetServer->hasClient()) { // client is connected
if(!*telnetClient || !telnetClient->connected()) {
telnetAcceptClient();
} else {
telnetServer->available().stop(); // have client, block new connections
}
}
// Handle client input from telnet connection.
if(telnetClient && telnetClient->connected() && telnetClient->available()) {
telnetProcessInput(); // client input processing
} }
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void telnetPrintln(const char * msg) void telnetPrintln(const char * msg)
{ {
if(telnetEnabled && telnetClient && telnetClient->connected() && telnetLoginState == 255) { if(telnetEnabled && telnetClient && telnetClient->connected() && telnetLoginState == TELNET_AUTHENTICATED) {
telnetClient->println(msg); telnetClient->println(msg);
} }
} }
void telnetPrint(const char * msg) void telnetPrint(const char * msg)
{ {
if(telnetEnabled && telnetClient && telnetClient->connected() && telnetLoginState == 255) { if(telnetEnabled && telnetClient && telnetClient->connected() && telnetLoginState == TELNET_AUTHENTICATED) {
telnetClient->print(msg); telnetClient->print(msg);
} }
} }