Skip to content

Commit 56b420b

Browse files
committed
lint
1 parent 1962f55 commit 56b420b

File tree

4 files changed

+41
-11
lines changed

4 files changed

+41
-11
lines changed

internal/auth/oauth/endpoints.go

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,9 @@ func (em *EndpointManager) tokenIntrospectionHandler() http.HandlerFunc {
296296
}
297297

298298
w.Header().Set("Content-Type", "application/json")
299-
json.NewEncoder(w).Encode(response)
299+
if err := json.NewEncoder(w).Encode(response); err != nil {
300+
log.Printf("Failed to encode introspection response: %v", err)
301+
}
300302
return
301303
}
302304

@@ -419,7 +421,9 @@ func (em *EndpointManager) writeErrorResponse(w http.ResponseWriter, errorCode,
419421
"error_description": description,
420422
}
421423

422-
json.NewEncoder(w).Encode(response)
424+
if err := json.NewEncoder(w).Encode(response); err != nil {
425+
log.Printf("Failed to encode error response: %v", err)
426+
}
423427
}
424428

425429
// authorizationProxyHandler proxies authorization requests to Azure AD with resource parameter filtering
@@ -608,7 +612,11 @@ func (em *EndpointManager) exchangeCodeForToken(code, state string) (*TokenRespo
608612
if err != nil {
609613
return nil, fmt.Errorf("token exchange request failed: %w", err)
610614
}
611-
defer resp.Body.Close()
615+
defer func() {
616+
if err := resp.Body.Close(); err != nil {
617+
log.Printf("Failed to close response body: %v", err)
618+
}
619+
}()
612620

613621
if resp.StatusCode != http.StatusOK {
614622
body, _ := io.ReadAll(resp.Body)
@@ -649,7 +657,9 @@ func (em *EndpointManager) writeCallbackErrorResponse(w http.ResponseWriter, mes
649657
</body>
650658
</html>`, message)
651659

652-
w.Write([]byte(html))
660+
if _, err := w.Write([]byte(html)); err != nil {
661+
log.Printf("Failed to write error response: %v", err)
662+
}
653663
}
654664

655665
// writeCallbackSuccessResponse writes a success response for callback
@@ -733,7 +743,9 @@ func (em *EndpointManager) writeCallbackSuccessResponse(w http.ResponseWriter, t
733743
tokenResponse.AccessToken,
734744
tokenResponse.AccessToken)
735745

736-
w.Write([]byte(html))
746+
if _, err := w.Write([]byte(html)); err != nil {
747+
log.Printf("Failed to write success response: %v", err)
748+
}
737749
}
738750

739751
// isValidClientID validates if a client ID is acceptable
@@ -896,7 +908,11 @@ func (em *EndpointManager) exchangeCodeForTokenDirect(code, redirectURI, codeVer
896908
if err != nil {
897909
return nil, fmt.Errorf("token exchange request failed: %w", err)
898910
}
899-
defer resp.Body.Close()
911+
defer func() {
912+
if err := resp.Body.Close(); err != nil {
913+
log.Printf("Failed to close response body: %v", err)
914+
}
915+
}()
900916

901917
if resp.StatusCode != http.StatusOK {
902918
body, _ := io.ReadAll(resp.Body)

internal/auth/oauth/middleware_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ func TestAuthMiddleware(t *testing.T) {
4444
// Create a test handler
4545
testHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
4646
w.WriteHeader(http.StatusOK)
47-
w.Write([]byte("success"))
47+
if _, err := w.Write([]byte("success")); err != nil {
48+
t.Errorf("Failed to write test response: %v", err)
49+
}
4850
})
4951

5052
wrappedHandler := middleware.Middleware(testHandler)

internal/auth/oauth/provider.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,11 @@ func (p *AzureOAuthProvider) GetAuthorizationServerMetadata(serverURL string) (*
116116
log.Printf("OAuth ERROR: Failed to fetch metadata from %s: %v", metadataURL, err)
117117
return nil, fmt.Errorf("failed to fetch metadata from %s: %w", metadataURL, err)
118118
}
119-
defer resp.Body.Close()
119+
defer func() {
120+
if err := resp.Body.Close(); err != nil {
121+
log.Printf("Failed to close response body: %v", err)
122+
}
123+
}()
120124

121125
if resp.StatusCode == http.StatusNotFound {
122126
log.Printf("OAuth ERROR: Tenant ID '%s' not found (HTTP 404)", p.config.TenantID)
@@ -421,7 +425,11 @@ func (p *AzureOAuthProvider) getPublicKey(kid string, issuer string) (*rsa.Publi
421425
if err != nil {
422426
return nil, fmt.Errorf("failed to fetch JWKS from %s: %w", jwksURL, err)
423427
}
424-
defer resp.Body.Close()
428+
defer func() {
429+
if err := resp.Body.Close(); err != nil {
430+
log.Printf("Failed to close response body: %v", err)
431+
}
432+
}()
425433

426434
if resp.StatusCode != http.StatusOK {
427435
return nil, fmt.Errorf("JWKS endpoint returned status %d", resp.StatusCode)

internal/auth/oauth/provider_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ func TestGetAuthorizationServerMetadataWithDefaults(t *testing.T) {
113113

114114
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
115115
w.Header().Set("Content-Type", "application/json")
116-
json.NewEncoder(w).Encode(mockMetadata)
116+
if err := json.NewEncoder(w).Encode(mockMetadata); err != nil {
117+
http.Error(w, "Failed to encode response", http.StatusInternalServerError)
118+
}
117119
}))
118120
defer server.Close()
119121

@@ -211,7 +213,9 @@ func TestGetAuthorizationServerMetadata(t *testing.T) {
211213

212214
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
213215
w.Header().Set("Content-Type", "application/json")
214-
json.NewEncoder(w).Encode(mockMetadata)
216+
if err := json.NewEncoder(w).Encode(mockMetadata); err != nil {
217+
http.Error(w, "Failed to encode response", http.StatusInternalServerError)
218+
}
215219
}))
216220
defer server.Close()
217221

0 commit comments

Comments
 (0)