Merge pull request #2 from Som-Energia/FIX_decode_unexpected_param

Fix decode unexpected param
Som-Energia · Dec 22, 2021 · eb2b17d · eb2b17d
2 parents 5e0065a + 2934e70
commit eb2b17d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,10 @@ redsystest = dict( # Clave para tests
 ```
 
 ## Changelog
+### sermepa 1.0.4-dev
+
+- When sermepa revice an unexpected param in `decodeSignedData` method not will raise `SignatureError`
+
 ### sermepa 1.0.2 (2020-09-16)
 
 - Accept `Ds_ProcessedPayMethod` parameter set

diff --git a/sermepa/__init__.py b/sermepa/__init__.py
@@ -280,10 +280,6 @@ def error(message):
             camell = _notification_fields_upper[key]
             data[camell]=data[key]
             del data[key]
-            continue
-
-        if key not in _notification_fields:
-            error("Bad parameter '{}'".format(key))
 
     return data
 

diff --git a/sermepa/sermepa_test.py b/sermepa/sermepa_test.py
@@ -3,6 +3,7 @@
 from __future__ import unicode_literals
 
 import unittest
+import random
 
 import base64
 import json
@@ -21,11 +22,6 @@
 except ImportError:
     config = None
 
-def randhex(nbytes):
-    import random
-    return "{1:0{0}x}".format(nbytes*2,random.getrandbits(nbytes*8))
-
-
 class Generator_Test(unittest.TestCase):
 
     # back2back data taken from PHP example
@@ -57,6 +53,9 @@ class Generator_Test(unittest.TestCase):
     signature = 'Ejse86yr96Xbr1mf6UvQLoTPwwTyFiLXM+2uT09i9nY='
     signatureversion = 'HMAC_SHA256_V1'
 
+    def new_order_id(self):
+        nbytes=6
+        return "{1:0{0}x}".format(nbytes*2,random.getrandbits(nbytes*8))
 
     def test_encodePayload(self):
         self.assertEqual(
@@ -179,7 +178,7 @@ def test_sendingPost_testing(self):
             Ds_Merchant_MerchantData = "COBRAMENT QUOTA SOCI",
             Ds_Merchant_MerchantName = "SOM ENERGIA, SCCL",
             Ds_Merchant_MerchantURL = "https://testing.somenergia.coop:5001/pagament/notificacio",
-            Ds_Merchant_Order = randhex(nbytes=6), # "20167db2f375",
+            Ds_Merchant_Order = self.new_order_id(),
             Ds_Merchant_ProductDescription = "Alta de soci SOMENERGIA",
             Ds_Merchant_SumTotal = "10000",
             Ds_Merchant_Terminal = "1",
@@ -210,7 +209,7 @@ def test_sendingPost_testing_invalidSignature(self):
             Ds_Merchant_MerchantData = "COBRAMENT QUOTA SOCI",
             Ds_Merchant_MerchantName = "SOM ENERGIA, SCCL",
             Ds_Merchant_MerchantURL = "https://testing.somenergia.coop:5001/pagament/notificacio",
-            Ds_Merchant_Order = randhex(nbytes=6), # "20167db2f375",
+            Ds_Merchant_Order = self.new_order_id(),
             Ds_Merchant_ProductDescription = "Alta de soci SOMENERGIA",
             Ds_Merchant_SumTotal = "10000",
             Ds_Merchant_Terminal = "1",
@@ -241,7 +240,7 @@ def test_sendingPost_testingFails_invalidUser(self):
             Ds_Merchant_MerchantData = "COBRAMENT QUOTA SOCI",
             Ds_Merchant_MerchantName = "SOM ENERGIA, SCCL",
             Ds_Merchant_MerchantURL = "https://testing.somenergia.coop:5001/pagament/notificacio",
-            Ds_Merchant_Order = randhex(nbytes=6), # "20167db2f375",
+            Ds_Merchant_Order = self.new_order_id(),
             Ds_Merchant_ProductDescription = "Alta de soci SOMENERGIA",
             Ds_Merchant_SumTotal = "10000",
             Ds_Merchant_Terminal = "1",
@@ -412,19 +411,19 @@ def test_decodeSignedData_badSignature(self):
         msg = cm.exception.args[0]
         self.assertEqual(msg, 'Bad signature')
 
-    def test_decodeSignedData_badParam(self):
+    def test_decodeSignedData_unexpectedParam(self):
         json_data = '{"Ds_Order":"666", "Bad":"value"}'
         base64_data = base64.urlsafe_b64encode(b(json_data))
         signature = signPayload(self.secret, base64_data, urlsafe=True)
-        with self.assertRaises(SignatureError) as cm:
-            decodeSignedData(
-                self.merchantkey,
-                Ds_MerchantParameters = base64_data,
-                Ds_Signature = signature,
-                Ds_SignatureVersion = self.signatureversion,
-                )
-        msg = cm.exception.args[0]
-        self.assertEqual(msg, "Bad parameter 'Bad'")
+
+        data = decodeSignedData(
+            self.merchantkey,
+            Ds_MerchantParameters=base64_data,
+            Ds_Signature=signature,
+            Ds_SignatureVersion=self.signatureversion,
+        )
+
+        self.assertEqual(data, dict(Ds_Order='666', Bad='value'))
 
     def test_decodeSignedData_upperCaseOrder(self):
         json_data = '{"DS_ORDER":"666"}'

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name='sermepa',
-    version='1.0.3',
+    version='1.0.4-dev',
     description = __doc__.strip(),
     author='GISCE Enginyeria',
     author_email='devel@gisce.net',