X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/fc09b9f44918bec49f5bbded81f5dc9172a6e396..0bd6d68e34bc41cd80cd7fc44aab9cf3884de8dc:/tests/unit/protocol.tcl?ds=inline

diff --git a/tests/unit/protocol.tcl b/tests/unit/protocol.tcl
index 5bf42d7f..1700e489 100644
--- a/tests/unit/protocol.tcl
+++ b/tests/unit/protocol.tcl
@@ -1,48 +1,109 @@
 start_server {tags {"protocol"}} {
-    test {Handle an empty query well} {
-        set fd [r channel]
-        puts -nonewline $fd "\r\n"
-        flush $fd
-        r ping
-    } {PONG}
+    test "Handle an empty query" {
+        reconnect
+        r write "\r\n"
+        r flush
+        assert_equal "PONG" [r ping]
+    }
 
-    test {Negative multi bulk command does not create problems} {
-        set fd [r channel]
-        puts -nonewline $fd "*-10\r\n"
-        flush $fd
-        r ping
-    } {PONG}
+    test "Negative multibulk length" {
+        reconnect
+        r write "*-10\r\n"
+        r flush
+        assert_equal PONG [r ping]
+    }
 
-    test {Negative multi bulk payload} {
-        set fd [r channel]
-        puts -nonewline $fd "SET x -10\r\n"
-        flush $fd
-        gets $fd
-    } {*invalid bulk*}
+    test "Out of range multibulk length" {
+        reconnect
+        r write "*20000000\r\n"
+        r flush
+        assert_error "*invalid multibulk length*" {r read}
+    }
 
-    test {Too big bulk payload} {
-        set fd [r channel]
-        puts -nonewline $fd "SET x 2000000000\r\n"
-        flush $fd
-        gets $fd
-    } {*invalid bulk*count*}
+    test "Wrong multibulk payload header" {
+        reconnect
+        r write "*3\r\n\$3\r\nSET\r\n\$1\r\nx\r\nfooz\r\n"
+        r flush
+        assert_error "*expected '$', got 'f'*" {r read}
+    }
 
-    test {bulk payload is not a number} {
-        set fd [r channel]
-        puts -nonewline $fd "SET x blabla\r\n"
-        flush $fd
-        gets $fd
-    } {*invalid bulk*count*}
+    test "Negative multibulk payload length" {
+        reconnect
+        r write "*3\r\n\$3\r\nSET\r\n\$1\r\nx\r\n\$-10\r\n"
+        r flush
+        assert_error "*invalid bulk length*" {r read}
+    }
+
+    test "Out of range multibulk payload length" {
+        reconnect
+        r write "*3\r\n\$3\r\nSET\r\n\$1\r\nx\r\n\$2000000000\r\n"
+        r flush
+        assert_error "*invalid bulk length*" {r read}
+    }
+
+    test "Non-number multibulk payload length" {
+        reconnect
+        r write "*3\r\n\$3\r\nSET\r\n\$1\r\nx\r\n\$blabla\r\n"
+        r flush
+        assert_error "*invalid bulk length*" {r read}
+    }
+
+    test "Multi bulk request not followed by bulk arguments" {
+        reconnect
+        r write "*1\r\nfoo\r\n"
+        r flush
+        assert_error "*expected '$', got 'f'*" {r read}
+    }
+
+    test "Generic wrong number of args" {
+        reconnect
+        assert_error "*wrong*arguments*ping*" {r ping x y z}
+    }
+
+    set c 0
+    foreach seq [list "\x00" "*\x00" "$\x00"] {
+        incr c
+        test "Protocol desync regression test #$c" {
+            set s [socket [srv 0 host] [srv 0 port]]
+            puts -nonewline $s $seq
+            set payload [string repeat A 1024]"\n"
+            set test_start [clock seconds]
+            set test_time_limit 30
+            while 1 {
+                if {[catch {
+                    puts -nonewline $s payload
+                    flush $s
+                    incr payload_size [string length $payload]
+                }]} {
+                    set retval [gets $s]
+                    close $s
+                    break
+                } else {
+                    set elapsed [expr {[clock seconds]-$test_start}]
+                    if {$elapsed > $test_time_limit} {
+                        close $s
+                        error "assertion:Redis did not closed connection after protocol desync"
+                    }
+                }
+            }
+            set retval
+        } {*Protocol error*}
+    }
+    unset c
+}
 
-    test {Multi bulk request not followed by bulk args} {
+start_server {tags {"regression"}} {
+    test "Regression for a crash with blocking ops and pipelining" {
+        set rd [redis_deferring_client]
         set fd [r channel]
-        puts -nonewline $fd "*1\r\nfoo\r\n"
+        set proto "*3\r\n\$5\r\nBLPOP\r\n\$6\r\nnolist\r\n\$1\r\n0\r\n"
+        puts -nonewline $fd $proto$proto
         flush $fd
-        gets $fd
-    } {*protocol error*}
+        set res {}
 
-    test {Generic wrong number of args} {
-        catch {r ping x y z} err
-        set _ $err
-    } {*wrong*arguments*ping*}
+        $rd rpush nolist a
+        $rd read
+        $rd rpush nolist a
+        $rd read
+    }
 }