Merge branch 'master' into pr-umm_malloc-misc-fix

earlephilhower · web-flow · commit 63a0c25eea74 · 2020-06-21T14:38:46.000-07:00
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h b/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h
@@ -20,7 +20,6 @@
   Modified 8 May 2015 by Hristo Gochkov (proper post and file upload handling)
 */
 
-
 #include <Arduino.h>
 #include <libb64/cencode.h>
 #include "WiFiServer.h"
@@ -61,6 +60,7 @@ ESP8266WebServerTemplate<ServerType>::ESP8266WebServerTemplate(IPAddress addr, i
 , _currentHeaders(nullptr)
 , _contentLength(0)
 , _chunked(false)
+, _corsEnabled(false)
 {
 }
 
@@ -82,6 +82,7 @@ ESP8266WebServerTemplate<ServerType>::ESP8266WebServerTemplate(int port)
 , _currentHeaders(nullptr)
 , _contentLength(0)
 , _chunked(false)
+, _corsEnabled(false)
 {
 }
 
@@ -98,6 +99,10 @@ ESP8266WebServerTemplate<ServerType>::~ESP8266WebServerTemplate() {
   }
 }
 
+template <typename ServerType>
+void ESP8266WebServerTemplate<ServerType>::enableCORS(bool enable) {
+  _corsEnabled = enable;
+}
 template <typename ServerType>
 void ESP8266WebServerTemplate<ServerType>::begin() {
   close();
@@ -421,6 +426,9 @@ void ESP8266WebServerTemplate<ServerType>::_prepareHeader(String& response, int
       sendHeader(String(F("Accept-Ranges")),String(F("none")));
       sendHeader(String(F("Transfer-Encoding")),String(F("chunked")));
     }
+    if (_corsEnabled) {
+      sendHeader(String(F("Access-Control-Allow-Origin")), String("*"));
+    }
     sendHeader(String(F("Connection")), String(F("close")));
 
     response += _responseHeaders;
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -99,6 +99,7 @@ class ESP8266WebServerTemplate
   void serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header = NULL );
   void onNotFound(THandlerFunction fn);  //called when handler is not assigned
   void onFileUpload(THandlerFunction fn); //handle file uploads
+  void enableCORS(bool enable);
 
   const String& uri() const { return _currentUri; }
   HTTPMethod method() const { return _currentMethod; }
@@ -244,11 +245,14 @@ class ESP8266WebServerTemplate
 
   String           _hostHeader;
   bool             _chunked;
+  bool             _corsEnabled;
 
   String           _snonce;  // Store noance and opaque for future comparison
   String           _sopaque;
   String           _srealm;  // Store the Auth realm between Calls
 
+  
+
 };
 
 
diff --git a/libraries/ESP8266WiFi/examples/BearSSL_Validation/BearSSL_Validation.ino b/libraries/ESP8266WiFi/examples/BearSSL_Validation/BearSSL_Validation.ino
@@ -110,10 +110,13 @@ void fetchFingerprint() {
   Serial.printf(R"EOF(
 The SHA-1 fingerprint of an X.509 certificate can be used to validate it
 instead of the while certificate.  This is not nearly as secure as real
-X.509 validation, but is better than nothing.
+X.509 validation, but is better than nothing.  Also be aware that these
+fingerprints will change if anything changes in the certificate chain
+(i.e. re-generating the certificate for a new end date, any updates to
+the root authorities, etc.).
 )EOF");
   BearSSL::WiFiClientSecure client;
-  static const char fp[] PROGMEM = "5F:F1:60:31:09:04:3E:F2:90:D2:B0:8A:50:38:04:E8:37:9F:BC:76";
+  static const char fp[] PROGMEM = "59:74:61:88:13:CA:12:34:15:4D:11:0A:C1:7F:E6:67:07:69:42:F5";
   client.setFingerprint(fp);
   fetchURL(&client, host, port, path);
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`Modified 8 May 2015 by Hristo Gochkov (proper post and file upload handling)`
`21`	`21`	`*/`
`22`	`22`
`23`		`-`
`24`	`23`	`#include <Arduino.h>`
`25`	`24`	`#include <libb64/cencode.h>`
`26`	`25`	`#include "WiFiServer.h"`
`@@ -61,6 +60,7 @@ ESP8266WebServerTemplate<ServerType>::ESP8266WebServerTemplate(IPAddress addr, i`
`61`	`60`	`, _currentHeaders(nullptr)`
`62`	`61`	`, _contentLength(0)`
`63`	`62`	`, _chunked(false)`
	`63`	`+, _corsEnabled(false)`
`64`	`64`	`{`
`65`	`65`	`}`
`66`	`66`
`@@ -82,6 +82,7 @@ ESP8266WebServerTemplate<ServerType>::ESP8266WebServerTemplate(int port)`
`82`	`82`	`, _currentHeaders(nullptr)`
`83`	`83`	`, _contentLength(0)`
`84`	`84`	`, _chunked(false)`
	`85`	`+, _corsEnabled(false)`
`85`	`86`	`{`
`86`	`87`	`}`
`87`	`88`
`@@ -98,6 +99,10 @@ ESP8266WebServerTemplate<ServerType>::~ESP8266WebServerTemplate() {`
`98`	`99`	`}`
`99`	`100`	`}`
`100`	`101`
	`102`	`+template <typename ServerType>`
	`103`	`+void ESP8266WebServerTemplate<ServerType>::enableCORS(bool enable) {`
	`104`	`+ _corsEnabled = enable;`
	`105`	`+}`
`101`	`106`	`template <typename ServerType>`
`102`	`107`	`void ESP8266WebServerTemplate<ServerType>::begin() {`
`103`	`108`	`close();`
`@@ -421,6 +426,9 @@ void ESP8266WebServerTemplate<ServerType>::_prepareHeader(String& response, int`
`421`	`426`	`sendHeader(String(F("Accept-Ranges")),String(F("none")));`
`422`	`427`	`sendHeader(String(F("Transfer-Encoding")),String(F("chunked")));`
`423`	`428`	`}`
	`429`	`+ if (_corsEnabled) {`
	`430`	`+ sendHeader(String(F("Access-Control-Allow-Origin")), String("*"));`
	`431`	`+ }`
`424`	`432`	`sendHeader(String(F("Connection")), String(F("close")));`
`425`	`433`
`426`	`434`	`response += _responseHeaders;`