limit max nesting

ephraimfeldblum · ephraimfeldblum · commit 40add3d7c7ca · 2022-09-07T12:21:20.000+03:00
diff --git a/dump.rdb b/dump.rdb
diff --git a/src/commands.rs b/src/commands.rs
@@ -625,8 +625,14 @@ pub fn json_set<M: Manager>(manager: M, ctx: &Context, args: Vec<RedisString>) -
                     let mut res = false;
                     if update_info.len() == 1 {
                         res = match update_info.pop().unwrap() {
-                            UpdateInfo::SUI(sui) => redis_key.set_value(sui.path, val)?,
-                            UpdateInfo::AUI(aui) => redis_key.dict_add(aui.path, &aui.key, val)?,
+                            UpdateInfo::SUI(sui) => {
+                                if sui.path.len() < 128 {
+                                    redis_key.set_value(sui.path, val)?
+                                } else {
+                                    return Err(RedisError::Str("recursion limit exceeded"))
+                                }
+                            },
+                            UpdateInfo::AUI(aui) => redis_key.dict_add(aui.path, &aui.key, val)?
                         }
                     } else {
                         for ui in update_info {
diff --git a/tests/pytest/test.py b/tests/pytest/test.py
@@ -1138,16 +1138,14 @@ def testNesting(env):
     res = r.execute_command('JSON.GET', 'test', '$..__leaf')
     r.assertEqual(res, '[42]')
 
-    # No overall max nesting level (can exceeded the single value max nesting level)
+    # Max nesting level of nested objects cannot exceed 128
     doc = nest_object(depth, 5, "__deep_leaf", 420)
     r.execute_command('JSON.SET', 'test', '$..__leaf', doc)
     res = r.execute_command('JSON.GET', 'test', '$..__deep_leaf')
     r.assertEqual(res, '[420]')
 
     doc = nest_object(depth, 5, "__helms_deep_leaf", 42000)
-    r.execute_command('JSON.SET', 'test', '$..__deep_leaf', doc)
-    res = r.execute_command('JSON.GET', 'test', '$..__helms_deep_leaf')
-    r.assertEqual(res, '[42000]')
+    r.expect('JSON.SET', 'test', '$..__deep_leaf', doc).raiseError().contains("recursion limit exceeded")
 
     # Max nesting level for a single JSON value cannot be exceeded
     depth = 129
