Merge pull request #19 from DJMarlow/master

Additional Methods for Custom Server URL and Connection Security

Author: acinader

keywords.txt

@@ -21,3 +21,6 @@ ParsePush	KEYWORD1
 #######################################
 
 begin	KEYWORD2
+setServerURL	KEYWORD2
+setHostFingerprint	KEYWORD2
+setClientInsecure	KEYWORD2

src/internal/ParseClient.h

@@ -40,6 +40,8 @@ class ParseClient {
 private:
   char applicationId[41]; // APPLICATION_ID_MAX_LEN
   char clientKey[41]; // CLIENT_KEY_MAX_LEN
+  char serverURL[100]; // SERVER_URL_MAX_LEN
+  char hostFingerprint[100]; // HOST_FINGERPRINT_MAX_LEN
   char installationId[37]; // INSTALLATION_ID_MAX_LEN
   char sessionToken[41]; // SESSION_TOKEN_MAX_LEN
 
@@ -92,6 +94,25 @@ class ParseClient {
    *
    */
   void setServerURL(const char *serverURL);
+  
+    /*! \fn void setHostFingerprint(const char *hostFingerprint)
+   *  \brief Set the host fingerprint this client.
+   *
+   *  Set the custom host fingerprint for this client. This needs to be called
+   *  API request.
+   *
+   *  \param  hostFingerprint     The host fingerprint of the serverURL.
+   *
+   */
+  void setHostFingerprint(const char *hostFingerprint);
+  
+    /*! \fn setClientInsecure()
+   *  \brief Sets the connection client to insecure
+   *
+   *  
+   *
+   */
+  void setClientInsecure();
 
   /*! \fn void setInstallationId(const char *installationId)
    *  \brief Set the installation object id for this client.

src/internal/esp8266/ParseClient.cpp

@@ -81,6 +81,8 @@ static void sendAndEchoToSerial(WiFiClientSecure& client, const char *line) {
 ParseClient::ParseClient() {
   memset(applicationId, 0, sizeof(applicationId));
   memset(clientKey, 0, sizeof(clientKey));
+  memset(serverURL, 0, sizeof(serverURL));
+  memset(hostFingerprint, 0, sizeof(hostFingerprint));
   memset(installationId, 0, sizeof(installationId));
   memset(sessionToken, 0, sizeof(sessionToken));
   memset(lastPushTime, 0, sizeof(lastPushTime));
@@ -110,6 +112,29 @@ void ParseClient::begin(const char *applicationId, const char *clientKey) {
   restoreKeys();
 }
 
+void ParseClient::setServerURL(const char *serverURL) {
+  Serial.print("setting serverURL(");
+  Serial.print(serverURL ? serverURL : "NULL");
+  Serial.println(")");
+  if(serverURL) {
+    strncpy(this->serverURL, serverURL, sizeof(this->serverURL));
+  }
+}
+
+void ParseClient::setHostFingerprint(const char *hostFingerprint) {
+  Serial.print("setting hostFingerprint(");
+  Serial.print(hostFingerprint ? hostFingerprint : "NULL");
+  Serial.println(")");
+  if(hostFingerprint) {
+    strncpy(this->hostFingerprint, hostFingerprint, sizeof(this->hostFingerprint));
+  }
+}
+
+void ParseClient::setClientInsecure() {
+  Serial.println("setting connection client insecure");
+  client.setInsecure();
+}
+
 void ParseClient::setInstallationId(const char *installationId) {
   if (installationId) {
     if (strcmp(this->installationId, installationId))
@@ -201,8 +226,10 @@ ParseResponse ParseClient::sendRequest(const String& httpVerb, const String& htt
 
   int retry = 3;
   bool connected;
+  
+  client.setFingerprint(hostFingerprint);
 
-  while(!(connected = client.connect(PARSE_API, SSL_PORT)) && retry--) {
+  while(!(connected = client.connect(serverURL, SSL_PORT)) && retry--) {
     Serial.printf("connecting...%d\n", retry);
     yield();
   }
@@ -220,7 +247,7 @@ ParseResponse ParseClient::sendRequest(const String& httpVerb, const String& htt
         snprintf(buff, sizeof(buff) - 1, "%s %s HTTP/1.1\r\n", httpVerb.c_str(), httpPath.c_str());
     }
     sendAndEchoToSerial(client, buff);
-    snprintf(buff, sizeof(buff) - 1, "Host: %s\r\n",  PARSE_API);
+    snprintf(buff, sizeof(buff) - 1, "Host: %s\r\n",  serverURL);
     sendAndEchoToSerial(client, buff);
     snprintf(buff, sizeof(buff) - 1, "X-Parse-Client-Version: %s\r\n", CLIENT_VERSION);
     sendAndEchoToSerial(client, buff);