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

Fix tls auditlog tests and enable tls for CI (#234)

Browse Source 
* fix auditlog test titles, and enable tls tests for CI

* fix tls auditlog key string
This commit is contained in:
Malavan Sotheeswaran 2023-10-23 14:34:23 -04:00 committed by GitHub Enterprise
parent cd42776c9f
commit 47f635ee16
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.yaml
View File

@ -21,13 +21,13 @@ machamp:
parent: make-build parent: make-build
# https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04 # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
command: ./runtest --clients 4 --verbose command: ./runtest --clients 4 --verbose --tls
cluster-test: cluster-test:
type: cmd type: cmd
parent: make-build parent: make-build
# https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04 # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
command: ./runtest-cluster command: ./runtest-cluster --tls
sentinel-test: sentinel-test:
type: cmd type: cmd
parent: make-build parent: make-build

4
src/server.cpp
View File

@ -5102,8 +5102,8 @@ int processCommand(client *c, int callFlags) {
sds str = sdsempty(); sds str = sdsempty();
for (int j = 0; j < numkeys; j++) { for (int j = 0; j < numkeys; j++) {
sdscatsds(str, (sds)ptrFromObj(c->argv[keyindex[j]])); str = sdscatsds(str, (sds)ptrFromObj(c->argv[keyindex[j]]));
sdscat(str, " "); str = sdscat(str, " ");
} }
if (numkeys > 0) if (numkeys > 0)

4
tests/unit/tls-auditlog.tcl
View File

@ -51,7 +51,7 @@ if {$::tls} {
} }
} }
test {TLS: Able to connect while with SAN having a comprehensive list} { test {TLS Audit Log: Able to connect while with SAN having a comprehensive list} {
start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.keydb.dev san2.keydb.dev other.keydb.dev}}} { start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.keydb.dev san2.keydb.dev other.keydb.dev}}} {
catch {r PING} e catch {r PING} e
assert_match {PONG} $e assert_match {PONG} $e
@ -65,7 +65,7 @@ if {$::tls} {
} }
} }
test {TLS Audit LogTLS: Able to connect while with SAN having a comprehensive list with wildcards} { test {TLS Audit Log: Able to connect while with SAN having a comprehensive list with wildcards} {
start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.* san*.dev other.*}}} { start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.* san*.dev other.*}}} {
catch {r PING} e catch {r PING} e
assert_match {PONG} $e assert_match {PONG} $e