* Default SSL enabled for ESP8266 and Arduino! (can be disabled using #defines)

* Improved debug info to detect if the device is connecting trhough secure connections.
* Added support for call other devices directly from code without calling endpoints!
* Improved call_endpoint data to actually output the resource data.
* Added support to specify different server parameters, like hosts, or ports, to start supporting local deployments.
* Some minor changes in binary messages to properly support calling devices, or endpoints.

Author: alvarolb

examples/ArduinoWifi/ArduinoWifi.ino

@@ -9,7 +9,7 @@
 #define SSID "your_wifi_ssid"
 #define SSID_PASSWORD "your_wifi_ssid_password"
 
-ThingerWifi thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
+ThingerWifi<> thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
 
 void setup() {
   // configure wifi network

examples/ESP8266/ESP8266.ino

@@ -1,5 +1,5 @@
 #include <ESP8266WiFi.h>
-#include <ThingerWifi.h>
+#include <ThingerESP8266.h>
 
 #define USERNAME "your_user_name"
 #define DEVICE_ID "your_device_id"
@@ -8,7 +8,7 @@
 #define SSID "your_wifi_ssid"
 #define SSID_PASSWORD "your_wifi_ssid_password"
 
-ThingerWifi thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
+ThingerESP8266 thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
 
 void setup() {
   pinMode(BUILTIN_LED, OUTPUT);

examples/EnergiaCC3200/EnergiaCC3200.ino

@@ -8,7 +8,7 @@
 #define SSID "your_wifi_ssid"
 #define SSID_PASSWORD "your_wifi_ssid_password"
 
-ThingerWifi thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
+ThingerWifi<> thing(USERNAME, DEVICE_ID, DEVICE_CREDENTIAL);
 
 void setup() {
   // set the boards led to output

library.properties

@@ -1,5 +1,5 @@
 name=thinger.io
-version=2.4.3
+version=2.5.0
 author=Alvaro Luis Bustamante <[email protected]>
 maintainer=Thinger.io <[email protected]>
 sentence=Arduino library for the Thinger.io Internet of Things Platform.

src/ThingerClient.h

@@ -32,11 +32,28 @@ dynamic_memory_allocator alloc;
 //circular_memory_allocator<512> alloc;
 memory_allocator& protoson::pool = alloc;
 
-#define THINGER_SERVER "iot.thinger.io"
-#define THINGER_PORT 25200
-#define THINGER_SSL_PORT 25202
-#define RECONNECTION_TIMEOUT 5000 // milliseconds
-#define DEFAULT_READ_TIMEOUT 30000
+#ifndef THINGER_SERVER
+    #define THINGER_SERVER "iot.thinger.io"
+#endif
+
+#ifndef THINGER_PORT
+    #define THINGER_PORT 25200
+#endif
+
+#ifndef THINGER_SSL_PORT
+    #define THINGER_SSL_PORT 25202
+#endif
+
+#ifndef THINGER_TLS_FINGERPRINT
+    #define THINGER_TLS_FINGERPRINT "50 1E ED 5D F3 E1 94 EC 2D 43 1E 22 4E 1D 5E 8B EB 66 8D EA"
+#endif
+
+#ifndef THINGER_TLS_HOST
+    #define THINGER_TLS_HOST "thinger.io"
+#endif
+
+#define RECONNECTION_TIMEOUT 5000   // milliseconds
+#define DEFAULT_READ_TIMEOUT 30000  // milliseconds
 
 #ifdef _DEBUG_
     #define THINGER_DEBUG(type, text) Serial.print("["); Serial.print(F(type)); Serial.print("] "); Serial.println(F(text));
@@ -139,6 +156,10 @@ class ThingerClient : public thinger::thinger {
         return client_.connect(THINGER_SERVER, THINGER_PORT);
     }
 
+    virtual bool secure_connection(){
+        return false;
+    }
+
     enum THINGER_STATE{
         NETWORK_CONNECTING,
         NETWORK_CONNECTED,
@@ -169,8 +190,10 @@ class ThingerClient : public thinger::thinger {
                 Serial.print(F("[_SOCKET] Connecting to "));
                 Serial.print(THINGER_SERVER);
                 Serial.print(F(":"));
-                Serial.print(THINGER_PORT);
+                Serial.print(secure_connection() ? THINGER_SSL_PORT : THINGER_PORT);
                 Serial.println(F("..."));
+                Serial.print(F("[_SOCKET] Using secure TLS/SSL connection: "));
+                Serial.println(secure_connection() ? F("yes") : F("no"));
                 break;
             case SOCKET_CONNECTED:
                 THINGER_DEBUG("_SOCKET", "Connected!");

src/ThingerESP8266.h

@@ -0,0 +1,69 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2016 THINK BIG LABS SL
+// Author: [email protected] (Alvaro Luis Bustamante)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#ifndef THINGER_ESP8266_H
+#define THINGER_ESP8266_H
+
+#include "ThingerWifi.h"
+
+#ifndef _DISABLE_TLS_
+class ThingerESP8266 : public ThingerWifi<WiFiClientSecure>{
+#else
+class ThingerESP8266 : public ThingerWifi<>{
+#endif
+
+public:
+    ThingerESP8266(const char* user, const char* device, const char* device_credential) :
+            ThingerWifi(user, device, device_credential)
+    {}
+
+    ~ThingerESP8266(){
+
+    }
+
+#ifndef _DISABLE_TLS_
+protected:
+    virtual bool connect_socket(){
+        if(client_.connect(THINGER_SERVER, THINGER_SSL_PORT)){
+            if(client_.verify(THINGER_TLS_FINGERPRINT, THINGER_TLS_HOST)){
+#ifdef _DEBUG_
+                THINGER_DEBUG("_SOCKET", "SSL/TLS Host Verification Succeed!");
+#endif
+            }else{
+#ifdef _DEBUG_
+                THINGER_DEBUG("_SOCKET", "SSL/TLS Host Verification Error!");
+#endif
+            }
+            return true;
+        }
+        return false;
+    }
+
+    virtual bool secure_connection(){
+        return true;
+    }
+#endif
+
+};
+
+#endif

src/ThingerSmartConfig.h

@@ -126,9 +126,22 @@ class ThingerSmartConfig : public ThingerClient {
         return true;
     }
 
+#ifndef _DISABLE_TLS_
+    virtual bool connect_socket(){
+        return client_.connect(THINGER_SERVER, THINGER_SSL_PORT) && client_.verify(THINGER_TLS_FINGERPRINT, THINGER_TLS_HOST);
+    }
+    virtual bool secure_connection(){
+        return true;
+    }
+#endif
+
 private:
     bool use_led_;
+#ifndef _DISABLE_TLS_
+    WiFiClientSecure client_;
+#else
     WiFiClient client_;
+#endif
 };
 
 #endif

src/ThingerWebConfig.h

@@ -192,8 +192,21 @@ class ThingerWebConfig : public ThingerClient {
         return true;
     }
 
+#ifndef _DISABLE_TLS_
+    virtual bool connect_socket(){
+        return client_.connect(THINGER_SERVER, THINGER_SSL_PORT) && client_.verify(THINGER_TLS_FINGERPRINT, THINGER_TLS_HOST);
+    }
+    virtual bool secure_connection(){
+        return true;
+    }
+#endif
+
 private:
+#ifndef _DISABLE_TLS_
+    WiFiClientSecure client_;
+#else
     WiFiClient client_;
+#endif
     char user[40];
     char device[40];
     char device_credential[40];

src/ThingerWifi.h

@@ -26,6 +26,7 @@
 
 #include "ThingerClient.h"
 
+template <class Client = WiFiClient>
 class ThingerWifi : public ThingerClient {
 
 public:
@@ -75,8 +76,7 @@ class ThingerWifi : public ThingerClient {
     }
 
 protected:
-
-    WiFiClient client_;
+    Client client_;
     const char* wifi_ssid_;
     const char* wifi_password_;
 };

src/ThingerWifi101.h

@@ -26,29 +26,27 @@
 
 #include "ThingerWifi.h"
 
-class ThingerWifi101 : public ThingerWifi {
+class ThingerWifi101 : public ThingerWifi<> {
 
 public:
-    ThingerWifi101(const char* user, const char* device, const char* device_credential, bool ssl = true) :
-            ThingerWifi(user, device, device_credential), ssl_(ssl)
+    ThingerWifi101(const char* user, const char* device, const char* device_credential) :
+            ThingerWifi(user, device, device_credential)
     {}
 
     ~ThingerWifi101(){
 
     }
 
+#ifndef _DISABLE_TLS_
 protected:
-
     virtual bool connect_socket(){
-        if(ssl_){
-            return client_.connectSSL(THINGER_SERVER, THINGER_SSL_PORT);
-        }else{
-            return client_.connect(THINGER_SERVER, THINGER_PORT);
-        }
+        return client_.connectSSL(THINGER_SERVER, THINGER_SSL_PORT);
+    }
+    virtual bool secure_connection(){
+        return true;
     }
+#endif
 
-private:
-    bool ssl_;
 };
 
 #endif