Update to make use of SSL a bit less confusing by ensuring errors are generated if the wrong method is called to retrieve the data stream. (espressif#934)

lonerzzz · me-no-dev · commit cfbb7300b768 · 2017-12-19T14:06:45.000+01:00
diff --git a/libraries/HTTPClient/src/HTTPClient.cpp b/libraries/HTTPClient/src/HTTPClient.cpp
@@ -203,6 +203,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer
     if (strlen(CAcert) == 0) {
         return false;
     }
+    _secure = true;
     _transportTraits = TransportTraitsPtr(new TLSTraits(CAcert));
     return true;
 }
@@ -217,6 +218,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer
     if (strlen(CAcert) == 0) {
         return false;
     }
+    _secure = true;
     _transportTraits = TransportTraitsPtr(new TLSTraits(CAcert, cli_cert, cli_key));
     return true;
 }
@@ -561,26 +563,26 @@ int HTTPClient::getSize(void)
  */
 WiFiClient& HTTPClient::getStream(void)
 {
-    if(connected()) {
+    if (connected() && !_secure) {
         return *_tcp;
     }
 
-    log_d("getStream: not connected");
+    log_w("getStream: not connected");
     static WiFiClient empty;
     return empty;
 }
 
 /**
- * returns the stream of the tcp connection
- * @return WiFiClient *
+ * returns a pointer to the stream of the tcp connection
+ * @return WiFiClient*
  */
 WiFiClient* HTTPClient::getStreamPtr(void)
 {
     if(connected()) {
         return _tcp.get();
     }
 
-    log_d("getStreamPtr: not connected");
+    log_w("getStreamPtr: not connected");
     return nullptr;
 }
 
diff --git a/libraries/HTTPClient/src/HTTPClient.h b/libraries/HTTPClient/src/HTTPClient.h
@@ -30,6 +30,7 @@
 #include <memory>
 #include <Arduino.h>
 #include <WiFiClient.h>
+#include <WiFiClientSecure.h>
 
 #define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (5000)
 
diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
@@ -134,7 +134,6 @@ size_t WiFiClientSecure::write(const uint8_t *buf, size_t size)
     }
     int res = send_ssl_data(sslclient, buf, size);
     if (res < 0) {
-						   
         stop();
         res = 0;
     }
@@ -148,7 +147,6 @@ int WiFiClientSecure::read(uint8_t *buf, size_t size)
     }
     int res = get_ssl_receive(sslclient, buf, size);
     if (res < 0) {
-							
         stop();
     }
     return res;
diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.h b/libraries/WiFiClientSecure/src/WiFiClientSecure.h
@@ -28,7 +28,6 @@
 class WiFiClientSecure : public WiFiClient
 {
 protected:
-    bool _connected;
     sslclient_context *sslclient;
 
     const char *_CA_cert;

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer`
`203`	`203`	`if (strlen(CAcert) == 0) {`
`204`	`204`	`return false;`
`205`	`205`	`}`
	`206`	`+ _secure = true;`
`206`	`207`	`_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert));`
`207`	`208`	`return true;`
`208`	`209`	`}`
`@@ -217,6 +218,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcer`
`217`	`218`	`if (strlen(CAcert) == 0) {`
`218`	`219`	`return false;`
`219`	`220`	`}`
	`221`	`+ _secure = true;`
`220`	`222`	`_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert, cli_cert, cli_key));`
`221`	`223`	`return true;`
`222`	`224`	`}`
`@@ -561,26 +563,26 @@ int HTTPClient::getSize(void)`
`561`	`563`	`*/`
`562`	`564`	`WiFiClient& HTTPClient::getStream(void)`
`563`	`565`	`{`
`564`		`- if(connected()) {`
	`566`	`+ if (connected() && !_secure) {`
`565`	`567`	`return *_tcp;`
`566`	`568`	`}`
`567`	`569`
`568`		`- log_d("getStream: not connected");`
	`570`	`+ log_w("getStream: not connected");`
`569`	`571`	`static WiFiClient empty;`
`570`	`572`	`return empty;`
`571`	`573`	`}`
`572`	`574`
`573`	`575`	`/**`
`574`		`- * returns the stream of the tcp connection`
`575`		`- * @return WiFiClient *`
	`576`	`+ * returns a pointer to the stream of the tcp connection`
	`577`	`+ * @return WiFiClient*`
`576`	`578`	`*/`
`577`	`579`	`WiFiClient* HTTPClient::getStreamPtr(void)`
`578`	`580`	`{`
`579`	`581`	`if(connected()) {`
`580`	`582`	`return _tcp.get();`
`581`	`583`	`}`
`582`	`584`
`583`		`- log_d("getStreamPtr: not connected");`
	`585`	`+ log_w("getStreamPtr: not connected");`
`584`	`586`	`return nullptr;`
`585`	`587`	`}`
`586`	`588`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,6 @@ size_t WiFiClientSecure::write(const uint8_t *buf, size_t size)`
`134`	`134`	`}`
`135`	`135`	`int res = send_ssl_data(sslclient, buf, size);`
`136`	`136`	`if (res < 0) {`
`137`		`-`
`138`	`137`	`stop();`
`139`	`138`	`res = 0;`
`140`	`139`	`}`
`@@ -148,7 +147,6 @@ int WiFiClientSecure::read(uint8_t *buf, size_t size)`
`148`	`147`	`}`
`149`	`148`	`int res = get_ssl_receive(sslclient, buf, size);`
`150`	`149`	`if (res < 0) {`
`151`		`-`
`152`	`150`	`stop();`
`153`	`151`	`}`
`154`	`152`	`return res;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`class WiFiClientSecure : public WiFiClient`
`29`	`29`	`{`
`30`	`30`	`protected:`
`31`		`- bool _connected;`
`32`	`31`	`sslclient_context *sslclient;`
`33`	`32`
`34`	`33`	`const char *_CA_cert;`