fix oauth signature problem when request a token in secure mode

Author: chavee

AuthClient.cpp

@@ -21,8 +21,9 @@ void AuthClient::init(char* appid, char* scope, unsigned long bts) {
     this->bootts = bts;
 }
 
-bool AuthClient::connect(bool securemode) {
-    int port = securemode?GEARAUTHSECUREPORT:GEARAUTHPORT;
+bool AuthClient::connect(bool isecuremode) {
+    int port = isecuremode?GEARAUTHSECUREPORT:GEARAUTHPORT;
+    this->securemode = isecuremode;
     if (client->connect(GEARAUTHHOST,port)) {
         return true;
     }
@@ -162,8 +163,8 @@ int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* en
         *endpoint = '\0';
         *flag = '\0';
 
-        strcpy(signbase,"POST&http%3A%2F%2F");
-        sprintf(strtail(signbase),"%s%%3A%d",GEARAUTHHOST,GEARAUTHPORT);
+        strcpy(signbase,this->securemode?"POST&https%3A%2F%2F":"POST&http%3A%2F%2F");
+        sprintf(strtail(signbase),"%s%%3A%d",GEARAUTHHOST,this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT);
 
         if (mode == _REQUESTTOKEN) {
             writeln("POST /api/rtoken HTTP/1.1");
@@ -173,7 +174,7 @@ int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* en
             writeln("POST /api/atoken HTTP/1.1");
             strcat(signbase,"%2Fapi%2Fatoken&");
         }
-        sprintf(buff,"Host: %s:%d",GEARAUTHHOST,GEARAUTHPORT);
+        sprintf(buff,"Host: %s:%d",GEARAUTHHOST,this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT);
         writeln(buff);
 
         write("Authorization: OAuth ");

AuthClient.h

@@ -9,7 +9,7 @@
 #define GEARAUTHPORT 8080
 #define GEARAUTHSECUREPORT 8081
 
-#define MGREV "E8A1a"
+#define MGREV "E8A1b"
 #define MAXVERIFIERSIZE         32
 #define TOKENSIZE               16
 #define TOKENSECRETSIZE         32
@@ -40,6 +40,7 @@ class AuthClient {
         char* appid;
         char* gearid;
         char* scope;
+        bool securemode;
         void writeout(char*, bool, bool);
         char* append(char*, char*, char);
         char* append_P(char*, char*, char);

MicroGear.cpp

@@ -67,15 +67,25 @@ bool MicroGear::clientReadln(Client* client, char *buffer, size_t buflen) {
     return false;
 }
 
-bool MicroGear::getHTTPReply(Client *client, char *buff, size_t buffsize) {
+int MicroGear::getHTTPReply(Client *client, char *buff, size_t buffsize) {
+    int httpstatus = 0;
     char pline = 0;
     buff[0] = '\0';
+
     while (true) {
         clientReadln(client, buff, buffsize);
-        if (pline > 0) {
-            return true;
+        if (httpstatus==0) {
+            if (strncmp(buff,"HTTP",4)==0) {
+                buff[12] = '\0';
+                httpstatus = atoi(buff+9);
+            }
+        }
+        else {
+            if (pline > 0) {
+                return httpstatus;
+            }
+            if (strlen(buff)<1) pline++;
         }
-        if (strlen(buff)<1) pline++;
     }
 }
 
@@ -110,7 +120,7 @@ void MicroGear::initEndpoint(Client *client, char* endpoint) {
 
 void MicroGear::syncTime(Client *client, unsigned long *bts) {
     char timestr[200];
-    int port = this->securemode?GEARTIMESECUREPORT:GEARTIMEPORT;
+    int port = (this->securemode)?GEARTIMESECUREPORT:GEARTIMEPORT;
 
     strcpy(timestr,"GET /api/time HTTP/1.1\r\n\r\n");
 
@@ -119,7 +129,6 @@ void MicroGear::syncTime(Client *client, unsigned long *bts) {
 
     delay(1000);
     getHTTPReply(client,timestr,200);
-    
     *bts = atol(timestr) - millis()/1000;
 
     client->stop();

MicroGear.h

@@ -17,7 +17,6 @@
 #include "AuthClient.h"
 //#include "debug.h"
 
-
 #define GEARTIMEADDRESS "ga.netpie.io"
 #define GEARTIMEPORT 8080
 #define GEARTIMESECUREPORT 8081
@@ -86,7 +85,7 @@ class MicroGear {
 		Client *sockclient;
 
 		bool connectBroker(char*);
-		bool getHTTPReply(Client*, char*, size_t);
+		int getHTTPReply(Client*, char*, size_t);
 		bool clientReadln(Client*, char*, size_t);
 		void syncTime(Client*, unsigned long*);
 		void initEndpoint(Client*, char*);