Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4430ce38a4 | |||
| 4ed2cecec5 | |||
| 9385c3846d | |||
| e450ade988 | |||
| 5b5e1a7ed6 | |||
| e4220b840e | |||
| cff7276293 | |||
| be3bc807b7 | |||
| ead32f72f8 | |||
| d7d80c0f25 | |||
| 41d01edfb4 | |||
| 9b521f3d99 | |||
| 115f23a3ea | |||
| 35e96444aa | |||
| db7cd73a6e | |||
| 39d9ffb79a | |||
| b0afe3b993 | |||
| 446b3df52d | |||
| 0b37fde155 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -20,7 +20,8 @@ mcias.toml
|
|||||||
*~
|
*~
|
||||||
go.work
|
go.work
|
||||||
go.work.sum
|
go.work.sum
|
||||||
dist/mcias_*.tar.gz
|
# dist/ is purely build output (tarballs); never commit it
|
||||||
|
dist/
|
||||||
man/man1/*.gz
|
man/man1/*.gz
|
||||||
|
|
||||||
# Client library build artifacts
|
# Client library build artifacts
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
CLAUDE.md
|
|
||||||
@@ -1377,7 +1377,7 @@ Error types exposed by every library:
|
|||||||
|
|
||||||
#### Go (`clients/go/`)
|
#### Go (`clients/go/`)
|
||||||
|
|
||||||
- Module: `git.wntrmute.dev/kyle/mcias/clients/go`
|
- Module: `git.wntrmute.dev/mc/mcias/clients/go`
|
||||||
- Package: `mciasgoclient`
|
- Package: `mciasgoclient`
|
||||||
- HTTP: `net/http` with custom `*tls.Config` for CA cert
|
- HTTP: `net/http` with custom `*tls.Config` for CA cert
|
||||||
- Token state: guarded by `sync.RWMutex`
|
- Token state: guarded by `sync.RWMutex`
|
||||||
|
|||||||
62
Dockerfile
62
Dockerfile
@@ -1,12 +1,16 @@
|
|||||||
# Dockerfile — MCIAS multi-stage container image
|
# Dockerfile — MCIAS multi-stage container image
|
||||||
#
|
#
|
||||||
# Stage 1 (builder): Compiles all four MCIAS binaries.
|
# Stage 1 (builder): Compiles all four MCIAS binaries.
|
||||||
# Stage 2 (runtime): Minimal Debian image containing only the binaries.
|
# Stage 2 (runtime): Minimal Alpine image containing only the binaries.
|
||||||
|
#
|
||||||
|
# modernc.org/sqlite is a pure-Go, CGo-free SQLite port. CGO_ENABLED=0
|
||||||
|
# produces fully static binaries with no C library dependencies, which
|
||||||
|
# deploy cleanly onto a minimal Alpine runtime image.
|
||||||
#
|
#
|
||||||
# The final image:
|
# The final image:
|
||||||
# - Runs as non-root uid 10001 (mcias)
|
# - Runs as non-root uid 10001 (mcias)
|
||||||
# - Exposes port 8443 (REST/TLS) and 9443 (gRPC/TLS)
|
# - Exposes port 8443 (REST/TLS) and 9443 (gRPC/TLS)
|
||||||
# - Declares VOLUME /data for the SQLite database
|
# - Declares VOLUME /srv/mcias for config, TLS, and database
|
||||||
# - Does NOT contain the Go toolchain, source code, or build cache
|
# - Does NOT contain the Go toolchain, source code, or build cache
|
||||||
#
|
#
|
||||||
# Build:
|
# Build:
|
||||||
@@ -15,8 +19,7 @@
|
|||||||
# Run:
|
# Run:
|
||||||
# docker run -d \
|
# docker run -d \
|
||||||
# --name mcias \
|
# --name mcias \
|
||||||
# -v /path/to/config:/etc/mcias:ro \
|
# -v /srv/mcias:/srv/mcias \
|
||||||
# -v mcias-data:/data \
|
|
||||||
# -e MCIAS_MASTER_PASSPHRASE=your-passphrase \
|
# -e MCIAS_MASTER_PASSPHRASE=your-passphrase \
|
||||||
# -p 8443:8443 \
|
# -p 8443:8443 \
|
||||||
# -p 9443:9443 \
|
# -p 9443:9443 \
|
||||||
@@ -25,7 +28,7 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Stage 1 — builder
|
# Stage 1 — builder
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
FROM golang:1.26-bookworm AS builder
|
FROM golang:1.26-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
|
||||||
@@ -36,35 +39,29 @@ RUN go mod download
|
|||||||
# Copy source.
|
# Copy source.
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# CGO_ENABLED=1 is required by modernc.org/sqlite (pure-Go CGo-free SQLite).
|
# CGO_ENABLED=0: modernc.org/sqlite is pure Go; no C toolchain required.
|
||||||
# -trimpath removes local file system paths from the binary.
|
# -trimpath removes local file system paths from the binary.
|
||||||
# -ldflags="-s -w" strips the DWARF debug info and symbol table to reduce
|
# -ldflags="-s -w" strips the DWARF debug info and symbol table to reduce
|
||||||
# image size.
|
# image size.
|
||||||
RUN CGO_ENABLED=1 go build -trimpath -ldflags="-s -w" -o /out/mciassrv ./cmd/mciassrv && \
|
RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/mciassrv ./cmd/mciassrv && \
|
||||||
CGO_ENABLED=1 go build -trimpath -ldflags="-s -w" -o /out/mciasctl ./cmd/mciasctl && \
|
CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/mciasctl ./cmd/mciasctl && \
|
||||||
CGO_ENABLED=1 go build -trimpath -ldflags="-s -w" -o /out/mciasdb ./cmd/mciasdb && \
|
CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/mciasdb ./cmd/mciasdb && \
|
||||||
CGO_ENABLED=1 go build -trimpath -ldflags="-s -w" -o /out/mciasgrpcctl ./cmd/mciasgrpcctl
|
CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/mciasgrpcctl ./cmd/mciasgrpcctl
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Stage 2 — runtime
|
# Stage 2 — runtime
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
FROM debian:bookworm-slim
|
FROM alpine:3.21
|
||||||
|
|
||||||
# Install runtime dependencies.
|
|
||||||
# ca-certificates: required to validate external TLS certificates.
|
# ca-certificates: required to validate external TLS certificates.
|
||||||
# libc6: required by CGo-compiled binaries (sqlite).
|
RUN apk add --no-cache ca-certificates
|
||||||
RUN apt-get update && \
|
|
||||||
apt-get install -y --no-install-recommends \
|
|
||||||
ca-certificates \
|
|
||||||
libc6 && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Create a non-root user for the service.
|
# Create a non-root user for the service.
|
||||||
# uid/gid 10001 is chosen to be well above the range typically assigned to
|
# uid/gid 10001 is chosen to be well above the range typically assigned to
|
||||||
# system users (1–999) and human users (1000+), reducing the chance of
|
# system users (1–999) and human users (1000+), reducing the chance of
|
||||||
# collision with existing uids on the host when using host networking.
|
# collision with existing uids on the host when using host networking.
|
||||||
RUN groupadd --gid 10001 mcias && \
|
RUN addgroup -g 10001 mcias && \
|
||||||
useradd --uid 10001 --gid 10001 --no-create-home --shell /usr/sbin/nologin mcias
|
adduser -u 10001 -G mcias -H -s /sbin/nologin -D mcias
|
||||||
|
|
||||||
# Copy compiled binaries from the builder stage.
|
# Copy compiled binaries from the builder stage.
|
||||||
COPY --from=builder /out/mciassrv /usr/local/bin/mciassrv
|
COPY --from=builder /out/mciassrv /usr/local/bin/mciassrv
|
||||||
@@ -72,17 +69,15 @@ COPY --from=builder /out/mciasctl /usr/local/bin/mciasctl
|
|||||||
COPY --from=builder /out/mciasdb /usr/local/bin/mciasdb
|
COPY --from=builder /out/mciasdb /usr/local/bin/mciasdb
|
||||||
COPY --from=builder /out/mciasgrpcctl /usr/local/bin/mciasgrpcctl
|
COPY --from=builder /out/mciasgrpcctl /usr/local/bin/mciasgrpcctl
|
||||||
|
|
||||||
# Create the config and data directories.
|
# Create the data directory.
|
||||||
# /etc/mcias is mounted read-only by the operator with the config file,
|
# /srv/mcias is mounted from the host with config, TLS certs, and database.
|
||||||
# TLS cert, and TLS key.
|
RUN mkdir -p /srv/mcias/certs /srv/mcias/backups && \
|
||||||
# /data is the SQLite database mount point.
|
chown -R mcias:mcias /srv/mcias && \
|
||||||
RUN mkdir -p /etc/mcias /data && \
|
chmod 0750 /srv/mcias
|
||||||
chown mcias:mcias /data && \
|
|
||||||
chmod 0750 /data
|
|
||||||
|
|
||||||
# Declare /data as a volume so the operator must explicitly mount it.
|
# Declare /srv/mcias as a volume so the operator must explicitly mount it.
|
||||||
# The SQLite database must persist across container restarts.
|
# Contains the config file, TLS cert/key, and SQLite database.
|
||||||
VOLUME /data
|
VOLUME /srv/mcias
|
||||||
|
|
||||||
# REST/TLS port and gRPC/TLS port. These are documentation only; the actual
|
# REST/TLS port and gRPC/TLS port. These are documentation only; the actual
|
||||||
# ports are set in the config file. Override by mounting a different config.
|
# ports are set in the config file. Override by mounting a different config.
|
||||||
@@ -93,7 +88,8 @@ EXPOSE 9443
|
|||||||
USER mcias
|
USER mcias
|
||||||
|
|
||||||
# Default entry point and config path.
|
# Default entry point and config path.
|
||||||
# The operator mounts /etc/mcias/mcias.conf from the host or a volume.
|
# The operator mounts /srv/mcias from the host containing mcias.toml,
|
||||||
# See dist/mcias.conf.docker.example for a suitable template.
|
# TLS cert/key, and the SQLite database.
|
||||||
|
# See deploy/examples/mcias.conf.docker.example for a suitable template.
|
||||||
ENTRYPOINT ["mciassrv"]
|
ENTRYPOINT ["mciassrv"]
|
||||||
CMD ["-config", "/etc/mcias/mcias.conf"]
|
CMD ["-config", "/srv/mcias/mcias.toml"]
|
||||||
|
|||||||
@@ -381,7 +381,7 @@ expose the same API surface:
|
|||||||
|
|
||||||
| Language | Location | Install |
|
| Language | Location | Install |
|
||||||
|----------|----------|---------|
|
|----------|----------|---------|
|
||||||
| Go | `clients/go/` | `go get git.wntrmute.dev/kyle/mcias/clients/go` |
|
| Go | `clients/go/` | `go get git.wntrmute.dev/mc/mcias/clients/go` |
|
||||||
| Python | `clients/python/` | `pip install ./clients/python` |
|
| Python | `clients/python/` | `pip install ./clients/python` |
|
||||||
| Rust | `clients/rust/` | `cargo add mcias-client` |
|
| Rust | `clients/rust/` | `cargo add mcias-client` |
|
||||||
| Common Lisp | `clients/lisp/` | ASDF `mcias-client` |
|
| Common Lisp | `clients/lisp/` | ASDF `mcias-client` |
|
||||||
@@ -389,7 +389,7 @@ expose the same API surface:
|
|||||||
### Go
|
### Go
|
||||||
|
|
||||||
```go
|
```go
|
||||||
import mcias "git.wntrmute.dev/kyle/mcias/clients/go"
|
import mcias "git.wntrmute.dev/mc/mcias/clients/go"
|
||||||
|
|
||||||
c, err := mcias.New("https://auth.example.com:8443", "/etc/mcias/server.crt", "")
|
c, err := mcias.New("https://auth.example.com:8443", "/etc/mcias/server.crt", "")
|
||||||
if err != nil { ... }
|
if err != nil { ... }
|
||||||
|
|||||||
87
Makefile
87
Makefile
@@ -3,10 +3,14 @@
|
|||||||
# Usage:
|
# Usage:
|
||||||
# make build — compile all binaries to bin/
|
# make build — compile all binaries to bin/
|
||||||
# make test — run tests with race detector
|
# make test — run tests with race detector
|
||||||
|
# make vet — run go vet
|
||||||
# make lint — run golangci-lint
|
# make lint — run golangci-lint
|
||||||
|
# make all — vet → lint → test → build (CI pipeline)
|
||||||
# make generate — regenerate protobuf stubs (requires protoc)
|
# make generate — regenerate protobuf stubs (requires protoc)
|
||||||
|
# make proto-lint — lint proto files with buf
|
||||||
# make man — build compressed man pages
|
# make man — build compressed man pages
|
||||||
# make install — run dist/install.sh (requires root)
|
# make install — run deploy/scripts/install.sh (requires root)
|
||||||
|
# make devserver — build and run mciassrv against run/ config
|
||||||
# make clean — remove bin/ and generated artifacts
|
# make clean — remove bin/ and generated artifacts
|
||||||
# make dist — build release tarballs for linux/amd64 and linux/arm64
|
# make dist — build release tarballs for linux/amd64 and linux/arm64
|
||||||
# make docker — build Docker image tagged mcias:$(VERSION) and mcias:latest
|
# make docker — build Docker image tagged mcias:$(VERSION) and mcias:latest
|
||||||
@@ -15,7 +19,8 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Variables
|
# Variables
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
MODULE := git.wntrmute.dev/kyle/mcias
|
MODULE := git.wntrmute.dev/mc/mcias
|
||||||
|
MCR := mcr.svc.mcp.metacircular.net:8443
|
||||||
BINARIES := mciassrv mciasctl mciasdb mciasgrpcctl
|
BINARIES := mciassrv mciasctl mciasdb mciasgrpcctl
|
||||||
BIN_DIR := bin
|
BIN_DIR := bin
|
||||||
MAN_DIR := man/man1
|
MAN_DIR := man/man1
|
||||||
@@ -27,20 +32,25 @@ MAN_PAGES := $(MAN_DIR)/mciassrv.1 $(MAN_DIR)/mciasctl.1 \
|
|||||||
VERSION := $(shell git describe --tags --always 2>/dev/null || echo dev)
|
VERSION := $(shell git describe --tags --always 2>/dev/null || echo dev)
|
||||||
|
|
||||||
# Build flags: trim paths from binaries and strip DWARF/symbol table.
|
# Build flags: trim paths from binaries and strip DWARF/symbol table.
|
||||||
# CGO_ENABLED=1 is required for modernc.org/sqlite.
|
# modernc.org/sqlite is pure-Go and does not require CGo; CGO_ENABLED=0
|
||||||
|
# produces statically linked binaries that deploy cleanly to Alpine containers.
|
||||||
GO := go
|
GO := go
|
||||||
GOFLAGS := -trimpath
|
GOFLAGS := -trimpath
|
||||||
LDFLAGS := -s -w -X main.version=$(VERSION)
|
LDFLAGS := -s -w -X main.version=$(VERSION)
|
||||||
CGO := CGO_ENABLED=1
|
CGO := CGO_ENABLED=0
|
||||||
|
|
||||||
|
# The race detector requires CGo on some platforms, so tests continue to use
|
||||||
|
# CGO_ENABLED=1 while production builds are CGO_ENABLED=0.
|
||||||
|
CGO_TEST := CGO_ENABLED=1
|
||||||
|
|
||||||
# Platforms for cross-compiled dist tarballs.
|
# Platforms for cross-compiled dist tarballs.
|
||||||
DIST_PLATFORMS := linux/amd64 linux/arm64
|
DIST_PLATFORMS := linux/amd64 linux/arm64
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Default target
|
# Default target — CI pipeline: vet → lint → test → build
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: build
|
all: vet lint test build
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# build — compile all binaries to bin/
|
# build — compile all binaries to bin/
|
||||||
@@ -59,7 +69,14 @@ build:
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
test:
|
test:
|
||||||
$(CGO) $(GO) test -race ./...
|
$(CGO_TEST) $(GO) test -race ./...
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# vet — static analysis via go vet
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
.PHONY: vet
|
||||||
|
vet:
|
||||||
|
$(GO) vet ./...
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# lint — run golangci-lint
|
# lint — run golangci-lint
|
||||||
@@ -68,6 +85,15 @@ test:
|
|||||||
lint:
|
lint:
|
||||||
golangci-lint run ./...
|
golangci-lint run ./...
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# proto-lint — lint and check for breaking changes in proto definitions
|
||||||
|
# Requires: buf (https://buf.build/docs/installation)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
.PHONY: proto-lint
|
||||||
|
proto-lint:
|
||||||
|
buf lint
|
||||||
|
buf breaking --against '.git#branch=master,subdir=proto'
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# generate — regenerate protobuf stubs from proto/ definitions
|
# generate — regenerate protobuf stubs from proto/ definitions
|
||||||
# Requires: protoc, protoc-gen-go, protoc-gen-go-grpc
|
# Requires: protoc, protoc-gen-go, protoc-gen-go-grpc
|
||||||
@@ -76,6 +102,13 @@ lint:
|
|||||||
generate:
|
generate:
|
||||||
$(GO) generate ./...
|
$(GO) generate ./...
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# devserver — build and run mciassrv against the local run/ config
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
.PHONY: devserver
|
||||||
|
devserver: build
|
||||||
|
$(BIN_DIR)/mciassrv -config run/mcias.conf
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# man — build compressed man pages
|
# man — build compressed man pages
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -90,7 +123,7 @@ man: $(patsubst %.1,%.1.gz,$(MAN_PAGES))
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: build
|
install: build
|
||||||
sh dist/install.sh
|
sh deploy/scripts/install.sh
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# clean — remove build artifacts
|
# clean — remove build artifacts
|
||||||
@@ -98,6 +131,7 @@ install: build
|
|||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(BIN_DIR)
|
rm -rf $(BIN_DIR)
|
||||||
|
rm -rf dist/
|
||||||
rm -f $(patsubst %.1,%.1.gz,$(MAN_PAGES))
|
rm -f $(patsubst %.1,%.1.gz,$(MAN_PAGES))
|
||||||
-docker rmi mcias:$(VERSION) mcias:latest 2>/dev/null || true
|
-docker rmi mcias:$(VERSION) mcias:latest 2>/dev/null || true
|
||||||
|
|
||||||
@@ -106,7 +140,7 @@ clean:
|
|||||||
#
|
#
|
||||||
# Output files: dist/mcias_<version>_<os>_<arch>.tar.gz
|
# Output files: dist/mcias_<version>_<os>_<arch>.tar.gz
|
||||||
# Each tarball contains: mciassrv, mciasctl, mciasdb, mciasgrpcctl,
|
# Each tarball contains: mciassrv, mciasctl, mciasdb, mciasgrpcctl,
|
||||||
# man pages, and dist/ files.
|
# man pages, and deploy/ files.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
.PHONY: dist
|
.PHONY: dist
|
||||||
dist: man
|
dist: man
|
||||||
@@ -117,14 +151,12 @@ dist: man
|
|||||||
echo " DIST $$platform -> $$outdir.tar.gz"; \
|
echo " DIST $$platform -> $$outdir.tar.gz"; \
|
||||||
mkdir -p $$outdir/bin; \
|
mkdir -p $$outdir/bin; \
|
||||||
for bin in $(BINARIES); do \
|
for bin in $(BINARIES); do \
|
||||||
CGO_ENABLED=1 GOOS=$$os GOARCH=$$arch $(GO) build \
|
CGO_ENABLED=0 GOOS=$$os GOARCH=$$arch $(GO) build \
|
||||||
$(GOFLAGS) -ldflags "$(LDFLAGS)" \
|
$(GOFLAGS) -ldflags "$(LDFLAGS)" \
|
||||||
-o $$outdir/bin/$$bin ./cmd/$$bin; \
|
-o $$outdir/bin/$$bin ./cmd/$$bin; \
|
||||||
done; \
|
done; \
|
||||||
cp -r man $$outdir/; \
|
cp -r man $$outdir/; \
|
||||||
cp dist/mcias.conf.example dist/mcias-dev.conf.example \
|
cp -r deploy $$outdir/; \
|
||||||
dist/mcias.env.example dist/mcias.service \
|
|
||||||
dist/install.sh $$outdir/; \
|
|
||||||
tar -czf $$outdir.tar.gz -C dist mcias_$$(echo $(VERSION) | tr -d 'v')_$${os}_$${arch}; \
|
tar -czf $$outdir.tar.gz -C dist mcias_$$(echo $(VERSION) | tr -d 'v')_$${os}_$${arch}; \
|
||||||
rm -rf $$outdir; \
|
rm -rf $$outdir; \
|
||||||
done
|
done
|
||||||
@@ -132,9 +164,12 @@ dist: man
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# docker — build the Docker image
|
# docker — build the Docker image
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
.PHONY: docker
|
.PHONY: docker push
|
||||||
docker:
|
docker:
|
||||||
docker build -t mcias:$(VERSION) -t mcias:latest .
|
docker build --force-rm -t $(MCR)/mcias:$(VERSION) .
|
||||||
|
|
||||||
|
push: docker
|
||||||
|
docker push $(MCR)/mcias:$(VERSION)
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# docker-clean — remove local mcias Docker images
|
# docker-clean — remove local mcias Docker images
|
||||||
@@ -154,13 +189,17 @@ install-local: build
|
|||||||
.PHONY: help
|
.PHONY: help
|
||||||
help:
|
help:
|
||||||
@echo "Available targets:"
|
@echo "Available targets:"
|
||||||
@echo " build Compile all binaries to bin/"
|
@echo " all vet → lint → test → build (CI pipeline)"
|
||||||
@echo " test Run tests with race detector"
|
@echo " build Compile all binaries to bin/"
|
||||||
@echo " lint Run golangci-lint"
|
@echo " test Run tests with race detector"
|
||||||
@echo " generate Regenerate protobuf stubs"
|
@echo " vet Run go vet"
|
||||||
@echo " man Build compressed man pages"
|
@echo " lint Run golangci-lint"
|
||||||
@echo " install Install to /usr/local/bin (requires root)"
|
@echo " proto-lint Lint proto files with buf"
|
||||||
@echo " clean Remove build artifacts"
|
@echo " generate Regenerate protobuf stubs"
|
||||||
@echo " dist Build release tarballs for Linux amd64/arm64"
|
@echo " devserver Build and run mciassrv against run/ config"
|
||||||
@echo " docker Build Docker image mcias:$(VERSION) and mcias:latest"
|
@echo " man Build compressed man pages"
|
||||||
|
@echo " install Install to /usr/local/bin (requires root)"
|
||||||
|
@echo " clean Remove build artifacts"
|
||||||
|
@echo " dist Build release tarballs for Linux amd64/arm64"
|
||||||
|
@echo " docker Build Docker image mcias:$(VERSION) and mcias:latest"
|
||||||
@echo " docker-clean Remove local mcias Docker images"
|
@echo " docker-clean Remove local mcias Docker images"
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ features implemented beyond the original plan scope.
|
|||||||
|
|
||||||
### Step 0.1: Go module and dependency setup
|
### Step 0.1: Go module and dependency setup
|
||||||
**Acceptance criteria:**
|
**Acceptance criteria:**
|
||||||
- `go.mod` exists with module path `git.wntrmute.dev/kyle/mcias`
|
- `go.mod` exists with module path `git.wntrmute.dev/mc/mcias`
|
||||||
- Required dependencies declared: `modernc.org/sqlite` (CGo-free SQLite),
|
- Required dependencies declared: `modernc.org/sqlite` (CGo-free SQLite),
|
||||||
`golang.org/x/crypto` (Argon2, Ed25519 helpers), `github.com/golang-jwt/jwt/v5`,
|
`golang.org/x/crypto` (Argon2, Ed25519 helpers), `github.com/golang-jwt/jwt/v5`,
|
||||||
`github.com/pelletier/go-toml/v2`, `github.com/google/uuid`,
|
`github.com/pelletier/go-toml/v2`, `github.com/google/uuid`,
|
||||||
@@ -543,7 +543,7 @@ implementation notes.
|
|||||||
|
|
||||||
### Step 9.2: Go client library
|
### Step 9.2: Go client library
|
||||||
**Acceptance criteria:**
|
**Acceptance criteria:**
|
||||||
- `clients/go/` — Go module `git.wntrmute.dev/kyle/mcias/clients/go`
|
- `clients/go/` — Go module `git.wntrmute.dev/mc/mcias/clients/go`
|
||||||
- Package `mciasgoclient` exposes the canonical API surface from Step 9.1
|
- Package `mciasgoclient` exposes the canonical API surface from Step 9.1
|
||||||
- Uses `net/http` with `crypto/tls`; custom CA cert supported via `x509.CertPool`
|
- Uses `net/http` with `crypto/tls`; custom CA cert supported via `x509.CertPool`
|
||||||
- Token stored in-memory; `Client.Token()` accessor returns current token
|
- Token stored in-memory; `Client.Token()` accessor returns current token
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ See [ARCHITECTURE.md](ARCHITECTURE.md) for the technical design and
|
|||||||
**Prerequisites:** Go 1.26+, a C compiler (required by modernc.org/sqlite).
|
**Prerequisites:** Go 1.26+, a C compiler (required by modernc.org/sqlite).
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git clone https://git.wntrmute.dev/kyle/mcias
|
git clone https://git.wntrmute.dev/mc/mcias
|
||||||
cd mcias
|
cd mcias
|
||||||
make build # produces bin/mciassrv, other binaries
|
make build # produces bin/mciassrv, other binaries
|
||||||
sudo make install
|
sudo make install
|
||||||
|
|||||||
90
RUNBOOK.md
90
RUNBOOK.md
@@ -322,6 +322,83 @@ mciasdb $CONF audit query --json
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## WebAuthn / Passkey Configuration
|
||||||
|
|
||||||
|
WebAuthn enables passwordless passkey login and hardware security key 2FA.
|
||||||
|
It is **disabled by default** — to enable it, add a `[webauthn]` section to
|
||||||
|
`mcias.toml` with the relying party ID and origin.
|
||||||
|
|
||||||
|
### Enable WebAuthn
|
||||||
|
|
||||||
|
Add to `/srv/mcias/mcias.toml`:
|
||||||
|
|
||||||
|
```toml
|
||||||
|
[webauthn]
|
||||||
|
rp_id = "auth.example.com"
|
||||||
|
rp_origin = "https://auth.example.com"
|
||||||
|
display_name = "MCIAS"
|
||||||
|
```
|
||||||
|
|
||||||
|
- **`rp_id`** — The domain name (no scheme or port). Must match the domain
|
||||||
|
users see in their browser address bar.
|
||||||
|
- **`rp_origin`** — The full HTTPS origin. Include the port if non-standard
|
||||||
|
(e.g., `https://localhost:8443` for development).
|
||||||
|
- **`display_name`** — Shown to users during browser passkey prompts. Defaults
|
||||||
|
to "MCIAS" if omitted.
|
||||||
|
|
||||||
|
Restart the server after changing the config:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
systemctl restart mcias
|
||||||
|
```
|
||||||
|
|
||||||
|
Once enabled, the **Passkeys** section appears on the user's Profile page
|
||||||
|
(self-service enrollment) and on the admin Account Detail page (credential
|
||||||
|
management).
|
||||||
|
|
||||||
|
### Passkey enrollment
|
||||||
|
|
||||||
|
Passkey enrollment is self-service only. Users add passkeys from their
|
||||||
|
**Profile → Passkeys** section. Admins can view and remove passkeys from
|
||||||
|
the Account Detail page but cannot enroll on behalf of users (passkey
|
||||||
|
registration requires the authenticator device to be present).
|
||||||
|
|
||||||
|
### Disable WebAuthn
|
||||||
|
|
||||||
|
Remove or comment out the `[webauthn]` section and restart. Existing
|
||||||
|
credentials remain in the database but are unused. Passkey UI sections
|
||||||
|
will be hidden.
|
||||||
|
|
||||||
|
### Remove all passkeys for an account (break-glass)
|
||||||
|
|
||||||
|
```sh
|
||||||
|
mciasdb --config /srv/mcias/mcias.toml account reset-webauthn --id <UUID>
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## TOTP Two-Factor Authentication
|
||||||
|
|
||||||
|
TOTP enrollment is self-service via the **Profile → Two-Factor Authentication**
|
||||||
|
section. Users enter their current password to begin enrollment, scan the QR
|
||||||
|
code with an authenticator app, and confirm with a 6-digit code.
|
||||||
|
|
||||||
|
### Admin: Remove TOTP for an account
|
||||||
|
|
||||||
|
From the web UI: navigate to the account's detail page and click **Remove**
|
||||||
|
next to the TOTP status.
|
||||||
|
|
||||||
|
From the CLI:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
mciasdb --config /srv/mcias/mcias.toml account reset-totp --id <UUID>
|
||||||
|
```
|
||||||
|
|
||||||
|
This clears the TOTP secret and disables the 2FA requirement. The user can
|
||||||
|
re-enroll from their Profile page.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Master Key Rotation
|
## Master Key Rotation
|
||||||
|
|
||||||
> This operation is not yet automated. Until a rotation command is
|
> This operation is not yet automated. Until a rotation command is
|
||||||
@@ -384,6 +461,19 @@ See `dist/mcias.conf.docker.example` for the full annotated Docker config.
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## MCP Deployment
|
||||||
|
|
||||||
|
MCIAS is **not** managed by MCP and does not run on rift. Because MCIAS is the
|
||||||
|
authentication root for the entire platform — including MCP itself — running it
|
||||||
|
under MCP would create a circular dependency. Instead, MCIAS runs as a systemd
|
||||||
|
service on a separate VPS (`svc.metacircular.net`).
|
||||||
|
|
||||||
|
All deployment, upgrades, and operational tasks use systemd directly on the VPS.
|
||||||
|
See the [Installation](#installation), [Routine Operations](#routine-operations),
|
||||||
|
and [Upgrading](#upgrading) sections above for the relevant procedures.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
### Server fails to start: "open database"
|
### Server fails to start: "open database"
|
||||||
|
|||||||
14
buf.yaml
Normal file
14
buf.yaml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
version: v2
|
||||||
|
modules:
|
||||||
|
- path: proto
|
||||||
|
lint:
|
||||||
|
use:
|
||||||
|
- STANDARD
|
||||||
|
except:
|
||||||
|
# PACKAGE_VERSION_SUFFIX requires package names to end in a version (e.g.
|
||||||
|
# mcias.v1). The current protos use mcias.v1 already so this is fine, but
|
||||||
|
# keeping the exception documents the intent explicitly.
|
||||||
|
- PACKAGE_VERSION_SUFFIX
|
||||||
|
breaking:
|
||||||
|
use:
|
||||||
|
- FILE
|
||||||
@@ -29,7 +29,7 @@ set_pg_creds(account_id, host, port, database, username, password) → void
|
|||||||
| `MciasConflictError` | 409 | Conflict (e.g. duplicate username) |
|
| `MciasConflictError` | 409 | Conflict (e.g. duplicate username) |
|
||||||
| `MciasServerError` | 5xx | Unexpected server error |
|
| `MciasServerError` | 5xx | Unexpected server error |
|
||||||
`testdata/` contains canonical JSON response fixtures shared across language tests.
|
`testdata/` contains canonical JSON response fixtures shared across language tests.
|
||||||
- `go/` — Go module `git.wntrmute.dev/kyle/mcias/clients/go`
|
- `go/` — Go module `git.wntrmute.dev/mc/mcias/clients/go`
|
||||||
- `rust/` — Rust crate `mcias-client`
|
- `rust/` — Rust crate `mcias-client`
|
||||||
- `lisp/` — ASDF system `mcias-client`
|
- `lisp/` — ASDF system `mcias-client`
|
||||||
- `python/` — Python package `mcias_client`
|
- `python/` — Python package `mcias_client`
|
||||||
|
|||||||
@@ -9,13 +9,13 @@ Go client library for the [MCIAS](../../README.md) identity and access managemen
|
|||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
go get git.wntrmute.dev/kyle/mcias/clients/go
|
go get git.wntrmute.dev/mc/mcias/clients/go
|
||||||
```
|
```
|
||||||
|
|
||||||
## Quick Start
|
## Quick Start
|
||||||
|
|
||||||
```go
|
```go
|
||||||
import "git.wntrmute.dev/kyle/mcias/clients/go/mcias"
|
import "git.wntrmute.dev/mc/mcias/clients/go/mcias"
|
||||||
|
|
||||||
// Connect to the MCIAS server.
|
// Connect to the MCIAS server.
|
||||||
client, err := mcias.New("https://auth.example.com", mcias.Options{})
|
client, err := mcias.New("https://auth.example.com", mcias.Options{})
|
||||||
|
|||||||
@@ -185,16 +185,28 @@ type Options struct {
|
|||||||
CACertPath string
|
CACertPath string
|
||||||
// Token is an optional pre-existing bearer token.
|
// Token is an optional pre-existing bearer token.
|
||||||
Token string
|
Token string
|
||||||
|
// ServiceName is the name of this service as registered in MCIAS. It is
|
||||||
|
// sent with every Login call so MCIAS can evaluate service-context policy
|
||||||
|
// rules (e.g. deny guest users from logging into this service).
|
||||||
|
// Populate from [mcias] service_name in the service's config file.
|
||||||
|
ServiceName string
|
||||||
|
// Tags are the service-level tags sent with every Login call. MCIAS
|
||||||
|
// evaluates auth:login policy against these tags, enabling rules such as
|
||||||
|
// "deny guest accounts from services tagged env:restricted".
|
||||||
|
// Populate from [mcias] tags in the service's config file.
|
||||||
|
Tags []string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Client is a thread-safe MCIAS REST API client.
|
// Client is a thread-safe MCIAS REST API client.
|
||||||
// Security: the bearer token is guarded by a sync.RWMutex; it is never
|
// Security: the bearer token is guarded by a sync.RWMutex; it is never
|
||||||
// written to logs or included in error messages in this library.
|
// written to logs or included in error messages in this library.
|
||||||
type Client struct {
|
type Client struct {
|
||||||
baseURL string
|
baseURL string
|
||||||
http *http.Client
|
http *http.Client
|
||||||
mu sync.RWMutex
|
serviceName string
|
||||||
token string
|
tags []string
|
||||||
|
mu sync.RWMutex
|
||||||
|
token string
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -224,9 +236,11 @@ func New(serverURL string, opts Options) (*Client, error) {
|
|||||||
}
|
}
|
||||||
transport := &http.Transport{TLSClientConfig: tlsCfg}
|
transport := &http.Transport{TLSClientConfig: tlsCfg}
|
||||||
c := &Client{
|
c := &Client{
|
||||||
baseURL: serverURL,
|
baseURL: serverURL,
|
||||||
http: &http.Client{Transport: transport},
|
http: &http.Client{Transport: transport},
|
||||||
token: opts.Token,
|
token: opts.Token,
|
||||||
|
serviceName: opts.ServiceName,
|
||||||
|
tags: opts.Tags,
|
||||||
}
|
}
|
||||||
return c, nil
|
return c, nil
|
||||||
}
|
}
|
||||||
@@ -343,16 +357,28 @@ func (c *Client) GetPublicKey() (*PublicKey, error) {
|
|||||||
// Login authenticates with username and password. On success the token is
|
// Login authenticates with username and password. On success the token is
|
||||||
// stored in the Client and returned along with the expiry timestamp.
|
// stored in the Client and returned along with the expiry timestamp.
|
||||||
// totpCode may be empty for accounts without TOTP.
|
// totpCode may be empty for accounts without TOTP.
|
||||||
|
//
|
||||||
|
// The client's ServiceName and Tags (from Options) are included in the
|
||||||
|
// request so MCIAS can evaluate service-context policy rules.
|
||||||
func (c *Client) Login(username, password, totpCode string) (token, expiresAt string, err error) {
|
func (c *Client) Login(username, password, totpCode string) (token, expiresAt string, err error) {
|
||||||
req := map[string]string{"username": username, "password": password}
|
body := map[string]interface{}{
|
||||||
|
"username": username,
|
||||||
|
"password": password,
|
||||||
|
}
|
||||||
if totpCode != "" {
|
if totpCode != "" {
|
||||||
req["totp_code"] = totpCode
|
body["totp_code"] = totpCode
|
||||||
|
}
|
||||||
|
if c.serviceName != "" {
|
||||||
|
body["service_name"] = c.serviceName
|
||||||
|
}
|
||||||
|
if len(c.tags) > 0 {
|
||||||
|
body["tags"] = c.tags
|
||||||
}
|
}
|
||||||
var resp struct {
|
var resp struct {
|
||||||
Token string `json:"token"`
|
Token string `json:"token"`
|
||||||
ExpiresAt string `json:"expires_at"`
|
ExpiresAt string `json:"expires_at"`
|
||||||
}
|
}
|
||||||
if err := c.do(http.MethodPost, "/v1/auth/login", req, &resp); err != nil {
|
if err := c.do(http.MethodPost, "/v1/auth/login", body, &resp); err != nil {
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
c.setToken(resp.Token)
|
c.setToken(resp.Token)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
mcias "git.wntrmute.dev/kyle/mcias/clients/go"
|
mcias "git.wntrmute.dev/mc/mcias/clients/go"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module git.wntrmute.dev/kyle/mcias/clients/go
|
module git.wntrmute.dev/mc/mcias/clients/go
|
||||||
|
|
||||||
go 1.21
|
go 1.21
|
||||||
|
|||||||
@@ -20,9 +20,13 @@ class Client:
|
|||||||
ca_cert_path: str | None = None,
|
ca_cert_path: str | None = None,
|
||||||
token: str | None = None,
|
token: str | None = None,
|
||||||
timeout: float = 30.0,
|
timeout: float = 30.0,
|
||||||
|
service_name: str | None = None,
|
||||||
|
tags: list[str] | None = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
self._base_url = server_url.rstrip("/")
|
self._base_url = server_url.rstrip("/")
|
||||||
self.token = token
|
self.token = token
|
||||||
|
self._service_name = service_name
|
||||||
|
self._tags = tags or []
|
||||||
ssl_context: ssl.SSLContext | bool
|
ssl_context: ssl.SSLContext | bool
|
||||||
if ca_cert_path is not None:
|
if ca_cert_path is not None:
|
||||||
ssl_context = ssl.create_default_context(cafile=ca_cert_path)
|
ssl_context = ssl.create_default_context(cafile=ca_cert_path)
|
||||||
@@ -115,6 +119,9 @@ class Client:
|
|||||||
) -> tuple[str, str]:
|
) -> tuple[str, str]:
|
||||||
"""POST /v1/auth/login — authenticate and obtain a JWT.
|
"""POST /v1/auth/login — authenticate and obtain a JWT.
|
||||||
Returns (token, expires_at). Stores the token on self.token.
|
Returns (token, expires_at). Stores the token on self.token.
|
||||||
|
|
||||||
|
The client's service_name and tags are included so MCIAS can evaluate
|
||||||
|
service-context policy rules (e.g. deny guests from restricted services).
|
||||||
"""
|
"""
|
||||||
payload: dict[str, Any] = {
|
payload: dict[str, Any] = {
|
||||||
"username": username,
|
"username": username,
|
||||||
@@ -122,6 +129,10 @@ class Client:
|
|||||||
}
|
}
|
||||||
if totp_code is not None:
|
if totp_code is not None:
|
||||||
payload["totp_code"] = totp_code
|
payload["totp_code"] = totp_code
|
||||||
|
if self._service_name is not None:
|
||||||
|
payload["service_name"] = self._service_name
|
||||||
|
if self._tags:
|
||||||
|
payload["tags"] = self._tags
|
||||||
data = self._request("POST", "/v1/auth/login", json=payload)
|
data = self._request("POST", "/v1/auth/login", json=payload)
|
||||||
assert data is not None
|
assert data is not None
|
||||||
token = str(data["token"])
|
token = str(data["token"])
|
||||||
|
|||||||
@@ -227,6 +227,10 @@ struct LoginRequest<'a> {
|
|||||||
password: &'a str,
|
password: &'a str,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
totp_code: Option<&'a str>,
|
totp_code: Option<&'a str>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
service_name: Option<&'a str>,
|
||||||
|
#[serde(skip_serializing_if = "Vec::is_empty")]
|
||||||
|
tags: Vec<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
@@ -268,6 +272,16 @@ pub struct ClientOptions {
|
|||||||
|
|
||||||
/// Optional pre-existing bearer token.
|
/// Optional pre-existing bearer token.
|
||||||
pub token: Option<String>,
|
pub token: Option<String>,
|
||||||
|
|
||||||
|
/// This service's name as registered in MCIAS. Sent with every login
|
||||||
|
/// request so MCIAS can evaluate service-context policy rules.
|
||||||
|
/// Populate from `[mcias] service_name` in the service config.
|
||||||
|
pub service_name: Option<String>,
|
||||||
|
|
||||||
|
/// Service-level tags sent with every login request. MCIAS evaluates
|
||||||
|
/// `auth:login` policy against these tags.
|
||||||
|
/// Populate from `[mcias] tags` in the service config.
|
||||||
|
pub tags: Vec<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- Client ----
|
// ---- Client ----
|
||||||
@@ -280,6 +294,8 @@ pub struct ClientOptions {
|
|||||||
pub struct Client {
|
pub struct Client {
|
||||||
base_url: String,
|
base_url: String,
|
||||||
http: reqwest::Client,
|
http: reqwest::Client,
|
||||||
|
service_name: Option<String>,
|
||||||
|
tags: Vec<String>,
|
||||||
/// Bearer token storage. `Arc<RwLock<...>>` so clones share the token.
|
/// Bearer token storage. `Arc<RwLock<...>>` so clones share the token.
|
||||||
/// Security: the token is never logged or included in error messages.
|
/// Security: the token is never logged or included in error messages.
|
||||||
token: Arc<RwLock<Option<String>>>,
|
token: Arc<RwLock<Option<String>>>,
|
||||||
@@ -306,6 +322,8 @@ impl Client {
|
|||||||
Ok(Self {
|
Ok(Self {
|
||||||
base_url: base_url.trim_end_matches('/').to_owned(),
|
base_url: base_url.trim_end_matches('/').to_owned(),
|
||||||
http,
|
http,
|
||||||
|
service_name: opts.service_name,
|
||||||
|
tags: opts.tags,
|
||||||
token: Arc::new(RwLock::new(opts.token)),
|
token: Arc::new(RwLock::new(opts.token)),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -336,6 +354,8 @@ impl Client {
|
|||||||
username,
|
username,
|
||||||
password,
|
password,
|
||||||
totp_code,
|
totp_code,
|
||||||
|
service_name: self.service_name.as_deref(),
|
||||||
|
tags: self.tags.clone(),
|
||||||
};
|
};
|
||||||
let resp: TokenResponse = self.post("/v1/auth/login", &body).await?;
|
let resp: TokenResponse = self.post("/v1/auth/login", &body).await?;
|
||||||
*self.token.write().await = Some(resp.token.clone());
|
*self.token.write().await = Some(resp.token.clone());
|
||||||
|
|||||||
1448
cmd/mciasctl/main.go
1448
cmd/mciasctl/main.go
File diff suppressed because it is too large
Load Diff
@@ -6,9 +6,10 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"golang.org/x/term"
|
|
||||||
|
"git.wntrmute.dev/mc/mcdsl/terminal"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (t *tool) runAccount(args []string) {
|
func (t *tool) runAccount(args []string) {
|
||||||
@@ -233,20 +234,14 @@ func (t *tool) accountResetTOTP(args []string) {
|
|||||||
// readPassword reads a password from the terminal without echo.
|
// readPassword reads a password from the terminal without echo.
|
||||||
// Falls back to a regular line read if stdin is not a terminal (e.g. in tests).
|
// Falls back to a regular line read if stdin is not a terminal (e.g. in tests).
|
||||||
func readPassword(prompt string) (string, error) {
|
func readPassword(prompt string) (string, error) {
|
||||||
fmt.Fprint(os.Stderr, prompt)
|
pw, err := terminal.ReadPassword(prompt)
|
||||||
fd := int(os.Stdin.Fd()) //nolint:gosec // G115: file descriptors are non-negative and fit in int on all supported platforms
|
if err == nil {
|
||||||
if term.IsTerminal(fd) {
|
return pw, nil
|
||||||
pw, err := term.ReadPassword(fd)
|
|
||||||
fmt.Fprintln(os.Stderr) // newline after hidden input
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("read password from terminal: %w", err)
|
|
||||||
}
|
|
||||||
return string(pw), nil
|
|
||||||
}
|
}
|
||||||
// Not a terminal: read a plain line (for piped input in tests).
|
// Fallback for piped input (e.g. tests).
|
||||||
|
fmt.Fprint(os.Stderr, prompt)
|
||||||
var line string
|
var line string
|
||||||
_, err := fmt.Fscanln(os.Stdin, &line)
|
if _, err := fmt.Fscanln(os.Stdin, &line); err != nil {
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("read password: %w", err)
|
return "", fmt.Errorf("read password: %w", err)
|
||||||
}
|
}
|
||||||
return line, nil
|
return line, nil
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (t *tool) runAudit(args []string) {
|
func (t *tool) runAudit(args []string) {
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
// pgcreds get --id UUID
|
// pgcreds get --id UUID
|
||||||
// pgcreds set --id UUID --host H --port P --db D --user U
|
// pgcreds set --id UUID --host H --port P --db D --user U
|
||||||
//
|
//
|
||||||
// rekey
|
// snapshot [--retain-days N]
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -49,9 +49,9 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/config"
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -68,6 +68,14 @@ func main() {
|
|||||||
command := args[0]
|
command := args[0]
|
||||||
subArgs := args[1:]
|
subArgs := args[1:]
|
||||||
|
|
||||||
|
// snapshot loads only the config (no master key needed — VACUUM INTO does
|
||||||
|
// not access encrypted columns) and must be handled before openDB, which
|
||||||
|
// requires the master key passphrase env var.
|
||||||
|
if command == "snapshot" {
|
||||||
|
runSnapshot(*configPath, subArgs)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// schema subcommands manage migrations themselves and must not trigger
|
// schema subcommands manage migrations themselves and must not trigger
|
||||||
// auto-migration on open (a dirty database would prevent the tool from
|
// auto-migration on open (a dirty database would prevent the tool from
|
||||||
// opening at all, blocking recovery operations like "schema force").
|
// opening at all, blocking recovery operations like "schema force").
|
||||||
@@ -273,6 +281,11 @@ Commands:
|
|||||||
rekey Re-encrypt all secrets under a new master passphrase
|
rekey Re-encrypt all secrets under a new master passphrase
|
||||||
(prompts interactively; requires server to be stopped)
|
(prompts interactively; requires server to be stopped)
|
||||||
|
|
||||||
|
snapshot Write a timestamped VACUUM INTO backup to
|
||||||
|
<db-dir>/backups/; prune backups older than
|
||||||
|
--retain-days days (default 30, 0 = keep all).
|
||||||
|
Does not require the master key passphrase.
|
||||||
|
|
||||||
NOTE: mciasdb bypasses the mciassrv API and operates directly on the SQLite
|
NOTE: mciasdb bypasses the mciassrv API and operates directly on the SQLite
|
||||||
file. Use it only when the server is unavailable or for break-glass recovery.
|
file. Use it only when the server is unavailable or for break-glass recovery.
|
||||||
All write operations are recorded in the audit log.
|
All write operations are recorded in the audit log.
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// newTestTool creates a tool backed by an in-memory SQLite database with a
|
// newTestTool creates a tool backed by an in-memory SQLite database with a
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (t *tool) runPGCreds(args []string) {
|
func (t *tool) runPGCreds(args []string) {
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
// runRekey re-encrypts all secrets under a new passphrase-derived master key.
|
// runRekey re-encrypts all secrets under a new passphrase-derived master key.
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (t *tool) runSchema(args []string) {
|
func (t *tool) runSchema(args []string) {
|
||||||
|
|||||||
44
cmd/mciasdb/snapshot.go
Normal file
44
cmd/mciasdb/snapshot.go
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
// runSnapshot handles the "snapshot" command.
|
||||||
|
//
|
||||||
|
// It opens the database read-only (no master key derivation needed — VACUUM
|
||||||
|
// INTO does not access encrypted columns) and writes a timestamped backup to
|
||||||
|
// /srv/mcias/backups/ (or the directory adjacent to the configured DB path).
|
||||||
|
// Backups older than --retain-days are pruned.
|
||||||
|
func runSnapshot(configPath string, args []string) {
|
||||||
|
fs := flag.NewFlagSet("snapshot", flag.ExitOnError)
|
||||||
|
retainDays := fs.Int("retain-days", 30, "prune backups older than this many days (0 = keep all)")
|
||||||
|
if err := fs.Parse(args); err != nil {
|
||||||
|
fatalf("snapshot: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg, err := config.Load(configPath)
|
||||||
|
if err != nil {
|
||||||
|
fatalf("snapshot: load config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
database, err := db.Open(cfg.Database.Path)
|
||||||
|
if err != nil {
|
||||||
|
fatalf("snapshot: open database: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = database.Close() }()
|
||||||
|
|
||||||
|
// Place backups in a "backups" directory adjacent to the database file.
|
||||||
|
backupDir := filepath.Join(filepath.Dir(cfg.Database.Path), "backups")
|
||||||
|
|
||||||
|
dest, err := database.SnapshotDir(backupDir, *retainDays)
|
||||||
|
if err != nil {
|
||||||
|
fatalf("snapshot: %v", err)
|
||||||
|
}
|
||||||
|
fmt.Printf("snapshot written: %s\n", dest)
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -31,12 +31,12 @@ import (
|
|||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
"google.golang.org/grpc/credentials"
|
"google.golang.org/grpc/credentials"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/config"
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/grpcserver"
|
"git.wntrmute.dev/mc/mcias/internal/grpcserver"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/server"
|
"git.wntrmute.dev/mc/mcias/internal/server"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -41,3 +41,10 @@ threads = 4
|
|||||||
|
|
||||||
[master_key]
|
[master_key]
|
||||||
passphrase_env = "MCIAS_MASTER_PASSPHRASE"
|
passphrase_env = "MCIAS_MASTER_PASSPHRASE"
|
||||||
|
|
||||||
|
# WebAuthn — passkey authentication for local development.
|
||||||
|
# rp_origin includes the non-standard port since we're not behind a proxy.
|
||||||
|
[webauthn]
|
||||||
|
rp_id = "localhost"
|
||||||
|
rp_origin = "https://localhost:8443"
|
||||||
|
display_name = "MCIAS (dev)"
|
||||||
@@ -48,3 +48,14 @@ threads = 4
|
|||||||
# Set it with: docker run -e MCIAS_MASTER_PASSPHRASE=your-passphrase ...
|
# Set it with: docker run -e MCIAS_MASTER_PASSPHRASE=your-passphrase ...
|
||||||
# or with a Docker secret / Kubernetes secret.
|
# or with a Docker secret / Kubernetes secret.
|
||||||
passphrase_env = "MCIAS_MASTER_PASSPHRASE"
|
passphrase_env = "MCIAS_MASTER_PASSPHRASE"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# [webauthn] — FIDO2/WebAuthn passkey authentication (OPTIONAL)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Uncomment to enable passwordless passkey login. Set rp_id to your domain
|
||||||
|
# and rp_origin to the full HTTPS origin users access in their browser.
|
||||||
|
#
|
||||||
|
# [webauthn]
|
||||||
|
# rp_id = "auth.example.com"
|
||||||
|
# rp_origin = "https://auth.example.com"
|
||||||
|
# display_name = "MCIAS"
|
||||||
@@ -123,3 +123,24 @@ passphrase_env = "MCIAS_MASTER_PASSPHRASE"
|
|||||||
#
|
#
|
||||||
# Uncomment and comment out passphrase_env to switch modes.
|
# Uncomment and comment out passphrase_env to switch modes.
|
||||||
# keyfile = "/srv/mcias/master.key"
|
# keyfile = "/srv/mcias/master.key"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# [webauthn] — FIDO2/WebAuthn passkey authentication (OPTIONAL)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Enables passwordless passkey login and hardware security key 2FA.
|
||||||
|
# If this section is omitted or rp_id/rp_origin are empty, WebAuthn is
|
||||||
|
# disabled and passkey options will not appear in the UI.
|
||||||
|
#
|
||||||
|
# [webauthn]
|
||||||
|
#
|
||||||
|
# REQUIRED (if enabling). The Relying Party ID — typically the domain name
|
||||||
|
# (without port or scheme). Must match the domain users see in their browser.
|
||||||
|
# rp_id = "auth.example.com"
|
||||||
|
#
|
||||||
|
# REQUIRED (if enabling). The Relying Party Origin — the full origin URL
|
||||||
|
# including scheme. Must be HTTPS. Include the port if non-standard (not 443).
|
||||||
|
# rp_origin = "https://auth.example.com"
|
||||||
|
#
|
||||||
|
# OPTIONAL. Display name shown to users during passkey registration prompts.
|
||||||
|
# Default: "MCIAS".
|
||||||
|
# display_name = "MCIAS"
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# install.sh — MCIAS first-time and upgrade installer
|
# install.sh — MCIAS first-time and upgrade installer
|
||||||
#
|
#
|
||||||
# Usage: sh dist/install.sh
|
# Usage: sh deploy/scripts/install.sh
|
||||||
#
|
#
|
||||||
# This script must be run as root. It:
|
# This script must be run as root. It:
|
||||||
# 1. Creates the mcias system user and group (idempotent).
|
# 1. Creates the mcias system user and group (idempotent).
|
||||||
# 2. Copies binaries to /usr/local/bin/.
|
# 2. Copies binaries to /usr/local/bin/.
|
||||||
# 3. Creates /srv/mcias/ with correct permissions.
|
# 3. Creates /srv/mcias/ with correct permissions.
|
||||||
# 4. Installs the systemd service unit.
|
# 4. Installs the systemd service and backup units.
|
||||||
# 5. Prints post-install instructions.
|
# 5. Prints post-install instructions.
|
||||||
#
|
#
|
||||||
# The script does NOT start or enable the service automatically. Review the
|
# The script does NOT start or enable the service automatically. Review the
|
||||||
@@ -31,7 +31,8 @@ SYSTEMD_DIR="/etc/systemd/system"
|
|||||||
SERVICE_USER="mcias"
|
SERVICE_USER="mcias"
|
||||||
SERVICE_GROUP="mcias"
|
SERVICE_GROUP="mcias"
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
REPO_ROOT="$(dirname "$SCRIPT_DIR")"
|
DEPLOY_DIR="$(dirname "$SCRIPT_DIR")"
|
||||||
|
REPO_ROOT="$(dirname "$DEPLOY_DIR")"
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Helpers
|
# Helpers
|
||||||
@@ -100,11 +101,7 @@ fi
|
|||||||
# Step 2: Install binaries.
|
# Step 2: Install binaries.
|
||||||
info "Installing binaries to $BIN_DIR"
|
info "Installing binaries to $BIN_DIR"
|
||||||
for bin in mciassrv mciasctl mciasdb mciasgrpcctl; do
|
for bin in mciassrv mciasctl mciasdb mciasgrpcctl; do
|
||||||
src="$REPO_ROOT/$bin"
|
src="$REPO_ROOT/bin/$bin"
|
||||||
if [ ! -f "$src" ]; then
|
|
||||||
# Try bin/ subdirectory (Makefile build output).
|
|
||||||
src="$REPO_ROOT/bin/$bin"
|
|
||||||
fi
|
|
||||||
if [ ! -f "$src" ]; then
|
if [ ! -f "$src" ]; then
|
||||||
warn "Binary not found: $bin — skipping. Run 'make build' first."
|
warn "Binary not found: $bin — skipping. Run 'make build' first."
|
||||||
continue
|
continue
|
||||||
@@ -113,30 +110,40 @@ for bin in mciassrv mciasctl mciasdb mciasgrpcctl; do
|
|||||||
install -m 0755 -o root -g root "$src" "$BIN_DIR/$bin"
|
install -m 0755 -o root -g root "$src" "$BIN_DIR/$bin"
|
||||||
done
|
done
|
||||||
|
|
||||||
# Step 3: Create service directory.
|
# Step 3: Create service directory structure.
|
||||||
info "Creating $SRV_DIR"
|
info "Creating $SRV_DIR"
|
||||||
install -d -m 0750 -o "$SERVICE_USER" -g "$SERVICE_GROUP" "$SRV_DIR"
|
install -d -m 0750 -o "$SERVICE_USER" -g "$SERVICE_GROUP" "$SRV_DIR"
|
||||||
|
install -d -m 0750 -o "$SERVICE_USER" -g "$SERVICE_GROUP" "$SRV_DIR/certs"
|
||||||
|
install -d -m 0750 -o "$SERVICE_USER" -g "$SERVICE_GROUP" "$SRV_DIR/backups"
|
||||||
|
|
||||||
# Install example config files; never overwrite existing configs.
|
# Install example config files; never overwrite existing configs.
|
||||||
for f in mcias.conf.example mcias.env.example; do
|
for f in mcias.conf.example mcias.env.example; do
|
||||||
src="$SCRIPT_DIR/$f"
|
src="$DEPLOY_DIR/examples/$f"
|
||||||
dst="$SRV_DIR/$f"
|
dst="$SRV_DIR/$f"
|
||||||
if [ -f "$src" ]; then
|
if [ -f "$src" ]; then
|
||||||
install -m 0640 -o "$SERVICE_USER" -g "$SERVICE_GROUP" "$src" "$dst" 2>/dev/null || true
|
install -m 0640 -o "$SERVICE_USER" -g "$SERVICE_GROUP" "$src" "$dst" 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# Step 5: Install systemd service unit.
|
# Step 4: Install systemd units.
|
||||||
if [ -d "$SYSTEMD_DIR" ]; then
|
if [ -d "$SYSTEMD_DIR" ]; then
|
||||||
info "Installing systemd service unit to $SYSTEMD_DIR"
|
info "Installing systemd units to $SYSTEMD_DIR"
|
||||||
install -m 0644 -o root -g root "$SCRIPT_DIR/mcias.service" "$SYSTEMD_DIR/mcias.service"
|
for unit in mcias.service mcias-backup.service mcias-backup.timer; do
|
||||||
|
src="$DEPLOY_DIR/systemd/$unit"
|
||||||
|
if [ -f "$src" ]; then
|
||||||
|
install -m 0644 -o root -g root "$src" "$SYSTEMD_DIR/$unit"
|
||||||
|
info " Installed $unit"
|
||||||
|
fi
|
||||||
|
done
|
||||||
info "Reloading systemd daemon"
|
info "Reloading systemd daemon"
|
||||||
systemctl daemon-reload 2>/dev/null || warn "systemctl not available; reload manually."
|
systemctl daemon-reload 2>/dev/null || warn "systemctl not available; reload manually."
|
||||||
|
info "Enabling backup timer"
|
||||||
|
systemctl enable mcias-backup.timer 2>/dev/null || warn "Could not enable timer; enable manually with: systemctl enable mcias-backup.timer"
|
||||||
else
|
else
|
||||||
warn "systemd not found at $SYSTEMD_DIR; skipping service unit installation."
|
warn "systemd not found at $SYSTEMD_DIR; skipping service unit installation."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 6: Install man pages.
|
# Step 5: Install man pages.
|
||||||
if [ -d "$REPO_ROOT/man/man1" ]; then
|
if [ -d "$REPO_ROOT/man/man1" ]; then
|
||||||
install -d -m 0755 -o root -g root "$MAN_DIR"
|
install -d -m 0755 -o root -g root "$MAN_DIR"
|
||||||
info "Installing man pages to $MAN_DIR"
|
info "Installing man pages to $MAN_DIR"
|
||||||
@@ -170,12 +177,12 @@ Next steps:
|
|||||||
|
|
||||||
# Self-signed (development / personal use):
|
# Self-signed (development / personal use):
|
||||||
openssl req -x509 -newkey ed25519 -days 3650 \\
|
openssl req -x509 -newkey ed25519 -days 3650 \\
|
||||||
-keyout /srv/mcias/server.key \\
|
-keyout /srv/mcias/certs/server.key \\
|
||||||
-out /srv/mcias/server.crt \\
|
-out /srv/mcias/certs/server.crt \\
|
||||||
-subj "/CN=auth.example.com" \\
|
-subj "/CN=auth.example.com" \\
|
||||||
-nodes
|
-nodes
|
||||||
chmod 0640 /srv/mcias/server.key
|
chmod 0640 /srv/mcias/certs/server.key
|
||||||
chown mcias:mcias /srv/mcias/server.key /srv/mcias/server.crt
|
chown mcias:mcias /srv/mcias/certs/server.key /srv/mcias/certs/server.crt
|
||||||
|
|
||||||
2. Copy and edit the configuration file:
|
2. Copy and edit the configuration file:
|
||||||
|
|
||||||
@@ -200,6 +207,9 @@ Next steps:
|
|||||||
systemctl start mcias
|
systemctl start mcias
|
||||||
systemctl status mcias
|
systemctl status mcias
|
||||||
|
|
||||||
|
The backup timer was enabled automatically. Verify with:
|
||||||
|
systemctl status mcias-backup.timer
|
||||||
|
|
||||||
5. Create the first admin account using mciasdb (while the server is
|
5. Create the first admin account using mciasdb (while the server is
|
||||||
running, or before first start):
|
running, or before first start):
|
||||||
|
|
||||||
32
deploy/systemd/mcias-backup.service
Normal file
32
deploy/systemd/mcias-backup.service
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=MCIAS Database Backup
|
||||||
|
Documentation=man:mciasdb(1)
|
||||||
|
After=mcias.service
|
||||||
|
# Backup runs against the live database using VACUUM INTO, which is safe
|
||||||
|
# while mciassrv is running (WAL mode allows concurrent readers).
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
User=mcias
|
||||||
|
Group=mcias
|
||||||
|
|
||||||
|
EnvironmentFile=/srv/mcias/env
|
||||||
|
|
||||||
|
ExecStart=/usr/local/bin/mciasdb -config /srv/mcias/mcias.toml snapshot
|
||||||
|
|
||||||
|
# Filesystem restrictions (read-write to /srv/mcias for the backup output).
|
||||||
|
ProtectSystem=strict
|
||||||
|
ProtectHome=true
|
||||||
|
PrivateTmp=true
|
||||||
|
ReadWritePaths=/srv/mcias
|
||||||
|
NoNewPrivileges=true
|
||||||
|
PrivateDevices=true
|
||||||
|
CapabilityBoundingSet=
|
||||||
|
RestrictSUIDSGID=true
|
||||||
|
RestrictNamespaces=true
|
||||||
|
RestrictRealtime=true
|
||||||
|
LockPersonality=true
|
||||||
|
MemoryDenyWriteExecute=true
|
||||||
|
ProtectKernelTunables=true
|
||||||
|
ProtectKernelModules=true
|
||||||
|
ProtectControlGroups=true
|
||||||
15
deploy/systemd/mcias-backup.timer
Normal file
15
deploy/systemd/mcias-backup.timer
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Daily MCIAS Database Backup
|
||||||
|
Documentation=man:mciasdb(1)
|
||||||
|
|
||||||
|
[Timer]
|
||||||
|
# Run daily at 02:00 UTC with up to 5-minute random jitter to avoid
|
||||||
|
# thundering-herd on systems with many services.
|
||||||
|
OnCalendar=*-*-* 02:00:00 UTC
|
||||||
|
RandomizedDelaySec=5min
|
||||||
|
# Run immediately on boot if the last scheduled run was missed
|
||||||
|
# (e.g. host was offline at 02:00).
|
||||||
|
Persistent=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
@@ -12,7 +12,7 @@ Group=mcias
|
|||||||
|
|
||||||
# Configuration and secrets.
|
# Configuration and secrets.
|
||||||
# /srv/mcias/env must contain MCIAS_MASTER_PASSPHRASE=<passphrase>
|
# /srv/mcias/env must contain MCIAS_MASTER_PASSPHRASE=<passphrase>
|
||||||
# See dist/mcias.env.example for the template.
|
# See deploy/examples/mcias.env.example for the template.
|
||||||
EnvironmentFile=/srv/mcias/env
|
EnvironmentFile=/srv/mcias/env
|
||||||
|
|
||||||
ExecStart=/usr/local/bin/mciassrv -config /srv/mcias/mcias.toml
|
ExecStart=/usr/local/bin/mciassrv -config /srv/mcias/mcias.toml
|
||||||
@@ -42,6 +42,7 @@ PrivateDevices=true
|
|||||||
ProtectKernelTunables=true
|
ProtectKernelTunables=true
|
||||||
ProtectKernelModules=true
|
ProtectKernelModules=true
|
||||||
ProtectControlGroups=true
|
ProtectControlGroups=true
|
||||||
|
RestrictSUIDSGID=true
|
||||||
RestrictNamespaces=true
|
RestrictNamespaces=true
|
||||||
RestrictRealtime=true
|
RestrictRealtime=true
|
||||||
LockPersonality=true
|
LockPersonality=true
|
||||||
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1774273680,
|
||||||
|
"narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
45
flake.nix
Normal file
45
flake.nix
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
{
|
||||||
|
description = "mcias - Metacircular Identity and Access Service";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs =
|
||||||
|
{ self, nixpkgs }:
|
||||||
|
let
|
||||||
|
system = "x86_64-linux";
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
version = "1.8.0";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
packages.${system} = {
|
||||||
|
default = pkgs.buildGoModule {
|
||||||
|
pname = "mciasctl";
|
||||||
|
inherit version;
|
||||||
|
src = ./.;
|
||||||
|
vendorHash = null;
|
||||||
|
subPackages = [
|
||||||
|
"cmd/mciasctl"
|
||||||
|
"cmd/mciasgrpcctl"
|
||||||
|
];
|
||||||
|
ldflags = [
|
||||||
|
"-s"
|
||||||
|
"-w"
|
||||||
|
"-X main.version=${version}"
|
||||||
|
];
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p $out/share/zsh/site-functions
|
||||||
|
mkdir -p $out/share/bash-completion/completions
|
||||||
|
mkdir -p $out/share/fish/vendor_completions.d
|
||||||
|
$out/bin/mciasctl completion zsh > $out/share/zsh/site-functions/_mciasctl
|
||||||
|
$out/bin/mciasctl completion bash > $out/share/bash-completion/completions/mciasctl
|
||||||
|
$out/bin/mciasctl completion fish > $out/share/fish/vendor_completions.d/mciasctl.fish
|
||||||
|
$out/bin/mciasgrpcctl completion zsh > $out/share/zsh/site-functions/_mciasgrpcctl
|
||||||
|
$out/bin/mciasgrpcctl completion bash > $out/share/bash-completion/completions/mciasgrpcctl
|
||||||
|
$out/bin/mciasgrpcctl completion fish > $out/share/fish/vendor_completions.d/mciasgrpcctl.fish
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.36.11
|
// protoc-gen-go v1.36.11
|
||||||
// protoc v3.20.3
|
// protoc v6.32.1
|
||||||
// source: mcias/v1/account.proto
|
// source: mcias/v1/account.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
@@ -1080,7 +1080,7 @@ const file_mcias_v1_account_proto_rawDesc = "" +
|
|||||||
"\n" +
|
"\n" +
|
||||||
"GetPGCreds\x12\x1b.mcias.v1.GetPGCredsRequest\x1a\x1c.mcias.v1.GetPGCredsResponse\x12G\n" +
|
"GetPGCreds\x12\x1b.mcias.v1.GetPGCredsRequest\x1a\x1c.mcias.v1.GetPGCredsResponse\x12G\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
"SetPGCreds\x12\x1b.mcias.v1.SetPGCredsRequest\x1a\x1c.mcias.v1.SetPGCredsResponseB2Z0git.wntrmute.dev/kyle/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
"SetPGCreds\x12\x1b.mcias.v1.SetPGCredsRequest\x1a\x1c.mcias.v1.SetPGCredsResponseB0Z.git.wntrmute.dev/mc/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcias_v1_account_proto_rawDescOnce sync.Once
|
file_mcias_v1_account_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// - protoc-gen-go-grpc v1.6.1
|
// - protoc-gen-go-grpc v1.6.1
|
||||||
// - protoc v3.20.3
|
// - protoc v6.32.1
|
||||||
// source: mcias/v1/account.proto
|
// source: mcias/v1/account.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.36.11
|
// protoc-gen-go v1.36.11
|
||||||
// protoc v3.20.3
|
// protoc v6.32.1
|
||||||
// source: mcias/v1/admin.proto
|
// source: mcias/v1/admin.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
@@ -238,7 +238,7 @@ const file_mcias_v1_admin_proto_rawDesc = "" +
|
|||||||
"\x01x\x18\x05 \x01(\tR\x01x2\x9a\x01\n" +
|
"\x01x\x18\x05 \x01(\tR\x01x2\x9a\x01\n" +
|
||||||
"\fAdminService\x12;\n" +
|
"\fAdminService\x12;\n" +
|
||||||
"\x06Health\x12\x17.mcias.v1.HealthRequest\x1a\x18.mcias.v1.HealthResponse\x12M\n" +
|
"\x06Health\x12\x17.mcias.v1.HealthRequest\x1a\x18.mcias.v1.HealthResponse\x12M\n" +
|
||||||
"\fGetPublicKey\x12\x1d.mcias.v1.GetPublicKeyRequest\x1a\x1e.mcias.v1.GetPublicKeyResponseB2Z0git.wntrmute.dev/kyle/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
"\fGetPublicKey\x12\x1d.mcias.v1.GetPublicKeyRequest\x1a\x1e.mcias.v1.GetPublicKeyResponseB0Z.git.wntrmute.dev/mc/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcias_v1_admin_proto_rawDescOnce sync.Once
|
file_mcias_v1_admin_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// - protoc-gen-go-grpc v1.6.1
|
// - protoc-gen-go-grpc v1.6.1
|
||||||
// - protoc v3.20.3
|
// - protoc v6.32.1
|
||||||
// source: mcias/v1/admin.proto
|
// source: mcias/v1/admin.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.36.11
|
// protoc-gen-go v1.36.11
|
||||||
// protoc v3.20.3
|
// protoc v6.32.1
|
||||||
// source: mcias/v1/auth.proto
|
// source: mcias/v1/auth.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
@@ -919,7 +919,7 @@ const file_mcias_v1_auth_proto_rawDesc = "" +
|
|||||||
"\n" +
|
"\n" +
|
||||||
"RemoveTOTP\x12\x1b.mcias.v1.RemoveTOTPRequest\x1a\x1c.mcias.v1.RemoveTOTPResponse\x12n\n" +
|
"RemoveTOTP\x12\x1b.mcias.v1.RemoveTOTPRequest\x1a\x1c.mcias.v1.RemoveTOTPResponse\x12n\n" +
|
||||||
"\x17ListWebAuthnCredentials\x12(.mcias.v1.ListWebAuthnCredentialsRequest\x1a).mcias.v1.ListWebAuthnCredentialsResponse\x12q\n" +
|
"\x17ListWebAuthnCredentials\x12(.mcias.v1.ListWebAuthnCredentialsRequest\x1a).mcias.v1.ListWebAuthnCredentialsResponse\x12q\n" +
|
||||||
"\x18RemoveWebAuthnCredential\x12).mcias.v1.RemoveWebAuthnCredentialRequest\x1a*.mcias.v1.RemoveWebAuthnCredentialResponseB2Z0git.wntrmute.dev/kyle/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
"\x18RemoveWebAuthnCredential\x12).mcias.v1.RemoveWebAuthnCredentialRequest\x1a*.mcias.v1.RemoveWebAuthnCredentialResponseB0Z.git.wntrmute.dev/mc/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcias_v1_auth_proto_rawDescOnce sync.Once
|
file_mcias_v1_auth_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// - protoc-gen-go-grpc v1.6.1
|
// - protoc-gen-go-grpc v1.6.1
|
||||||
// - protoc v3.20.3
|
// - protoc v6.32.1
|
||||||
// source: mcias/v1/auth.proto
|
// source: mcias/v1/auth.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.36.11
|
// protoc-gen-go v1.36.11
|
||||||
// protoc v3.20.3
|
// protoc v6.32.1
|
||||||
// source: mcias/v1/common.proto
|
// source: mcias/v1/common.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
@@ -349,7 +349,7 @@ const file_mcias_v1_common_proto_rawDesc = "" +
|
|||||||
"\x04port\x18\x05 \x01(\x05R\x04port\"5\n" +
|
"\x04port\x18\x05 \x01(\x05R\x04port\"5\n" +
|
||||||
"\x05Error\x12\x18\n" +
|
"\x05Error\x12\x18\n" +
|
||||||
"\amessage\x18\x01 \x01(\tR\amessage\x12\x12\n" +
|
"\amessage\x18\x01 \x01(\tR\amessage\x12\x12\n" +
|
||||||
"\x04code\x18\x02 \x01(\tR\x04codeB2Z0git.wntrmute.dev/kyle/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
"\x04code\x18\x02 \x01(\tR\x04codeB0Z.git.wntrmute.dev/mc/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcias_v1_common_proto_rawDescOnce sync.Once
|
file_mcias_v1_common_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.36.11
|
// protoc-gen-go v1.36.11
|
||||||
// protoc v3.20.3
|
// protoc v6.32.1
|
||||||
// source: mcias/v1/policy.proto
|
// source: mcias/v1/policy.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
@@ -703,7 +703,7 @@ const file_mcias_v1_policy_proto_rawDesc = "" +
|
|||||||
"\x10CreatePolicyRule\x12!.mcias.v1.CreatePolicyRuleRequest\x1a\".mcias.v1.CreatePolicyRuleResponse\x12P\n" +
|
"\x10CreatePolicyRule\x12!.mcias.v1.CreatePolicyRuleRequest\x1a\".mcias.v1.CreatePolicyRuleResponse\x12P\n" +
|
||||||
"\rGetPolicyRule\x12\x1e.mcias.v1.GetPolicyRuleRequest\x1a\x1f.mcias.v1.GetPolicyRuleResponse\x12Y\n" +
|
"\rGetPolicyRule\x12\x1e.mcias.v1.GetPolicyRuleRequest\x1a\x1f.mcias.v1.GetPolicyRuleResponse\x12Y\n" +
|
||||||
"\x10UpdatePolicyRule\x12!.mcias.v1.UpdatePolicyRuleRequest\x1a\".mcias.v1.UpdatePolicyRuleResponse\x12Y\n" +
|
"\x10UpdatePolicyRule\x12!.mcias.v1.UpdatePolicyRuleRequest\x1a\".mcias.v1.UpdatePolicyRuleResponse\x12Y\n" +
|
||||||
"\x10DeletePolicyRule\x12!.mcias.v1.DeletePolicyRuleRequest\x1a\".mcias.v1.DeletePolicyRuleResponseB2Z0git.wntrmute.dev/kyle/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
"\x10DeletePolicyRule\x12!.mcias.v1.DeletePolicyRuleRequest\x1a\".mcias.v1.DeletePolicyRuleResponseB0Z.git.wntrmute.dev/mc/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcias_v1_policy_proto_rawDescOnce sync.Once
|
file_mcias_v1_policy_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// - protoc-gen-go-grpc v1.6.1
|
// - protoc-gen-go-grpc v1.6.1
|
||||||
// - protoc v3.20.3
|
// - protoc v6.32.1
|
||||||
// source: mcias/v1/policy.proto
|
// source: mcias/v1/policy.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.36.11
|
// protoc-gen-go v1.36.11
|
||||||
// protoc v3.20.3
|
// protoc v6.32.1
|
||||||
// source: mcias/v1/token.proto
|
// source: mcias/v1/token.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
@@ -346,7 +346,7 @@ const file_mcias_v1_token_proto_rawDesc = "" +
|
|||||||
"\fTokenService\x12P\n" +
|
"\fTokenService\x12P\n" +
|
||||||
"\rValidateToken\x12\x1e.mcias.v1.ValidateTokenRequest\x1a\x1f.mcias.v1.ValidateTokenResponse\x12\\\n" +
|
"\rValidateToken\x12\x1e.mcias.v1.ValidateTokenRequest\x1a\x1f.mcias.v1.ValidateTokenResponse\x12\\\n" +
|
||||||
"\x11IssueServiceToken\x12\".mcias.v1.IssueServiceTokenRequest\x1a#.mcias.v1.IssueServiceTokenResponse\x12J\n" +
|
"\x11IssueServiceToken\x12\".mcias.v1.IssueServiceTokenRequest\x1a#.mcias.v1.IssueServiceTokenResponse\x12J\n" +
|
||||||
"\vRevokeToken\x12\x1c.mcias.v1.RevokeTokenRequest\x1a\x1d.mcias.v1.RevokeTokenResponseB2Z0git.wntrmute.dev/kyle/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
"\vRevokeToken\x12\x1c.mcias.v1.RevokeTokenRequest\x1a\x1d.mcias.v1.RevokeTokenResponseB0Z.git.wntrmute.dev/mc/mcias/gen/mcias/v1;mciasv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcias_v1_token_proto_rawDescOnce sync.Once
|
file_mcias_v1_token_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// - protoc-gen-go-grpc v1.6.1
|
// - protoc-gen-go-grpc v1.6.1
|
||||||
// - protoc v3.20.3
|
// - protoc v6.32.1
|
||||||
// source: mcias/v1/token.proto
|
// source: mcias/v1/token.proto
|
||||||
|
|
||||||
package mciasv1
|
package mciasv1
|
||||||
|
|||||||
26
go.mod
26
go.mod
@@ -1,38 +1,40 @@
|
|||||||
module git.wntrmute.dev/kyle/mcias
|
module git.wntrmute.dev/mc/mcias
|
||||||
|
|
||||||
go 1.26.0
|
go 1.26.0
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
git.wntrmute.dev/mc/mcdsl v1.4.0
|
||||||
|
github.com/go-webauthn/webauthn v0.16.1
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1
|
github.com/golang-jwt/jwt/v5 v5.3.1
|
||||||
github.com/golang-migrate/migrate/v4 v4.19.1
|
github.com/golang-migrate/migrate/v4 v4.19.1
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4
|
github.com/pelletier/go-toml/v2 v2.3.0
|
||||||
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
||||||
|
github.com/spf13/cobra v1.10.2
|
||||||
golang.org/x/crypto v0.49.0
|
golang.org/x/crypto v0.49.0
|
||||||
golang.org/x/term v0.41.0
|
google.golang.org/grpc v1.79.3
|
||||||
google.golang.org/grpc v1.74.2
|
google.golang.org/protobuf v1.36.11
|
||||||
google.golang.org/protobuf v1.36.7
|
modernc.org/sqlite v1.47.0
|
||||||
modernc.org/sqlite v1.46.1
|
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
|
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
|
||||||
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
|
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
|
||||||
github.com/go-webauthn/webauthn v0.16.1 // indirect
|
|
||||||
github.com/go-webauthn/x v0.2.2 // indirect
|
github.com/go-webauthn/x v0.2.2 // indirect
|
||||||
github.com/google/go-tpm v0.9.8 // indirect
|
github.com/google/go-tpm v0.9.8 // indirect
|
||||||
|
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
github.com/ncruces/go-strftime v1.0.0 // indirect
|
github.com/ncruces/go-strftime v1.0.0 // indirect
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
|
github.com/spf13/pflag v1.0.9 // indirect
|
||||||
github.com/stretchr/testify v1.11.1 // indirect
|
|
||||||
github.com/x448/float16 v0.8.4 // indirect
|
github.com/x448/float16 v0.8.4 // indirect
|
||||||
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
|
|
||||||
golang.org/x/net v0.51.0 // indirect
|
golang.org/x/net v0.51.0 // indirect
|
||||||
golang.org/x/sys v0.42.0 // indirect
|
golang.org/x/sys v0.42.0 // indirect
|
||||||
|
golang.org/x/term v0.41.0 // indirect
|
||||||
golang.org/x/text v0.35.0 // indirect
|
golang.org/x/text v0.35.0 // indirect
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
|
||||||
modernc.org/libc v1.67.6 // indirect
|
modernc.org/libc v1.70.0 // indirect
|
||||||
modernc.org/mathutil v1.7.1 // indirect
|
modernc.org/mathutil v1.7.1 // indirect
|
||||||
modernc.org/memory v1.11.0 // indirect
|
modernc.org/memory v1.11.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
82
go.sum
82
go.sum
@@ -1,3 +1,8 @@
|
|||||||
|
git.wntrmute.dev/mc/mcdsl v1.4.0 h1:PsEIyskcjBduwHSRwNB/U/uSeU/cv3C8MVr0SRjBRLg=
|
||||||
|
git.wntrmute.dev/mc/mcdsl v1.4.0/go.mod h1:MhYahIu7Sg53lE2zpQ20nlrsoNRjQzOJBAlCmom2wJc=
|
||||||
|
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||||
|
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
|
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
@@ -24,46 +29,56 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
|||||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||||
github.com/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo=
|
github.com/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo=
|
||||||
github.com/google/go-tpm v0.9.8/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
|
github.com/google/go-tpm v0.9.8/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
|
||||||
|
github.com/google/go-tpm-tools v0.3.13-0.20230620182252-4639ecce2aba h1:qJEJcuLzH5KDR0gKc0zcktin6KSAwL7+jWKBYceddTc=
|
||||||
|
github.com/google/go-tpm-tools v0.3.13-0.20230620182252-4639ecce2aba/go.mod h1:EFYHy8/1y2KfgTAsx7Luu7NGhoxtuVHnNo8jE7FikKc=
|
||||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
||||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
|
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
||||||
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||||
|
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||||
|
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||||
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
||||||
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
github.com/pelletier/go-toml/v2 v2.3.0 h1:k59bC/lIZREW0/iVaQR8nDHxVq8OVlIzYCOJf421CaM=
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
github.com/pelletier/go-toml/v2 v2.3.0/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||||
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
|
||||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
||||||
|
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
|
||||||
|
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
|
||||||
|
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
|
||||||
|
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
||||||
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||||
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
|
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
|
||||||
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
|
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
|
||||||
go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
|
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
|
||||||
go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
|
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
|
||||||
go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
|
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
|
||||||
go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
|
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
|
||||||
go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
|
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
|
||||||
go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
|
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
|
||||||
go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
|
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
|
||||||
go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
|
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
|
||||||
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
|
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
|
||||||
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
|
go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
|
||||||
|
go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
|
||||||
|
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
|
||||||
|
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
||||||
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
|
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
|
||||||
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
|
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
|
||||||
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
|
|
||||||
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
|
|
||||||
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
|
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
|
||||||
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
|
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
|
||||||
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
|
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
|
||||||
@@ -79,28 +94,31 @@ golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
|
|||||||
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
|
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
|
||||||
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
|
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
|
||||||
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
|
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c h1:qXWI/sQtv5UKboZ/zUk7h+mrf/lXORyI+n9DKDAusdg=
|
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
|
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
|
||||||
google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
|
||||||
google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
|
||||||
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
|
google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
|
||||||
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
|
google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
|
||||||
|
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
|
||||||
|
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
|
modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
|
||||||
modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
|
modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
|
||||||
modernc.org/ccgo/v4 v4.30.1 h1:4r4U1J6Fhj98NKfSjnPUN7Ze2c6MnAdL0hWw6+LrJpc=
|
modernc.org/ccgo/v4 v4.32.0 h1:hjG66bI/kqIPX1b2yT6fr/jt+QedtP2fqojG2VrFuVw=
|
||||||
modernc.org/ccgo/v4 v4.30.1/go.mod h1:bIOeI1JL54Utlxn+LwrFyjCx2n2RDiYEaJVSrgdrRfM=
|
modernc.org/ccgo/v4 v4.32.0/go.mod h1:6F08EBCx5uQc38kMGl+0Nm0oWczoo1c7cgpzEry7Uc0=
|
||||||
modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA=
|
modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
|
||||||
modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
|
modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
|
||||||
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
|
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
|
||||||
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
|
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
|
||||||
modernc.org/gc/v3 v3.1.1 h1:k8T3gkXWY9sEiytKhcgyiZ2L0DTyCQ/nvX+LoCljoRE=
|
modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo=
|
||||||
modernc.org/gc/v3 v3.1.1/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
|
modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
|
||||||
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
|
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
|
||||||
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
|
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
|
||||||
modernc.org/libc v1.67.6 h1:eVOQvpModVLKOdT+LvBPjdQqfrZq+pC39BygcT+E7OI=
|
modernc.org/libc v1.70.0 h1:U58NawXqXbgpZ/dcdS9kMshu08aiA6b7gusEusqzNkw=
|
||||||
modernc.org/libc v1.67.6/go.mod h1:JAhxUVlolfYDErnwiqaLvUqc8nfb2r6S6slAgZOnaiE=
|
modernc.org/libc v1.70.0/go.mod h1:OVmxFGP1CI/Z4L3E0Q3Mf1PDE0BucwMkcXjjLntvHJo=
|
||||||
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
||||||
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
||||||
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
||||||
@@ -109,8 +127,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
|
|||||||
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
|
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
|
||||||
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
|
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
|
||||||
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
|
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
|
||||||
modernc.org/sqlite v1.46.1 h1:eFJ2ShBLIEnUWlLy12raN0Z1plqmFX9Qe3rjQTKt6sU=
|
modernc.org/sqlite v1.47.0 h1:R1XyaNpoW4Et9yly+I2EeX7pBza/w+pmYee/0HJDyKk=
|
||||||
modernc.org/sqlite v1.46.1/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
|
modernc.org/sqlite v1.47.0/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig=
|
||||||
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
|
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
|
||||||
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
|
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
|
||||||
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import (
|
|||||||
|
|
||||||
"golang.org/x/crypto/argon2"
|
"golang.org/x/crypto/argon2"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrInvalidCredentials is returned for any authentication failure.
|
// ErrInvalidCredentials is returned for any authentication failure.
|
||||||
|
|||||||
@@ -22,6 +22,24 @@ type Config struct { //nolint:govet // fieldalignment: TOML section order is mor
|
|||||||
Tokens TokensConfig `toml:"tokens"`
|
Tokens TokensConfig `toml:"tokens"`
|
||||||
Argon2 Argon2Config `toml:"argon2"`
|
Argon2 Argon2Config `toml:"argon2"`
|
||||||
WebAuthn WebAuthnConfig `toml:"webauthn"`
|
WebAuthn WebAuthnConfig `toml:"webauthn"`
|
||||||
|
SSO SSOConfig `toml:"sso"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SSOConfig holds registered SSO clients that may use the authorization code
|
||||||
|
// flow to authenticate users via MCIAS. Omitting the [sso] section or leaving
|
||||||
|
// clients empty disables SSO.
|
||||||
|
type SSOConfig struct {
|
||||||
|
Clients []SSOClient `toml:"clients"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SSOClient is a registered relying-party application that may redirect users
|
||||||
|
// to MCIAS for login. The redirect_uri is validated as an exact match (no
|
||||||
|
// wildcards) to prevent open-redirect attacks.
|
||||||
|
type SSOClient struct {
|
||||||
|
ClientID string `toml:"client_id"` // unique identifier (e.g. "mcr")
|
||||||
|
RedirectURI string `toml:"redirect_uri"` // exact callback URL, https required
|
||||||
|
ServiceName string `toml:"service_name"` // passed to policy engine on login
|
||||||
|
Tags []string `toml:"tags"` // passed to policy engine on login
|
||||||
}
|
}
|
||||||
|
|
||||||
// WebAuthnConfig holds FIDO2/WebAuthn settings. Omitting the entire [webauthn]
|
// WebAuthnConfig holds FIDO2/WebAuthn settings. Omitting the entire [webauthn]
|
||||||
@@ -246,9 +264,48 @@ func (c *Config) validate() error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SSO clients — if any are configured, each must have a unique client_id,
|
||||||
|
// a non-empty redirect_uri with the https:// scheme, and a non-empty
|
||||||
|
// service_name.
|
||||||
|
seen := make(map[string]bool, len(c.SSO.Clients))
|
||||||
|
for i, cl := range c.SSO.Clients {
|
||||||
|
prefix := fmt.Sprintf("sso.clients[%d]", i)
|
||||||
|
if cl.ClientID == "" {
|
||||||
|
errs = append(errs, fmt.Errorf("%s: client_id is required", prefix))
|
||||||
|
} else if seen[cl.ClientID] {
|
||||||
|
errs = append(errs, fmt.Errorf("%s: duplicate client_id %q", prefix, cl.ClientID))
|
||||||
|
} else {
|
||||||
|
seen[cl.ClientID] = true
|
||||||
|
}
|
||||||
|
if cl.RedirectURI == "" {
|
||||||
|
errs = append(errs, fmt.Errorf("%s: redirect_uri is required", prefix))
|
||||||
|
} else if !strings.HasPrefix(cl.RedirectURI, "https://") {
|
||||||
|
errs = append(errs, fmt.Errorf("%s: redirect_uri must use the https:// scheme (got %q)", prefix, cl.RedirectURI))
|
||||||
|
}
|
||||||
|
if cl.ServiceName == "" {
|
||||||
|
errs = append(errs, fmt.Errorf("%s: service_name is required", prefix))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return errors.Join(errs...)
|
return errors.Join(errs...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SSOClient looks up a registered SSO client by client_id.
|
||||||
|
// Returns nil if no client with that ID is registered.
|
||||||
|
func (c *Config) SSOClient(clientID string) *SSOClient {
|
||||||
|
for i := range c.SSO.Clients {
|
||||||
|
if c.SSO.Clients[i].ClientID == clientID {
|
||||||
|
return &c.SSO.Clients[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SSOEnabled reports whether any SSO clients are registered.
|
||||||
|
func (c *Config) SSOEnabled() bool {
|
||||||
|
return len(c.SSO.Clients) > 0
|
||||||
|
}
|
||||||
|
|
||||||
// DefaultExpiry returns the configured default token expiry duration.
|
// DefaultExpiry returns the configured default token expiry duration.
|
||||||
func (c *Config) DefaultExpiry() time.Duration { return c.Tokens.DefaultExpiry.Duration }
|
func (c *Config) DefaultExpiry() time.Duration { return c.Tokens.DefaultExpiry.Duration }
|
||||||
|
|
||||||
|
|||||||
@@ -244,6 +244,153 @@ func TestTrustedProxyValidation(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestSSOClientValidation(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
extra string
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "valid single client",
|
||||||
|
extra: `
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
redirect_uri = "https://mcr.example.com/sso/callback"
|
||||||
|
service_name = "mcr"
|
||||||
|
tags = ["env:restricted"]
|
||||||
|
`,
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "valid multiple clients",
|
||||||
|
extra: `
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
redirect_uri = "https://mcr.example.com/sso/callback"
|
||||||
|
service_name = "mcr"
|
||||||
|
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcat"
|
||||||
|
redirect_uri = "https://mcat.example.com/sso/callback"
|
||||||
|
service_name = "mcat"
|
||||||
|
`,
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "missing client_id",
|
||||||
|
extra: `
|
||||||
|
[[sso.clients]]
|
||||||
|
redirect_uri = "https://mcr.example.com/sso/callback"
|
||||||
|
service_name = "mcr"
|
||||||
|
`,
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "missing redirect_uri",
|
||||||
|
extra: `
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
service_name = "mcr"
|
||||||
|
`,
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "http redirect_uri rejected",
|
||||||
|
extra: `
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
redirect_uri = "http://mcr.example.com/sso/callback"
|
||||||
|
service_name = "mcr"
|
||||||
|
`,
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "missing service_name",
|
||||||
|
extra: `
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
redirect_uri = "https://mcr.example.com/sso/callback"
|
||||||
|
`,
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "duplicate client_id",
|
||||||
|
extra: `
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
redirect_uri = "https://mcr.example.com/sso/callback"
|
||||||
|
service_name = "mcr"
|
||||||
|
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
redirect_uri = "https://other.example.com/sso/callback"
|
||||||
|
service_name = "mcr2"
|
||||||
|
`,
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
path := writeTempConfig(t, validConfig()+tc.extra)
|
||||||
|
_, err := Load(path)
|
||||||
|
if tc.wantErr && err == nil {
|
||||||
|
t.Error("expected validation error, got nil")
|
||||||
|
}
|
||||||
|
if !tc.wantErr && err != nil {
|
||||||
|
t.Errorf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSSOClientLookup(t *testing.T) {
|
||||||
|
path := writeTempConfig(t, validConfig()+`
|
||||||
|
[[sso.clients]]
|
||||||
|
client_id = "mcr"
|
||||||
|
redirect_uri = "https://mcr.example.com/sso/callback"
|
||||||
|
service_name = "mcr"
|
||||||
|
tags = ["env:restricted"]
|
||||||
|
`)
|
||||||
|
cfg, err := Load(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Load: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cl := cfg.SSOClient("mcr")
|
||||||
|
if cl == nil {
|
||||||
|
t.Fatal("SSOClient(mcr) returned nil")
|
||||||
|
}
|
||||||
|
if cl.RedirectURI != "https://mcr.example.com/sso/callback" {
|
||||||
|
t.Errorf("RedirectURI = %q", cl.RedirectURI)
|
||||||
|
}
|
||||||
|
if cl.ServiceName != "mcr" {
|
||||||
|
t.Errorf("ServiceName = %q", cl.ServiceName)
|
||||||
|
}
|
||||||
|
if len(cl.Tags) != 1 || cl.Tags[0] != "env:restricted" {
|
||||||
|
t.Errorf("Tags = %v", cl.Tags)
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.SSOClient("nonexistent") != nil {
|
||||||
|
t.Error("SSOClient(nonexistent) should return nil")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !cfg.SSOEnabled() {
|
||||||
|
t.Error("SSOEnabled() should return true")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSSODisabledByDefault(t *testing.T) {
|
||||||
|
path := writeTempConfig(t, validConfig())
|
||||||
|
cfg, err := Load(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Load: %v", err)
|
||||||
|
}
|
||||||
|
if cfg.SSOEnabled() {
|
||||||
|
t.Error("SSOEnabled() should return false with no clients")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestDurationParsing(t *testing.T) {
|
func TestDurationParsing(t *testing.T) {
|
||||||
var d duration
|
var d duration
|
||||||
if err := d.UnmarshalText([]byte("1h30m")); err != nil {
|
if err := d.UnmarshalText([]byte("1h30m")); err != nil {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// openTestDB opens an in-memory SQLite database for testing.
|
// openTestDB opens an in-memory SQLite database for testing.
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// openTestDB is defined in db_test.go in this package; reused here.
|
// openTestDB is defined in db_test.go in this package; reused here.
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ListCredentialedAccountIDs returns the set of account IDs that already have
|
// ListCredentialedAccountIDs returns the set of account IDs that already have
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// policyRuleCols is the column list for all policy rule SELECT queries.
|
// policyRuleCols is the column list for all policy rule SELECT queries.
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCreateAndGetPolicyRule(t *testing.T) {
|
func TestCreateAndGetPolicyRule(t *testing.T) {
|
||||||
|
|||||||
68
internal/db/snapshot.go
Normal file
68
internal/db/snapshot.go
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Snapshot creates a consistent backup of the database at destPath using
|
||||||
|
// SQLite's VACUUM INTO statement. VACUUM INTO acquires a read lock for the
|
||||||
|
// duration of the copy, which is safe while the server is running in WAL mode.
|
||||||
|
// The destination file is created by SQLite; the caller must ensure the parent
|
||||||
|
// directory exists.
|
||||||
|
func (db *DB) Snapshot(destPath string) error {
|
||||||
|
// VACUUM INTO is not supported on in-memory databases.
|
||||||
|
if strings.Contains(db.path, "mode=memory") {
|
||||||
|
return fmt.Errorf("db: snapshot not supported on in-memory databases")
|
||||||
|
}
|
||||||
|
if _, err := db.sql.Exec("VACUUM INTO ?", destPath); err != nil {
|
||||||
|
return fmt.Errorf("db: snapshot VACUUM INTO %q: %w", destPath, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SnapshotDir creates a timestamped backup in dir and prunes backups older
|
||||||
|
// than retainDays days. dir is created with mode 0750 if it does not exist.
|
||||||
|
// The backup filename format is mcias-20060102-150405.db.
|
||||||
|
func (db *DB) SnapshotDir(dir string, retainDays int) (string, error) {
|
||||||
|
if err := os.MkdirAll(dir, 0750); err != nil {
|
||||||
|
return "", fmt.Errorf("db: create backup dir %q: %w", dir, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ts := time.Now().UTC().Format("20060102-150405")
|
||||||
|
dest := filepath.Join(dir, fmt.Sprintf("mcias-%s.db", ts))
|
||||||
|
if err := db.Snapshot(dest); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prune backups older than retainDays.
|
||||||
|
if retainDays > 0 {
|
||||||
|
cutoff := time.Now().UTC().AddDate(0, 0, -retainDays)
|
||||||
|
entries, err := os.ReadDir(dir)
|
||||||
|
if err != nil {
|
||||||
|
// Non-fatal: the backup was written; log pruning failure separately.
|
||||||
|
return dest, fmt.Errorf("db: list backup dir for pruning: %w", err)
|
||||||
|
}
|
||||||
|
for _, e := range entries {
|
||||||
|
if e.IsDir() || !strings.HasSuffix(e.Name(), ".db") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Skip the file we just wrote.
|
||||||
|
if e.Name() == filepath.Base(dest) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
info, err := e.Info()
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if info.ModTime().Before(cutoff) {
|
||||||
|
_ = os.Remove(filepath.Join(dir, e.Name()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return dest, nil
|
||||||
|
}
|
||||||
@@ -3,7 +3,7 @@ package db
|
|||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGetAccountTags_Empty(t *testing.T) {
|
func TestGetAccountTags_Empty(t *testing.T) {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CreateWebAuthnCredential inserts a new WebAuthn credential record.
|
// CreateWebAuthnCredential inserts a new WebAuthn credential record.
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestWebAuthnCRUD(t *testing.T) {
|
func TestWebAuthnCRUD(t *testing.T) {
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ import (
|
|||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/validate"
|
"git.wntrmute.dev/mc/mcias/internal/validate"
|
||||||
)
|
)
|
||||||
|
|
||||||
type accountServiceServer struct {
|
type accountServiceServer struct {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
type adminServiceServer struct {
|
type adminServiceServer struct {
|
||||||
|
|||||||
@@ -13,12 +13,12 @@ import (
|
|||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
)
|
)
|
||||||
|
|
||||||
type authServiceServer struct {
|
type authServiceServer struct {
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ import (
|
|||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
type credentialServiceServer struct {
|
type credentialServiceServer struct {
|
||||||
|
|||||||
@@ -30,11 +30,11 @@ import (
|
|||||||
"google.golang.org/grpc/peer"
|
"google.golang.org/grpc/peer"
|
||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/config"
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
// contextKey is the unexported context key type for this package.
|
// contextKey is the unexported context key type for this package.
|
||||||
|
|||||||
@@ -24,13 +24,13 @@ import (
|
|||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
"google.golang.org/grpc/test/bufconn"
|
"google.golang.org/grpc/test/bufconn"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/config"
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ import (
|
|||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/policy"
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
)
|
)
|
||||||
|
|
||||||
type policyServiceServer struct {
|
type policyServiceServer struct {
|
||||||
|
|||||||
@@ -10,10 +10,10 @@ import (
|
|||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
)
|
)
|
||||||
|
|
||||||
type tokenServiceServer struct {
|
type tokenServiceServer struct {
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ import (
|
|||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
|
||||||
mciasv1 "git.wntrmute.dev/kyle/mcias/gen/mcias/v1"
|
mciasv1 "git.wntrmute.dev/mc/mcias/gen/mcias/v1"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ListWebAuthnCredentials returns metadata for an account's WebAuthn credentials.
|
// ListWebAuthnCredentials returns metadata for an account's WebAuthn credentials.
|
||||||
|
|||||||
@@ -23,10 +23,10 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/policy"
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
// contextKey is the unexported type for context keys in this package, preventing
|
// contextKey is the unexported type for context keys in this package, preventing
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
func generateTestKey(t *testing.T) (ed25519.PublicKey, ed25519.PrivateKey) {
|
func generateTestKey(t *testing.T) (ed25519.PublicKey, ed25519.PrivateKey) {
|
||||||
|
|||||||
@@ -218,6 +218,9 @@ const (
|
|||||||
EventWebAuthnRemoved = "webauthn_removed"
|
EventWebAuthnRemoved = "webauthn_removed"
|
||||||
EventWebAuthnLoginOK = "webauthn_login_ok"
|
EventWebAuthnLoginOK = "webauthn_login_ok"
|
||||||
EventWebAuthnLoginFail = "webauthn_login_fail"
|
EventWebAuthnLoginFail = "webauthn_login_fail"
|
||||||
|
|
||||||
|
EventSSOAuthorize = "sso_authorize"
|
||||||
|
EventSSOLoginOK = "sso_login_ok"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ServiceAccountDelegate records that a specific account has been granted
|
// ServiceAccountDelegate records that a specific account has been granted
|
||||||
|
|||||||
@@ -8,10 +8,10 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/middleware"
|
"git.wntrmute.dev/mc/mcias/internal/middleware"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/policy"
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ---- Tag endpoints ----
|
// ---- Tag endpoints ----
|
||||||
|
|||||||
141
internal/server/handlers_sso.go
Normal file
141
internal/server/handlers_sso.go
Normal file
@@ -0,0 +1,141 @@
|
|||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/middleware"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/sso"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ssoTokenRequest is the request body for POST /v1/sso/token.
|
||||||
|
type ssoTokenRequest struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
ClientID string `json:"client_id"`
|
||||||
|
RedirectURI string `json:"redirect_uri"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleSSOTokenExchange exchanges an SSO authorization code for a JWT token.
|
||||||
|
//
|
||||||
|
// Security design:
|
||||||
|
// - The authorization code is single-use (consumed via LoadAndDelete).
|
||||||
|
// - The client_id and redirect_uri must match the values stored when the code
|
||||||
|
// was issued, preventing a stolen code from being exchanged by a different
|
||||||
|
// service.
|
||||||
|
// - Policy evaluation uses the service_name and tags from the registered SSO
|
||||||
|
// client config (not from the request), preventing identity spoofing.
|
||||||
|
// - The code expires after 60 seconds to limit the interception window.
|
||||||
|
func (s *Server) handleSSOTokenExchange(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req ssoTokenRequest
|
||||||
|
if !decodeJSON(w, r, &req) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if req.Code == "" || req.ClientID == "" || req.RedirectURI == "" {
|
||||||
|
middleware.WriteError(w, http.StatusBadRequest, "code, client_id, and redirect_uri are required", "bad_request")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consume the authorization code (single-use).
|
||||||
|
ac, ok := sso.Consume(req.Code)
|
||||||
|
if !ok {
|
||||||
|
middleware.WriteError(w, http.StatusUnauthorized, "invalid or expired authorization code", "invalid_code")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Security: verify client_id and redirect_uri match the stored values.
|
||||||
|
if ac.ClientID != req.ClientID || ac.RedirectURI != req.RedirectURI {
|
||||||
|
s.logger.Warn("sso: token exchange parameter mismatch",
|
||||||
|
"expected_client", ac.ClientID, "got_client", req.ClientID)
|
||||||
|
middleware.WriteError(w, http.StatusUnauthorized, "invalid or expired authorization code", "invalid_code")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Look up the registered SSO client for policy context.
|
||||||
|
client := s.cfg.SSOClient(req.ClientID)
|
||||||
|
if client == nil {
|
||||||
|
// Should not happen if the authorize endpoint validated, but defend in depth.
|
||||||
|
middleware.WriteError(w, http.StatusUnauthorized, "unknown client", "invalid_code")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load account.
|
||||||
|
acct, err := s.db.GetAccountByID(ac.AccountID)
|
||||||
|
if err != nil {
|
||||||
|
s.logger.Error("sso: load account for token exchange", "error", err, "account_id", ac.AccountID)
|
||||||
|
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if acct.Status != model.AccountStatusActive {
|
||||||
|
middleware.WriteError(w, http.StatusForbidden, "account is not active", "account_inactive")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load roles for policy evaluation and expiry decision.
|
||||||
|
roles, err := s.db.GetRoles(acct.ID)
|
||||||
|
if err != nil {
|
||||||
|
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Policy evaluation with the SSO client's service_name and tags.
|
||||||
|
{
|
||||||
|
input := policy.PolicyInput{
|
||||||
|
Subject: acct.UUID,
|
||||||
|
AccountType: string(acct.AccountType),
|
||||||
|
Roles: roles,
|
||||||
|
Action: policy.ActionLogin,
|
||||||
|
Resource: policy.Resource{
|
||||||
|
ServiceName: client.ServiceName,
|
||||||
|
Tags: client.Tags,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if effect, _ := s.polEng.Evaluate(input); effect == policy.Deny {
|
||||||
|
s.writeAudit(r, model.EventLoginFail, &acct.ID, nil,
|
||||||
|
audit.JSON("reason", "policy_deny", "service_name", client.ServiceName, "via", "sso"))
|
||||||
|
middleware.WriteError(w, http.StatusForbidden, "access denied by policy", "policy_denied")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine expiry.
|
||||||
|
expiry := s.cfg.DefaultExpiry()
|
||||||
|
for _, rol := range roles {
|
||||||
|
if rol == "admin" {
|
||||||
|
expiry = s.cfg.AdminExpiry()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
privKey, err := s.vault.PrivKey()
|
||||||
|
if err != nil {
|
||||||
|
middleware.WriteError(w, http.StatusServiceUnavailable, "vault sealed", "vault_sealed")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tokenStr, claims, err := token.IssueToken(privKey, s.cfg.Tokens.Issuer, acct.UUID, roles, expiry)
|
||||||
|
if err != nil {
|
||||||
|
s.logger.Error("sso: issue token", "error", err)
|
||||||
|
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := s.db.TrackToken(claims.JTI, acct.ID, claims.IssuedAt, claims.ExpiresAt); err != nil {
|
||||||
|
s.logger.Error("sso: track token", "error", err)
|
||||||
|
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
s.writeAudit(r, model.EventSSOLoginOK, &acct.ID, nil,
|
||||||
|
audit.JSON("jti", claims.JTI, "client_id", client.ClientID))
|
||||||
|
s.writeAudit(r, model.EventTokenIssued, &acct.ID, nil,
|
||||||
|
audit.JSON("jti", claims.JTI, "via", "sso"))
|
||||||
|
|
||||||
|
writeJSON(w, http.StatusOK, loginResponse{
|
||||||
|
Token: tokenStr,
|
||||||
|
ExpiresAt: claims.ExpiresAt.Format("2006-01-02T15:04:05Z"),
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -23,13 +23,14 @@ import (
|
|||||||
"github.com/go-webauthn/webauthn/protocol"
|
"github.com/go-webauthn/webauthn/protocol"
|
||||||
libwebauthn "github.com/go-webauthn/webauthn/webauthn"
|
libwebauthn "github.com/go-webauthn/webauthn/webauthn"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/middleware"
|
"git.wntrmute.dev/mc/mcias/internal/middleware"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
mciaswebauthn "git.wntrmute.dev/kyle/mcias/internal/webauthn"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
|
mciaswebauthn "git.wntrmute.dev/mc/mcias/internal/webauthn"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -618,13 +619,37 @@ func (s *Server) handleWebAuthnLoginFinish(w http.ResponseWriter, r *http.Reques
|
|||||||
// Login succeeded: clear lockout counter.
|
// Login succeeded: clear lockout counter.
|
||||||
_ = s.db.ClearLoginFailures(acct.ID)
|
_ = s.db.ClearLoginFailures(acct.ID)
|
||||||
|
|
||||||
// Issue JWT.
|
// Load roles for policy check and expiry decision.
|
||||||
roles, err := s.db.GetRoles(acct.ID)
|
roles, err := s.db.GetRoles(acct.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Policy check: evaluate auth:login rules.
|
||||||
|
// WebAuthn login has no service context (no service_name or tags in the
|
||||||
|
// request body), so per-service deny rules won't fire. Account-level deny
|
||||||
|
// rules (e.g. deny a specific role from all auth:login actions) apply.
|
||||||
|
// This mirrors the policy gate in handleLogin so both auth paths are consistent.
|
||||||
|
//
|
||||||
|
// Security: policy is checked after credential verification so that a
|
||||||
|
// policy-denied login returns 403 (not 401), distinguishing a policy
|
||||||
|
// restriction from a bad credential without leaking account existence.
|
||||||
|
if s.polEng != nil {
|
||||||
|
input := policy.PolicyInput{
|
||||||
|
Subject: acct.UUID,
|
||||||
|
AccountType: string(acct.AccountType),
|
||||||
|
Roles: roles,
|
||||||
|
Action: policy.ActionLogin,
|
||||||
|
Resource: policy.Resource{},
|
||||||
|
}
|
||||||
|
if effect, _ := s.polEng.Evaluate(input); effect == policy.Deny {
|
||||||
|
s.writeAudit(r, model.EventWebAuthnLoginFail, &acct.ID, nil, `{"reason":"policy_denied"}`)
|
||||||
|
middleware.WriteError(w, http.StatusForbidden, "access denied by policy", "policy_denied")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
expiry := s.cfg.DefaultExpiry()
|
expiry := s.cfg.DefaultExpiry()
|
||||||
for _, role := range roles {
|
for _, role := range roles {
|
||||||
if role == "admin" {
|
if role == "admin" {
|
||||||
|
|||||||
@@ -21,19 +21,19 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/config"
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/middleware"
|
"git.wntrmute.dev/mc/mcias/internal/middleware"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/policy"
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/ui"
|
"git.wntrmute.dev/mc/mcias/internal/ui"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/validate"
|
"git.wntrmute.dev/mc/mcias/internal/validate"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
"git.wntrmute.dev/kyle/mcias/web"
|
"git.wntrmute.dev/mc/mcias/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Server holds the dependencies injected into all handlers.
|
// Server holds the dependencies injected into all handlers.
|
||||||
@@ -215,6 +215,7 @@ func (s *Server) Handler() http.Handler {
|
|||||||
mux.HandleFunc("GET /v1/health", s.handleHealth)
|
mux.HandleFunc("GET /v1/health", s.handleHealth)
|
||||||
mux.HandleFunc("GET /v1/keys/public", s.handlePublicKey)
|
mux.HandleFunc("GET /v1/keys/public", s.handlePublicKey)
|
||||||
mux.Handle("POST /v1/auth/login", loginRateLimit(http.HandlerFunc(s.handleLogin)))
|
mux.Handle("POST /v1/auth/login", loginRateLimit(http.HandlerFunc(s.handleLogin)))
|
||||||
|
mux.Handle("POST /v1/sso/token", loginRateLimit(http.HandlerFunc(s.handleSSOTokenExchange)))
|
||||||
mux.Handle("POST /v1/token/validate", loginRateLimit(http.HandlerFunc(s.handleTokenValidate)))
|
mux.Handle("POST /v1/token/validate", loginRateLimit(http.HandlerFunc(s.handleTokenValidate)))
|
||||||
|
|
||||||
// API documentation: Swagger UI at /docs and raw spec at /docs/openapi.yaml.
|
// API documentation: Swagger UI at /docs and raw spec at /docs/openapi.yaml.
|
||||||
@@ -436,6 +437,12 @@ type loginRequest struct {
|
|||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
Password string `json:"password"`
|
Password string `json:"password"`
|
||||||
TOTPCode string `json:"totp_code,omitempty"`
|
TOTPCode string `json:"totp_code,omitempty"`
|
||||||
|
// ServiceName and Tags identify the calling service. MCIAS evaluates the
|
||||||
|
// auth:login policy with these as the resource context, enabling operators
|
||||||
|
// to restrict which roles/account-types may log into specific services.
|
||||||
|
// Clients populate these from their [mcias] config section.
|
||||||
|
ServiceName string `json:"service_name,omitempty"`
|
||||||
|
Tags []string `json:"tags,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// loginResponse is the response body for a successful login.
|
// loginResponse is the response body for a successful login.
|
||||||
@@ -546,13 +553,42 @@ func (s *Server) handleLogin(w http.ResponseWriter, r *http.Request) {
|
|||||||
// Login succeeded: clear any outstanding failure counter.
|
// Login succeeded: clear any outstanding failure counter.
|
||||||
_ = s.db.ClearLoginFailures(acct.ID)
|
_ = s.db.ClearLoginFailures(acct.ID)
|
||||||
|
|
||||||
// Determine expiry.
|
// Load roles for expiry decision and policy check.
|
||||||
expiry := s.cfg.DefaultExpiry()
|
|
||||||
roles, err := s.db.GetRoles(acct.ID)
|
roles, err := s.db.GetRoles(acct.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
middleware.WriteError(w, http.StatusInternalServerError, "internal error", "internal_error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Policy check: evaluate auth:login with the calling service's context.
|
||||||
|
// Operator rules can deny login based on role, account type, service name,
|
||||||
|
// or tags. The built-in default Allow for auth:login is overridden by any
|
||||||
|
// matching Deny rule (deny-wins semantics).
|
||||||
|
//
|
||||||
|
// Security: policy is checked after credential verification so that a
|
||||||
|
// policy-denied login returns 403 (not 401), distinguishing a service
|
||||||
|
// access restriction from a wrong password without leaking user existence.
|
||||||
|
{
|
||||||
|
input := policy.PolicyInput{
|
||||||
|
Subject: acct.UUID,
|
||||||
|
AccountType: string(acct.AccountType),
|
||||||
|
Roles: roles,
|
||||||
|
Action: policy.ActionLogin,
|
||||||
|
Resource: policy.Resource{
|
||||||
|
ServiceName: req.ServiceName,
|
||||||
|
Tags: req.Tags,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if effect, _ := s.polEng.Evaluate(input); effect == policy.Deny {
|
||||||
|
s.writeAudit(r, model.EventLoginFail, &acct.ID, nil,
|
||||||
|
audit.JSON("reason", "policy_deny", "service_name", req.ServiceName))
|
||||||
|
middleware.WriteError(w, http.StatusForbidden, "access denied by policy", "policy_denied")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine expiry.
|
||||||
|
expiry := s.cfg.DefaultExpiry()
|
||||||
for _, r := range roles {
|
for _, r := range roles {
|
||||||
if r == "admin" {
|
if r == "admin" {
|
||||||
expiry = s.cfg.AdminExpiry()
|
expiry = s.cfg.AdminExpiry()
|
||||||
@@ -669,11 +705,12 @@ type validateRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type validateResponse struct {
|
type validateResponse struct {
|
||||||
Subject string `json:"sub,omitempty"`
|
Subject string `json:"sub,omitempty"`
|
||||||
Username string `json:"username,omitempty"`
|
Username string `json:"username,omitempty"`
|
||||||
ExpiresAt string `json:"expires_at,omitempty"`
|
AccountType string `json:"account_type,omitempty"`
|
||||||
Roles []string `json:"roles,omitempty"`
|
ExpiresAt string `json:"expires_at,omitempty"`
|
||||||
Valid bool `json:"valid"`
|
Roles []string `json:"roles,omitempty"`
|
||||||
|
Valid bool `json:"valid"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) handleTokenValidate(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleTokenValidate(w http.ResponseWriter, r *http.Request) {
|
||||||
@@ -718,6 +755,7 @@ func (s *Server) handleTokenValidate(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
if acct, err := s.db.GetAccountByUUID(claims.Subject); err == nil {
|
if acct, err := s.db.GetAccountByUUID(claims.Subject); err == nil {
|
||||||
resp.Username = acct.Username
|
resp.Username = acct.Username
|
||||||
|
resp.AccountType = string(acct.AccountType)
|
||||||
}
|
}
|
||||||
writeJSON(w, http.StatusOK, resp)
|
writeJSON(w, http.StatusOK, resp)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,13 +19,13 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/config"
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/policy"
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
// generateTOTPCode computes a valid RFC 6238 TOTP code for the current time
|
// generateTOTPCode computes a valid RFC 6238 TOTP code for the current time
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ package server
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/middleware"
|
"git.wntrmute.dev/mc/mcias/internal/middleware"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
// unsealRequest is the request body for POST /v1/vault/unseal.
|
// unsealRequest is the request body for POST /v1/vault/unseal.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestHandleHealthSealed(t *testing.T) {
|
func TestHandleHealthSealed(t *testing.T) {
|
||||||
|
|||||||
91
internal/sso/session.go
Normal file
91
internal/sso/session.go
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
package sso
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
sessionTTL = 5 * time.Minute
|
||||||
|
sessionBytes = 16 // 128 bits of entropy for the nonce
|
||||||
|
)
|
||||||
|
|
||||||
|
// Session holds the SSO parameters between /sso/authorize and login completion.
|
||||||
|
// The nonce is embedded as a hidden form field in the login page and carried
|
||||||
|
// through the multi-step login flow (password → TOTP, or WebAuthn).
|
||||||
|
type Session struct { //nolint:govet // fieldalignment: field order matches logical grouping
|
||||||
|
ClientID string
|
||||||
|
RedirectURI string
|
||||||
|
State string
|
||||||
|
ExpiresAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// pendingSessions stores SSO sessions created at /sso/authorize.
|
||||||
|
var pendingSessions sync.Map //nolint:gochecknoglobals
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
go cleanupSessions()
|
||||||
|
}
|
||||||
|
|
||||||
|
func cleanupSessions() {
|
||||||
|
ticker := time.NewTicker(cleanupPeriod)
|
||||||
|
defer ticker.Stop()
|
||||||
|
for range ticker.C {
|
||||||
|
now := time.Now()
|
||||||
|
pendingSessions.Range(func(key, value any) bool {
|
||||||
|
s, ok := value.(*Session)
|
||||||
|
if !ok || now.After(s.ExpiresAt) {
|
||||||
|
pendingSessions.Delete(key)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// StoreSession creates and stores a new SSO session, returning the hex-encoded
|
||||||
|
// nonce that should be embedded in the login form.
|
||||||
|
func StoreSession(clientID, redirectURI, state string) (string, error) {
|
||||||
|
raw, err := crypto.RandomBytes(sessionBytes)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("sso: generate session nonce: %w", err)
|
||||||
|
}
|
||||||
|
nonce := fmt.Sprintf("%x", raw)
|
||||||
|
pendingSessions.Store(nonce, &Session{
|
||||||
|
ClientID: clientID,
|
||||||
|
RedirectURI: redirectURI,
|
||||||
|
State: state,
|
||||||
|
ExpiresAt: time.Now().Add(sessionTTL),
|
||||||
|
})
|
||||||
|
return nonce, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ConsumeSession retrieves and deletes an SSO session by nonce.
|
||||||
|
// Returns the Session and true if valid, or (nil, false) if unknown or expired.
|
||||||
|
func ConsumeSession(nonce string) (*Session, bool) {
|
||||||
|
v, ok := pendingSessions.LoadAndDelete(nonce)
|
||||||
|
if !ok {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
s, ok2 := v.(*Session)
|
||||||
|
if !ok2 || time.Now().After(s.ExpiresAt) {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
return s, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSession retrieves an SSO session without consuming it (for read-only checks
|
||||||
|
// during multi-step login). Returns nil if unknown or expired.
|
||||||
|
func GetSession(nonce string) *Session {
|
||||||
|
v, ok := pendingSessions.Load(nonce)
|
||||||
|
if !ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
s, ok2 := v.(*Session)
|
||||||
|
if !ok2 || time.Now().After(s.ExpiresAt) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
93
internal/sso/store.go
Normal file
93
internal/sso/store.go
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
// Package sso implements the authorization code store for the SSO redirect flow.
|
||||||
|
//
|
||||||
|
// MCIAS acts as the SSO provider: downstream services (MCR, MCAT, Metacrypt)
|
||||||
|
// redirect users to MCIAS for login, and MCIAS issues a short-lived, single-use
|
||||||
|
// authorization code that the service exchanges for a JWT token.
|
||||||
|
//
|
||||||
|
// Security design:
|
||||||
|
// - Authorization codes are 32 random bytes (256 bits), hex-encoded.
|
||||||
|
// - Codes are single-use: consumed via sync.Map LoadAndDelete on first exchange.
|
||||||
|
// - Codes expire after 60 seconds to limit the window for interception.
|
||||||
|
// - A background goroutine evicts expired codes every 5 minutes.
|
||||||
|
// - The code is bound to the client_id and redirect_uri presented at authorize
|
||||||
|
// time; the token exchange endpoint must verify both match.
|
||||||
|
package sso
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
codeTTL = 60 * time.Second
|
||||||
|
codeBytes = 32 // 256 bits of entropy
|
||||||
|
cleanupPeriod = 5 * time.Minute
|
||||||
|
)
|
||||||
|
|
||||||
|
// AuthCode is a pending authorization code awaiting exchange for a JWT.
|
||||||
|
type AuthCode struct { //nolint:govet // fieldalignment: field order matches logical grouping
|
||||||
|
ClientID string
|
||||||
|
RedirectURI string
|
||||||
|
State string
|
||||||
|
AccountID int64
|
||||||
|
ExpiresAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// pendingCodes stores issued authorization codes awaiting exchange.
|
||||||
|
var pendingCodes sync.Map //nolint:gochecknoglobals
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
go cleanupCodes()
|
||||||
|
}
|
||||||
|
|
||||||
|
func cleanupCodes() {
|
||||||
|
ticker := time.NewTicker(cleanupPeriod)
|
||||||
|
defer ticker.Stop()
|
||||||
|
for range ticker.C {
|
||||||
|
now := time.Now()
|
||||||
|
pendingCodes.Range(func(key, value any) bool {
|
||||||
|
ac, ok := value.(*AuthCode)
|
||||||
|
if !ok || now.After(ac.ExpiresAt) {
|
||||||
|
pendingCodes.Delete(key)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store creates and stores a new authorization code bound to the given
|
||||||
|
// client_id, redirect_uri, state, and account. Returns the hex-encoded code.
|
||||||
|
func Store(clientID, redirectURI, state string, accountID int64) (string, error) {
|
||||||
|
raw, err := crypto.RandomBytes(codeBytes)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("sso: generate authorization code: %w", err)
|
||||||
|
}
|
||||||
|
code := fmt.Sprintf("%x", raw)
|
||||||
|
pendingCodes.Store(code, &AuthCode{
|
||||||
|
ClientID: clientID,
|
||||||
|
RedirectURI: redirectURI,
|
||||||
|
State: state,
|
||||||
|
AccountID: accountID,
|
||||||
|
ExpiresAt: time.Now().Add(codeTTL),
|
||||||
|
})
|
||||||
|
return code, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consume retrieves and deletes an authorization code. Returns the AuthCode
|
||||||
|
// and true if the code was valid and not expired, or (nil, false) otherwise.
|
||||||
|
//
|
||||||
|
// Security: LoadAndDelete ensures single-use; the code cannot be replayed.
|
||||||
|
func Consume(code string) (*AuthCode, bool) {
|
||||||
|
v, ok := pendingCodes.LoadAndDelete(code)
|
||||||
|
if !ok {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
ac, ok2 := v.(*AuthCode)
|
||||||
|
if !ok2 || time.Now().After(ac.ExpiresAt) {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
return ac, true
|
||||||
|
}
|
||||||
132
internal/sso/store_test.go
Normal file
132
internal/sso/store_test.go
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
package sso
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestStoreAndConsume(t *testing.T) {
|
||||||
|
code, err := Store("mcr", "https://mcr.example.com/cb", "state123", 42)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Store: %v", err)
|
||||||
|
}
|
||||||
|
if code == "" {
|
||||||
|
t.Fatal("Store returned empty code")
|
||||||
|
}
|
||||||
|
|
||||||
|
ac, ok := Consume(code)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("Consume returned false for valid code")
|
||||||
|
}
|
||||||
|
if ac.ClientID != "mcr" {
|
||||||
|
t.Errorf("ClientID = %q, want %q", ac.ClientID, "mcr")
|
||||||
|
}
|
||||||
|
if ac.RedirectURI != "https://mcr.example.com/cb" {
|
||||||
|
t.Errorf("RedirectURI = %q", ac.RedirectURI)
|
||||||
|
}
|
||||||
|
if ac.State != "state123" {
|
||||||
|
t.Errorf("State = %q", ac.State)
|
||||||
|
}
|
||||||
|
if ac.AccountID != 42 {
|
||||||
|
t.Errorf("AccountID = %d, want 42", ac.AccountID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConsumeSingleUse(t *testing.T) {
|
||||||
|
code, err := Store("mcr", "https://mcr.example.com/cb", "s", 1)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Store: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := Consume(code); !ok {
|
||||||
|
t.Fatal("first Consume should succeed")
|
||||||
|
}
|
||||||
|
if _, ok := Consume(code); ok {
|
||||||
|
t.Error("second Consume should fail (single-use)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConsumeUnknownCode(t *testing.T) {
|
||||||
|
if _, ok := Consume("nonexistent"); ok {
|
||||||
|
t.Error("Consume should fail for unknown code")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConsumeExpiredCode(t *testing.T) {
|
||||||
|
code, err := Store("mcr", "https://mcr.example.com/cb", "s", 1)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Store: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Manually expire the code.
|
||||||
|
v, loaded := pendingCodes.Load(code)
|
||||||
|
if !loaded {
|
||||||
|
t.Fatal("code not found in pendingCodes")
|
||||||
|
}
|
||||||
|
ac, ok := v.(*AuthCode)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("unexpected type in pendingCodes")
|
||||||
|
}
|
||||||
|
ac.ExpiresAt = time.Now().Add(-1 * time.Second)
|
||||||
|
|
||||||
|
if _, ok := Consume(code); ok {
|
||||||
|
t.Error("Consume should fail for expired code")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStoreSessionAndConsume(t *testing.T) {
|
||||||
|
nonce, err := StoreSession("mcr", "https://mcr.example.com/cb", "state456")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("StoreSession: %v", err)
|
||||||
|
}
|
||||||
|
if nonce == "" {
|
||||||
|
t.Fatal("StoreSession returned empty nonce")
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSession should return it without consuming.
|
||||||
|
s := GetSession(nonce)
|
||||||
|
if s == nil {
|
||||||
|
t.Fatal("GetSession returned nil")
|
||||||
|
}
|
||||||
|
if s.ClientID != "mcr" {
|
||||||
|
t.Errorf("ClientID = %q", s.ClientID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Still available after GetSession.
|
||||||
|
s2, ok := ConsumeSession(nonce)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("ConsumeSession returned false")
|
||||||
|
}
|
||||||
|
if s2.State != "state456" {
|
||||||
|
t.Errorf("State = %q", s2.State)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Consumed — should be gone.
|
||||||
|
if _, ok := ConsumeSession(nonce); ok {
|
||||||
|
t.Error("second ConsumeSession should fail")
|
||||||
|
}
|
||||||
|
if GetSession(nonce) != nil {
|
||||||
|
t.Error("GetSession should return nil after consume")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConsumeSessionExpired(t *testing.T) {
|
||||||
|
nonce, err := StoreSession("mcr", "https://mcr.example.com/cb", "s")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("StoreSession: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
v, loaded := pendingSessions.Load(nonce)
|
||||||
|
if !loaded {
|
||||||
|
t.Fatal("session not found in pendingSessions")
|
||||||
|
}
|
||||||
|
sess, ok := v.(*Session)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("unexpected type in pendingSessions")
|
||||||
|
}
|
||||||
|
sess.ExpiresAt = time.Now().Add(-1 * time.Second)
|
||||||
|
|
||||||
|
if _, ok := ConsumeSession(nonce); ok {
|
||||||
|
t.Error("ConsumeSession should fail for expired session")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,7 @@ package ui
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
)
|
)
|
||||||
|
|
||||||
// uiContextKey is the unexported type for UI context values, preventing
|
// uiContextKey is the unexported type for UI context values, preventing
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CSRFManager implements HMAC-signed Double-Submit Cookie CSRF protection.
|
// CSRFManager implements HMAC-signed Double-Submit Cookie CSRF protection.
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/validate"
|
"git.wntrmute.dev/mc/mcias/internal/validate"
|
||||||
)
|
)
|
||||||
|
|
||||||
// knownRoles lists the built-in roles shown as checkboxes in the roles editor.
|
// knownRoles lists the built-in roles shown as checkboxes in the roles editor.
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
const auditPageSize = 50
|
const auditPageSize = 50
|
||||||
|
|||||||
@@ -3,18 +3,19 @@ package ui
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/validate"
|
"git.wntrmute.dev/mc/mcias/internal/validate"
|
||||||
)
|
)
|
||||||
|
|
||||||
// handleLoginPage renders the login form.
|
// handleLoginPage renders the login form.
|
||||||
func (u *UIServer) handleLoginPage(w http.ResponseWriter, r *http.Request) {
|
func (u *UIServer) handleLoginPage(w http.ResponseWriter, r *http.Request) {
|
||||||
u.render(w, "login", LoginData{
|
u.render(w, "login", LoginData{
|
||||||
WebAuthnEnabled: u.cfg.WebAuthnEnabled(),
|
WebAuthnEnabled: u.cfg.WebAuthnEnabled(),
|
||||||
|
SSONonce: r.URL.Query().Get("sso"),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,6 +98,8 @@ func (u *UIServer) handleLoginPost(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ssoNonce := r.FormValue("sso_nonce")
|
||||||
|
|
||||||
// TOTP required: issue a server-side nonce and show the TOTP step form.
|
// TOTP required: issue a server-side nonce and show the TOTP step form.
|
||||||
// Security: the nonce replaces the password hidden field (F-02). The password
|
// Security: the nonce replaces the password hidden field (F-02). The password
|
||||||
// is not stored anywhere after this point; only the account ID is retained.
|
// is not stored anywhere after this point; only the account ID is retained.
|
||||||
@@ -110,11 +113,12 @@ func (u *UIServer) handleLoginPost(w http.ResponseWriter, r *http.Request) {
|
|||||||
u.render(w, "totp_step", LoginData{
|
u.render(w, "totp_step", LoginData{
|
||||||
Username: username,
|
Username: username,
|
||||||
Nonce: nonce,
|
Nonce: nonce,
|
||||||
|
SSONonce: ssoNonce,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
u.finishLogin(w, r, acct)
|
u.finishLogin(w, r, acct, ssoNonce)
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleTOTPStep handles the second POST when totp_step=1 is set.
|
// handleTOTPStep handles the second POST when totp_step=1 is set.
|
||||||
@@ -129,6 +133,7 @@ func (u *UIServer) handleTOTPStep(w http.ResponseWriter, r *http.Request) {
|
|||||||
username := r.FormValue("username") //nolint:gosec // body already limited by caller
|
username := r.FormValue("username") //nolint:gosec // body already limited by caller
|
||||||
nonce := r.FormValue("totp_nonce") //nolint:gosec // body already limited by caller
|
nonce := r.FormValue("totp_nonce") //nolint:gosec // body already limited by caller
|
||||||
totpCode := r.FormValue("totp_code") //nolint:gosec // body already limited by caller
|
totpCode := r.FormValue("totp_code") //nolint:gosec // body already limited by caller
|
||||||
|
ssoNonce := r.FormValue("sso_nonce") //nolint:gosec // body already limited by caller
|
||||||
|
|
||||||
// Security: consume the nonce (single-use); reject if unknown or expired.
|
// Security: consume the nonce (single-use); reject if unknown or expired.
|
||||||
accountID, ok := u.consumeTOTPNonce(nonce)
|
accountID, ok := u.consumeTOTPNonce(nonce)
|
||||||
@@ -172,6 +177,7 @@ func (u *UIServer) handleTOTPStep(w http.ResponseWriter, r *http.Request) {
|
|||||||
Error: "invalid TOTP code",
|
Error: "invalid TOTP code",
|
||||||
Username: username,
|
Username: username,
|
||||||
Nonce: newNonce,
|
Nonce: newNonce,
|
||||||
|
SSONonce: ssoNonce,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -189,15 +195,36 @@ func (u *UIServer) handleTOTPStep(w http.ResponseWriter, r *http.Request) {
|
|||||||
Error: "invalid TOTP code",
|
Error: "invalid TOTP code",
|
||||||
Username: username,
|
Username: username,
|
||||||
Nonce: newNonce,
|
Nonce: newNonce,
|
||||||
|
SSONonce: ssoNonce,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
u.finishLogin(w, r, acct)
|
u.finishLogin(w, r, acct, ssoNonce)
|
||||||
}
|
}
|
||||||
|
|
||||||
// finishLogin issues a JWT, sets the session cookie, and redirects to dashboard.
|
// finishLogin issues a JWT, sets the session cookie, and redirects to dashboard.
|
||||||
func (u *UIServer) finishLogin(w http.ResponseWriter, r *http.Request, acct *model.Account) {
|
// When ssoNonce is non-empty, the login is part of an SSO redirect flow: instead
|
||||||
|
// of setting a session cookie, an authorization code is issued and the user is
|
||||||
|
// redirected back to the service's callback URL.
|
||||||
|
func (u *UIServer) finishLogin(w http.ResponseWriter, r *http.Request, acct *model.Account, ssoNonce string) {
|
||||||
|
// SSO redirect flow: issue authorization code and redirect to service.
|
||||||
|
if ssoNonce != "" {
|
||||||
|
if callbackURL, ok := u.buildSSOCallback(r, ssoNonce, acct.ID); ok {
|
||||||
|
// Security: htmx follows 302 redirects via fetch, which fails
|
||||||
|
// cross-origin (no CORS on the service callback). Use HX-Redirect
|
||||||
|
// so htmx performs a full page navigation instead.
|
||||||
|
if isHTMX(r) {
|
||||||
|
w.Header().Set("HX-Redirect", callbackURL)
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
http.Redirect(w, r, callbackURL, http.StatusFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// SSO session expired/consumed — fall through to normal login.
|
||||||
|
}
|
||||||
|
|
||||||
// Determine token expiry based on admin role.
|
// Determine token expiry based on admin role.
|
||||||
expiry := u.cfg.DefaultExpiry()
|
expiry := u.cfg.DefaultExpiry()
|
||||||
roles, err := u.db.GetRoles(acct.ID)
|
roles, err := u.db.GetRoles(acct.ID)
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ package ui
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// handleDashboard renders the main dashboard page. Admin users see account
|
// handleDashboard renders the main dashboard page. Admin users see account
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/policy"
|
"git.wntrmute.dev/mc/mcias/internal/policy"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ---- Policies page ----
|
// ---- Policies page ----
|
||||||
|
|||||||
84
internal/ui/handlers_sso.go
Normal file
84
internal/ui/handlers_sso.go
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
package ui
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
|
"git.wntrmute.dev/mc/mcias/internal/sso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// handleSSOAuthorize validates the SSO request parameters against registered
|
||||||
|
// clients, creates an SSO session, and redirects to /login with the SSO nonce.
|
||||||
|
//
|
||||||
|
// Security: the client_id and redirect_uri are validated against the MCIAS
|
||||||
|
// config (exact match). The state parameter is opaque and carried through
|
||||||
|
// unchanged. An SSO session is created server-side so the nonce is the only
|
||||||
|
// value embedded in the login form.
|
||||||
|
func (u *UIServer) handleSSOAuthorize(w http.ResponseWriter, r *http.Request) {
|
||||||
|
clientID := r.URL.Query().Get("client_id")
|
||||||
|
redirectURI := r.URL.Query().Get("redirect_uri")
|
||||||
|
state := r.URL.Query().Get("state")
|
||||||
|
|
||||||
|
if clientID == "" || redirectURI == "" || state == "" {
|
||||||
|
http.Error(w, "missing required parameters: client_id, redirect_uri, state", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Security: validate client_id against registered SSO clients.
|
||||||
|
client := u.cfg.SSOClient(clientID)
|
||||||
|
if client == nil {
|
||||||
|
u.logger.Warn("sso: unknown client_id", "client_id", clientID)
|
||||||
|
http.Error(w, "unknown client_id", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Security: redirect_uri must exactly match the registered URI to prevent
|
||||||
|
// open-redirect attacks.
|
||||||
|
if redirectURI != client.RedirectURI {
|
||||||
|
u.logger.Warn("sso: redirect_uri mismatch",
|
||||||
|
"client_id", clientID,
|
||||||
|
"expected", client.RedirectURI,
|
||||||
|
"got", redirectURI)
|
||||||
|
http.Error(w, "redirect_uri does not match registered URI", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
nonce, err := sso.StoreSession(clientID, redirectURI, state)
|
||||||
|
if err != nil {
|
||||||
|
u.logger.Error("sso: store session", "error", err)
|
||||||
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
u.writeAudit(r, model.EventSSOAuthorize, nil, nil,
|
||||||
|
audit.JSON("client_id", clientID))
|
||||||
|
|
||||||
|
http.Redirect(w, r, "/login?sso="+url.QueryEscape(nonce), http.StatusFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
// buildSSOCallback consumes the SSO session, generates an authorization code,
|
||||||
|
// and returns the callback URL with code and state parameters. Returns ("", false)
|
||||||
|
// if the SSO session is expired or already consumed.
|
||||||
|
//
|
||||||
|
// Security: the SSO session is consumed (single-use) and the authorization code
|
||||||
|
// is stored server-side for exchange via POST /v1/sso/token. The state parameter
|
||||||
|
// is carried through unchanged for the service to validate.
|
||||||
|
func (u *UIServer) buildSSOCallback(r *http.Request, ssoNonce string, accountID int64) (string, bool) {
|
||||||
|
sess, ok := sso.ConsumeSession(ssoNonce)
|
||||||
|
if !ok {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
code, err := sso.Store(sess.ClientID, sess.RedirectURI, sess.State, accountID)
|
||||||
|
if err != nil {
|
||||||
|
u.logger.Error("sso: store auth code", "error", err)
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
u.writeAudit(r, model.EventSSOLoginOK, &accountID, nil,
|
||||||
|
audit.JSON("client_id", sess.ClientID))
|
||||||
|
|
||||||
|
return sess.RedirectURI + "?code=" + url.QueryEscape(code) + "&state=" + url.QueryEscape(sess.State), true
|
||||||
|
}
|
||||||
@@ -4,14 +4,15 @@ import (
|
|||||||
"encoding/base32"
|
"encoding/base32"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"html/template"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
qrcode "github.com/skip2/go-qrcode"
|
qrcode "github.com/skip2/go-qrcode"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
// handleTOTPEnrollStart processes the password re-auth step and generates
|
// handleTOTPEnrollStart processes the password re-auth step and generates
|
||||||
@@ -108,7 +109,7 @@ func (u *UIServer) handleTOTPEnrollStart(w http.ResponseWriter, r *http.Request)
|
|||||||
u.renderTOTPSection(w, r, ProfileData{TOTPError: "internal error"})
|
u.renderTOTPSection(w, r, ProfileData{TOTPError: "internal error"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
qrDataURI := "data:image/png;base64," + base64.StdEncoding.EncodeToString(png)
|
qrDataURI := template.URL("data:image/png;base64," + base64.StdEncoding.EncodeToString(png)) //nolint:gosec // G203: trusted server-generated data URI
|
||||||
|
|
||||||
// Issue enrollment nonce for the confirm step.
|
// Issue enrollment nonce for the confirm step.
|
||||||
nonce, err := u.issueTOTPEnrollNonce(acct.ID)
|
nonce, err := u.issueTOTPEnrollNonce(acct.ID)
|
||||||
@@ -224,7 +225,7 @@ func (u *UIServer) reissueTOTPEnrollQR(w http.ResponseWriter, r *http.Request, a
|
|||||||
u.renderTOTPSection(w, r, ProfileData{TOTPError: "internal error"})
|
u.renderTOTPSection(w, r, ProfileData{TOTPError: "internal error"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
qrDataURI := "data:image/png;base64," + base64.StdEncoding.EncodeToString(png)
|
qrDataURI := template.URL("data:image/png;base64," + base64.StdEncoding.EncodeToString(png)) //nolint:gosec // G203: trusted server-generated data URI
|
||||||
|
|
||||||
newNonce, nonceErr := u.issueTOTPEnrollNonce(acct.ID)
|
newNonce, nonceErr := u.issueTOTPEnrollNonce(acct.ID)
|
||||||
if nonceErr != nil {
|
if nonceErr != nil {
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ package ui
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/middleware"
|
"git.wntrmute.dev/mc/mcias/internal/middleware"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
)
|
)
|
||||||
|
|
||||||
// UnsealData is the view model for the unseal page.
|
// UnsealData is the view model for the unseal page.
|
||||||
|
|||||||
@@ -12,12 +12,12 @@ import (
|
|||||||
"github.com/go-webauthn/webauthn/protocol"
|
"github.com/go-webauthn/webauthn/protocol"
|
||||||
libwebauthn "github.com/go-webauthn/webauthn/webauthn"
|
libwebauthn "github.com/go-webauthn/webauthn/webauthn"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/audit"
|
"git.wntrmute.dev/mc/mcias/internal/audit"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/crypto"
|
"git.wntrmute.dev/mc/mcias/internal/crypto"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
mciaswebauthn "git.wntrmute.dev/kyle/mcias/internal/webauthn"
|
mciaswebauthn "git.wntrmute.dev/mc/mcias/internal/webauthn"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -27,10 +27,11 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// webauthnCeremony holds a pending WebAuthn ceremony.
|
// webauthnCeremony holds a pending WebAuthn ceremony.
|
||||||
type webauthnCeremony struct {
|
type webauthnCeremony struct { //nolint:govet // fieldalignment: field order matches logical grouping
|
||||||
expiresAt time.Time
|
expiresAt time.Time
|
||||||
session *libwebauthn.SessionData
|
session *libwebauthn.SessionData
|
||||||
accountID int64
|
accountID int64
|
||||||
|
ssoNonce string // non-empty when login is part of an SSO redirect flow
|
||||||
}
|
}
|
||||||
|
|
||||||
// pendingWebAuthnCeremonies stores in-flight WebAuthn ceremonies for the UI.
|
// pendingWebAuthnCeremonies stores in-flight WebAuthn ceremonies for the UI.
|
||||||
@@ -55,7 +56,7 @@ func cleanupUIWebAuthnCeremonies() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func storeUICeremony(session *libwebauthn.SessionData, accountID int64) (string, error) {
|
func storeUICeremony(session *libwebauthn.SessionData, accountID int64, ssoNonce string) (string, error) {
|
||||||
raw, err := crypto.RandomBytes(webauthnNonceBytes)
|
raw, err := crypto.RandomBytes(webauthnNonceBytes)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("webauthn: generate ceremony nonce: %w", err)
|
return "", fmt.Errorf("webauthn: generate ceremony nonce: %w", err)
|
||||||
@@ -64,6 +65,7 @@ func storeUICeremony(session *libwebauthn.SessionData, accountID int64) (string,
|
|||||||
pendingUIWebAuthnCeremonies.Store(nonce, &webauthnCeremony{
|
pendingUIWebAuthnCeremonies.Store(nonce, &webauthnCeremony{
|
||||||
session: session,
|
session: session,
|
||||||
accountID: accountID,
|
accountID: accountID,
|
||||||
|
ssoNonce: ssoNonce,
|
||||||
expiresAt: time.Now().Add(webauthnCeremonyTTL),
|
expiresAt: time.Now().Add(webauthnCeremonyTTL),
|
||||||
})
|
})
|
||||||
return nonce, nil
|
return nonce, nil
|
||||||
@@ -170,7 +172,7 @@ func (u *UIServer) handleWebAuthnBegin(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
nonce, err := storeUICeremony(session, acct.ID)
|
nonce, err := storeUICeremony(session, acct.ID, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeJSONError(w, http.StatusInternalServerError, "internal error")
|
writeJSONError(w, http.StatusInternalServerError, "internal error")
|
||||||
return
|
return
|
||||||
@@ -352,6 +354,7 @@ func (u *UIServer) handleWebAuthnLoginBegin(w http.ResponseWriter, r *http.Reque
|
|||||||
r.Body = http.MaxBytesReader(w, r.Body, maxFormBytes)
|
r.Body = http.MaxBytesReader(w, r.Body, maxFormBytes)
|
||||||
var req struct {
|
var req struct {
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
|
SSONonce string `json:"sso_nonce"`
|
||||||
}
|
}
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
writeJSONError(w, http.StatusBadRequest, "invalid JSON")
|
writeJSONError(w, http.StatusBadRequest, "invalid JSON")
|
||||||
@@ -413,7 +416,7 @@ func (u *UIServer) handleWebAuthnLoginBegin(w http.ResponseWriter, r *http.Reque
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
nonce, err := storeUICeremony(session, accountID)
|
nonce, err := storeUICeremony(session, accountID, req.SSONonce)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeJSONError(w, http.StatusInternalServerError, "internal error")
|
writeJSONError(w, http.StatusInternalServerError, "internal error")
|
||||||
return
|
return
|
||||||
@@ -582,6 +585,17 @@ func (u *UIServer) handleWebAuthnLoginFinish(w http.ResponseWriter, r *http.Requ
|
|||||||
|
|
||||||
_ = u.db.ClearLoginFailures(acct.ID)
|
_ = u.db.ClearLoginFailures(acct.ID)
|
||||||
|
|
||||||
|
// SSO redirect flow: issue authorization code and return redirect URL as JSON.
|
||||||
|
if ceremony.ssoNonce != "" {
|
||||||
|
if callbackURL, ok := u.buildSSOCallback(r, ceremony.ssoNonce, acct.ID); ok {
|
||||||
|
u.writeAudit(r, model.EventWebAuthnLoginOK, &acct.ID, nil, "")
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_ = json.NewEncoder(w).Encode(map[string]string{"redirect": callbackURL})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// SSO session expired — fall through to normal login.
|
||||||
|
}
|
||||||
|
|
||||||
// Issue JWT and set session cookie.
|
// Issue JWT and set session cookie.
|
||||||
expiry := u.cfg.DefaultExpiry()
|
expiry := u.cfg.DefaultExpiry()
|
||||||
roles, err := u.db.GetRoles(acct.ID)
|
roles, err := u.db.GetRoles(acct.ID)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/token"
|
"git.wntrmute.dev/mc/mcias/internal/token"
|
||||||
)
|
)
|
||||||
|
|
||||||
// validateSessionToken wraps token.ValidateToken for use by UI session middleware.
|
// validateSessionToken wraps token.ValidateToken for use by UI session middleware.
|
||||||
|
|||||||
@@ -27,13 +27,13 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/auth"
|
"git.wntrmute.dev/mc/mcias/internal/auth"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/config"
|
"git.wntrmute.dev/mc/mcias/internal/config"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/db"
|
"git.wntrmute.dev/mc/mcias/internal/db"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/middleware"
|
"git.wntrmute.dev/mc/mcias/internal/middleware"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/model"
|
"git.wntrmute.dev/mc/mcias/internal/model"
|
||||||
"git.wntrmute.dev/kyle/mcias/internal/vault"
|
"git.wntrmute.dev/mc/mcias/internal/vault"
|
||||||
"git.wntrmute.dev/kyle/mcias/web"
|
"git.wntrmute.dev/mc/mcias/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -445,6 +445,9 @@ func (u *UIServer) Register(mux *http.ServeMux) {
|
|||||||
uiMux.HandleFunc("GET /unseal", u.handleUnsealPage)
|
uiMux.HandleFunc("GET /unseal", u.handleUnsealPage)
|
||||||
uiMux.Handle("POST /unseal", unsealRateLimit(http.HandlerFunc(u.handleUnsealPost)))
|
uiMux.Handle("POST /unseal", unsealRateLimit(http.HandlerFunc(u.handleUnsealPost)))
|
||||||
|
|
||||||
|
// SSO authorize route (no session required, rate-limited).
|
||||||
|
uiMux.Handle("GET /sso/authorize", loginRateLimit(http.HandlerFunc(u.handleSSOAuthorize)))
|
||||||
|
|
||||||
// Auth routes (no session required).
|
// Auth routes (no session required).
|
||||||
uiMux.HandleFunc("GET /login", u.handleLoginPage)
|
uiMux.HandleFunc("GET /login", u.handleLoginPage)
|
||||||
uiMux.Handle("POST /login", loginRateLimit(http.HandlerFunc(u.handleLoginPost)))
|
uiMux.Handle("POST /login", loginRateLimit(http.HandlerFunc(u.handleLoginPost)))
|
||||||
@@ -746,8 +749,11 @@ func noDirListing(next http.Handler) http.Handler {
|
|||||||
func securityHeaders(next http.Handler) http.Handler {
|
func securityHeaders(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) {
|
||||||
h := w.Header()
|
h := w.Header()
|
||||||
|
// Security: 'unsafe-hashes' with the htmx swap indicator style hash
|
||||||
|
// allows htmx to apply its settling/swapping CSS transitions without
|
||||||
|
// opening the door to arbitrary inline styles.
|
||||||
h.Set("Content-Security-Policy",
|
h.Set("Content-Security-Policy",
|
||||||
"default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; font-src 'self'")
|
"default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-hashes' 'sha256-bsV5JivYxvGywDAZ22EZJKBFip65Ng9xoJVLbBg7bdo='; img-src 'self' data:; font-src 'self'")
|
||||||
h.Set("X-Content-Type-Options", "nosniff")
|
h.Set("X-Content-Type-Options", "nosniff")
|
||||||
h.Set("X-Frame-Options", "DENY")
|
h.Set("X-Frame-Options", "DENY")
|
||||||
h.Set("Strict-Transport-Security", "max-age=63072000; includeSubDomains")
|
h.Set("Strict-Transport-Security", "max-age=63072000; includeSubDomains")
|
||||||
@@ -810,6 +816,7 @@ type PageData struct {
|
|||||||
type LoginData struct {
|
type LoginData struct {
|
||||||
Error string
|
Error string
|
||||||
Username string // pre-filled on TOTP step
|
Username string // pre-filled on TOTP step
|
||||||
|
SSONonce string // SSO session nonce (hidden field for SSO redirect flow)
|
||||||
// Security (F-02): Password is no longer carried in the HTML form. Instead
|
// Security (F-02): Password is no longer carried in the HTML form. Instead
|
||||||
// a short-lived server-side nonce is issued after successful password
|
// a short-lived server-side nonce is issued after successful password
|
||||||
// verification, and only the nonce is embedded in the TOTP step form.
|
// verification, and only the nonce is embedded in the TOTP step form.
|
||||||
@@ -931,11 +938,11 @@ type ProfileData struct { //nolint:govet // fieldalignment: readability over ali
|
|||||||
WebAuthnEnabled bool
|
WebAuthnEnabled bool
|
||||||
// TOTP enrollment fields (populated only during enrollment flow).
|
// TOTP enrollment fields (populated only during enrollment flow).
|
||||||
TOTPEnabled bool
|
TOTPEnabled bool
|
||||||
TOTPSecret string // base32-encoded; shown once during enrollment
|
TOTPSecret string // base32-encoded; shown once during enrollment
|
||||||
TOTPQR string // data:image/png;base64,... QR code
|
TOTPQR template.URL // data:image/png;base64,... QR code; template.URL bypasses URL escaping
|
||||||
TOTPEnrollNonce string // single-use nonce for confirm step
|
TOTPEnrollNonce string // single-use nonce for confirm step
|
||||||
TOTPError string // enrollment-specific error message
|
TOTPError string // enrollment-specific error message
|
||||||
TOTPSuccess string // success flash after confirmation
|
TOTPSuccess string // success flash after confirmation
|
||||||
}
|
}
|
||||||
|
|
||||||
// PGCredsData is the view model for the "My PG Credentials" list page.
|
// PGCredsData is the view model for the "My PG Credentials" list page.
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user