diff --git a/gitea/client.go b/gitea/client.go index f73a55c..c2060fc 100644 --- a/gitea/client.go +++ b/gitea/client.go @@ -56,8 +56,8 @@ type ChangedFile struct { // GetPullRequest fetches PR metadata. func (c *Client) GetPullRequest(ctx context.Context, owner, repo string, number int) (*PullRequest, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d", c.baseURL, owner, repo, number) - body, err := c.doGet(ctx, url) + reqURL := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d", c.baseURL, owner, repo, number) + body, err := c.doGet(ctx, reqURL) if err != nil { return nil, fmt.Errorf("fetch PR: %w", err) } @@ -70,8 +70,8 @@ func (c *Client) GetPullRequest(ctx context.Context, owner, repo string, number // GetPullRequestDiff fetches the unified diff for a PR. func (c *Client) GetPullRequestDiff(ctx context.Context, owner, repo string, number int) (string, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d.diff", c.baseURL, owner, repo, number) - body, err := c.doGet(ctx, url) + reqURL := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d.diff", c.baseURL, owner, repo, number) + body, err := c.doGet(ctx, reqURL) if err != nil { return "", fmt.Errorf("fetch diff: %w", err) } @@ -80,8 +80,8 @@ func (c *Client) GetPullRequestDiff(ctx context.Context, owner, repo string, num // GetPullRequestFiles fetches the list of files changed in a PR. func (c *Client) GetPullRequestFiles(ctx context.Context, owner, repo string, number int) ([]ChangedFile, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d/files", c.baseURL, owner, repo, number) - body, err := c.doGet(ctx, url) + reqURL := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d/files", c.baseURL, owner, repo, number) + body, err := c.doGet(ctx, reqURL) if err != nil { return nil, fmt.Errorf("fetch PR files: %w", err) } @@ -94,8 +94,8 @@ func (c *Client) GetPullRequestFiles(ctx context.Context, owner, repo string, nu // GetCommitStatuses fetches CI statuses for a commit SHA. func (c *Client) GetCommitStatuses(ctx context.Context, owner, repo, sha string) ([]CommitStatus, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/%s/commits/%s/statuses", c.baseURL, owner, repo, sha) - body, err := c.doGet(ctx, url) + reqURL := fmt.Sprintf("%s/api/v1/repos/%s/%s/commits/%s/statuses", c.baseURL, owner, repo, sha) + body, err := c.doGet(ctx, reqURL) if err != nil { return nil, fmt.Errorf("fetch commit statuses: %w", err) } @@ -129,7 +129,7 @@ func (c *Client) GetFileContentRef(ctx context.Context, owner, repo, filepath, r // PostReview submits a review to a PR. // event should be "APPROVED" or "REQUEST_CHANGES". func (c *Client) PostReview(ctx context.Context, owner, repo string, number int, event, body string) error { - url := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d/reviews", c.baseURL, owner, repo, number) + reqURL := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls/%d/reviews", c.baseURL, owner, repo, number) payload := struct { Body string `json:"body"` @@ -144,7 +144,7 @@ func (c *Client) PostReview(ctx context.Context, owner, repo string, number int, return fmt.Errorf("marshal review payload: %w", err) } - req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(data)) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, reqURL, bytes.NewReader(data)) if err != nil { return fmt.Errorf("create review request: %w", err) } @@ -165,7 +165,7 @@ func (c *Client) PostReview(ctx context.Context, owner, repo string, number int, } func (c *Client) doGet(ctx context.Context, reqURL string) ([]byte, error) { - req, err := http.NewRequestWithContext(ctx, "GET", reqURL, nil) + req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil) if err != nil { return nil, err } @@ -184,8 +184,10 @@ func (c *Client) doGet(ctx context.Context, reqURL string) ([]byte, error) { return io.ReadAll(resp.Body) } -// escapePath escapes each segment of a file path for use in URLs. +// escapePath escapes each segment of a relative file path for use in URLs. // Slashes are preserved as path separators; other special characters are escaped. +// Input should be a relative path (no leading slash). Already-encoded segments +// will be double-encoded, which is the desired behavior for user-provided paths. func escapePath(p string) string { parts := strings.Split(p, "/") for i, part := range parts { diff --git a/gitea/client_test.go b/gitea/client_test.go index 0ec067c..24f60f8 100644 --- a/gitea/client_test.go +++ b/gitea/client_test.go @@ -294,3 +294,27 @@ func TestGetAllFilesInPath_File(t *testing.T) { t.Errorf("unexpected content: %q", files["README.md"]) } } + +func TestEscapePath(t *testing.T) { + tests := []struct { + name string + input string + want string + }{ + {"simple", "src/main.go", "src/main.go"}, + {"spaces", "my dir/my file.go", "my%20dir/my%20file.go"}, + {"special chars", "path/file#1.txt", "path/file%231.txt"}, + {"empty", "", ""}, + {"single segment", "README.md", "README.md"}, + {"nested deep", "a/b/c/d.md", "a/b/c/d.md"}, + {"already encoded", "path/file%20name.go", "path/file%2520name.go"}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got := escapePath(tt.input) + if got != tt.want { + t.Errorf("escapePath(%q) = %q, want %q", tt.input, got, tt.want) + } + }) + } +}