Fix TypeError while validating webhook signature(Fix razorpay#121)

razorpay/utility/utility.py

@@ -25,9 +25,12 @@ def verify_webhook_signature(self, body, signature, secret):
         return self.verify_signature(body, signature, secret)
 
     def verify_signature(self, body, signature, key):
-        if sys.version_info[0] == 3:  # pragma: no cover
-            key = bytes(key, 'utf-8')
-            body = bytes(body, 'utf-8')
+        if sys.version_info[0] == 3:
+            # ensure if not already bytes object
+            if not isinstance(key, (bytes, bytearray)):
+                key = bytes(key, 'utf-8')
+            if not isinstance(body, (bytes, bytearray)):
+                body = bytes(body, 'utf-8')
 
         dig = hmac.new(key=key,
                        msg=body,

tests/test_client_utility.py

@@ -43,6 +43,16 @@ def test_verify_webhook_signature(self):
              self.client.utility.verify_webhook_signature(body, sig, secret),
              True)
 
+    @responses.activate
+    def test_verify_webhook_signature_with_bytes_data(self):
+        secret = self.client.auth[1]
+        sig = 'd60e67fd884556c045e9be7dad57903e33efc7172c17c6e3ef77db42d2b366e9'
+        body = bytes(mock_file('fake_payment_authorized_webhook'), 'utf-8')
+
+        self.assertEqual(
+             self.client.utility.verify_webhook_signature(body, sig, secret),
+             True)
+
     @responses.activate
     def test_verify_webhook_signature_with_exception(self):
         secret = self.client.auth[1]