Extend HTTPClient to allow connecting with a client certificate (espressif#788)

APokorny · me-no-dev · commit 36dba996c118 · 2017-10-30T09:37:33.000+01:00
* Forward client certificate to wificlient secure

* remove comment
diff --git a/libraries/HTTPClient/src/HTTPClient.cpp b/libraries/HTTPClient/src/HTTPClient.cpp
@@ -54,8 +54,8 @@ class TransportTraits
 class TLSTraits : public TransportTraits
{
 public:
- TLSTraits(const char* CAcert) :
- _cacert(CAcert)
+ TLSTraits(const char* CAcert, const char* clicert = nullptr, const char* clikey = nullptr) :
+ _cacert(CAcert), _clicert(clicert), _clikey(clikey)
{
 }
 
@@ -67,12 +67,16 @@ class TLSTraits : public TransportTraits
 bool verify(WiFiClient& client, const char* host) override
{
 WiFiClientSecure& wcs = static_cast<WiFiClientSecure&>(client);
-		 wcs.setCACert(_cacert);
+ wcs.setCACert(_cacert);
+ wcs.setCertificate(_clicert);
+ wcs.setPrivateKey(_clikey);
 return true;
 }
 
 protected:
 const char* _cacert;
+ const char* _clicert;
+ const char* _clikey;
 };
 
 /**
@@ -203,6 +207,20 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer
 return true;
 }
 
+bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcert, const char* cli_cert, const char* cli_key)
+{
+ clear();
+ _host = host;
+ _port = port;
+ _uri = uri;
+
+ if (strlen(CAcert) == 0){
+ return false;
+ }
+ _transportTraits = TransportTraitsPtr(new TLSTraits(CAcert, cli_cert, cli_key));
+ return true;
+}
+
 /**
 * end
 * called after the payload is handled
diff --git a/libraries/HTTPClient/src/HTTPClient.h b/libraries/HTTPClient/src/HTTPClient.h
@@ -129,6 +129,7 @@ class HTTPClient
 bool begin(String url, const char* CAcert);
 bool begin(String host, uint16_t port, String uri = "/");
 bool begin(String host, uint16_t port, String uri, const char* CAcert);
+ bool begin(String host, uint16_t port, String uri, const char* CAcert, const char* cli_cert, const char* cli_key);
 
 void end(void);
 

-Original file line number
+Diff line change
 classTLSTraits : publicTransportTraits
+{
 public:
 -TLSTraits(constchar* CAcert) :
 -_cacert(CAcert)
 +TLSTraits(constchar* CAcert, constchar* clicert = nullptr, constchar* clikey = nullptr) :
 +_cacert(CAcert), _clicert(clicert), _clikey(clikey)
+{
+ }
 boolverify(WiFiClient& client, constchar* host) override
+{
  WiFiClientSecure& wcs = static_cast<WiFiClientSecure&>(client);
 - wcs.setCACert(_cacert);
 + wcs.setCACert(_cacert);
 + wcs.setCertificate(_clicert);
 + wcs.setPrivateKey(_clikey);
 returntrue;
+ }
 protected:
 constchar* _cacert;
 +constchar* _clicert;
 +constchar* _clikey;
 };
 /**
 returntrue;
+}
 +boolHTTPClient::begin(String host, uint16_t port, String uri, constchar* CAcert, constchar* cli_cert, constchar* cli_key)
 +{
 +clear();
 + _host = host;
 + _port = port;
 + _uri = uri;
++
 +if (strlen(CAcert) == 0){
 +returnfalse;
 + }
 + _transportTraits = TransportTraitsPtr(newTLSTraits(CAcert, cli_cert, cli_key));
 +returntrue;
 +}
++
 /**
  * end
  * called after the payload is handled
-Original file line number
+Diff line change
 boolbegin(String url, constchar* CAcert);
 boolbegin(String host, uint16_t port, String uri = "/");
 boolbegin(String host, uint16_t port, String uri, constchar* CAcert);
 +boolbegin(String host, uint16_t port, String uri, constchar* CAcert, constchar* cli_cert, constchar* cli_key);
 voidend(void);