Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e6ce6bc6c6 | |||
| 77c8e92e38 | |||
| 2566e14bef | |||
| b0747c0239 | |||
| becb925456 | |||
| feae2e19a1 |
+1
-1
@@ -33,7 +33,7 @@ func main() {
|
|||||||
|
|
||||||
// Apply middleware chain: logging -> auth.
|
// Apply middleware chain: logging -> auth.
|
||||||
var handler http.Handler = mux
|
var handler http.Handler = mux
|
||||||
handler = middleware.Auth(cfg.SessionSecret)(handler)
|
handler = middleware.Auth(cfg.SessionSecret, cfg.GiteaToken)(handler)
|
||||||
handler = middleware.Logging()(handler)
|
handler = middleware.Logging()(handler)
|
||||||
|
|
||||||
slog.Info("server starting", "addr", cfg.ListenAddr, "gitea_url", cfg.GiteaURL)
|
slog.Info("server starting", "addr", cfg.ListenAddr, "gitea_url", cfg.GiteaURL)
|
||||||
|
|||||||
@@ -8,8 +8,11 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"math"
|
||||||
"net/http"
|
"net/http"
|
||||||
"sort"
|
"sort"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
@@ -27,6 +30,11 @@ type Client struct {
|
|||||||
maxConcurrent int
|
maxConcurrent int
|
||||||
// cacheTTL controls how long cache entries remain valid.
|
// cacheTTL controls how long cache entries remain valid.
|
||||||
cacheTTL time.Duration
|
cacheTTL time.Duration
|
||||||
|
|
||||||
|
// maxRetries is the maximum number of retries for rate-limited requests.
|
||||||
|
maxRetries int
|
||||||
|
// baseRetryDelay is the initial backoff delay before the first retry.
|
||||||
|
baseRetryDelay time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
type cacheEntry struct {
|
type cacheEntry struct {
|
||||||
@@ -132,21 +140,43 @@ func NewClient(baseURL string) *Client {
|
|||||||
cache: make(map[string]*cacheEntry),
|
cache: make(map[string]*cacheEntry),
|
||||||
maxConcurrent: 5,
|
maxConcurrent: 5,
|
||||||
cacheTTL: 30 * time.Second,
|
cacheTTL: 30 * time.Second,
|
||||||
|
maxRetries: 3,
|
||||||
|
baseRetryDelay: 1 * time.Second,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// doRequest performs an authenticated HTTP request to the Gitea API.
|
// doRequest performs an authenticated HTTP request to the Gitea API.
|
||||||
|
// It automatically retries on HTTP 429 (rate limit) responses with
|
||||||
|
// exponential backoff, respecting the Retry-After header when present.
|
||||||
func (c *Client) doRequest(ctx context.Context, token, method, path string, body io.Reader) (*http.Response, error) {
|
func (c *Client) doRequest(ctx context.Context, token, method, path string, body io.Reader) (*http.Response, error) {
|
||||||
url := c.baseURL + "/api/v1" + path
|
url := c.baseURL + "/api/v1" + path
|
||||||
|
|
||||||
req, err := http.NewRequestWithContext(ctx, method, url, body)
|
// Read the body once so we can replay it on retries.
|
||||||
|
var bodyBytes []byte
|
||||||
|
if body != nil {
|
||||||
|
var err error
|
||||||
|
bodyBytes, err = io.ReadAll(body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("reading request body: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var lastErr error
|
||||||
|
for attempt := 0; attempt <= c.maxRetries; attempt++ {
|
||||||
|
// Recreate the body reader for each attempt.
|
||||||
|
var reqBody io.Reader
|
||||||
|
if bodyBytes != nil {
|
||||||
|
reqBody = strings.NewReader(string(bodyBytes))
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, method, url, reqBody)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("creating request: %w", err)
|
return nil, fmt.Errorf("creating request: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req.Header.Set("Authorization", "token "+token)
|
req.Header.Set("Authorization", "token "+token)
|
||||||
req.Header.Set("Accept", "application/json")
|
req.Header.Set("Accept", "application/json")
|
||||||
if body != nil {
|
if bodyBytes != nil {
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,13 +185,54 @@ func (c *Client) doRequest(ctx context.Context, token, method, path string, body
|
|||||||
return nil, fmt.Errorf("executing request: %w", err)
|
return nil, fmt.Errorf("executing request: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Not rate-limited: handle normally.
|
||||||
|
if resp.StatusCode != http.StatusTooManyRequests {
|
||||||
if resp.StatusCode >= 400 {
|
if resp.StatusCode >= 400 {
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
respBody, _ := io.ReadAll(resp.Body)
|
respBody, _ := io.ReadAll(resp.Body)
|
||||||
return nil, fmt.Errorf("API error %d: %s", resp.StatusCode, string(respBody))
|
return nil, fmt.Errorf("API error %d: %s", resp.StatusCode, string(respBody))
|
||||||
}
|
}
|
||||||
|
|
||||||
return resp, nil
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rate-limited (429): close body and compute retry delay.
|
||||||
|
resp.Body.Close()
|
||||||
|
|
||||||
|
if attempt == c.maxRetries {
|
||||||
|
lastErr = fmt.Errorf("API rate limit exceeded after %d retries (429)", c.maxRetries)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
delay := c.retryDelay(resp, attempt)
|
||||||
|
slog.Warn("rate limited by Gitea API, retrying",
|
||||||
|
"attempt", attempt+1,
|
||||||
|
"max_retries", c.maxRetries,
|
||||||
|
"delay", delay,
|
||||||
|
"path", path,
|
||||||
|
)
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return nil, ctx.Err()
|
||||||
|
case <-time.After(delay):
|
||||||
|
// Continue to next attempt.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, lastErr
|
||||||
|
}
|
||||||
|
|
||||||
|
// retryDelay computes the delay before the next retry attempt. It uses the
|
||||||
|
// Retry-After header value (in seconds) if present, otherwise falls back to
|
||||||
|
// exponential backoff: baseRetryDelay * 2^attempt.
|
||||||
|
func (c *Client) retryDelay(resp *http.Response, attempt int) time.Duration {
|
||||||
|
if ra := resp.Header.Get("Retry-After"); ra != "" {
|
||||||
|
if seconds, err := strconv.Atoi(ra); err == nil && seconds > 0 {
|
||||||
|
return time.Duration(seconds) * time.Second
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Exponential backoff: 1s, 2s, 4s, ...
|
||||||
|
return c.baseRetryDelay * time.Duration(math.Pow(2, float64(attempt)))
|
||||||
}
|
}
|
||||||
|
|
||||||
// getFromCache returns cached data if still valid.
|
// getFromCache returns cached data if still valid.
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -893,6 +894,140 @@ func TestListAllPullRequests_StateFilter(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Issue #127: Tests for ApplyLabel and SubmitReview ---
|
||||||
|
|
||||||
|
func TestApplyLabel(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
t.Errorf("expected POST, got %s", r.Method)
|
||||||
|
}
|
||||||
|
if r.URL.Path != "/api/v1/repos/owner1/repo1/issues/42/labels" {
|
||||||
|
t.Errorf("unexpected path: %s", r.URL.Path)
|
||||||
|
}
|
||||||
|
if r.Header.Get("Authorization") != "token test-token" {
|
||||||
|
t.Error("missing or wrong Authorization header")
|
||||||
|
}
|
||||||
|
|
||||||
|
var body map[string]interface{}
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||||
|
t.Fatalf("failed to decode body: %v", err)
|
||||||
|
}
|
||||||
|
labels, ok := body["labels"].([]interface{})
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected labels array, got %T", body["labels"])
|
||||||
|
}
|
||||||
|
if len(labels) != 2 {
|
||||||
|
t.Errorf("expected 2 label IDs, got %d", len(labels))
|
||||||
|
}
|
||||||
|
// Verify the label IDs are correct (JSON numbers are float64).
|
||||||
|
if labels[0].(float64) != 10 || labels[1].(float64) != 20 {
|
||||||
|
t.Errorf("expected label IDs [10, 20], got %v", labels)
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
json.NewEncoder(w).Encode([]map[string]interface{}{
|
||||||
|
{"id": 10, "name": "bug"},
|
||||||
|
{"id": 20, "name": "enhancement"},
|
||||||
|
})
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
c := NewClient(server.URL)
|
||||||
|
c.setCache("issues-org1", "should-be-invalidated")
|
||||||
|
|
||||||
|
err := c.ApplyLabel(context.Background(), "test-token", "owner1", "repo1", 42, []int64{10, 20})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify cache was invalidated.
|
||||||
|
_, ok := c.getFromCache("issues-org1")
|
||||||
|
if ok {
|
||||||
|
t.Error("expected cache to be invalidated after ApplyLabel")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestApplyLabel_Error(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusNotFound)
|
||||||
|
fmt.Fprintln(w, `{"message":"issue not found"}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
c := NewClient(server.URL)
|
||||||
|
err := c.ApplyLabel(context.Background(), "test-token", "owner1", "repo1", 999, []int64{10})
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected error for 404 response, got nil")
|
||||||
|
}
|
||||||
|
if !strings.Contains(err.Error(), "404") {
|
||||||
|
t.Errorf("error should contain status code 404, got: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSubmitReview(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
t.Errorf("expected POST, got %s", r.Method)
|
||||||
|
}
|
||||||
|
if r.URL.Path != "/api/v1/repos/owner1/repo1/pulls/7/reviews" {
|
||||||
|
t.Errorf("unexpected path: %s", r.URL.Path)
|
||||||
|
}
|
||||||
|
if r.Header.Get("Authorization") != "token test-token" {
|
||||||
|
t.Error("missing or wrong Authorization header")
|
||||||
|
}
|
||||||
|
|
||||||
|
var body map[string]string
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||||
|
t.Fatalf("failed to decode body: %v", err)
|
||||||
|
}
|
||||||
|
if body["event"] != "APPROVED" {
|
||||||
|
t.Errorf("expected event=APPROVED, got %q", body["event"])
|
||||||
|
}
|
||||||
|
if body["body"] != "Looks good!" {
|
||||||
|
t.Errorf("expected body='Looks good!', got %q", body["body"])
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
json.NewEncoder(w).Encode(map[string]interface{}{
|
||||||
|
"id": 1,
|
||||||
|
"state": "APPROVED",
|
||||||
|
"body": body["body"],
|
||||||
|
})
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
c := NewClient(server.URL)
|
||||||
|
c.setCache("pulls-org1", "should-be-invalidated")
|
||||||
|
|
||||||
|
err := c.SubmitReview(context.Background(), "test-token", "owner1", "repo1", 7, "APPROVED", "Looks good!")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify cache was invalidated.
|
||||||
|
_, ok := c.getFromCache("pulls-org1")
|
||||||
|
if ok {
|
||||||
|
t.Error("expected cache to be invalidated after SubmitReview")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSubmitReview_Error(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
|
fmt.Fprintln(w, `{"message":"validation failed"}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
c := NewClient(server.URL)
|
||||||
|
err := c.SubmitReview(context.Background(), "test-token", "owner1", "repo1", 7, "INVALID", "")
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected error for 422 response, got nil")
|
||||||
|
}
|
||||||
|
if !strings.Contains(err.Error(), "422") {
|
||||||
|
t.Errorf("error should contain status code 422, got: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestListAllPullRequests_Pagination(t *testing.T) {
|
func TestListAllPullRequests_Pagination(t *testing.T) {
|
||||||
now := time.Date(2026, 3, 28, 12, 0, 0, 0, time.UTC)
|
now := time.Date(2026, 3, 28, 12, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
@@ -952,3 +1087,161 @@ func TestListAllPullRequests_Pagination(t *testing.T) {
|
|||||||
t.Error("page 2: HasMore should be false")
|
t.Error("page 2: HasMore should be false")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDoRequest_RateLimitRetry(t *testing.T) {
|
||||||
|
attempts := 0
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
attempts++
|
||||||
|
if attempts <= 2 {
|
||||||
|
w.Header().Set("Retry-After", "0")
|
||||||
|
w.WriteHeader(http.StatusTooManyRequests)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
fmt.Fprint(w, `[{"username":"test-org"}]`)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := NewClient(srv.URL)
|
||||||
|
c.maxRetries = 3
|
||||||
|
c.baseRetryDelay = 1 * time.Millisecond // Fast for tests.
|
||||||
|
|
||||||
|
resp, err := c.doRequest(context.Background(), "test-token", "GET", "/user/orgs", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("expected success after retries, got: %v", err)
|
||||||
|
}
|
||||||
|
resp.Body.Close()
|
||||||
|
|
||||||
|
if attempts != 3 {
|
||||||
|
t.Errorf("expected 3 attempts, got %d", attempts)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDoRequest_RateLimitExhausted(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusTooManyRequests)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := NewClient(srv.URL)
|
||||||
|
c.maxRetries = 2
|
||||||
|
c.baseRetryDelay = 1 * time.Millisecond
|
||||||
|
|
||||||
|
_, err := c.doRequest(context.Background(), "test-token", "GET", "/user/orgs", nil)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected error after exhausting retries")
|
||||||
|
}
|
||||||
|
if !strings.Contains(err.Error(), "rate limit exceeded") {
|
||||||
|
t.Errorf("expected rate limit error, got: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDoRequest_RateLimitWithRetryAfterHeader(t *testing.T) {
|
||||||
|
attempts := 0
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
attempts++
|
||||||
|
if attempts == 1 {
|
||||||
|
w.Header().Set("Retry-After", "1")
|
||||||
|
w.WriteHeader(http.StatusTooManyRequests)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
fmt.Fprint(w, `[]`)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := NewClient(srv.URL)
|
||||||
|
c.maxRetries = 3
|
||||||
|
c.baseRetryDelay = 1 * time.Millisecond
|
||||||
|
|
||||||
|
start := time.Now()
|
||||||
|
resp, err := c.doRequest(context.Background(), "test-token", "GET", "/user/orgs", nil)
|
||||||
|
elapsed := time.Since(start)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("expected success, got: %v", err)
|
||||||
|
}
|
||||||
|
resp.Body.Close()
|
||||||
|
|
||||||
|
// Retry-After: 1 means 1 second delay.
|
||||||
|
if elapsed < 900*time.Millisecond {
|
||||||
|
t.Errorf("expected at least ~1s delay from Retry-After header, got %v", elapsed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDoRequest_RateLimitCancelledContext(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Retry-After", "60")
|
||||||
|
w.WriteHeader(http.StatusTooManyRequests)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := NewClient(srv.URL)
|
||||||
|
c.maxRetries = 3
|
||||||
|
c.baseRetryDelay = 1 * time.Millisecond
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
_, err := c.doRequest(ctx, "test-token", "GET", "/user/orgs", nil)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected error from cancelled context")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDoRequest_NonRateLimitErrorNotRetried(t *testing.T) {
|
||||||
|
attempts := 0
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
attempts++
|
||||||
|
w.WriteHeader(http.StatusForbidden)
|
||||||
|
fmt.Fprint(w, `{"message":"forbidden"}`)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := NewClient(srv.URL)
|
||||||
|
c.maxRetries = 3
|
||||||
|
c.baseRetryDelay = 1 * time.Millisecond
|
||||||
|
|
||||||
|
_, err := c.doRequest(context.Background(), "test-token", "GET", "/user/orgs", nil)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected error for 403")
|
||||||
|
}
|
||||||
|
if attempts != 1 {
|
||||||
|
t.Errorf("expected only 1 attempt for non-429 error, got %d", attempts)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRetryDelay_WithRetryAfterHeader(t *testing.T) {
|
||||||
|
c := NewClient("https://example.com")
|
||||||
|
c.baseRetryDelay = 1 * time.Second
|
||||||
|
|
||||||
|
resp := &http.Response{Header: http.Header{}}
|
||||||
|
resp.Header.Set("Retry-After", "5")
|
||||||
|
|
||||||
|
delay := c.retryDelay(resp, 0)
|
||||||
|
if delay != 5*time.Second {
|
||||||
|
t.Errorf("expected 5s from Retry-After, got %v", delay)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRetryDelay_ExponentialBackoff(t *testing.T) {
|
||||||
|
c := NewClient("https://example.com")
|
||||||
|
c.baseRetryDelay = 1 * time.Second
|
||||||
|
|
||||||
|
resp := &http.Response{Header: http.Header{}}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
attempt int
|
||||||
|
want time.Duration
|
||||||
|
}{
|
||||||
|
{0, 1 * time.Second},
|
||||||
|
{1, 2 * time.Second},
|
||||||
|
{2, 4 * time.Second},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
delay := c.retryDelay(resp, tt.attempt)
|
||||||
|
if delay != tt.want {
|
||||||
|
t.Errorf("attempt %d: got %v, want %v", tt.attempt, delay, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -23,9 +23,12 @@ func TokenFromContext(ctx context.Context) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Auth returns middleware that checks for a valid token cookie.
|
// Auth returns middleware that checks for a valid token cookie.
|
||||||
|
// If no cookie token is found and fallbackToken is non-empty, the fallback
|
||||||
|
// token is used instead (useful for single-user or service-account deployments
|
||||||
|
// where GITEA_TOKEN is set in the environment).
|
||||||
// Unauthenticated requests are redirected to the settings page.
|
// Unauthenticated requests are redirected to the settings page.
|
||||||
// The /health, /settings, and /static/ paths are exempt from auth.
|
// The /health, /settings, and /static/ paths are exempt from auth.
|
||||||
func Auth(sessionSecret string) func(http.Handler) http.Handler {
|
func Auth(sessionSecret, fallbackToken string) func(http.Handler) http.Handler {
|
||||||
return func(next http.Handler) http.Handler {
|
return func(next http.Handler) http.Handler {
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
// Skip auth for exempt paths.
|
// Skip auth for exempt paths.
|
||||||
@@ -37,6 +40,13 @@ func Auth(sessionSecret string) func(http.Handler) http.Handler {
|
|||||||
|
|
||||||
token, err := auth.GetToken(r, sessionSecret)
|
token, err := auth.GetToken(r, sessionSecret)
|
||||||
if err != nil || token == "" {
|
if err != nil || token == "" {
|
||||||
|
// Fall back to environment token if available.
|
||||||
|
if fallbackToken != "" {
|
||||||
|
slog.Debug("using fallback token from environment", "path", path)
|
||||||
|
ctx := context.WithValue(r.Context(), TokenContextKey, fallbackToken)
|
||||||
|
next.ServeHTTP(w, r.WithContext(ctx))
|
||||||
|
return
|
||||||
|
}
|
||||||
slog.Debug("unauthenticated request, redirecting to settings", "path", path, "error", err)
|
slog.Debug("unauthenticated request, redirecting to settings", "path", path, "error", err)
|
||||||
http.Redirect(w, r, "/settings", http.StatusSeeOther)
|
http.Redirect(w, r, "/settings", http.StatusSeeOther)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
const testSecret = "test-secret-that-is-at-least-32-chars-long"
|
const testSecret = "test-secret-that-is-at-least-32-chars-long"
|
||||||
|
|
||||||
func TestAuth_HealthBypass(t *testing.T) {
|
func TestAuth_HealthBypass(t *testing.T) {
|
||||||
handler := Auth(testSecret)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Auth(testSecret, "")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@ func TestAuth_HealthBypass(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestAuth_SettingsBypass(t *testing.T) {
|
func TestAuth_SettingsBypass(t *testing.T) {
|
||||||
handler := Auth(testSecret)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Auth(testSecret, "")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ func TestAuth_SettingsBypass(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestAuth_RedirectWithoutToken(t *testing.T) {
|
func TestAuth_RedirectWithoutToken(t *testing.T) {
|
||||||
handler := Auth(testSecret)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Auth(testSecret, "")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ func TestAuth_RedirectWithoutToken(t *testing.T) {
|
|||||||
|
|
||||||
func TestAuth_PassWithToken(t *testing.T) {
|
func TestAuth_PassWithToken(t *testing.T) {
|
||||||
called := false
|
called := false
|
||||||
handler := Auth(testSecret)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Auth(testSecret, "")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
called = true
|
called = true
|
||||||
token := TokenFromContext(r.Context())
|
token := TokenFromContext(r.Context())
|
||||||
if token != "my-token" {
|
if token != "my-token" {
|
||||||
@@ -83,3 +83,72 @@ func TestAuth_PassWithToken(t *testing.T) {
|
|||||||
t.Errorf("status = %d, want %d", w.Code, http.StatusOK)
|
t.Errorf("status = %d, want %d", w.Code, http.StatusOK)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAuth_FallbackToken_UsedWhenNoCookie(t *testing.T) {
|
||||||
|
called := false
|
||||||
|
handler := Auth(testSecret, "env-fallback-token")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
called = true
|
||||||
|
token := TokenFromContext(r.Context())
|
||||||
|
if token != "env-fallback-token" {
|
||||||
|
t.Errorf("token = %q, want %q", token, "env-fallback-token")
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if !called {
|
||||||
|
t.Error("next handler was not called with fallback token")
|
||||||
|
}
|
||||||
|
if w.Code != http.StatusOK {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAuth_FallbackToken_CookieTakesPrecedence(t *testing.T) {
|
||||||
|
called := false
|
||||||
|
handler := Auth(testSecret, "env-fallback-token")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
called = true
|
||||||
|
token := TokenFromContext(r.Context())
|
||||||
|
if token != "cookie-token" {
|
||||||
|
t.Errorf("token = %q, want %q (cookie should take precedence over fallback)", token, "cookie-token")
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
|
||||||
|
// Set a cookie token.
|
||||||
|
cookieW := httptest.NewRecorder()
|
||||||
|
auth.SetTokenCookie(cookieW, "cookie-token", testSecret, false)
|
||||||
|
cookie := cookieW.Result().Cookies()[0]
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/", nil)
|
||||||
|
req.AddCookie(cookie)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if !called {
|
||||||
|
t.Error("next handler was not called")
|
||||||
|
}
|
||||||
|
if w.Code != http.StatusOK {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAuth_NoFallbackToken_RedirectsWithoutCookie(t *testing.T) {
|
||||||
|
handler := Auth(testSecret, "")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/issues", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
handler.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusSeeOther {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusSeeOther)
|
||||||
|
}
|
||||||
|
if loc := w.Header().Get("Location"); loc != "/settings" {
|
||||||
|
t.Errorf("Location = %q, want %q", loc, "/settings")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user