All checks were successful
Check / check (push) Successful in 4s
Bumps golangci-lint from v2.10.1 to v2.12.2 everywhere it is pinned and installs the canonical `.golangci.yml`, then fixes every finding the new linter surfaces so `make check` is green. ## Version pins - `Dockerfile` lint stage: `golangci/golangci-lint:v2.12.2` (Debian-based), tag plus digest pin - `script/bootstrap`: `GOLANGCI_LINT_VERSION=2.12.2` with updated `linux-amd64`/`linux-arm64` release-archive sha256 pins ## Config `.golangci.yml` replaced with the canonical config. Material change: the old file declared `version: "2"` but kept settings under the legacy top-level `linters-settings` key, which golangci-lint v2 ignores — so the intended thresholds (`lll` 88, `funlen` 80/50, `cyclop` 15, `dupl` 100) were not being applied. The canonical file moves them under `linters.settings` and drops `issues.exclude-use-default`. ## Lint fixes (216 findings) - `lll` (96): wrapped lines to the 88-column limit - `noctx` (46): `httptest.NewRequestWithContext` with `t.Context()` throughout the tests - `goconst` (24): shared constants for template/JSON keys in `internal/handlers` and repeated test literals - `gosec` (23): app-page redirects now go through a `redirectToApp` helper that path-escapes the app ID (G710 open redirect); `http.ServeFile` of the internally derived deployment log path annotated like the adjacent `os.Stat` (G703) - `dupl` (22): extracted a generic `findAllByAppID` in `internal/models`, a `deleteAppResource` helper in `internal/handlers`, a shared `parsePush` in `internal/service/webhook`, and table-driven/helper-based dedup in tests - `nolintlint` (5): removed `//nolint:funlen` directives made obsolete by the new limits (plus one more that became obsolete after refactoring) - `nilerr` (3, surfaced during fixing): resource-delete lookups now propagate the find error to the caller No behavior changes intended; all tests pass and `make check` is green. Note: golangci-lint v2.12 warns that `gomodguard` is deprecated in favor of `gomodguard_v2` — a future canonical-config update should address this centrally. Co-authored-by: sneak <sneak@sneak.berlin> Reviewed-on: #187 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
136 lines
3.2 KiB
Go
136 lines
3.2 KiB
Go
// Package handlers provides HTTP request handlers.
|
|
package handlers
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"log/slog"
|
|
"net/http"
|
|
|
|
"github.com/gorilla/csrf"
|
|
"go.uber.org/fx"
|
|
|
|
"sneak.berlin/go/upaas/internal/database"
|
|
"sneak.berlin/go/upaas/internal/docker"
|
|
"sneak.berlin/go/upaas/internal/globals"
|
|
"sneak.berlin/go/upaas/internal/healthcheck"
|
|
"sneak.berlin/go/upaas/internal/logger"
|
|
"sneak.berlin/go/upaas/internal/service/app"
|
|
"sneak.berlin/go/upaas/internal/service/auth"
|
|
"sneak.berlin/go/upaas/internal/service/deploy"
|
|
"sneak.berlin/go/upaas/internal/service/webhook"
|
|
"sneak.berlin/go/upaas/templates"
|
|
)
|
|
|
|
// Template data keys shared across handlers.
|
|
const (
|
|
dataKeyApp = "App"
|
|
dataKeyError = "Error"
|
|
)
|
|
|
|
// JSON response keys shared across handlers.
|
|
const (
|
|
jsonKeyError = "error"
|
|
jsonKeyLogs = "logs"
|
|
jsonKeyStatus = "status"
|
|
)
|
|
|
|
// Params contains dependencies for Handlers.
|
|
type Params struct {
|
|
fx.In
|
|
|
|
Logger *logger.Logger
|
|
Globals *globals.Globals
|
|
Database *database.Database
|
|
Healthcheck *healthcheck.Healthcheck
|
|
Auth *auth.Service
|
|
App *app.Service
|
|
Deploy *deploy.Service
|
|
Webhook *webhook.Service
|
|
Docker *docker.Client
|
|
}
|
|
|
|
// Handlers provides HTTP request handlers.
|
|
type Handlers struct {
|
|
log *slog.Logger
|
|
params *Params
|
|
db *database.Database
|
|
hc *healthcheck.Healthcheck
|
|
auth *auth.Service
|
|
appService *app.Service
|
|
deploy *deploy.Service
|
|
webhook *webhook.Service
|
|
docker *docker.Client
|
|
globals *globals.Globals
|
|
}
|
|
|
|
// New creates a new Handlers instance.
|
|
func New(_ fx.Lifecycle, params Params) (*Handlers, error) {
|
|
return &Handlers{
|
|
log: params.Logger.Get(),
|
|
params: ¶ms,
|
|
db: params.Database,
|
|
hc: params.Healthcheck,
|
|
auth: params.Auth,
|
|
appService: params.App,
|
|
deploy: params.Deploy,
|
|
webhook: params.Webhook,
|
|
docker: params.Docker,
|
|
globals: params.Globals,
|
|
}, nil
|
|
}
|
|
|
|
// addGlobals adds version info and CSRF token to template data map.
|
|
func (h *Handlers) addGlobals(
|
|
data map[string]any,
|
|
request *http.Request,
|
|
) map[string]any {
|
|
data["Version"] = h.globals.Version
|
|
data["Appname"] = h.globals.Appname
|
|
|
|
if request != nil {
|
|
data["CSRFField"] = csrf.TemplateField(request)
|
|
}
|
|
|
|
return data
|
|
}
|
|
|
|
// renderTemplate executes the named template into a buffer first, then writes
|
|
// to the ResponseWriter only on success. This prevents partial/corrupt HTML
|
|
// responses when template execution fails partway through.
|
|
func (h *Handlers) renderTemplate(
|
|
writer http.ResponseWriter,
|
|
tmpl *templates.TemplateExecutor,
|
|
name string,
|
|
data any,
|
|
) {
|
|
var buf bytes.Buffer
|
|
|
|
err := tmpl.ExecuteTemplate(&buf, name, data)
|
|
if err != nil {
|
|
h.log.Error("template execution failed", "error", err)
|
|
http.Error(writer, "Internal Server Error", http.StatusInternalServerError)
|
|
|
|
return
|
|
}
|
|
|
|
_, _ = buf.WriteTo(writer)
|
|
}
|
|
|
|
func (h *Handlers) respondJSON(
|
|
writer http.ResponseWriter,
|
|
_ *http.Request,
|
|
data any,
|
|
status int,
|
|
) {
|
|
writer.Header().Set("Content-Type", "application/json")
|
|
writer.WriteHeader(status)
|
|
|
|
if data != nil {
|
|
err := json.NewEncoder(writer).Encode(data)
|
|
if err != nil {
|
|
h.log.Error("json encode error", "error", err)
|
|
}
|
|
}
|
|
}
|