Merge pull request #415 from sinricpro/fix-invalid-signature

fix: invalid signature error

Author: sivar2311

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 3.4.1
+  New: 
+  - Fix: invalid signature error message.
+
 ## Version 3.4.0
   New: 
   - Support Image upload on camera devices

library.json

@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "3.4.0",
+  "version": "3.4.1",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",

library.properties

@@ -1,5 +1,5 @@
 name=SinricPro
-version=3.4.0
+version=3.4.1
 author=Boris Jaeger <sivar2311@gmail.com>
 maintainer=Boris Jaeger <sivar2311@gmail.com>
 sentence=Library for https://sinric.pro - simple way to connect your device to alexa

src/SinricPro.h

@@ -127,6 +127,7 @@ class SinricProClass : public SinricProInterface {
     void handleDeviceRequest(JsonDocument& requestMessage, interface_t Interface);
     void handleModuleRequest(JsonDocument& requestMessage, interface_t Interface);
     void handleResponse(JsonDocument& responseMessage);
+    void handleInvalidSignatureRequest(JsonDocument& requestMessage, interface_t Interface);
 
     JsonDocument prepareRequest(String deviceId, const char* action);
 
@@ -327,7 +328,7 @@ void SinricProClass::handleResponse(JsonDocument& responseMessage) {
 }
 
 void SinricProClass::handleModuleRequest(JsonDocument& requestMessage, interface_t Interface) {
-    DEBUG_SINRIC("[SinricPro.handleModuleScopeRequest()]: handling device sope request\r\n");
+    DEBUG_SINRIC("[SinricPro.handleModuleScopeRequest()]: handling module scope request\r\n");
 #ifndef NODEBUG_SINRIC
     serializeJsonPretty(requestMessage, DEBUG_ESP_PORT);
 #endif
@@ -434,13 +435,28 @@ void SinricProClass::handleReceiveQueue() {
                 }
             };
         } else {
-            DEBUG_SINRIC("[SinricPro.handleReceiveQueue()]: Signature is invalid! \r\n");
-            if (messageType == FSTR_SINRICPRO_request) handleDeviceRequest(jsonMessage, rawMessage->getInterface());
+            handleInvalidSignatureRequest(jsonMessage, rawMessage->getInterface());
         }
         delete rawMessage;
     }
 }
 
+void SinricProClass::handleInvalidSignatureRequest(JsonDocument& requestMessage, interface_t Interface) { 
+    DEBUG_SINRIC("[SinricPro.handleInvalidSignatureRequest()]: Signature is invalid!\r\n");
+    
+#ifndef NODEBUG_SINRIC
+    serializeJsonPretty(requestMessage, DEBUG_ESP_PORT);
+#endif
+
+    JsonDocument responseMessage = prepareResponse(requestMessage);    
+    responseMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_success] = false;
+    responseMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_message] = "Signature is invalid";
+
+    String responseString;
+    serializeJson(responseMessage, responseString);
+    sendQueue.push(new SinricProMessage(Interface, responseString.c_str()));
+}
+
 void SinricProClass::handleSendQueue() {
     if (!isConnected()) return;
     if (!timestamp.getTimestamp()) return;

src/SinricProVersion.h

@@ -6,7 +6,7 @@
 // Version Configuration
 #define SINRICPRO_VERSION_MAJOR     3
 #define SINRICPRO_VERSION_MINOR     4
-#define SINRICPRO_VERSION_REVISION  0
+#define SINRICPRO_VERSION_REVISION  1
 #define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
 #define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"
 #define SINRICPRO_VERISON_INT SINRICPRO_VERSION_MAJOR * 1000000 + SINRICPRO_VERSION_MINOR * 1000 + SINRICPRO_VERSION_REVISION