1 files changed, 53 insertions, 3 deletions

diff --git a/tests/unit/acl-v2.tcl b/tests/unit/acl-v2.tcl
index 72ea44c3a..12eb5a3be 100644
--- a/tests/unit/acl-v2.tcl
+++ b/tests/unit/acl-v2.tcl
@@ -305,13 +305,19 @@ start_server {tags {"acl external:skip"}} {
         assert_equal "ERR Command 'not-a-command' not found" $e
     }
 
+    test {Test various commands for command permissions} {
+        r ACL setuser command-test -@all
+        assert_equal "This user has no permissions to run the 'set' command" [r ACL DRYRUN command-test set somekey somevalue]
+        assert_equal "This user has no permissions to run the 'get' command" [r ACL DRYRUN command-test get somekey]
+    }
+
     test {Test various odd commands for key permissions} {
         r ACL setuser command-test +@all %R~read* %W~write* %RW~rw*
 
         # Test migrate, which is marked with incomplete keys
-        assert_equal "OK" [r ACL DRYRUN command-test MIGRATE whatever whatever rw]
-        assert_equal "This user has no permissions to access the 'read' key" [r ACL DRYRUN command-test MIGRATE whatever whatever read]
-        assert_equal "This user has no permissions to access the 'write' key" [r ACL DRYRUN command-test MIGRATE whatever whatever write]
+        assert_equal "OK" [r ACL DRYRUN command-test MIGRATE whatever whatever rw 0 500]
+        assert_equal "This user has no permissions to access the 'read' key" [r ACL DRYRUN command-test MIGRATE whatever whatever read 0 500]
+        assert_equal "This user has no permissions to access the 'write' key" [r ACL DRYRUN command-test MIGRATE whatever whatever write 0 500]
         assert_equal "OK" [r ACL DRYRUN command-test MIGRATE whatever whatever "" 0 5000 KEYS rw]
         assert_equal "This user has no permissions to access the 'read' key" [r ACL DRYRUN command-test MIGRATE whatever whatever "" 0 5000 KEYS read]
         assert_equal "This user has no permissions to access the 'write' key" [r ACL DRYRUN command-test MIGRATE whatever whatever "" 0 5000 KEYS write]
@@ -428,6 +434,50 @@ start_server {tags {"acl external:skip"}} {
         assert_equal "This user has no permissions to access the 'otherchannel' channel" [r ACL DRYRUN test-channels ssubscribe otherchannel foo]
     }
 
+    test {Test sort with ACL permissions} {
+        r set v1 1
+        r lpush mylist 1
+        
+        r ACL setuser test-sort-acl on nopass (+sort ~mylist)   
+        $r2 auth test-sort-acl nopass
+         
+        catch {$r2 sort mylist by v*} e
+        assert_equal "ERR BY option of SORT denied due to insufficient ACL permissions." $e
+        catch {$r2 sort mylist get v*} e
+        assert_equal "ERR GET option of SORT denied due to insufficient ACL permissions." $e 
+        
+        r ACL setuser test-sort-acl (+sort ~mylist ~v*)     
+        catch {$r2 sort mylist by v*} e
+        assert_equal "ERR BY option of SORT denied due to insufficient ACL permissions." $e  
+        catch {$r2 sort mylist get v*} e
+        assert_equal "ERR GET option of SORT denied due to insufficient ACL permissions." $e 
+        
+        r ACL setuser test-sort-acl (+sort ~mylist %W~*)     
+        catch {$r2 sort mylist by v*} e
+        assert_equal "ERR BY option of SORT denied due to insufficient ACL permissions." $e
+        catch {$r2 sort mylist get v*} e
+        assert_equal "ERR GET option of SORT denied due to insufficient ACL permissions." $e
+       
+        r ACL setuser test-sort-acl (+sort ~mylist %R~*)     
+        assert_equal "1" [$r2 sort mylist by v*]     
+        
+        # cleanup
+        r ACL deluser test-sort-acl
+        r del v1 mylist
+    }
+    
+    test {Test DRYRUN with wrong number of arguments} {
+        r ACL setuser test-dry-run +@all ~v*
+        
+        assert_equal "OK" [r ACL DRYRUN test-dry-run SET v v]
+        
+        catch {r ACL DRYRUN test-dry-run SET v} e
+        assert_equal "ERR wrong number of arguments for 'set' command" $e
+        
+        catch {r ACL DRYRUN test-dry-run SET} e
+        assert_equal "ERR wrong number of arguments for 'set' command" $e
+    }
+
     $r2 close
 }