Getting started with WebServerSecure

Author: jackjansen

src/ESPWebServer.cpp

@@ -20,15 +20,22 @@ struct {
   {HTTP_OPTIONS, "OPTIONS"},
 };
 
+ESPWebServer::ESPWebServer(HTTPServer *server) :
+  _server(server),
+  _contentLength(0)
+{
+  _notFoundNode = nullptr;
+}
+
 ESPWebServer::ESPWebServer(IPAddress addr, int port) :
-  _server(HTTPServer(port, 4, addr)),
+  _server(new HTTPServer(port, 4, addr)),
   _contentLength(0)
 {
   _notFoundNode = nullptr;
 }
 
 ESPWebServer::ESPWebServer(int port) :
-  _server(HTTPServer(port, 4)) {
+  _server(new HTTPServer(port, 4)) {
   _notFoundNode = nullptr;
 }
 
@@ -39,19 +46,19 @@ ESPWebServer::~ESPWebServer() {
 }
 
 void ESPWebServer::begin() {
-  _server.start();
+  _server->start();
 }
 
 void ESPWebServer::handleClient() {
-  _server.loop();
+  _server->loop();
 }
 
 void ESPWebServer::close() {
-  _server.stop();
+  _server->stop();
 }
 
 void ESPWebServer::stop() {
-  _server.stop();
+  _server->stop();
 }
 
 bool ESPWebServer::authenticate(const char * username, const char * password) {
@@ -91,7 +98,7 @@ void ESPWebServer::on(const String &uri, HTTPMethod method, THandlerFunction fn,
     }
   }
   ESPWebServerNode *node = new ESPWebServerNode(this,std::string(uri.c_str()), std::string(methodname),fn, ufn);
-  _server.registerNode(node);
+  _server->registerNode(node);
 }
 
 void ESPWebServer::serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header) {
@@ -103,7 +110,7 @@ void ESPWebServer::onNotFound(THandlerFunction fn) {
     delete _notFoundNode;
   }
   _notFoundNode = new ESPWebServerNode(this, "", "", fn, THandlerFunction());
-  _server.setDefaultNode(_notFoundNode);
+  _server->setDefaultNode(_notFoundNode);
 }
 
 void ESPWebServer::onFileUpload(THandlerFunction fn) {
@@ -270,7 +277,7 @@ void ESPWebServer::_standardHeaders() {
 }
 
 void ESPWebServer::enableCORS(boolean value) {
-  if (value) _server.setDefaultHeader("Access-Control-Allow-Origin", "*");
+  if (value) _server->setDefaultHeader("Access-Control-Allow-Origin", "*");
 }
 
 void ESPWebServer::enableCrossOrigin(boolean value) {

src/ESPWebServer.hpp

@@ -11,6 +11,7 @@
 #include <HTTPRequest.hpp>
 #include <HTTPResponse.hpp>
 #include <HTTPSCallbackFunction.hpp>
+#include <SSLCert.hpp>
 
 #include "HTTP_Method.h"
 
@@ -46,6 +47,9 @@ class ESPWebServerNode;
 
 class ESPWebServer
 {
+  friend class ESPWebServerSecure;
+protected:
+  ESPWebServer(httpsserver::HTTPServer* _server);
 public:
   ESPWebServer(IPAddress addr, int port = 80);
   ESPWebServer(int port = 80);
@@ -135,7 +139,7 @@ class ESPWebServer
   void _prepareStreamFile(size_t fileSize, const String& contentType);
 
   /** The backing server instance */
-  httpsserver::HTTPServer _server;
+  httpsserver::HTTPServer* _server;
 
   /** The currently active request */
   httpsserver::HTTPRequest *_activeRequest;

src/ESPWebServerSecure.cpp

@@ -0,0 +1,30 @@
+#include "ESPWebServerSecure.hpp"
+
+
+ESPWebServerSecure::ESPWebServerSecure(IPAddress addr, int port)
+: ESPWebServer(new httpsserver::HTTPSServer(&_sslCert, port, 4, addr)),
+  _underlyingServer(this),
+  _sslCert()
+{}
+
+ESPWebServerSecure::ESPWebServerSecure(int port)
+: ESPWebServer(new httpsserver::HTTPSServer(&_sslCert, port, 4)),
+  _underlyingServer(this),
+  _sslCert()
+{}
+
+void ESPWebServerSecure::setServerKeyAndCert(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen) {
+  _sslCert.setPK((unsigned char *)key, keyLen);
+  _sslCert.setCert((unsigned char *)cert, certLen);
+}
+
+void ESPWebServerSecure::setServerKeyAndCert_P(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen) {
+  setServerKeyAndCert(key, keyLen, cert, certLen);
+}
+
+void ESPWebServerUnderlyingServer::setServerKeyAndCert(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen) {
+  _webserver->setServerKeyAndCert(key, keyLen, cert, certLen);
+}
+void ESPWebServerUnderlyingServer::setServerKeyAndCert_P(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen) {
+  _webserver->setServerKeyAndCert_P(key, keyLen, cert, certLen);
+}

src/ESPWebServerSecure.hpp

@@ -0,0 +1,34 @@
+#ifndef ESPWEBSERVERSECURE_H
+#define ESPWEBSERVERSECURE_H
+
+#include "ESPWebServer.hpp"
+#include <HTTPSServer.hpp>
+#include <SSLCert.hpp>
+
+class ESPWebServerSecure;
+
+class ESPWebServerUnderlyingServer {
+  friend class ESPWebServerSecure;
+protected:
+  ESPWebServerUnderlyingServer(ESPWebServerSecure *webserver)
+  : _webserver(webserver)
+  {}
+  ESPWebServerSecure* _webserver;
+public:
+  void setServerKeyAndCert(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen);
+  void setServerKeyAndCert_P(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen);
+};
+
+class ESPWebServerSecure : public ESPWebServer {
+  friend class ESPWebServerUnderlyingServer;
+public:
+  ESPWebServerSecure(IPAddress addr, int port = 442);
+  ESPWebServerSecure(int port = 442);
+  void setServerKeyAndCert(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen);
+  void setServerKeyAndCert_P(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen);
+protected:
+  ESPWebServerUnderlyingServer _underlyingServer;
+  httpsserver::SSLCert _sslCert;
+};
+
+#endif //ESPWEBSERVERSECURE_H