Added WebAdmin pages

Moved strings to PROGMEM to free up some RAM.
This allows to add WebAdmin features:
- File Manager (to download/add/delete exploit files)
- Device Reboot
- Storage Format

Author: frwololo

GlobalConfig.cpp

@@ -78,7 +78,7 @@ void GlobalConfig::loadConfigFromStorage(void)
 
 void GlobalConfig::DebugOutput(void) {
 #ifdef GLOBALCONFIG_DEBUG 
-  Serial.println("***Config****");
+  Serial.println(F("***Config****"));
 
   Serial.println("SSID: " + AP_SSID);
   Serial.println("Password: " + AP_PASS);
@@ -87,6 +87,6 @@ void GlobalConfig::DebugOutput(void) {
   Serial.println("Connect Wifi: " + connectWifi);
   Serial.println("WIFI_SSID: " + WIFI_SSID);  
   Serial.println("WIFI_PASS: " + WIFI_PASS);    
-  Serial.println("***END Config****");
+  Serial.println(F("***END Config****"));
 #endif
 }

PS4_PS5-ESP8266-Server.ino

@@ -19,12 +19,15 @@ const char* SpoofedDomains[] = {"playstation.net"}; //Used only if conf->wifiCon
 const char* BlockedDomains[] = {"playstation.com", "scea.com", "sonyentertainmentnetwork.com"}; //Used only if conf->wifiConnect is true - all these domains will be blocked in DNS queries (IP set to 0)
 
 // number of entries and number of ports in NAT table
-// Needs to be reasonably small as it uses the heap, which is also used by SSL 
+// Needs to be reasonably small as it uses the heap, which is also used by SSL. But big enough to actually handle queries 
 #define NAPT 100 //27 bytes per entry
 #define NAPT_PORT 30 //14 bytes per entry
 
 //Debug 
 #define DEBUG_HEAP //The ESP8266 has very little heap memory, and both NAT routing and SSL Handshake use it.
+                   // In my tests, the https Server needs around 25'000 bytes free heap to succesfully load a page. 30'000 is better, 20'000 not enough in my tests
+                   // Because of this, it is essential to move a lot of static content (e.g. Strings) to Flash rather than RAM (hence the heavy use of PROGMEM macro in WebAdmin.cpp in particular) 
+
 //#define DEBUG_DNS //To debug issues related to Fake DNS
 //#define DEBUG_WEBSERVER //Debug messages related to the Web Servers
 #define CHRISTMAS_TREE //Builtin LED lights up when DNS replies with a Spoofed or Blocked Domain
@@ -37,13 +40,10 @@ int lastHeap = 0;
 int lastTime = millis();
 #endif
 
-//static const char serverCert[] = "-----BEGIN CERTIFICATE-----\r\nMIIC1DCCAj2gAwIBAgIUFQgjEtkNYfmrrpNQKHVNl3+dl08wDQYJKoZIhvcNAQEL\r\nBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEDAOBgNVBAcM\r\nB0ZyZW1vbnQxDDAKBgNVBAoMA2VzcDEMMAoGA1UECwwDZXNwMQwwCgYDVQQDDANl\r\nc3AxHDAaBgkqhkiG9w0BCQEWDWVzcEBlc3AubG9jYWwwHhcNMjEwMjIxMDAwMDQ4\r\nWhcNNDMwNzI4MDAwMDQ4WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZv\r\ncm5pYTEQMA4GA1UEBwwHRnJlbW9udDEMMAoGA1UECgwDZXNwMQwwCgYDVQQLDANl\r\nc3AxDDAKBgNVBAMMA2VzcDEcMBoGCSqGSIb3DQEJARYNZXNwQGVzcC5sb2NhbDCB\r\nnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsrfFqlV5H0ajdAkkZ51HTOseOjYj\r\nNiaUD4MA5mIRonnph6EKIWb9Yl85vVa6yfVkGn3TFebQ96MMdTfZgLuP4ryCwe6Y\r\n+tZs2g6TjGbR0O6yuA8wQ2Ln7E0T05C8oOl88SGNV4tVL6hz64oMzuVebVDo0J9I\r\nybvL0O/LhMvC4x8CAwEAAaNTMFEwHQYDVR0OBBYEFCMQIU+pZQDVySXejfbIYbLQ\r\ncLXiMB8GA1UdIwQYMBaAFCMQIU+pZQDVySXejfbIYbLQcLXiMA8GA1UdEwEB/wQF\r\nMAMBAf8wDQYJKoZIhvcNAQELBQADgYEAFHPz3YhhXQYiERTGzt8r0LhNWdggr7t0\r\nWEVuAoEukjzv+3DVB2O+56NtDa++566gTXBGGar0pWfCwfWCEu5K6MBkBdm6Ub/A\r\nXDy+sRQTqH/jTFFh5lgxeq246kHWHGRad8664V5PoIh+OSa0G3CEB+BXy7WF82Qq\r\nqx0X6E/mDUU=\r\n-----END CERTIFICATE-----";
-//static const char serverKey[] = "-----BEGIN PRIVATE KEY-----\r\nMIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALK3xapVeR9Go3QJ\r\nJGedR0zrHjo2IzYmlA+DAOZiEaJ56YehCiFm/WJfOb1Wusn1ZBp90xXm0PejDHU3\r\n2YC7j+K8gsHumPrWbNoOk4xm0dDusrgPMENi5+xNE9OQvKDpfPEhjVeLVS+oc+uK\r\nDM7lXm1Q6NCfSMm7y9Dvy4TLwuMfAgMBAAECgYEApKFbSeyQtfnpSlO9oGEmtDmG\r\nT9NdHl3tWFiydId0fTpWoKT9YwWvdnYIB12klbQicbDkyTEl4Gjnafd3ufmNsaH8\r\nZ9twopIdvvWDvGPIqGNjvTYcuczpXmQWiUnG5OTiVWI1XuZa3uZEGSFK9Ra6bE4g\r\nG2xklGZGdaqqcd6AVhECQQDnBXVXwBxExxSFppL8KUtWgyXAvJAEvkzvTOQfcCel\r\naIM5EEUofB7WZeMtDEKgBtoBl+i5PP+GnDF0zsjDFx2nAkEAxgqVQii6zURSVE2T\r\niJDihySXJ2bmLJUjRIi1nCs64I9Oz4fECVvGwZ1XU8Uzhh3ylyBSG2HjhzA5sTSC\r\n1a/tyQJAOgE12EWFE4PE1FXhm+ymXN9q8DyoEHjTilYNBRO88JwQLpi2NJcNixlj\r\n8+CbLeDqhfHlXfVB10OKa2CsKce5CwJAbhaN+DQJ+3dCSOjC3YSk2Dkn6VhTFW9m\r\nJn/UbNa/KPug9M5k1Er3RsO/OqsBxEk7hHUMD3qv74OIXpBxNnZQuQJASlwk5HZT\r\n7rULkr72fK/YYxkS0czBDIpTKqwklxU+xLSGWkSHvSvl7sK4TmQ1w8KVpjKlTCW9\r\nxKbbW0zVmGN6wQ==\r\n-----END PRIVATE KEY-----";
-
-static const char serverCert[]= "-----BEGIN CERTIFICATE-----\r\nMIIBszCCAV2gAwIBAgIUa8NoeDqaT6pFP5PHokRpKMXrT6swDQYJKoZIhvcNAQEL\r\nBQAwLjELMAkGA1UEBhMCSlAxDjAMBgNVBAgMBVRva3lvMQ8wDQYDVQQKDAZXb2xv\r\nbG8wHhcNMjMwODMwMDE0NDIxWhcNMzQxMTE2MDE0NDIxWjAuMQswCQYDVQQGEwJK\r\nUDEOMAwGA1UECAwFVG9reW8xDzANBgNVBAoMBldvbG9sbzBcMA0GCSqGSIb3DQEB\r\nAQUAA0sAMEgCQQDFBUICgP5wFMcRCs8VRqrY3QZr72FtzvLtPTCMcgPsaBE60QJt\r\n+YAj+e2mAolbRPRk4FNNcrg5/XsURdfuAPfvAgMBAAGjUzBRMB0GA1UdDgQWBBSv\r\nywhrMAdpJLbVx4kF9hmuTpHlLjAfBgNVHSMEGDAWgBSvywhrMAdpJLbVx4kF9hmu\r\nTpHlLjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA0EAjH+jaG47Qngl\r\nPTGjPpFmJp+LK6YHPzhqrJrAN18WziGJiaeCsuWV7j8cgGgB0U0AOybcdYMrjMOR\r\n+u+B12nV2w==\r\n-----END CERTIFICATE-----";
-static const char serverKey[] = "-----BEGIN PRIVATE KEY-----\r\nMIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAxQVCAoD+cBTHEQrP\r\nFUaq2N0Ga+9hbc7y7T0wjHID7GgROtECbfmAI/ntpgKJW0T0ZOBTTXK4Of17FEXX\r\n7gD37wIDAQABAkAcuYaFPO9bwfvABVZp4LK6CYeNJwqKavjKE/jHETx3M/cot1rM\r\nA39OZ/wCuNrqr+k4Pb2qQy2rzXJoa37lMG7ZAiEA+itu8WdfuzdOUAfkoHgsjUdz\r\nBmfaWy37q58A0druQEMCIQDJnLmp1sTDIcqoIMlIXDNwTPUc4pJj/JJSeczTQg7U\r\n5QIhAJzSu2JzNgzLd7ktqYF6tBsAbjfWxIgiBEEqlL346x+3AiB54WAwN2C94jjE\r\nSQXF089Y7X0kmCgNgAvpBi7367BRrQIgDH+nVOtPl0Y4Yqop/7hCT3vEsvmMWgx4\r\n9InegA0Cz68=\r\n-----END PRIVATE KEY-----";
+static const char serverCert[] PROGMEM = "-----BEGIN CERTIFICATE-----\r\nMIIBszCCAV2gAwIBAgIUa8NoeDqaT6pFP5PHokRpKMXrT6swDQYJKoZIhvcNAQEL\r\nBQAwLjELMAkGA1UEBhMCSlAxDjAMBgNVBAgMBVRva3lvMQ8wDQYDVQQKDAZXb2xv\r\nbG8wHhcNMjMwODMwMDE0NDIxWhcNMzQxMTE2MDE0NDIxWjAuMQswCQYDVQQGEwJK\r\nUDEOMAwGA1UECAwFVG9reW8xDzANBgNVBAoMBldvbG9sbzBcMA0GCSqGSIb3DQEB\r\nAQUAA0sAMEgCQQDFBUICgP5wFMcRCs8VRqrY3QZr72FtzvLtPTCMcgPsaBE60QJt\r\n+YAj+e2mAolbRPRk4FNNcrg5/XsURdfuAPfvAgMBAAGjUzBRMB0GA1UdDgQWBBSv\r\nywhrMAdpJLbVx4kF9hmuTpHlLjAfBgNVHSMEGDAWgBSvywhrMAdpJLbVx4kF9hmu\r\nTpHlLjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA0EAjH+jaG47Qngl\r\nPTGjPpFmJp+LK6YHPzhqrJrAN18WziGJiaeCsuWV7j8cgGgB0U0AOybcdYMrjMOR\r\n+u+B12nV2w==\r\n-----END CERTIFICATE-----";
+static const char serverKey[]  PROGMEM = "-----BEGIN PRIVATE KEY-----\r\nMIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAxQVCAoD+cBTHEQrP\r\nFUaq2N0Ga+9hbc7y7T0wjHID7GgROtECbfmAI/ntpgKJW0T0ZOBTTXK4Of17FEXX\r\n7gD37wIDAQABAkAcuYaFPO9bwfvABVZp4LK6CYeNJwqKavjKE/jHETx3M/cot1rM\r\nA39OZ/wCuNrqr+k4Pb2qQy2rzXJoa37lMG7ZAiEA+itu8WdfuzdOUAfkoHgsjUdz\r\nBmfaWy37q58A0druQEMCIQDJnLmp1sTDIcqoIMlIXDNwTPUc4pJj/JJSeczTQg7U\r\n5QIhAJzSu2JzNgzLd7ktqYF6tBsAbjfWxIgiBEEqlL346x+3AiB54WAwN2C94jjE\r\nSQXF089Y7X0kmCgNgAvpBi7367BRrQIgDH+nVOtPl0Y4Yqop/7hCT3vEsvmMWgx4\r\n9InegA0Cz68=\r\n-----END PRIVATE KEY-----";
 
-String defaultIndex = "<!DOCTYPE html><title>hi</title><center>ESP</center>";
+static const char defaultIndex[] PROGMEM = "<!DOCTYPE html><title>hi</title><center>ESP</center>";
 
 //Global variables
 DNSServer dnsServer;
@@ -105,8 +105,8 @@ bool loadFromSpiffs(String path) {
   }
 
   if (path.endsWith("index.html") && !SPIFFS.exists(path)) {
-    webServer.setContentLength(defaultIndex.length());
-    webServer.send(200, "text/html", defaultIndex);
+    webServer.setContentLength(strlen_P(defaultIndex));
+    webServer.send_P(200, "text/html", defaultIndex);
     return true;
   }
 
@@ -130,7 +130,7 @@ bool loadFromSpiffs(String path) {
     }
 
     if (webServer.streamFile(dataFile, dataType) != dataFile.size()) {
-      Serial.println("Sent less data than expected!");
+      Serial.println(F("Sent less data than expected!"));
     }
     dataFile.close();
     return true;
@@ -170,16 +170,16 @@ void setup(void)
     WiFi.setAutoReconnect(true);
     WiFi.begin(conf->WIFI_SSID, conf->WIFI_PASS);
 
-    //Serial.println("WIFI connecting");
+    //Serial.println(F("WIFI connecting"));
     if (WiFi.waitForConnectResult() != WL_CONNECTED) {
-      Serial.println("Wifi failed to connect");
+      Serial.println(F("Wifi failed to connect"));
     } else {
        Serial.println("Connected to " + conf->WIFI_SSID);
     }
   } 
   else 
   {
-    Serial.println("Offline mode");
+    Serial.println(F("Offline mode"));
     WiFi.mode(WIFI_AP);
   }
 
@@ -193,7 +193,7 @@ void setup(void)
   dnsServer.setTTL(30);
   dnsServer.setErrorReplyCode(DNSReplyCode::ServerFailure);
   dnsServer.start(53, "*", conf->Server_IP);
-  Serial.println("DNS server started");
+  Serial.println(F("DNS server started"));
 
 
   //HTTP Web Server Setup
@@ -202,7 +202,13 @@ void setup(void)
   WebAdmin webAdmin (&webServer);
 
   //HTTPS Web Server Set up: only thing it does is instantly redirect the browser to the HTTP index page
-  sWebServer.getServer().setRSACert(new X509List(serverCert), new PrivateKey(serverKey));
+
+  char bufCert[1000];            // -------------------
+  char bufKey[1000];             //PROGMEM shenanigans
+  strcpy_P(bufCert,serverCert);  //
+  strcpy_P(bufKey,serverKey);    //--------------------
+  sWebServer.getServer().setRSACert(new X509List(bufCert), new PrivateKey(bufKey));
+  
   sWebServer.onNotFound([]() {
     sWebServer.sendHeader("Location", String("http://" + conf->Server_IP.toString() + "/index.html" ), true);
     sWebServer.send(301, "text/plain", "");
@@ -221,20 +227,20 @@ void setup(void)
       //Serial.printf("ip_napt_enable_no(SOFTAP_IF): ret=%d (OK=%d)\n", (int)ret, (int)ERR_OK);
       if (ret == ERR_OK)
       {
-        Serial.println("NAT init OK");
+        Serial.println(F("NAT init OK"));
       }
     }
     Serial.printf("Heap after napt init: %d\n", ESP.getFreeHeap());
     if (ret != ERR_OK)
     {
-      Serial.println("NAPT initialization failed");
+      Serial.println(F("NAPT initialization failed"));
     }
   }
 
   //Start HTTP and HTTPS Web Servers
   sWebServer.begin();
   webServer.begin();
-  Serial.println("HTTP servers started");
+  Serial.println(F("HTTP servers started"));
 
 }
 
@@ -266,7 +272,7 @@ void dnsProcess () {
         if (dom.indexOf(element) >= 0) 
         { 
 #ifdef DEBUG_DNS    
-          Serial.printf(" redirected to local server \n");
+          Serial.printf(F(" redirected to local server \n"));
 #endif                      
 
 #ifdef CHRISTMAS_TREE
@@ -285,7 +291,7 @@ void dnsProcess () {
         {  
 
 #ifdef DEBUG_DNS    
-          Serial.printf(" Blocked \n");
+          Serial.printf(F(" Blocked \n"));
 #endif    
 
 #ifdef CHRISTMAS_TREE