Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| faf5fc1797 | |||
| 8c390e7505 | |||
| ffacea132c | |||
| f44390a75a | |||
| a7b777cf7e | |||
| f0addf8fad | |||
| 2ea20da5ef | |||
| e6ce6bc6c6 | |||
| 25bc305fc9 | |||
| 77c8e92e38 | |||
| 2566e14bef | |||
| b0747c0239 | |||
| becb925456 | |||
| eeea1b6475 | |||
| feae2e19a1 | |||
| 417104c617 | |||
| d65676afe6 | |||
| a0f786e894 | |||
| 80aebe8e9f | |||
| b74e9de04d |
@@ -0,0 +1,44 @@
|
|||||||
|
root = "."
|
||||||
|
testdata_dir = "testdata"
|
||||||
|
tmp_dir = "tmp"
|
||||||
|
|
||||||
|
[build]
|
||||||
|
args_bin = []
|
||||||
|
bin = "./tmp/main"
|
||||||
|
cmd = "go build -o ./tmp/main ./cmd/server"
|
||||||
|
delay = 500
|
||||||
|
exclude_dir = ["assets", "tmp", "vendor", "testdata", ".git", "node_modules"]
|
||||||
|
exclude_file = []
|
||||||
|
exclude_regex = ["_test\\.go$"]
|
||||||
|
exclude_unchanged = false
|
||||||
|
follow_symlink = false
|
||||||
|
full_bin = ""
|
||||||
|
include_dir = []
|
||||||
|
include_ext = ["go", "html", "css", "js"]
|
||||||
|
include_file = []
|
||||||
|
kill_delay = "0s"
|
||||||
|
log = "build-errors.log"
|
||||||
|
poll = false
|
||||||
|
poll_interval = 0
|
||||||
|
rerun = false
|
||||||
|
rerun_delay = 500
|
||||||
|
send_interrupt = false
|
||||||
|
stop_on_error = false
|
||||||
|
|
||||||
|
[color]
|
||||||
|
app = ""
|
||||||
|
build = "yellow"
|
||||||
|
main = "magenta"
|
||||||
|
runner = "green"
|
||||||
|
watcher = "cyan"
|
||||||
|
|
||||||
|
[log]
|
||||||
|
main_only = false
|
||||||
|
time = false
|
||||||
|
|
||||||
|
[misc]
|
||||||
|
clean_on_exit = true
|
||||||
|
|
||||||
|
[screen]
|
||||||
|
clear_on_rebuild = false
|
||||||
|
keep_scroll = true
|
||||||
+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,15 +185,56 @@ 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.
|
||||||
func (c *Client) getFromCache(key string) (interface{}, bool) {
|
func (c *Client) getFromCache(key string) (interface{}, bool) {
|
||||||
c.mu.RLock()
|
c.mu.RLock()
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -181,11 +181,58 @@ func renderPage(w http.ResponseWriter, r *http.Request, title, activeTab string,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// errorData holds the template data for error pages.
|
||||||
|
type errorData struct {
|
||||||
|
Code int
|
||||||
|
Title string
|
||||||
|
Message string
|
||||||
|
}
|
||||||
|
|
||||||
|
// ErrorNotFound renders a mobile-friendly 404 error page.
|
||||||
|
func (h *Handler) ErrorNotFound(w http.ResponseWriter, r *http.Request) {
|
||||||
|
data := errorData{
|
||||||
|
Code: http.StatusNotFound,
|
||||||
|
Title: "Page Not Found",
|
||||||
|
Message: "The page you are looking for does not exist or has been moved.",
|
||||||
|
}
|
||||||
|
h.renderError(w, r, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ErrorInternal renders a mobile-friendly 500 error page.
|
||||||
|
func (h *Handler) ErrorInternal(w http.ResponseWriter, r *http.Request) {
|
||||||
|
data := errorData{
|
||||||
|
Code: http.StatusInternalServerError,
|
||||||
|
Title: "Internal Server Error",
|
||||||
|
Message: "Something went wrong on our end. Please try again later.",
|
||||||
|
}
|
||||||
|
h.renderError(w, r, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// renderError renders the error template with the given data and status code.
|
||||||
|
func (h *Handler) renderError(w http.ResponseWriter, r *http.Request, data errorData) {
|
||||||
|
tmpl, err := template.ParseFiles("internal/templates/error.html")
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to parse error template", "error", err)
|
||||||
|
http.Error(w, fmt.Sprintf("%d %s", data.Code, data.Title), data.Code)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf strings.Builder
|
||||||
|
if err := tmpl.ExecuteTemplate(&buf, "content", data); err != nil {
|
||||||
|
slog.Error("failed to execute error template", "error", err)
|
||||||
|
http.Error(w, fmt.Sprintf("%d %s", data.Code, data.Title), data.Code)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(data.Code)
|
||||||
|
renderPage(w, r, data.Title, "", buf.String())
|
||||||
|
}
|
||||||
|
|
||||||
// Dashboard handles GET / — the triage queue.
|
// Dashboard handles GET / — the triage queue.
|
||||||
func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) {
|
func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) {
|
||||||
// Only handle exact root path.
|
// Only handle exact root path.
|
||||||
if r.URL.Path != "/" {
|
if r.URL.Path != "/" {
|
||||||
http.NotFound(w, r)
|
h.ErrorNotFound(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -183,6 +183,87 @@ func TestAddComment_EmptyBody(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestErrorNotFound(t *testing.T) {
|
||||||
|
h := newTestHandler()
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/nonexistent", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
|
h.ErrorNotFound(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusNotFound {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
body := w.Body.String()
|
||||||
|
if body == "" {
|
||||||
|
t.Error("expected non-empty response body")
|
||||||
|
}
|
||||||
|
if !contains(body, "404") {
|
||||||
|
t.Error("expected body to contain '404'")
|
||||||
|
}
|
||||||
|
if !contains(body, "Page Not Found") {
|
||||||
|
t.Error("expected body to contain 'Page Not Found'")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestErrorInternal(t *testing.T) {
|
||||||
|
h := newTestHandler()
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/error", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
|
h.ErrorInternal(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusInternalServerError {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
body := w.Body.String()
|
||||||
|
if body == "" {
|
||||||
|
t.Error("expected non-empty response body")
|
||||||
|
}
|
||||||
|
if !contains(body, "500") {
|
||||||
|
t.Error("expected body to contain '500'")
|
||||||
|
}
|
||||||
|
if !contains(body, "Internal Server Error") {
|
||||||
|
t.Error("expected body to contain 'Internal Server Error'")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDashboard_NonRootPath_Returns404(t *testing.T) {
|
||||||
|
h := newTestHandler()
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/unknown/path", nil)
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
|
h.Dashboard(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusNotFound {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
body := w.Body.String()
|
||||||
|
if !contains(body, "404") {
|
||||||
|
t.Error("expected body to contain '404' for non-root path")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestErrorNotFound_HTMX(t *testing.T) {
|
||||||
|
h := newTestHandler()
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/nonexistent", nil)
|
||||||
|
req.Header.Set("HX-Request", "true")
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
|
h.ErrorNotFound(w, req)
|
||||||
|
|
||||||
|
if w.Code != http.StatusNotFound {
|
||||||
|
t.Errorf("status = %d, want %d", w.Code, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
body := w.Body.String()
|
||||||
|
// HTMX response should not contain DOCTYPE.
|
||||||
|
if contains(body, "<!DOCTYPE") {
|
||||||
|
t.Error("HTMX response should not contain DOCTYPE")
|
||||||
|
}
|
||||||
|
if !contains(body, "Page Not Found") {
|
||||||
|
t.Error("expected body to contain 'Page Not Found'")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func contains(s, substr string) bool {
|
func contains(s, substr string) bool {
|
||||||
return len(s) >= len(substr) && searchString(s, substr)
|
return len(s) >= len(substr) && searchString(s, substr)
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -2,6 +2,7 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"html/template"
|
"html/template"
|
||||||
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -9,89 +10,7 @@ import (
|
|||||||
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
|
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
|
||||||
)
|
)
|
||||||
|
|
||||||
var settingsTemplate = template.Must(template.New("settings").Parse(`<!DOCTYPE html>
|
const settingsTemplatePath = "internal/templates/settings.html"
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
|
|
||||||
<title>Settings — Gitea Mobile</title>
|
|
||||||
<style>
|
|
||||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
|
||||||
body {
|
|
||||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
|
||||||
background: #0d1117; color: #e6edf3;
|
|
||||||
padding: 1rem;
|
|
||||||
padding-top: max(1rem, env(safe-area-inset-top));
|
|
||||||
}
|
|
||||||
h1 { font-size: 1.5rem; margin-bottom: 1rem; }
|
|
||||||
.card {
|
|
||||||
background: #161b22; border: 1px solid #30363d; border-radius: 8px;
|
|
||||||
padding: 1rem; margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
label { display: block; font-size: 0.875rem; color: #8b949e; margin-bottom: 0.5rem; }
|
|
||||||
input[type="text"], input[type="password"] {
|
|
||||||
width: 100%; padding: 0.5rem; font-size: 1rem;
|
|
||||||
background: #0d1117; border: 1px solid #30363d; border-radius: 6px;
|
|
||||||
color: #e6edf3; margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
input:focus { outline: none; border-color: #58a6ff; }
|
|
||||||
button {
|
|
||||||
width: 100%; padding: 0.75rem; font-size: 1rem; font-weight: 600;
|
|
||||||
background: #238636; color: #fff; border: none; border-radius: 6px;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
button:active { background: #2ea043; }
|
|
||||||
.message {
|
|
||||||
padding: 0.75rem; border-radius: 6px; margin-bottom: 1rem;
|
|
||||||
font-size: 0.875rem;
|
|
||||||
}
|
|
||||||
.message.success { background: #0d2818; border: 1px solid #238636; color: #3fb950; }
|
|
||||||
.message.error { background: #2d1117; border: 1px solid #da3633; color: #f85149; }
|
|
||||||
.message.info { background: #0c1d2e; border: 1px solid #1f6feb; color: #58a6ff; }
|
|
||||||
.hint { font-size: 0.75rem; color: #8b949e; margin-top: 0.25rem; margin-bottom: 1rem; }
|
|
||||||
.status { font-size: 0.875rem; color: #8b949e; }
|
|
||||||
.status .connected { color: #3fb950; }
|
|
||||||
.logout-btn {
|
|
||||||
background: #21262d; border: 1px solid #30363d; margin-top: 0.5rem;
|
|
||||||
}
|
|
||||||
.logout-btn:active { background: #30363d; }
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>Settings</h1>
|
|
||||||
|
|
||||||
{{if .Message}}
|
|
||||||
<div class="message {{.MessageType}}">{{.Message}}</div>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{if .HasToken}}
|
|
||||||
<div class="card">
|
|
||||||
<p class="status">Status: <span class="connected">Connected</span></p>
|
|
||||||
<p class="hint">A Gitea API token is configured.</p>
|
|
||||||
<form method="POST" action="/settings">
|
|
||||||
<input type="hidden" name="action" value="logout">
|
|
||||||
<button type="submit" class="logout-btn">Remove Token</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
<div class="card">
|
|
||||||
<form method="POST" action="/settings">
|
|
||||||
<input type="hidden" name="action" value="save">
|
|
||||||
<label for="token">Gitea API Token</label>
|
|
||||||
<input type="password" id="token" name="token" placeholder="Enter your Gitea API token" required>
|
|
||||||
<p class="hint">Generate a token at your Gitea instance under Settings → Applications.</p>
|
|
||||||
<button type="submit">{{if .HasToken}}Update Token{{else}}Save Token{{end}}</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{if .HasToken}}
|
|
||||||
<p style="text-align:center; margin-top:1rem;">
|
|
||||||
<a href="/" style="color:#58a6ff; text-decoration:none;">Back to Dashboard</a>
|
|
||||||
</p>
|
|
||||||
{{end}}
|
|
||||||
</body>
|
|
||||||
</html>`))
|
|
||||||
|
|
||||||
// SettingsHandler handles GET and POST requests for the settings page.
|
// SettingsHandler handles GET and POST requests for the settings page.
|
||||||
type SettingsHandler struct {
|
type SettingsHandler struct {
|
||||||
@@ -126,8 +45,7 @@ func (h *SettingsHandler) handleGet(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
data := settingsData{HasToken: hasToken}
|
data := settingsData{HasToken: hasToken}
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
h.renderSettings(w, data)
|
||||||
settingsTemplate.Execute(w, data)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *SettingsHandler) handlePost(w http.ResponseWriter, r *http.Request) {
|
func (h *SettingsHandler) handlePost(w http.ResponseWriter, r *http.Request) {
|
||||||
@@ -172,6 +90,18 @@ func (h *SettingsHandler) renderWithMessage(w http.ResponseWriter, r *http.Reque
|
|||||||
Message: msg,
|
Message: msg,
|
||||||
MessageType: msgType,
|
MessageType: msgType,
|
||||||
}
|
}
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
h.renderSettings(w, data)
|
||||||
settingsTemplate.Execute(w, data)
|
}
|
||||||
|
|
||||||
|
func (h *SettingsHandler) renderSettings(w http.ResponseWriter, data settingsData) {
|
||||||
|
tmpl, err := template.ParseFiles(settingsTemplatePath)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to parse settings template", "error", err)
|
||||||
|
http.Error(w, "template error", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
if err := tmpl.Execute(w, data); err != nil {
|
||||||
|
slog.Error("failed to execute settings template", "error", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
{{define "content"}}
|
||||||
|
<div class="error-page">
|
||||||
|
<div class="error-icon">
|
||||||
|
{{if eq .Code 404}}
|
||||||
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" width="64" height="64">
|
||||||
|
<circle cx="11" cy="11" r="8"/>
|
||||||
|
<line x1="21" y1="21" x2="16.65" y2="16.65"/>
|
||||||
|
<line x1="8" y1="11" x2="14" y2="11"/>
|
||||||
|
</svg>
|
||||||
|
{{else}}
|
||||||
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" width="64" height="64">
|
||||||
|
<path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/>
|
||||||
|
<line x1="12" y1="9" x2="12" y2="13"/>
|
||||||
|
<line x1="12" y1="17" x2="12.01" y2="17"/>
|
||||||
|
</svg>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
<h1 class="error-code">{{.Code}}</h1>
|
||||||
|
<p class="error-title">{{.Title}}</p>
|
||||||
|
<p class="error-message">{{.Message}}</p>
|
||||||
|
<a href="/" class="error-home-link">Go to Dashboard</a>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
|
||||||
|
<title>Settings — Gitea Mobile</title>
|
||||||
|
<style>
|
||||||
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
|
body {
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
||||||
|
background: #0d1117; color: #e6edf3;
|
||||||
|
padding: 1rem;
|
||||||
|
padding-top: max(1rem, env(safe-area-inset-top));
|
||||||
|
}
|
||||||
|
h1 { font-size: 1.5rem; margin-bottom: 1rem; }
|
||||||
|
.card {
|
||||||
|
background: #161b22; border: 1px solid #30363d; border-radius: 8px;
|
||||||
|
padding: 1rem; margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
label { display: block; font-size: 0.875rem; color: #8b949e; margin-bottom: 0.5rem; }
|
||||||
|
input[type="text"], input[type="password"] {
|
||||||
|
width: 100%; padding: 0.5rem; font-size: 1rem;
|
||||||
|
background: #0d1117; border: 1px solid #30363d; border-radius: 6px;
|
||||||
|
color: #e6edf3; margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
input:focus { outline: none; border-color: #58a6ff; }
|
||||||
|
button {
|
||||||
|
width: 100%; padding: 0.75rem; font-size: 1rem; font-weight: 600;
|
||||||
|
background: #238636; color: #fff; border: none; border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
button:active { background: #2ea043; }
|
||||||
|
.message {
|
||||||
|
padding: 0.75rem; border-radius: 6px; margin-bottom: 1rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
}
|
||||||
|
.message.success { background: #0d2818; border: 1px solid #238636; color: #3fb950; }
|
||||||
|
.message.error { background: #2d1117; border: 1px solid #da3633; color: #f85149; }
|
||||||
|
.message.info { background: #0c1d2e; border: 1px solid #1f6feb; color: #58a6ff; }
|
||||||
|
.hint { font-size: 0.75rem; color: #8b949e; margin-top: 0.25rem; margin-bottom: 1rem; }
|
||||||
|
.status { font-size: 0.875rem; color: #8b949e; }
|
||||||
|
.status .connected { color: #3fb950; }
|
||||||
|
.logout-btn {
|
||||||
|
background: #21262d; border: 1px solid #30363d; margin-top: 0.5rem;
|
||||||
|
}
|
||||||
|
.logout-btn:active { background: #30363d; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Settings</h1>
|
||||||
|
|
||||||
|
{{if .Message}}
|
||||||
|
<div class="message {{.MessageType}}">{{.Message}}</div>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
|
{{if .HasToken}}
|
||||||
|
<div class="card">
|
||||||
|
<p class="status">Status: <span class="connected">Connected</span></p>
|
||||||
|
<p class="hint">A Gitea API token is configured.</p>
|
||||||
|
<form method="POST" action="/settings">
|
||||||
|
<input type="hidden" name="action" value="logout">
|
||||||
|
<button type="submit" class="logout-btn">Remove Token</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
|
<div class="card">
|
||||||
|
<form method="POST" action="/settings">
|
||||||
|
<input type="hidden" name="action" value="save">
|
||||||
|
<label for="token">Gitea API Token</label>
|
||||||
|
<input type="password" id="token" name="token" placeholder="Enter your Gitea API token" required>
|
||||||
|
<p class="hint">Generate a token at your Gitea instance under Settings → Applications.</p>
|
||||||
|
<button type="submit">{{if .HasToken}}Update Token{{else}}Save Token{{end}}</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{if .HasToken}}
|
||||||
|
<p style="text-align:center; margin-top:1rem;">
|
||||||
|
<a href="/" style="color:#58a6ff; text-decoration:none;">Back to Dashboard</a>
|
||||||
|
</p>
|
||||||
|
{{end}}
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
+59
-2
@@ -510,13 +510,17 @@ a:active {
|
|||||||
max-width: 960px;
|
max-width: 960px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-grid {
|
.card-grid,
|
||||||
|
#issue-list,
|
||||||
|
#pull-list {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(2, 1fr);
|
grid-template-columns: repeat(2, 1fr);
|
||||||
gap: var(--spacing-sm);
|
gap: var(--spacing-sm);
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-grid .card {
|
.card-grid .card,
|
||||||
|
#issue-list .card,
|
||||||
|
#pull-list .card {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -541,3 +545,56 @@ a:active {
|
|||||||
--text-link: #0969da;
|
--text-link: #0969da;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Error page */
|
||||||
|
.error-page {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 60vh;
|
||||||
|
text-align: center;
|
||||||
|
padding: var(--spacing-lg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-icon {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin-bottom: var(--spacing-lg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-code {
|
||||||
|
font-size: 4rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-primary);
|
||||||
|
line-height: 1;
|
||||||
|
margin-bottom: var(--spacing-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-title {
|
||||||
|
font-size: var(--font-xl);
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin-bottom: var(--spacing-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-message {
|
||||||
|
font-size: var(--font-base);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin-bottom: var(--spacing-lg);
|
||||||
|
max-width: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-home-link {
|
||||||
|
display: inline-block;
|
||||||
|
padding: var(--spacing-sm) var(--spacing-lg);
|
||||||
|
background: var(--accent-blue);
|
||||||
|
color: #fff;
|
||||||
|
border-radius: var(--radius);
|
||||||
|
text-decoration: none;
|
||||||
|
font-size: var(--font-base);
|
||||||
|
font-weight: 500;
|
||||||
|
transition: opacity 0.15s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-home-link:active {
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user