From ea95e6c406a501653a2971374927db8f11195fab Mon Sep 17 00:00:00 2001 From: christianEQ Date: Thu, 8 Jul 2021 02:46:42 +0000 Subject: [PATCH] various branding and cleanup fixes Former-commit-id: e3c619eca4755c96af83e1959a6ea5ba95734e93 --- keydb.conf | 6 +-- src/server.cpp | 2 +- tests/instances.tcl | 2 +- tests/integration/psync2.tcl | 2 +- tests/support/server.tcl | 2 +- tests/unit/other.tcl | 90 ++++++++++++++++++------------------ tests/unit/tls.tcl | 4 +- utils/gen-test-certs.sh | 12 ++--- 8 files changed, 59 insertions(+), 61 deletions(-) diff --git a/keydb.conf b/keydb.conf index 3874c5acd..d380d139f 100644 --- a/keydb.conf +++ b/keydb.conf @@ -141,12 +141,12 @@ tcp-keepalive 300 # server to connected clients, masters or cluster peers. These files should be # PEM formatted. # -# tls-cert-file redis.crt -# tls-key-file redis.key +# tls-cert-file keydb.crt +# tls-key-file keydb.key # Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # -# tls-dh-params-file redis.dh +# tls-dh-params-file keydb.dh # Configure a CA certificate(s) bundle or directory to authenticate TLS/SSL # clients and peers. Redis requires an explicit configuration of at least one diff --git a/src/server.cpp b/src/server.cpp index 045938657..841d35bad 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -6830,7 +6830,7 @@ int main(int argc, char **argv) { serverLog(LL_WARNING, "Failed to test the kernel for a bug that could lead to data corruption during background save. " "Your system could be affected, please report this error."); if (!checkIgnoreWarning("ARM64-COW-BUG")) { - serverLog(LL_WARNING,"Redis will now exit to prevent data corruption. " + serverLog(LL_WARNING,"KeyDB will now exit to prevent data corruption. " "Note that it is possible to suppress this warning by setting the following config: ignore-warnings ARM64-COW-BUG"); exit(1); } diff --git a/tests/instances.tcl b/tests/instances.tcl index ce5518231..ae1835139 100644 --- a/tests/instances.tcl +++ b/tests/instances.tcl @@ -92,7 +92,7 @@ proc spawn_instance {type base_port count {conf {}} {base_conf_file ""}} { puts $cfg [format "tls-key-file %s/../../tls/server.key" [pwd]] puts $cfg [format "tls-client-cert-file %s/../../tls/client.crt" [pwd]] puts $cfg [format "tls-client-key-file %s/../../tls/client.key" [pwd]] - puts $cfg [format "tls-dh-params-file %s/../../tls/redis.dh" [pwd]] + puts $cfg [format "tls-dh-params-file %s/../../tls/keydb.dh" [pwd]] puts $cfg [format "tls-ca-cert-file %s/../../tls/ca.crt" [pwd]] puts $cfg "loglevel debug" } else { diff --git a/tests/integration/psync2.tcl b/tests/integration/psync2.tcl index 8459d2378..2c66ae880 100644 --- a/tests/integration/psync2.tcl +++ b/tests/integration/psync2.tcl @@ -4,7 +4,7 @@ proc show_cluster_status {} { # The following is the regexp we use to match the log line # time info. Logs are in the following form: # - # 11296:M 25 May 2020 17:37:14.652 # Server initialized + # 11296:11296:M 25 May 2020 17:37:14.652 # Server initialized set log_regexp {^[0-9]+:^[0-9]+:[A-Z] [0-9]+ [A-z]+ [0-9]+ ([0-9:.]+) .*} set repl_regexp {(master|repl|sync|backlog|meaningful|offset)} diff --git a/tests/support/server.tcl b/tests/support/server.tcl index c06dd0561..701ae4aa2 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -355,7 +355,7 @@ proc start_server {options {code undefined}} { dict set config "tls-key-file" [format "%s/tests/tls/server.key" [pwd]] dict set config "tls-client-cert-file" [format "%s/tests/tls/client.crt" [pwd]] dict set config "tls-client-key-file" [format "%s/tests/tls/client.key" [pwd]] - dict set config "tls-dh-params-file" [format "%s/tests/tls/redis.dh" [pwd]] + dict set config "tls-dh-params-file" [format "%s/tests/tls/keydb.dh" [pwd]] dict set config "tls-ca-cert-file" [format "%s/tests/tls/ca.crt" [pwd]] dict set config "loglevel" "debug" } diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl index 7502ed22b..b4f49804d 100644 --- a/tests/unit/other.tcl +++ b/tests/unit/other.tcl @@ -62,57 +62,55 @@ start_server {overrides {save ""} tags {"other"}} { } {*index is out of range*} tags {consistency} { - if {true} { - if {$::accurate} {set numops 10000} else {set numops 1000} - test {Check consistency of different data types after a reload} { - r flushdb - createComplexDataset r $numops - set dump [csvdump r] - set sha1 [r debug digest] - r debug reload - set sha1_after [r debug digest] - if {$sha1 eq $sha1_after} { - set _ 1 - } else { - set newdump [csvdump r] - puts "Consistency test failed!" - puts "You can inspect the two dumps in /tmp/repldump*.txt" + if {$::accurate} {set numops 10000} else {set numops 1000} + test {Check consistency of different data types after a reload} { + r flushdb + createComplexDataset r $numops + set dump [csvdump r] + set sha1 [r debug digest] + r debug reload + set sha1_after [r debug digest] + if {$sha1 eq $sha1_after} { + set _ 1 + } else { + set newdump [csvdump r] + puts "Consistency test failed!" + puts "You can inspect the two dumps in /tmp/repldump*.txt" - set fd [open /tmp/repldump1.txt w] - puts $fd $dump - close $fd - set fd [open /tmp/repldump2.txt w] - puts $fd $newdump - close $fd + set fd [open /tmp/repldump1.txt w] + puts $fd $dump + close $fd + set fd [open /tmp/repldump2.txt w] + puts $fd $newdump + close $fd - set _ 0 - } - } {1} + set _ 0 + } + } {1} - test {Same dataset digest if saving/reloading as AOF?} { - r config set aof-use-rdb-preamble no - r bgrewriteaof - waitForBgrewriteaof r - r debug loadaof - set sha1_after [r debug digest] - if {$sha1 eq $sha1_after} { - set _ 1 - } else { - set newdump [csvdump r] - puts "Consistency test failed!" - puts "You can inspect the two dumps in /tmp/aofdump*.txt" + test {Same dataset digest if saving/reloading as AOF?} { + r config set aof-use-rdb-preamble no + r bgrewriteaof + waitForBgrewriteaof r + r debug loadaof + set sha1_after [r debug digest] + if {$sha1 eq $sha1_after} { + set _ 1 + } else { + set newdump [csvdump r] + puts "Consistency test failed!" + puts "You can inspect the two dumps in /tmp/aofdump*.txt" - set fd [open /tmp/aofdump1.txt w] - puts $fd $dump - close $fd - set fd [open /tmp/aofdump2.txt w] - puts $fd $newdump - close $fd + set fd [open /tmp/aofdump1.txt w] + puts $fd $dump + close $fd + set fd [open /tmp/aofdump2.txt w] + puts $fd $newdump + close $fd - set _ 0 - } - } {1} - } + set _ 0 + } + } {1} } test {EXPIRES after a reload (snapshot + append only file rewrite)} { diff --git a/tests/unit/tls.tcl b/tests/unit/tls.tcl index 29fe39fbf..7dff47eb4 100644 --- a/tests/unit/tls.tcl +++ b/tests/unit/tls.tcl @@ -100,8 +100,8 @@ start_server {tags {"tls"}} { set master_port [srv 0 port] # Use a non-restricted client/server cert for the replica - set redis_crt [format "%s/tests/tls/redis.crt" [pwd]] - set redis_key [format "%s/tests/tls/redis.key" [pwd]] + set redis_crt [format "%s/tests/tls/keydb.crt" [pwd]] + set redis_key [format "%s/tests/tls/keydb.key" [pwd]] start_server [list overrides [list tls-cert-file $redis_crt tls-key-file $redis_key] \ omit [list tls-client-cert-file tls-client-key-file]] { diff --git a/utils/gen-test-certs.sh b/utils/gen-test-certs.sh index 60814483b..265255c42 100755 --- a/utils/gen-test-certs.sh +++ b/utils/gen-test-certs.sh @@ -3,10 +3,10 @@ # Generate some test certificates which are used by the regression test suite: # # tests/tls/ca.{crt,key} Self signed CA certificate. -# tests/tls/redis.{crt,key} A certificate with no key usage/policy restrictions. +# tests/tls/keydb.{crt,key} A certificate with no key usage/policy restrictions. # tests/tls/client.{crt,key} A certificate restricted for SSL client usage. # tests/tls/server.{crt,key} A certificate restricted fro SSL server usage. -# tests/tls/redis.dh DH Params file. +# tests/tls/keydb.dh DH Params file. generate_cert() { local name=$1 @@ -19,7 +19,7 @@ generate_cert() { [ -f $keyfile ] || openssl genrsa -out $keyfile 2048 openssl req \ -new -sha256 \ - -subj "/O=Redis Test/CN=$cn" \ + -subj "/O=KeyDB Test/CN=$cn" \ -key $keyfile | \ openssl x509 \ -req -sha256 \ @@ -38,7 +38,7 @@ openssl req \ -x509 -new -nodes -sha256 \ -key tests/tls/ca.key \ -days 3650 \ - -subj '/O=Redis Test/CN=Certificate Authority' \ + -subj '/O=KeyDB Test/CN=Certificate Authority' \ -out tests/tls/ca.crt cat > tests/tls/openssl.cnf <<_END_ @@ -53,6 +53,6 @@ _END_ generate_cert server "Server-only" "-extfile tests/tls/openssl.cnf -extensions server_cert" generate_cert client "Client-only" "-extfile tests/tls/openssl.cnf -extensions client_cert" -generate_cert redis "Generic-cert" +generate_cert keydb "Generic-cert" -[ -f tests/tls/redis.dh ] || openssl dhparam -out tests/tls/redis.dh 2048 +[ -f tests/tls/keydb.dh ] || openssl dhparam -out tests/tls/keydb.dh 2048