rainbows 4.4.3 → 4.5.0

data/t/hijack.ru

@@ -0,0 +1,56 @@
+use Rack::Lint
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+class DieIfUsed
+  def each
+    abort "body.each called after response hijack\n"
+  end
+
+  def close
+    abort "body.close called after response hijack\n"
+  end
+end
+def lazy_close(io)
+  thr = Thread.new do
+    # wait and see if Rainbows! accidentally closes us
+    sleep((ENV["DELAY"] || 10).to_i)
+    begin
+      io.close
+    rescue => e
+      warn "E: #{e.message} (#{e.class})"
+      exit!(3)
+    end
+  end
+  at_exit { thr.join }
+end
+
+run lambda { |env|
+  case env["PATH_INFO"]
+  when "/hijack_req"
+    if env["rack.hijack?"]
+      io = env["rack.hijack"].call
+      if io.respond_to?(:read_nonblock) &&
+         env["rack.hijack_io"].respond_to?(:read_nonblock)
+
+        # exercise both, since we Rack::Lint may use different objects
+        env["rack.hijack_io"].write("HTTP/1.0 200 OK\r\n\r\n")
+        io.write("request.hijacked")
+        lazy_close(io)
+        return [ 500, {}, DieIfUsed.new ]
+      end
+    end
+    [ 500, {}, [ "hijack BAD\n" ] ]
+  when "/hijack_res"
+    r = "response.hijacked"
+    [ 200,
+      {
+        "Content-Length" => r.bytesize.to_s,
+        "rack.hijack" => proc do |io|
+          io.write(r)
+          lazy_close(io)
+        end
+      },
+      DieIfUsed.new
+    ]
+  end
+}

data/t/t0000-simple-http.sh

@@ -60,19 +60,19 @@ t_begin "pipelining partial requests" && {
 dbgcat tmp
 
 t_begin "two HTTP/1.1 responses" && {
-	test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1' $tmp | count_lines)
 }
 
 t_begin "two HTTP/1.1 200 OK responses" && {
-	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | count_lines)
 }
 
 t_begin 'one "Connection: keep-alive" response' && {
-	test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: keep-alive' $tmp | count_lines)
 }
 
 t_begin 'one "Connection: close" response' && {
-	test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: close' $tmp | count_lines)
 }
 
 t_begin 'check subshell success' && {
@@ -98,19 +98,19 @@ dbgcat tmp
 dbgcat r_err
 
 t_begin "got 2 HTTP/1.1 responses from pipelining" && {
-	test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1' $tmp | count_lines)
 }
 
 t_begin "got 2 HTTP/1.1 200 OK responses" && {
-	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | count_lines)
 }
 
 t_begin "one keepalive connection" && {
-	test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: keep-alive' $tmp | count_lines)
 }
 
 t_begin "second request closes connection" && {
-	test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: close' $tmp | count_lines)
 }
 
 t_begin "subshell exited correctly" && {
@@ -134,7 +134,7 @@ dbgcat tmp
 dbgcat r_err
 
 t_begin "env.inspect should've put everything on one line" && {
-	test 1 -eq $(wc -l < $tmp)
+	test 1 -eq $(count_lines < $tmp)
 }
 
 t_begin "no headers in output" && {

data/t/t0001-unix-http.sh

@@ -51,19 +51,19 @@ t_begin "pipelining partial requests" && {
 dbgcat tmp
 
 t_begin "two HTTP/1.1 responses" && {
-	test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1' $tmp | count_lines)
 }
 
 t_begin "two HTTP/1.1 200 OK responses" && {
-	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | count_lines)
 }
 
 t_begin 'one "Connection: keep-alive" response' && {
-	test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: keep-alive' $tmp | count_lines)
 }
 
 t_begin 'one "Connection: close" response' && {
-	test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: close' $tmp | count_lines)
 }
 
 t_begin 'check subshell success' && {
@@ -89,19 +89,19 @@ dbgcat tmp
 dbgcat r_err
 
 t_begin "two HTTP/1.1 responses" && {
-	test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1' $tmp | count_lines)
 }
 
 t_begin "two HTTP/1.1 200 OK responses" && {
-	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
+	test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | count_lines)
 }
 
 t_begin 'one "Connection: keep-alive" response' && {
-	test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: keep-alive' $tmp | count_lines)
 }
 
 t_begin 'one "Connection: close" response' && {
-	test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
+	test 1 -eq $(grep '^Connection: close' $tmp | count_lines)
 }
 
 t_begin 'check subshell success' && {

data/t/t0003-reopen-logs.sh

@@ -17,7 +17,7 @@ t_begin "ensure server is responsive" && {
 }
 
 t_begin "start $nr_client concurrent requests" && {
-	start=$(date +%s)
+	start=$(unix_time)
 	for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
 	do
 		( curl -sSf http://$listen/2 >> $curl_out 2>> $curl_err ) &
@@ -59,7 +59,7 @@ dbgcat r_err
 
 t_begin "wait curl requests to finish" && {
 	wait
-	t_info elapsed=$(( $(date +%s) - $start ))
+	t_info elapsed=$(( $(unix_time) - $start ))
 }
 
 t_begin "ensure no errors from curl" && {
@@ -67,11 +67,11 @@ t_begin "ensure no errors from curl" && {
 }
 
 t_begin "curl got $nr_client responses" && {
-	test "$(wc -l < $curl_out)" -eq $nr_client
+	test "$(count_lines < $curl_out)" -eq $nr_client
 }
 
 t_begin "all responses were identical" && {
-	nr=$(sort < $curl_out | uniq | wc -l)
+	nr=$(sort < $curl_out | uniq | count_lines)
 	test "$nr" -eq 1
 }
 
@@ -86,11 +86,11 @@ t_begin "rotated stderr is clean" && {
 }
 
 t_begin "server is now writing logs to new stderr" && {
-	before_rot=$(wc -c < $r_rot)
-	before_err=$(wc -c < $r_err)
+	before_rot=$(count_bytes < $r_rot)
+	before_err=$(count_bytes < $r_err)
 	curl -sSfv http://$listen/
-	after_rot=$(wc -c < $r_rot)
-	after_err=$(wc -c < $r_err)
+	after_rot=$(count_bytes < $r_rot)
+	after_err=$(count_bytes < $r_err)
 	test $after_rot -eq $before_rot
 	test $after_err -gt $before_err
 }

data/t/t0004-heartbeat-timeout.sh

@@ -23,9 +23,9 @@ t_begin "sleep for a bit, ensure worker PID does not change" && {
 
 t_begin "block the worker process to force it to die" && {
 	rm $ok
-	t0=$(date +%s)
+	t0=$(unix_time)
 	err="$(curl -sSf http://$listen/block-forever 2>&1 || > $ok)"
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(($t1 - $t0))
 	t_info "elapsed=$elapsed err=$err"
 	test x"$err" != x"Should never get here"
@@ -34,7 +34,7 @@ t_begin "block the worker process to force it to die" && {
 
 t_begin "ensure worker was killed" && {
 	test -e $ok
-	test 1 -eq $(grep timeout $r_err | grep killing | wc -l)
+	test 1 -eq $(grep timeout $r_err | grep killing | count_lines)
 }
 
 t_begin "ensure timeout took at least 3 seconds" && {

data/t/t0005-large-file-response.sh

@@ -21,7 +21,7 @@ t_begin "setup and startup" && {
 
 t_begin "read random blob sha1 and size" && {
 	random_blob_sha1=$(rsha1 < random_blob)
-	random_blob_size=$(wc -c < random_blob)
+	random_blob_size=$(count_bytes < random_blob)
 }
 
 t_begin "read current RSS" && {

data/t/t0010-keepalive-timeout-effective.sh

@@ -16,12 +16,12 @@ t_begin 'check server up' && {
 
 t_begin "send keepalive response that does not expect close" && {
 	req='GET / HTTP/1.1\r\nHost: example.com\r\n\r\n'
-	t0=$(date +%s)
+	t0=$(unix_time)
 	(
 		cat $fifo > $tmp &
 		printf "$req"
 		wait
-		date +%s > $ok
+		unix_time > $ok
 	) | socat - TCP:$listen > $fifo
 	now="$(cat $ok)"
 	elapsed=$(( $now - $t0 ))

data/t/t0011-close-on-exec-set.sh

@@ -13,12 +13,12 @@ t_begin "setup and start" && {
 
 t_begin "send keepalive req expect it to timeout in ~1s" && {
 	req='GET / HTTP/1.1\r\nHost: example.com\r\n\r\n'
-	t0=$(date +%s)
+	t0=$(unix_time)
 	(
 		cat $fifo > $tmp &
 		printf "$req"
 		wait
-		date +%s > $ok
+		unix_time > $ok
 	) | socat - TCP:$listen > $fifo
 	now="$(cat $ok)"
 	elapsed=$(( $now - $t0 ))

data/t/t0017-keepalive-timeout-zero.sh

@@ -16,12 +16,12 @@ t_begin 'check server responds with Connection: close' && {
 
 t_begin "send keepalive response that does not expect close" && {
 	req='GET / HTTP/1.1\r\nHost: example.com\r\n\r\n'
-	t0=$(date +%s)
+	t0=$(unix_time)
 	(
 		cat $fifo > $tmp &
 		printf "$req"
 		wait
-		date +%s > $ok
+		unix_time > $ok
 	) | socat - TCP:$listen > $fifo
 	now="$(cat $ok)"
 	elapsed=$(( $now - $t0 ))

data/t/t0024-pipelined-sendfile-response.sh

@@ -63,7 +63,7 @@ t_begin "staggered pipeline of 3 HTTP requests" && {
 		wait
 		echo ok >> $ok
 	) | socat - TCP:$listen > $dd_fifo
-	test 2 -eq $(grep '^ok$' $ok |wc -l)
+	test 2 -eq $(grep '^ok$' $ok |count_lines)
 }
 
 t_begin "pipeline 3 HTTP requests" && {
@@ -78,7 +78,7 @@ t_begin "pipeline 3 HTTP requests" && {
 		wait
 		echo ok >> $ok
 	) | socat - TCP:$listen > $fifo
-	test 2 -eq $(grep '^ok$' $ok |wc -l)
+	test 2 -eq $(grep '^ok$' $ok |count_lines)
 }
 
 t_begin "shutdown server" && {

data/t/t0027-nil-copy_stream.sh

@@ -19,7 +19,7 @@ EOF
 
 t_begin "read random blob sha1 and size" && {
 	random_blob_sha1=$(rsha1 < random_blob)
-	random_blob_size=$(wc -c < random_blob)
+	random_blob_size=$(count_bytes < random_blob)
 }
 
 t_begin "send a series HTTP/1.1 requests sequentially" && {

data/t/t0030-fast-pipe-response.sh

@@ -35,7 +35,7 @@ t_begin "send three keep-alive requests" && {
 }
 
 t_begin "ensure responses were all keep-alive" && {
-	test 3 -eq $(grep '< Connection: keep-alive' < $err | wc -l)
+	test 3 -eq $(grep '< Connection: keep-alive' < $err | count_lines)
 }
 
 t_begin "HTTP/1.0 test" && {

data/t/t0034-pipelined-pipe-response.sh

@@ -62,7 +62,7 @@ t_begin "staggered pipeline of 3 HTTP requests" && {
 		wait
 		echo ok >> $ok
 	) | socat - TCP:$listen > $dd_fifo
-	test 2 -eq $(grep '^ok$' $ok |wc -l)
+	test 2 -eq $(grep '^ok$' $ok |count_lines)
 }
 
 t_begin "pipeline 3 HTTP requests" && {
@@ -77,7 +77,7 @@ t_begin "pipeline 3 HTTP requests" && {
 		wait
 		echo ok >> $ok
 	) | socat - TCP:$listen > $fifo
-	test 2 -eq $(grep '^ok$' $ok |wc -l)
+	test 2 -eq $(grep '^ok$' $ok |count_lines)
 }
 
 t_begin "shutdown server" && {

data/t/t0035-kgio-pipe-response.sh

@@ -35,7 +35,7 @@ t_begin "send three keep-alive requests" && {
 }
 
 t_begin "ensure responses were all keep-alive" && {
-	test 3 -eq $(grep '< Connection: keep-alive' < $err | wc -l)
+	test 3 -eq $(grep '< Connection: keep-alive' < $err | count_lines)
 }
 
 t_begin "HTTP/1.0 test" && {

data/t/t0040-keepalive_requests-setting.sh

@@ -13,8 +13,8 @@ t_begin "setup and start" && {
 
 t_begin "curl requests hit default keepalive_requests limit" && {
 	curl -sSfv http://$listen/[0-101] > $curl_out 2> $curl_err
-	test 1 -eq $(grep 'Connection: close' $curl_err |wc -l)
-	test 101 -eq $(grep 'Connection: keep-alive' $curl_err |wc -l)
+	test 1 -eq $(grep 'Connection: close' $curl_err |count_lines)
+	test 101 -eq $(grep 'Connection: keep-alive' $curl_err |count_lines)
 }
 
 t_begin "reload with smaller keepalive_requests limit" && {
@@ -32,8 +32,8 @@ EOF
 t_begin "curl requests hit smaller keepalive_requests limit" && {
 	rm -f $curl_out $curl_err
 	curl -sSfv http://$listen/[1-13] > $curl_out 2> $curl_err
-	test 2 -eq $(grep 'Connection: close' $curl_err |wc -l)
-	test 11 -eq $(grep 'Connection: keep-alive' $curl_err |wc -l)
+	test 2 -eq $(grep 'Connection: close' $curl_err |count_lines)
+	test 11 -eq $(grep 'Connection: keep-alive' $curl_err |count_lines)
 }
 
 t_begin "killing succeeds" && {

data/t/t0043-quit-keepalive-disconnect.sh

@@ -33,13 +33,13 @@ t_begin "wait for response" && {
 }
 
 t_begin "stop Rainbows! gracefully" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	kill -QUIT $rainbows_pid
 }
 
 t_begin "keepalive client disconnected quickly" && {
 	wait
-	diff=$(( $(date +%s) - $t0 ))
+	diff=$(( $(unix_time) - $t0 ))
 	test $diff -le 2 || die "client diff=$diff > 2"
 }
 
@@ -48,7 +48,7 @@ t_begin "wait for termination" && {
 	do
 		sleep 1
 	done
-	diff=$(( $(date +%s) - $t0 ))
+	diff=$(( $(unix_time) - $t0 ))
 	test $diff -le 4 || die "server diff=$diff > 4"
 }
 

data/t/t0044-autopush.sh

@@ -37,7 +37,7 @@ start_strace () {
 
 check_TCP_CORK () {
 	nr=0
-	while test 2 -gt $(grep TCP_CORK $strace_out | wc -l)
+	while test 2 -gt $(grep TCP_CORK $strace_out | count_lines)
 	do
 		nr=$(( $nr + 1 ))
 		if test $nr -gt 30
@@ -48,7 +48,7 @@ check_TCP_CORK () {
 		sleep 1
 	done
 
-	test 2 -eq $(grep TCP_CORK $strace_out | wc -l)
+	test 2 -eq $(grep TCP_CORK $strace_out | count_lines)
 	fgrep 'SOL_TCP, TCP_CORK, [0],' $strace_out
 	fgrep 'SOL_TCP, TCP_CORK, [1],' $strace_out
 }

data/t/t0045-client_max_header_size.sh

@@ -54,7 +54,7 @@ t_begin "smallest HTTP/0.9 request works right" && {
 	) | socat - TCP:$listen > $fifo
 	wait
 	test xok = x"$(cat $ok)"
-	test 1 -eq $(wc -l < $tmp)
+	test 1 -eq $(count_lines < $tmp)
 	grep HTTP_VERSION $tmp && die "unexpected HTTP_VERSION in HTTP/0.9 request"
 }
 
@@ -75,7 +75,7 @@ EOF
 
 t_begin "HTTP/1.1 request succeeds" && {
 	curl -sSf http://$listen/ > $tmp
-	test 1 -eq $(wc -l < $tmp)
+	test 1 -eq $(count_lines < $tmp)
 	dbgcat tmp
 }
 

data/t/t0100-rack-input-hammer-chunked.sh

@@ -17,7 +17,7 @@ t_begin "setup and startup" && {
 }
 
 t_begin "send $nr_client concurrent requests" && {
-	start=$(date +%s)
+	start=$(unix_time)
 	for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
 	do
 		(
@@ -26,17 +26,17 @@ t_begin "send $nr_client concurrent requests" && {
 		) &
 	done
 	wait
-	t_info elapsed=$(( $(date +%s) - $start ))
+	t_info elapsed=$(( $(unix_time) - $start ))
 }
 
 t_begin "kill server" && kill $rainbows_pid
 
 t_begin "got $nr_client responses" && {
-	test $nr_client -eq $(wc -l < $curl_out)
+	test $nr_client -eq $(count_lines < $curl_out)
 }
 
 t_begin "all responses identical" && {
-	test 1 -eq $(sort < $curl_out | uniq | wc -l)
+	test 1 -eq $(sort < $curl_out | uniq | count_lines)
 }
 
 t_begin "sha1 matches on-disk sha1" && {