Unverified Commit 69d55768 authored by Yossi Gottlieb's avatar Yossi Gottlieb Committed by GitHub
Browse files

Fix TLS tests on newer tcl-tls/OpenSSL. (#10910)

Before this commit, TLS tests on Ubuntu 22.04 would fail as dropped
connections result with an ECONNABORTED error thrown instead of an empty
read.
parent 2ab67677
...@@ -67,6 +67,33 @@ proc redis {{server 127.0.0.1} {port 6379} {defer 0} {tls 0} {tlsoptions {}} {re ...@@ -67,6 +67,33 @@ proc redis {{server 127.0.0.1} {port 6379} {defer 0} {tls 0} {tlsoptions {}} {re
interp alias {} ::redis::redisHandle$id {} ::redis::__dispatch__ $id interp alias {} ::redis::redisHandle$id {} ::redis::__dispatch__ $id
} }
# On recent versions of tcl-tls/OpenSSL, reading from a dropped connection
# results with an error we need to catch and mimic the old behavior.
proc ::redis::redis_safe_read {fd len} {
if {$len == -1} {
set err [catch {set val [read $fd]} msg]
} else {
set err [catch {set val [read $fd $len]} msg]
}
if {!$err} {
return $val
}
if {[string match "*connection abort*" $msg]} {
return {}
}
error $msg
}
proc ::redis::redis_safe_gets {fd} {
if {[catch {set val [gets $fd]} msg]} {
if {[string match "*connection abort*" $msg]} {
return {}
}
error $msg
}
return $val
}
# This is a wrapper to the actual dispatching procedure that handles # This is a wrapper to the actual dispatching procedure that handles
# reconnection if needed. # reconnection if needed.
proc ::redis::__dispatch__ {id method args} { proc ::redis::__dispatch__ {id method args} {
...@@ -148,8 +175,8 @@ proc ::redis::__method__read {id fd} { ...@@ -148,8 +175,8 @@ proc ::redis::__method__read {id fd} {
::redis::redis_read_reply $id $fd ::redis::redis_read_reply $id $fd
} }
proc ::redis::__method__rawread {id fd len} { proc ::redis::__method__rawread {id fd {len -1}} {
return [read $fd $len] return [redis_safe_read $fd $len]
} }
proc ::redis::__method__write {id fd buf} { proc ::redis::__method__write {id fd buf} {
...@@ -207,8 +234,8 @@ proc ::redis::redis_writenl {fd buf} { ...@@ -207,8 +234,8 @@ proc ::redis::redis_writenl {fd buf} {
} }
proc ::redis::redis_readnl {fd len} { proc ::redis::redis_readnl {fd len} {
set buf [read $fd $len] set buf [redis_safe_read $fd $len]
read $fd 2 ; # discard CR LF redis_safe_read $fd 2 ; # discard CR LF
return $buf return $buf
} }
...@@ -254,11 +281,11 @@ proc ::redis::redis_read_map {id fd} { ...@@ -254,11 +281,11 @@ proc ::redis::redis_read_map {id fd} {
} }
proc ::redis::redis_read_line fd { proc ::redis::redis_read_line fd {
string trim [gets $fd] string trim [redis_safe_gets $fd]
} }
proc ::redis::redis_read_null fd { proc ::redis::redis_read_null fd {
gets $fd redis_safe_gets $fd
return {} return {}
} }
...@@ -281,7 +308,7 @@ proc ::redis::redis_read_reply {id fd} { ...@@ -281,7 +308,7 @@ proc ::redis::redis_read_reply {id fd} {
} }
while {1} { while {1} {
set type [read $fd 1] set type [redis_safe_read $fd 1]
switch -exact -- $type { switch -exact -- $type {
_ {return [redis_read_null $fd]} _ {return [redis_read_null $fd]}
: - : -
......
...@@ -140,7 +140,7 @@ start_server {tags {"obuf-limits external:skip"}} { ...@@ -140,7 +140,7 @@ start_server {tags {"obuf-limits external:skip"}} {
# Read nothing # Read nothing
set fd [$rd channel] set fd [$rd channel]
assert_equal {} [read $fd] assert_equal {} [$rd rawread]
} }
# Note: This test assumes that what's written with one write, will be read by redis in one read. # Note: This test assumes that what's written with one write, will be read by redis in one read.
...@@ -180,8 +180,7 @@ start_server {tags {"obuf-limits external:skip"}} { ...@@ -180,8 +180,7 @@ start_server {tags {"obuf-limits external:skip"}} {
assert_equal "PONG" [r ping] assert_equal "PONG" [r ping]
set clients [r client list] set clients [r client list]
assert_no_match "*name=multicommands*" $clients assert_no_match "*name=multicommands*" $clients
set fd [$rd2 channel] assert_equal {} [$rd2 rawread]
assert_equal {} [read $fd]
} }
test {Execute transactions completely even if client output buffer limit is enforced} { test {Execute transactions completely even if client output buffer limit is enforced} {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment