Skip to content
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

Update extended SSL stats #184

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Update extended SSL stats #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6608d6b
update extended SSL stats
dakshinai Nov 6, 2023
00437fc
unit test extended SSL stats
dakshinai Nov 7, 2023
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
17 changes: 15 additions & 2 deletions client/nginx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,21 @@ type HTTPRequests struct {
// SSL represents SSL related stats.
type SSL struct {
Handshakes uint64
HandshakesFailed uint64 `json:"handshakes_failed"`
SessionReuses uint64 `json:"session_reuses"`
HandshakesFailed uint64 `json:"handshakes_failed"`
SessionReuses uint64 `json:"session_reuses"`
NoCommonProtocol uint64 `json:"no_common_protocol"`
NoCommonCipher uint64 `json:"no_common_cipher"`
HandshakeTimeout uint64 `json:"handshake_timeout"`
PeerRejectedCert uint64 `json:"peer_rejected_cert"`
VerifyFailures VerifyFailures `json:"verify_failures"`
}

type VerifyFailures struct {
NoCert uint64 `json:"no_cert"`
ExpiredCert uint64 `json:"expired_cert"`
RevokedCert uint64 `json:"revoked_cert"`
HostnameMismatch uint64 `json:"hostname_mismatch"`
Other uint64 `json:"other"`
}

// ServerZones is map of server zone stats by zone name
Expand Down
83 changes: 80 additions & 3 deletions client/nginx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ func TestHaveSameParametersForStream(t *testing.T) {
func TestClientWithCheckAPI(t *testing.T) {
// Create a test server that returns supported API versions
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
_, err := w.Write([]byte(`[4, 5, 6, 7]`))
_, err := w.Write([]byte(`[4, 5, 6, 7, 8, 9]`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
Expand All @@ -542,7 +542,7 @@ func TestClientWithCheckAPI(t *testing.T) {
}

// Test creating a new client with an unsupported API version on the server
client, err = NewNginxClient(ts.URL, WithAPIVersion(8), WithCheckAPI())
client, err = NewNginxClient(ts.URL, WithAPIVersion(3), WithCheckAPI())
if err == nil {
t.Fatalf("expected error, but got nil")
}
Expand Down Expand Up @@ -594,7 +594,7 @@ func TestClientWithHTTPClient(t *testing.T) {
func TestGetStats_NoStreamEndpoint(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.RequestURI == "/" {
_, err := w.Write([]byte(`[4, 5, 6, 7]`))
_, err := w.Write([]byte(`[4, 5, 6, 7, 8, 9]`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
Expand Down Expand Up @@ -641,3 +641,80 @@ func TestGetStats_NoStreamEndpoint(t *testing.T) {
t.Fatalf("StreamZoneSync: expected %v, actual %v", &StreamZoneSync{}, stats.StreamZoneSync)
}
}

func TestGetStats_SSL(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.RequestURI == "/" {
_, err := w.Write([]byte(`[4, 5, 6, 7, 8, 9]`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
} else if r.RequestURI == "/8/" {
_, err := w.Write([]byte(`["nginx","processes","connections","slabs","http","resolvers","ssl","workers"]`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
} else if strings.HasPrefix(r.RequestURI, "/8/ssl") {
_, err := w.Write([]byte(`{
"handshakes" : 79572,
"handshakes_failed" : 21025,
"session_reuses" : 15762,
"no_common_protocol" : 4,
"no_common_cipher" : 2,
"handshake_timeout" : 0,
"peer_rejected_cert" : 0,
"verify_failures" : {
"no_cert" : 0,
"expired_cert" : 2,
"revoked_cert" : 1,
"hostname_mismatch" : 2,
"other" : 1
}
}`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
} else {
_, err := w.Write([]byte(`{}`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
}
}))
defer ts.Close()

// Test creating a new client with a supported API version on the server
client, err := NewNginxClient(ts.URL, WithAPIVersion(8), WithCheckAPI())
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if client == nil {
t.Fatalf("client is nil")
}

stats, err := client.GetStats()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

testStats := SSL{
Handshakes: 79572,
HandshakesFailed: 21025,
SessionReuses: 15762,
NoCommonProtocol: 4,
NoCommonCipher: 2,
HandshakeTimeout: 0,
PeerRejectedCert: 0,
VerifyFailures: VerifyFailures{
NoCert: 0,
ExpiredCert: 2,
RevokedCert: 1,
HostnameMismatch: 2,
Other: 1,
},
}

if !reflect.DeepEqual(stats.SSL, testStats) {
t.Fatalf("SSL stats: expected %v, actual %v", testStats, stats.SSL)
}
}
Loading