2026-05-13 01:44:32 +00:00 · 2026-05-13 01:44:32 +00:00 · 2026-05-13 01:42:53 +00:00 · 2026-05-13 02:31:14 +00:00 · 2026-05-13 03:48:59 +00:00 · 2026-05-12 23:01:09 +00:00
3 changed files with 35 additions and 32 deletions
1
				
			
			
				
			
			
			
				@@ -26,6 +26,10 @@ const (
 // APIError represents an HTTP error response from the GitHub API.
 // It carries the status code so callers can distinguish between
 // different failure modes (e.g. 404 vs 500).
+//
+// Note: Error() includes up to 200 bytes of the response body for debugging.
+// Callers should avoid logging raw error messages in production if the upstream
+// server may return sensitive details in error responses.
 type APIError struct {
 	StatusCode int
 	Body       string
9
				
			
			
				
			
			
			
				@@ -97,6 +101,21 @@ type Client struct {
 	retryBackoff []time.Duration
 }

+// defaultCheckRedirect is the redirect policy used by NewClient and SetHTTPClient(nil).
+// It strips the Authorization header on cross-host redirects or protocol downgrades
+// (HTTPS→HTTP) to prevent credential leakage, while still following the redirect.
+func defaultCheckRedirect(req *http.Request, via []*http.Request) error {
+	if len(via) >= 10 {
+		return fmt.Errorf("stopped after 10 redirects")
+	}
+	// Strip Authorization on cross-host redirect or protocol downgrade (https→http).
+	prev := via[len(via)-1]
+	if req.URL.Host != prev.URL.Host || (prev.URL.Scheme == "https" && req.URL.Scheme == "http") {
+		req.Header.Del("Authorization")
+	}
+	return nil
+}
+
 // NewClient creates a new GitHub API client.
 // If baseURL is empty, it defaults to https://api.github.com.
 // For GitHub Enterprise, pass the API base URL (e.g. https://github.concur.com/api/v3).
@@ -116,17 +135,7 @@ func NewClient(token, baseURL string, opts ...ClientOption) *Client {
 		token:             token,
 		httpClient: &http.Client{
 			Timeout:       30 * time.Second,
-			CheckRedirect: func(req *http.Request, via []*http.Request) error {
-				if len(via) >= 10 {
-					return fmt.Errorf("stopped after 10 redirects")
-				}
-				// Strip Authorization on cross-host redirect or protocol downgrade (https→http).
-				prev := via[len(via)-1]
-				if req.URL.Host != prev.URL.Host || (prev.URL.Scheme == "https" && req.URL.Scheme == "http") {
-					req.Header.Del("Authorization")
-				}
-				return nil
-			},
+			CheckRedirect: defaultCheckRedirect,
 		},
 	}
 }
1
				
			
			
				
			
			
			
				@@ -139,16 +148,7 @@ func (c *Client) SetHTTPClient(hc *http.Client) {
 	if hc == nil {
 		hc = &http.Client{
 			Timeout:       30 * time.Second,
-			CheckRedirect: func(req *http.Request, via []*http.Request) error {
-				if len(via) >= 10 {
-					return fmt.Errorf("stopped after 10 redirects")
-				}
-				prev := via[len(via)-1]
-				if req.URL.Host != prev.URL.Host || (prev.URL.Scheme == "https" && req.URL.Scheme == "http") {
-					req.Header.Del("Authorization")
-				}
-				return nil
-			},
+			CheckRedirect: defaultCheckRedirect,
 		}
 	}
 	c.httpClient = hc
5
				
			
			
				
			
			
			
				@@ -235,7 +235,7 @@ func (c *Client) doRequest(ctx context.Context, method, reqURL string, accept st
 			if err != nil {
 				return nil, fmt.Errorf("read response body: %w", err)
 			}
-			if int64(len(body)) >= maxResponseBytes {
+			if len(body) >= maxResponseBytes {
 				return nil, fmt.Errorf("response body exceeded %d bytes (truncated)", maxResponseBytes)
 			}
 			return body, nil
4
4
				
			
			
				
			
			
			
				@@ -48,6 +48,9 @@ func (c *Client) ListContents(ctx context.Context, owner, repo, path string) ([]
 		if err2 := json.Unmarshal(body, &single); err2 != nil {
 			return nil, fmt.Errorf("parse contents JSON: %w", err2)
 		}
+		if single.Name == "" && single.Path == "" && single.Type == "" {
+			return nil, fmt.Errorf("parse contents JSON: unexpected response format")
+		}
 		entries = []entry{single}
 	}

4
2
				
			
			
				
			
			
			
				@@ -528,13 +528,13 @@ func TestGetCommitStatuses_CheckRunConclusions(t *testing.T) {
 		status     string
 		want       string
 	}{
-		{strPtr("success"), "completed", "success"},
-		{strPtr("failure"), "completed", "failure"},
-		{strPtr("action_required"), "completed", "failure"},
-		{strPtr("timed_out"), "completed", "failure"},
-		{strPtr("cancelled"), "completed", "success"},
-		{strPtr("skipped"), "completed", "success"},
-		{strPtr("neutral"), "completed", "success"},
+		{stringPtr("success"), "completed", "success"},
+		{stringPtr("failure"), "completed", "failure"},
+		{stringPtr("action_required"), "completed", "failure"},
+		{stringPtr("timed_out"), "completed", "failure"},
+		{stringPtr("cancelled"), "completed", "success"},
+		{stringPtr("skipped"), "completed", "success"},
+		{stringPtr("neutral"), "completed", "success"},
 		{nil, "in_progress", "pending"},
 		{nil, "queued", "pending"},
 	}
3
				
			
			
				
			
			
			
				@@ -632,6 +632,6 @@ func TestGetCommitStatuses_MalformedJSON(t *testing.T) {
 	}
 }

-func strPtr(s string) *string {
+func stringPtr(s string) *string {
 	return &s
 }