From 04ed5ae77dc0d0fecfd6e71887713f089e0ec9ed Mon Sep 17 00:00:00 2001 From: Chrome Legion Date: Thu, 27 Sep 2018 08:07:53 -0700 Subject: [PATCH] Qrome - updated with ability to turn on or off Basic Auth for web interface --- README.md | 3 ++- printermonitor/Settings.h | 5 +++-- printermonitor/printermonitor.ino | 34 +++++++++++++++++++++++-------- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 803273b..c751ef5 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,8 @@ Please do not feel obligated, but donations and tips are warmly welcomed. I hav ## Contributors David Payne -Daniel Eichhorn -- Author of the TimeClient class and OLEDDisplayUi . +Daniel Eichhorn -- Author of the TimeClient class and OLEDDisplayUi +Florian Schütte -- added flip display to web interface Contributing to this software is warmly welcomed. You can do this basically by forking from master, committing modifications and then making a pulling requests to be reviewed (follow the links above diff --git a/printermonitor/Settings.h b/printermonitor/Settings.h index dfa100e..5bf439c 100644 --- a/printermonitor/Settings.h +++ b/printermonitor/Settings.h @@ -70,6 +70,7 @@ boolean IS_METRIC = false; // false = Imperial and true = Metric const int WEBSERVER_PORT = 80; // The port you can access this device on over HTTP const boolean WEBSERVER_ENABLED = true; // Device will provide a web interface via http://[ip]:[port]/ +boolean IS_BASIC_AUTH = true; // true = require athentication to change configuration settings / false = no auth char* www_username = "admin"; // User account for the Web Interface char* www_password = "password"; // Password for the Web Interface float UtcOffset = -7; // Hour offset from GMT for your timezone @@ -82,7 +83,7 @@ const int I2C_DISPLAY_ADDRESS = 0x3c; // I2C Address of your Display (usually 0x const int SDA_PIN = D2; const int SCL_PIN = D5; boolean INVERT_DISPLAY = false; // true = pins at top | false = pins at the bottom -//#define DISPLAY_SH1106 // Uncomment this line to use the SH1106 display -- SSD1306 is used by default and is most common +#define DISPLAY_SH1106 // Uncomment this line to use the SH1106 display -- SSD1306 is used by default and is most common boolean ENABLE_OTA = true; // this will allow you to load firmware to the device over WiFi (see OTA for ESP8266) String OTA_Password = ""; // Set an OTA password here -- leave blank if you don't want to be prompted for password @@ -90,4 +91,4 @@ String OTA_Password = ""; // Set an OTA password here -- leave blank if you // End Settings //****************************** -String themeColor = "light-green"; // this can be changed later in the web interface. +String themeColor = "light-green"; // this can be changed later in the web interface. diff --git a/printermonitor/printermonitor.ino b/printermonitor/printermonitor.ino index f827286..e3685cb 100644 --- a/printermonitor/printermonitor.ino +++ b/printermonitor/printermonitor.ino @@ -112,10 +112,11 @@ String CHANGE_FORM = "
Display Clock when printer is off

" "

Use 24 Hour Clock (military time)

" - "

Flip display?

" + "

Flip display orientation

" "

Clock Sync / Weather Refresh (minutes)

" "

Theme Color

" "

" + "

Use Security Credentials for Configuration Changes

" "

" "

" "
"; @@ -374,8 +375,15 @@ void getUpdateTime() { digitalWrite(externalLight, HIGH); // turn off the LED } +boolean authentication() { + if (IS_BASIC_AUTH && (strlen(www_username) >= 1 && strlen(www_password) >= 1)) { + return server.authenticate(www_username, www_password); + } + return true; // Authentication not required +} + void handleSystemReset() { - if (!server.authenticate(www_username, www_password)) { + if (!authentication()) { return server.requestAuthentication(); } Serial.println("Reset System Configuration"); @@ -386,7 +394,7 @@ void handleSystemReset() { } void handleUpdateWeather() { - if (!server.authenticate(www_username, www_password)) { + if (!authentication()) { return server.requestAuthentication(); } DISPLAYWEATHER = server.hasArg("isWeatherEnabled"); @@ -402,7 +410,7 @@ void handleUpdateWeather() { void handleUpdateConfig() { boolean flipOld = INVERT_DISPLAY; - if (!server.authenticate(www_username, www_password)) { + if (!authentication()) { return server.requestAuthentication(); } OctoPrintApiKey = server.arg("octoPrintApiKey"); @@ -436,7 +444,7 @@ void handleUpdateConfig() { } void handleWifiReset() { - if (!server.authenticate(www_username, www_password)) { + if (!authentication()) { return server.requestAuthentication(); } //WiFiManager @@ -448,7 +456,7 @@ void handleWifiReset() { } void handleWeatherConfigure() { - if (!server.authenticate(www_username, www_password)) { + if (!authentication()) { return server.requestAuthentication(); } digitalWrite(externalLight, LOW); @@ -488,7 +496,7 @@ void handleWeatherConfigure() { } void handleConfigure() { - if (!server.authenticate(www_username, www_password)) { + if (!authentication()) { return server.requestAuthentication(); } digitalWrite(externalLight, LOW); @@ -533,6 +541,11 @@ void handleConfigure() { themeOptions.replace(">"+String(themeColor)+"<", " selected>"+String(themeColor)+"<"); form.replace("%THEME_OPTIONS%", themeOptions); form.replace("%UTCOFFSET%", String(UtcOffset)); + String isUseSecurityChecked = ""; + if (IS_BASIC_AUTH) { + isUseSecurityChecked = "checked='checked'"; + } + form.replace("%IS_BASICAUTH_CHECKED%", isUseSecurityChecked); form.replace("%USERID%", String(www_username)); form.replace("%STATIONPASSWORD%", String(www_password)); @@ -947,6 +960,7 @@ void writeSettings() { f.println("octoPass=" + OctoAuthPass); f.println("refreshRate=" + String(minutesBetweenDataRefresh)); f.println("themeColor=" + themeColor); + f.println("IS_BASIC_AUTH=" + String(IS_BASIC_AUTH)); f.println("www_username=" + String(www_username)); f.println("www_password=" + String(www_password)); f.println("DISPLAYCLOCK=" + String(DISPLAYCLOCK)); @@ -1015,6 +1029,10 @@ void readSettings() { themeColor.trim(); Serial.println("themeColor=" + themeColor); } + if (line.indexOf("IS_BASIC_AUTH=") >= 0) { + IS_BASIC_AUTH = line.substring(line.lastIndexOf("IS_BASIC_AUTH=") + 14).toInt(); + Serial.println("IS_BASIC_AUTH=" + String(IS_BASIC_AUTH)); + } if (line.indexOf("www_username=") >= 0) { String temp = line.substring(line.lastIndexOf("www_username=") + 13); temp.trim(); @@ -1148,4 +1166,4 @@ void enableDisplay(boolean enable) { Serial.println("Display was turned OFF: " + timeClient.getFormattedTime()); displayOffEpoch = lastEpoch; } -} +}