Merge pull request #223 from steemit/netuoso-221-custom-json-validator

Community - adjust custom_json validator
steemit · Oct 4, 2019 · ae6c6c7 · ae6c6c7
2 parents 74a41cc + 39ff4b9
commit ae6c6c7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/Pipfile b/Pipfile
@@ -41,6 +41,7 @@ funcy = "*"
 vprof = "*"
 
 [packages]
+attrs = "==19.1.0"
 aiodns = "*"
 aiohttp = "*"
 aredis = "*"

diff --git a/jussi/validators.py b/jussi/validators.py
@@ -34,7 +34,7 @@
 ID_TYPES = (int, str, float, NONE_TYPE)
 PARAMS_TYPES = (list, dict, NONE_TYPE)
 
-CUSTOM_JSON_SIZE_LIMIT = 2000
+CUSTOM_JSON_SIZE_LIMIT = 8192
 CUSTOM_JSON_FOLLOW_RATE = 2
 
 BROADCAST_TRANSACTION_METHODS = {
@@ -199,7 +199,7 @@ def limit_broadcast_transaction_request(request: JSONRPCRequest, limits=None) ->
 
 
 def limit_custom_json_op_length(ops: list, size_limit=None):
-    if any(len(op[1]['json']) > size_limit for op in ops):
+    if any(len(op[1]['json'].encode('utf-8')) > size_limit for op in ops):
         raise JussiCustomJsonOpLengthError(size_limit=size_limit)
 
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1594,7 +1594,7 @@ def appbase_requests(appbase_requests_and_responses):
                          {
                              "required_auths": [],
                              "id": "follow",
-                             "json": 'a' * 2001,
+                             "json": 'a' * 8193,
                              "required_posting_auths": ["steemit"]
                          }
                      ]
@@ -1666,7 +1666,7 @@ def appbase_requests(appbase_requests_and_responses):
                             {
                                 "required_auths": [],
                                 "id": "follow",
-                                "json": 'a' * 2001,
+                                "json": 'a' * 8193,
                                 "required_posting_auths": ["steemit"]
                             }
                         ]

diff --git a/tests/test_validators.py b/tests/test_validators.py
@@ -294,17 +294,26 @@ def test_is_valid_jussi_response_using_steemd(steemd_request_and_response):
         {
             "required_auths": [],
             "id": "follow",
-            "json": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+            "json": "a"*8192,
+            "required_posting_auths": ["steemit"]
+        }
+    ]], False),
+    ([[
+        'custom_json',
+        {
+            "required_auths": [],
+            "id": "follow",
+            "json": "😂"*2048,
             "required_posting_auths": ["steemit"]
         }
     ]], False),
 ])
 def test_is_valid_custom_json_op_length(ops, expected):
     if expected is False:
         with pytest.raises(JussiCustomJsonOpLengthError):
-            limit_custom_json_op_length(ops, size_limit=1000)
+            limit_custom_json_op_length(ops, size_limit=8191)
     else:
-        limit_custom_json_op_length(ops, size_limit=1000)
+        limit_custom_json_op_length(ops, size_limit=100)
 
 
 @pytest.mark.parametrize('ops, expected', [