return message when not encrypted

pubnub · Nov 23, 2023 · ddf7b2c · ddf7b2c
1 parent 0b6f537
commit ddf7b2c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/subscription_manager.go b/subscription_manager.go
@@ -971,6 +971,10 @@ func parseCipherInterface(data interface{}, pnConf *Config, module crypto.Crypto
 					pnConf.Log.Println("v[pn_other]", v["pn_other"], v, msg)
 					decrypted, errDecryption := decryptString(module, msg)
 					if errDecryption != nil {
+                        if strings.Contains(errDecryption.Error(), "decrypt error on decode") {
+                            pnConf.Log.Println("Couldn't decode message. Asumming no encrypted message. Returning raw message...")
+                            return msg, nil
+                        }
 						pnConf.Log.Println(errDecryption, msg)
 						return v, errDecryption
 					} else {
@@ -994,6 +998,11 @@ func parseCipherInterface(data interface{}, pnConf *Config, module crypto.Crypto
 			var intf interface{}
 			decrypted, errDecryption := decryptString(module, data.(string))
 			if errDecryption != nil {
+                if strings.Contains(errDecryption.Error(), "decrypt error on decode") {
+                    pnConf.Log.Println("Couldn't decode message. Asumming no encrypted message. Returning raw message...")
+                    return data, nil
+                }
+
 				pnConf.Log.Println(errDecryption, intf)
 				intf = data
 				return intf, errDecryption

diff --git a/subscription_manager_test.go b/subscription_manager_test.go
@@ -569,3 +569,13 @@ func TestProcessSubscribePayloadCipherErr(t *testing.T) {
 	<-done
 	//pn.Destroy()
 }
+
+func TestDecryptionProcessOnNoEncryptedMessage(t *testing.T) {
+    assert := assert.New(t)
+    pn := NewPubNub(NewDemoConfig())
+
+    result, err := parseCipherInterface("test", pn.Config, pn.getCryptoModule())
+
+    assert.Nil(err)
+    assert.Equal("test", result)
+}