Skip to content

fix: prevent nil pointer dereference panics in TestClientCertRequired #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mzack9999 merged 3 commits into from
Mar 20, 2026
+7 −14
Merged

fix: prevent nil pointer dereference panics in TestClientCertRequired #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab53db0
fix: prevent nil pointer dereference panics in TestClientCertRequired
mendarb Mar 20, 2026
8f713b2
Merge remote-tracking branch 'origin/dev' into pr/968
Mzack9999 Mar 20, 2026
de7d082
merging dev
Mzack9999 Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkg/tlsx/openssl/openssl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,22 +178,19 @@ func TestClientCertRequired(t *testing.T) {

args, err := opts.Args()
if err != nil {
t.Error(err.Error())
t.Fatalf("failed to build args: %s", err)
}

result, err := execOpenSSL(context.Background(), args)
if err != nil {
t.Skipf("openssl execution failed (environment issue): %s", err)
t.Fatalf("failed to execute openssl: %v", err)
}
if result == nil || result.Stderr == "" {
t.Skip("openssl returned no output, skipping")
t.Fatal("openssl returned no output")
}

actualResult := isClientCertRequired(result.Stderr)
if actualResult != tc.expectedResult {
if tc.expectedResult && strings.Contains(result.Stderr, "handshake failure") {
t.Skipf("openssl got generic handshake failure instead of specific cert alert (environment-dependent)")
}
t.Errorf("expected isClientCertRequired = %t but received %t\nstderr: %s", tc.expectedResult, actualResult, result.Stderr)
}
})
Expand Down
6 changes: 2 additions & 4 deletions pkg/tlsx/tls/tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func TestClientCertRequired(t *testing.T) {

parsedUrl, err := url.Parse(server.URL)
if err != nil {
t.Errorf("error parsing test server url: %s", err)
t.Fatalf("error parsing test server url: %s", err)
}

connectOpts := clients.ConnectOptions{
Expand All @@ -103,9 +103,7 @@ func TestClientCertRequired(t *testing.T) {
host := parsedUrl.Hostname()
resp, err := client.ConnectWithOptions(host, host, parsedUrl.Port(), connectOpts)
if err != nil {
// We don't fail here because some pre-existing failures are expected in some environments
t.Logf("client ConnectWithOptions failed (pre-existing issue?): %s", err)
return
t.Fatalf("client ConnectWithOptions call failed: %s", err)
}

actualResult := resp.ClientCertRequired
Expand Down
6 changes: 2 additions & 4 deletions pkg/tlsx/ztls/ztls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestClientCertRequired(t *testing.T) {

parsedUrl, err := url.Parse(server.URL)
if err != nil {
t.Errorf("error parsing test server url: %s", err)
t.Fatalf("error parsing test server url: %s", err)
}

connectOpts := clients.ConnectOptions{
Expand All @@ -88,9 +88,7 @@ func TestClientCertRequired(t *testing.T) {
host := parsedUrl.Hostname()
resp, err := client.ConnectWithOptions(host, host, parsedUrl.Port(), connectOpts)
if err != nil {
// We don't fail here because some pre-existing failures are expected in some environments
t.Logf("client ConnectWithOptions failed (pre-existing issue?): %s", err)
return
t.Fatalf("client ConnectWithOptions call failed: %s", err)
}

actualResult := resp.ClientCertRequired
Expand Down
Loading