gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various branding and cleanup fixes

Browse Source 
Former-commit-id: e3c619eca4755c96af83e1959a6ea5ba95734e93
This commit is contained in:
christianEQ 2021-07-08 02:46:42 +00:00
parent 9dd97c9c0d
commit ea95e6c406
8 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keydb.conf
View File

@ -141,12 +141,12 @@ tcp-keepalive 300
# server to connected clients, masters or cluster peers. These files should be # server to connected clients, masters or cluster peers. These files should be
# PEM formatted. # PEM formatted.
# #
# tls-cert-file redis.crt # tls-cert-file keydb.crt
# tls-key-file redis.key # tls-key-file keydb.key
# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # 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 # Configure a CA certificate(s) bundle or directory to authenticate TLS/SSL
# clients and peers. Redis requires an explicit configuration of at least one # clients and peers. Redis requires an explicit configuration of at least one

2
src/server.cpp
View File

@ -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. " 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."); "Your system could be affected, please report this error.");
if (!checkIgnoreWarning("ARM64-COW-BUG")) { 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"); "Note that it is possible to suppress this warning by setting the following config: ignore-warnings ARM64-COW-BUG");
exit(1); exit(1);
} }

2
tests/instances.tcl
View File

@ -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-key-file %s/../../tls/server.key" [pwd]]
puts $cfg [format "tls-client-cert-file %s/../../tls/client.crt" [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-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 [format "tls-ca-cert-file %s/../../tls/ca.crt" [pwd]]
puts $cfg "loglevel debug" puts $cfg "loglevel debug"
} else { } else {

2
tests/integration/psync2.tcl
View File

@ -4,7 +4,7 @@ proc show_cluster_status {} {
# The following is the regexp we use to match the log line # The following is the regexp we use to match the log line
# time info. Logs are in the following form: # 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 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)} set repl_regexp {(master|repl|sync|backlog|meaningful|offset)}

2
tests/support/server.tcl
View File

@ -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-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-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-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 "tls-ca-cert-file" [format "%s/tests/tls/ca.crt" [pwd]]
dict set config "loglevel" "debug" dict set config "loglevel" "debug"
} }

90
tests/unit/other.tcl
View File

@ -62,57 +62,55 @@ start_server {overrides {save ""} tags {"other"}} {
} {*index is out of range*} } {*index is out of range*}
tags {consistency} { tags {consistency} {
if {true} { if {$::accurate} {set numops 10000} else {set numops 1000}
if {$::accurate} {set numops 10000} else {set numops 1000} test {Check consistency of different data types after a reload} {
test {Check consistency of different data types after a reload} { r flushdb
r flushdb createComplexDataset r $numops
createComplexDataset r $numops set dump [csvdump r]
set dump [csvdump r] set sha1 [r debug digest]
set sha1 [r debug digest] r debug reload
r debug reload set sha1_after [r debug digest]
set sha1_after [r debug digest] if {$sha1 eq $sha1_after} {
if {$sha1 eq $sha1_after} { set _ 1
set _ 1 } else {
} else { set newdump [csvdump r]
set newdump [csvdump r] puts "Consistency test failed!"
puts "Consistency test failed!" puts "You can inspect the two dumps in /tmp/repldump*.txt"
puts "You can inspect the two dumps in /tmp/repldump*.txt"
set fd [open /tmp/repldump1.txt w] set fd [open /tmp/repldump1.txt w]
puts $fd $dump puts $fd $dump
close $fd close $fd
set fd [open /tmp/repldump2.txt w] set fd [open /tmp/repldump2.txt w]
puts $fd $newdump puts $fd $newdump
close $fd close $fd
set _ 0 set _ 0
} }
} {1} } {1}
test {Same dataset digest if saving/reloading as AOF?} { test {Same dataset digest if saving/reloading as AOF?} {
r config set aof-use-rdb-preamble no r config set aof-use-rdb-preamble no
r bgrewriteaof r bgrewriteaof
waitForBgrewriteaof r waitForBgrewriteaof r
r debug loadaof r debug loadaof
set sha1_after [r debug digest] set sha1_after [r debug digest]
if {$sha1 eq $sha1_after} { if {$sha1 eq $sha1_after} {
set _ 1 set _ 1
} else { } else {
set newdump [csvdump r] set newdump [csvdump r]
puts "Consistency test failed!" puts "Consistency test failed!"
puts "You can inspect the two dumps in /tmp/aofdump*.txt" puts "You can inspect the two dumps in /tmp/aofdump*.txt"
set fd [open /tmp/aofdump1.txt w] set fd [open /tmp/aofdump1.txt w]
puts $fd $dump puts $fd $dump
close $fd close $fd
set fd [open /tmp/aofdump2.txt w] set fd [open /tmp/aofdump2.txt w]
puts $fd $newdump puts $fd $newdump
close $fd close $fd
set _ 0 set _ 0
} }
} {1} } {1}
}
} }
test {EXPIRES after a reload (snapshot + append only file rewrite)} { test {EXPIRES after a reload (snapshot + append only file rewrite)} {

4
tests/unit/tls.tcl
View File

@ -100,8 +100,8 @@ start_server {tags {"tls"}} {
set master_port [srv 0 port] set master_port [srv 0 port]
# Use a non-restricted client/server cert for the replica # Use a non-restricted client/server cert for the replica
set redis_crt [format "%s/tests/tls/redis.crt" [pwd]] set redis_crt [format "%s/tests/tls/keydb.crt" [pwd]]
set redis_key [format "%s/tests/tls/redis.key" [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] \ 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]] { omit [list tls-client-cert-file tls-client-key-file]] {

12
utils/gen-test-certs.sh
View File

@ -3,10 +3,10 @@
# Generate some test certificates which are used by the regression test suite: # Generate some test certificates which are used by the regression test suite:
# #
# tests/tls/ca.{crt,key} Self signed CA certificate. # 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/client.{crt,key} A certificate restricted for SSL client usage.
# tests/tls/server.{crt,key} A certificate restricted fro SSL server 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() { generate_cert() {
local name=$1 local name=$1
@ -19,7 +19,7 @@ generate_cert() {
[ -f $keyfile ] || openssl genrsa -out $keyfile 2048 [ -f $keyfile ] || openssl genrsa -out $keyfile 2048
openssl req \ openssl req \
-new -sha256 \ -new -sha256 \
-subj "/O=Redis Test/CN=$cn" \ -subj "/O=KeyDB Test/CN=$cn" \
-key $keyfile | \ -key $keyfile | \
openssl x509 \ openssl x509 \
-req -sha256 \ -req -sha256 \
@ -38,7 +38,7 @@ openssl req \
-x509 -new -nodes -sha256 \ -x509 -new -nodes -sha256 \
-key tests/tls/ca.key \ -key tests/tls/ca.key \
-days 3650 \ -days 3650 \
-subj '/O=Redis Test/CN=Certificate Authority' \ -subj '/O=KeyDB Test/CN=Certificate Authority' \
-out tests/tls/ca.crt -out tests/tls/ca.crt
cat > tests/tls/openssl.cnf <<_END_ 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 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 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