mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 18:51:32 +00:00
0e29c416b1
Closes one 2026-04-24 audit finding (P2):
- cat-s6-efc7f6f6bd50: 30 strings.Contains(err.Error(), ...) sites
in internal/api/handler/ — brittle to repository-layer message
changes, untyped against the actual failure mode.
Approach (Option B from prompt design notes):
- New typed sentinels in internal/repository/errors.go:
ErrNotFound, ErrForeignKeyConstraint
IsForeignKeyError(err) helper (the only place substring
matching at the lib/pq boundary is allowed; isolates the
DB-driver string knowledge to one function).
- New typed sentinel in internal/domain/errors.go:
ErrValidation (reserved for future per-entity validation
wrappers; not yet used by all handlers).
- 49 sites in internal/repository/postgres/*.go updated to wrap
sql.ErrNoRows-derived errors via fmt.Errorf("...: %w",
repository.ErrNotFound).
- 18 not-found handler sites + 2 FK-constraint handler sites
refactored to errors.Is(err, repository.ErrNotFound) /
repository.IsForeignKeyError(err).
- 23 inline `fmt.Errorf("X not found")` test fixtures across
handler tests rewrapped to wrap repository.ErrNotFound.
- test_utils.go::ErrMockNotFound rewrapped to wrap
repository.ErrNotFound; renewal_policy.go closure docblock
updated to reflect the new convention.
- integration test mockJobRepository.Get wraps repository.ErrNotFound.
CI regression guardrail:
- .github/workflows/ci.yml::"Forbidden strings.Contains(err.Error())
regression guard (S-2)" greps for the three patterns ("not found",
"violates foreign key", "RESTRICT") under internal/api/handler/
and fails the build on regression.
Verification:
- go build ./... — clean
- go vet ./... — clean
- go test ./... -short -count=1 — all packages pass (handler +
repository + service + integration)
- golangci-lint v2.11.4 run ./... — 0 issues
- S-2 guardrail dry-run on post-fix tree → empty (good)
- All sibling guardrails (S-1, G-3, D-1+D-2, B-1, L-1, H-1, C-1, F-1, P-1) pass
Audit findings closed:
- cat-s6-efc7f6f6bd50 (P2)
Deferred follow-ups:
- 6 domain-specific substring patterns still inline in handlers
("cannot approve", "cannot reject", "cannot be parsed",
"no certificates found", "challenge password", "invalid"/
"required" validation chains in profiles + agent_groups). Each
needs its own typed sentinel, scoped per service. Documented
by the S-2 CI guardrail's allowlist for closure-comments only.
- Per-entity not-found sentinels (Option A — ErrCertificateNotFound,
ErrAgentNotFound, etc.) deferred. Generic ErrNotFound covers the
current dispatch needs; per-entity precision would let handlers
return entity-aware error bodies without a domain.Type field,
but not blocking.
231 lines
6.7 KiB
Go
231 lines
6.7 KiB
Go
package handler
|
|
|
|
import (
|
|
"github.com/shankar0123/certctl/internal/repository"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"io"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/shankar0123/certctl/internal/api/middleware"
|
|
"github.com/shankar0123/certctl/internal/domain"
|
|
"github.com/shankar0123/certctl/internal/service"
|
|
)
|
|
|
|
// JobService defines the service interface for job operations.
|
|
type JobService interface {
|
|
ListJobs(ctx context.Context, status, jobType string, page, perPage int) ([]domain.Job, int64, error)
|
|
GetJob(ctx context.Context, id string) (*domain.Job, error)
|
|
CancelJob(ctx context.Context, id string) error
|
|
// ApproveJob approves a renewal job. actor is the named-key identity
|
|
// resolved from the auth middleware; the service returns ErrSelfApproval
|
|
// (mapped to 403) when actor matches the certificate owner.
|
|
ApproveJob(ctx context.Context, id, actor string) error
|
|
// RejectJob rejects a renewal job. actor is the named-key identity
|
|
// recorded for audit attribution; no not-self restriction.
|
|
RejectJob(ctx context.Context, id, reason, actor string) error
|
|
}
|
|
|
|
// JobHandler handles HTTP requests for job operations.
|
|
type JobHandler struct {
|
|
svc JobService
|
|
}
|
|
|
|
// NewJobHandler creates a new JobHandler with a service dependency.
|
|
func NewJobHandler(svc JobService) JobHandler {
|
|
return JobHandler{svc: svc}
|
|
}
|
|
|
|
// ListJobs lists jobs with optional filtering by status and type.
|
|
// GET /api/v1/jobs?status=Pending&type=Renewal&page=1&per_page=50
|
|
func (h JobHandler) ListJobs(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
query := r.URL.Query()
|
|
status := query.Get("status")
|
|
jobType := query.Get("type")
|
|
|
|
page := 1
|
|
perPage := 50
|
|
if p := query.Get("page"); p != "" {
|
|
if parsed, err := strconv.Atoi(p); err == nil && parsed > 0 {
|
|
page = parsed
|
|
}
|
|
}
|
|
if pp := query.Get("per_page"); pp != "" {
|
|
if parsed, err := strconv.Atoi(pp); err == nil && parsed > 0 && parsed <= 500 {
|
|
perPage = parsed
|
|
}
|
|
}
|
|
|
|
jobs, total, err := h.svc.ListJobs(r.Context(), status, jobType, page, perPage)
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to list jobs", requestID)
|
|
return
|
|
}
|
|
|
|
response := PagedResponse{
|
|
Data: jobs,
|
|
Total: total,
|
|
Page: page,
|
|
PerPage: perPage,
|
|
}
|
|
|
|
JSON(w, http.StatusOK, response)
|
|
}
|
|
|
|
// GetJob retrieves a single job by ID.
|
|
// GET /api/v1/jobs/{id}
|
|
func (h JobHandler) GetJob(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
id := strings.TrimPrefix(r.URL.Path, "/api/v1/jobs/")
|
|
parts := strings.Split(id, "/")
|
|
if len(parts) == 0 || parts[0] == "" {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Job ID is required", requestID)
|
|
return
|
|
}
|
|
id = parts[0]
|
|
|
|
job, err := h.svc.GetJob(r.Context(), id)
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusNotFound, "Job not found", requestID)
|
|
return
|
|
}
|
|
|
|
JSON(w, http.StatusOK, job)
|
|
}
|
|
|
|
// CancelJob cancels a job.
|
|
// POST /api/v1/jobs/{id}/cancel
|
|
func (h JobHandler) CancelJob(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
// Extract job ID from path /api/v1/jobs/{id}/cancel
|
|
path := strings.TrimPrefix(r.URL.Path, "/api/v1/jobs/")
|
|
parts := strings.Split(path, "/")
|
|
if len(parts) < 2 || parts[0] == "" {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Job ID is required", requestID)
|
|
return
|
|
}
|
|
jobID := parts[0]
|
|
|
|
if err := h.svc.CancelJob(r.Context(), jobID); err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to cancel job", requestID)
|
|
return
|
|
}
|
|
|
|
response := map[string]string{
|
|
"status": "job_cancelled",
|
|
}
|
|
|
|
JSON(w, http.StatusOK, response)
|
|
}
|
|
|
|
// ApproveJob approves a renewal job awaiting approval.
|
|
// POST /api/v1/jobs/{id}/approve
|
|
func (h JobHandler) ApproveJob(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
path := strings.TrimPrefix(r.URL.Path, "/api/v1/jobs/")
|
|
parts := strings.Split(path, "/")
|
|
if len(parts) < 2 || parts[0] == "" {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Job ID is required", requestID)
|
|
return
|
|
}
|
|
jobID := parts[0]
|
|
|
|
actor := resolveActor(r.Context())
|
|
|
|
if err := h.svc.ApproveJob(r.Context(), jobID, actor); err != nil {
|
|
// M-003: self-approval by the certificate owner is forbidden.
|
|
if errors.Is(err, service.ErrSelfApproval) {
|
|
ErrorWithRequestID(w, http.StatusForbidden,
|
|
"Self-approval is forbidden: the certificate owner cannot approve their own renewal",
|
|
requestID)
|
|
return
|
|
}
|
|
if errors.Is(err, repository.ErrNotFound) {
|
|
ErrorWithRequestID(w, http.StatusNotFound, "Job not found", requestID)
|
|
return
|
|
}
|
|
if strings.Contains(err.Error(), "cannot approve") {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, err.Error(), requestID)
|
|
return
|
|
}
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to approve job", requestID)
|
|
return
|
|
}
|
|
|
|
JSON(w, http.StatusOK, map[string]string{"status": "job_approved"})
|
|
}
|
|
|
|
// RejectJob rejects a renewal job awaiting approval.
|
|
// POST /api/v1/jobs/{id}/reject
|
|
func (h JobHandler) RejectJob(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
path := strings.TrimPrefix(r.URL.Path, "/api/v1/jobs/")
|
|
parts := strings.Split(path, "/")
|
|
if len(parts) < 2 || parts[0] == "" {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Job ID is required", requestID)
|
|
return
|
|
}
|
|
jobID := parts[0]
|
|
|
|
var body struct {
|
|
Reason string `json:"reason"`
|
|
}
|
|
if r.Body != nil && r.Body != http.NoBody {
|
|
if err := json.NewDecoder(r.Body).Decode(&body); err != nil && err != io.EOF {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, "Invalid request body", requestID)
|
|
return
|
|
}
|
|
}
|
|
|
|
actor := resolveActor(r.Context())
|
|
|
|
if err := h.svc.RejectJob(r.Context(), jobID, body.Reason, actor); err != nil {
|
|
if errors.Is(err, repository.ErrNotFound) {
|
|
ErrorWithRequestID(w, http.StatusNotFound, "Job not found", requestID)
|
|
return
|
|
}
|
|
if strings.Contains(err.Error(), "cannot reject") {
|
|
ErrorWithRequestID(w, http.StatusBadRequest, err.Error(), requestID)
|
|
return
|
|
}
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to reject job", requestID)
|
|
return
|
|
}
|
|
|
|
JSON(w, http.StatusOK, map[string]string{"status": "job_rejected"})
|
|
}
|