Fix SSL verification time issue.

mobizt · mobizt · commit 1398e595744b · 2023-11-10T10:09:16.000+07:00
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP-Google-Sheet-Client",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "keywords": "communication, REST, esp32, esp8266, raspberrypi, arduino",
   "description": "Arduino Google Sheet REST client library for Arduino devices. This library allows devices to communicate with Google Sheet API to read, edit and delete the spreadsheets",
   "repository": {
diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=ESP-Google-Sheet-Client
 
-version=1.4.2
+version=1.4.3
 
 author=Mobizt
 
diff --git a/src/ESP_Google_Sheet_Client.cpp b/src/ESP_Google_Sheet_Client.cpp
@@ -1,9 +1,9 @@
 /**
- * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.2
+ * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.3
  *
  * This library supports Espressif ESP8266 and ESP32 MCUs
  *
- * Created November 9, 2023
+ * Created November 10, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2022 K. Suwatchai (Mobizt)
diff --git a/src/ESP_Google_Sheet_Client.h b/src/ESP_Google_Sheet_Client.h
@@ -1,13 +1,13 @@
 #ifndef ESP_GOOGLE_SHEET_CLIENT_VERSION
-#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.2"
+#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.3"
 #endif
 
 /**
- * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.2
+ * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.3
  *
  * This library supports Espressif ESP8266 and ESP32 MCUs
  *
- * Created November 9, 2023
+ * Created November 10, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
diff --git a/src/auth/GAuthManager.cpp b/src/auth/GAuthManager.cpp
@@ -1,9 +1,9 @@
 /**
- * Google Sheet Client, GAuthManager v1.0.4
+ * Google Sheet Client, GAuthManager v1.0.5
  *
  * This library supports Espressif ESP8266, ESP32 and Raspberry Pi Pico MCUs.
  *
- * Created August 21, 2023
+ * Created November 10, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2022 K. Suwatchai (Mobizt)
@@ -990,6 +990,10 @@ bool GAuthManager::initClient(PGM_P subDomain, gauth_auth_token_status status)
     Utils::idle();
     tcpClient->begin(host.c_str(), 443, &response_code);
 
+    time_t now = getTime();
+
+    tcpClient->setX509Time(now);
+
     return true;
 }
 
diff --git a/src/auth/GAuthManager.h b/src/auth/GAuthManager.h
@@ -1,9 +1,9 @@
 /**
- * Google Sheet Client, GAuthManager v1.0.4
+ * Google Sheet Client, GAuthManager v1.0.5
  *
  * This library supports Espressif ESP8266, ESP32 and Raspberry Pi Pico MCUs.
  *
- * Created August 21, 2023
+ * Created November 10, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2022 K. Suwatchai (Mobizt)
diff --git a/src/client/GS_TCP_Client.h b/src/client/GS_TCP_Client.h
@@ -116,6 +116,16 @@ class GS_TCP_Client : public Client
 #endif
   }
 
+  void setX509Time(time_t now)
+  {
+    if (_tcp_client)
+    {
+      _tcp_client->setX509Time(now);
+      if (now > ESP_SSLCLIENT_VALID_TIMESTAMP)
+        _clock_ready = true;
+    }
+  }
+
   /**
    * Set Root CA certificate to verify.
    * @param caCert The certificate.
@@ -933,7 +943,7 @@ class GS_TCP_Client : public Client
     {
       if (gsmModem->getNetworkTime(&year3, &month3, &day3, &hour3, &min3, &sec3, &timezone))
       {
-        //We have to subtract the local GSM network timezone to get GMT time
+        // We have to subtract the local GSM network timezone to get GMT time
         return TimeHelper::getTimestamp(year3, month3, day3, hour3, min3, sec3) - timezone * 3600;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ESP-Google-Sheet-Client",`
`3`		`- "version": "1.4.2",`
	`3`	`+ "version": "1.4.3",`
`4`	`4`	`"keywords": "communication, REST, esp32, esp8266, raspberrypi, arduino",`
`5`	`5`	`"description": "Arduino Google Sheet REST client library for Arduino devices. This library allows devices to communicate with Google Sheet API to read, edit and delete the spreadsheets",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`/**`
`2`		`- * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.2`
	`2`	`+ * Google Sheet Client, ESP_GOOGLE_SHEET_CLIENT_Google_Sheet_Client.cpp v1.4.3`
`3`	`3`	`*`
`4`	`4`	`* This library supports Espressif ESP8266 and ESP32 MCUs`
`5`	`5`	`*`
`6`		`- * Created November 9, 2023`
	`6`	`+ * Created November 10, 2023`
`7`	`7`	`*`
`8`	`8`	`* The MIT License (MIT)`
`9`	`9`	`* Copyright (c) 2022 K. Suwatchai (Mobizt)`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`#ifndef ESP_GOOGLE_SHEET_CLIENT_VERSION`
`2`		`-#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.2"`
	`2`	`+#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.3"`
`3`	`3`	`#endif`
`4`	`4`
`5`	`5`	`/**`
`6`		`- * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.2`
	`6`	`+ * Google Sheet Client, ESP_Google_Sheet_Client.h v1.4.3`
`7`	`7`	`*`
`8`	`8`	`* This library supports Espressif ESP8266 and ESP32 MCUs`
`9`	`9`	`*`
`10`		`- * Created November 9, 2023`
	`10`	`+ * Created November 10, 2023`
`11`	`11`	`*`
`12`	`12`	`* The MIT License (MIT)`
`13`	`13`	`* Copyright (c) 2023 K. Suwatchai (Mobizt)`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`/**`
`2`		`- * Google Sheet Client, GAuthManager v1.0.4`
	`2`	`+ * Google Sheet Client, GAuthManager v1.0.5`
`3`	`3`	`*`
`4`	`4`	`* This library supports Espressif ESP8266, ESP32 and Raspberry Pi Pico MCUs.`
`5`	`5`	`*`
`6`		`- * Created August 21, 2023`
	`6`	`+ * Created November 10, 2023`
`7`	`7`	`*`
`8`	`8`	`* The MIT License (MIT)`
`9`	`9`	`* Copyright (c) 2022 K. Suwatchai (Mobizt)`
`@@ -990,6 +990,10 @@ bool GAuthManager::initClient(PGM_P subDomain, gauth_auth_token_status status)`
`990`	`990`	`Utils::idle();`
`991`	`991`	`tcpClient->begin(host.c_str(), 443, &response_code);`
`992`	`992`
	`993`	`+ time_t now = getTime();`
	`994`	`+`
	`995`	`+ tcpClient->setX509Time(now);`
	`996`	`+`
`993`	`997`	`return true;`
`994`	`998`	`}`
`995`	`999`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,16 @@ class GS_TCP_Client : public Client`
`116`	`116`	`#endif`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ void setX509Time(time_t now)`
	`120`	`+ {`
	`121`	`+ if (_tcp_client)`
	`122`	`+ {`
	`123`	`+ _tcp_client->setX509Time(now);`
	`124`	`+ if (now > ESP_SSLCLIENT_VALID_TIMESTAMP)`
	`125`	`+ _clock_ready = true;`
	`126`	`+ }`
	`127`	`+ }`
	`128`	`+`
`119`	`129`	`/**`
`120`	`130`	`* Set Root CA certificate to verify.`
`121`	`131`	`* @param caCert The certificate.`
`@@ -933,7 +943,7 @@ class GS_TCP_Client : public Client`
`933`	`943`	`{`
`934`	`944`	`if (gsmModem->getNetworkTime(&year3, &month3, &day3, &hour3, &min3, &sec3, &timezone))`
`935`	`945`	`{`
`936`		`- //We have to subtract the local GSM network timezone to get GMT time`
	`946`	`+ // We have to subtract the local GSM network timezone to get GMT time`
`937`	`947`	`return TimeHelper::getTimestamp(year3, month3, day3, hour3, min3, sec3) - timezone * 3600;`
`938`	`948`	`}`
`939`	`949`	`}`