refactor: extract readBody helper to remove duplicate io.ReadAll calls (#1241)

The same pattern for reading an error response body appeared in three
places across the auth handlers:

- `internal/api/handlers/v0/auth/github_at.go` (twice)
- `internal/api/handlers/v0/auth/github_oidc.go` (once)

A shared `readBody` helper function added to `common.go` now handles
this in one place.
The `io` import is removed from both files since it is no longer used
directly there.

---------

Co-authored-by: Radoslav Dimitrov <radoslav@stacklok.com>
This commit is contained in:
Mesut Oezdil 2026-05-04 12:57:02 +02:00 • committed by GitHub
commit 6f9bd6661c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions

View file

@ -10,6 +10,7 @@ import (
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
"io"
"math/big" "math/big"
"net" "net"
"regexp" "regexp"
@ -20,6 +21,11 @@ import (
"github.com/modelcontextprotocol/registry/internal/config" "github.com/modelcontextprotocol/registry/internal/config"
) )
func readBody(r io.Reader) string {
b, _ := io.ReadAll(r)
return string(b)
}
// ErrSignatureMismatch is returned by VerifySignature when the signature is structurally // ErrSignatureMismatch is returned by VerifySignature when the signature is structurally
// valid but does not verify against the public key. Distinguishing this from structural // valid but does not verify against the public key. Distinguishing this from structural
// failures (wrong size, bad key format) lets the caller add fingerprint hints only when // failures (wrong size, bad key format) lets the caller add fingerprint hints only when

View file

@ -4,7 +4,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"net/http" "net/http"
"regexp" "regexp"
"strings" "strings"
@ -123,8 +122,7 @@ func (h *GitHubHandler) getGitHubUser(ctx context.Context, token string) (*GitHu
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(resp.Body) return nil, fmt.Errorf("GitHub API error (status %d): %s", resp.StatusCode, readBody(resp.Body))
return nil, fmt.Errorf("GitHub API error (status %d): %s", resp.StatusCode, body)
} }
var user GitHubUserOrOrg var user GitHubUserOrOrg
@ -152,8 +150,7 @@ func (h *GitHubHandler) getGitHubUserOrgs(ctx context.Context, username string,
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(resp.Body) return nil, fmt.Errorf("GitHub API error (status %d): %s", resp.StatusCode, readBody(resp.Body))
return nil, fmt.Errorf("GitHub API error (status %d): %s", resp.StatusCode, body)
} }
var orgs []GitHubUserOrOrg var orgs []GitHubUserOrOrg

View file

@ -6,7 +6,6 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"math/big" "math/big"
"net/http" "net/http"
"strings" "strings"
@ -149,8 +148,7 @@ func (v *GitHubOIDCValidator) fetchJWKS(ctx context.Context) (*JWKS, error) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(resp.Body) return nil, fmt.Errorf("JWKS endpoint returned status %d: %s", resp.StatusCode, readBody(resp.Body))
return nil, fmt.Errorf("JWKS endpoint returned status %d: %s", resp.StatusCode, body)
} }
var jwks JWKS var jwks JWKS

View file

@ -198,7 +198,6 @@ func (db *PostgreSQL) ListServers(
whereConditions = append(whereConditions, cursorCondition) whereConditions = append(whereConditions, cursorCondition)
args = append(args, cursorArgs...) args = append(args, cursorArgs...)
} }
_ = argIndex // Silence unused variable warning
// Build the WHERE clause // Build the WHERE clause
whereClause := "" whereClause := ""