Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c302b1d719 | ||
|
|
ee31dff01e | ||
|
|
bed563fd20 |
+5
-13
@@ -12,25 +12,17 @@ RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X main.version=${VERSION}"
|
||||
|
||||
FROM alpine:3.21
|
||||
|
||||
RUN apk add --no-cache ca-certificates tzdata \
|
||||
&& addgroup -S metacrypt \
|
||||
&& adduser -S -G metacrypt -h /srv/metacrypt -s /sbin/nologin metacrypt \
|
||||
&& mkdir -p /srv/metacrypt && chown metacrypt:metacrypt /srv/metacrypt
|
||||
RUN apk add --no-cache ca-certificates tzdata
|
||||
|
||||
COPY --from=builder /metacrypt /usr/local/bin/metacrypt
|
||||
|
||||
# /srv/metacrypt is the single volume mount point.
|
||||
# It must contain:
|
||||
# metacrypt.toml — configuration file
|
||||
# certs/ — TLS certificate and key
|
||||
# metacrypt.db — created automatically on first run
|
||||
VOLUME /srv/metacrypt
|
||||
WORKDIR /srv/metacrypt
|
||||
# /srv/metacrypt (config, certs/, metacrypt.db) is bind-mounted at runtime by
|
||||
# MCP. No VOLUME / pre-created dir / USER — the agent supplies --user 0:0, so
|
||||
# the image unpacks and runs cleanly under rootless podman.
|
||||
WORKDIR /
|
||||
|
||||
EXPOSE 8443
|
||||
EXPOSE 9443
|
||||
|
||||
USER metacrypt
|
||||
|
||||
ENTRYPOINT ["metacrypt"]
|
||||
CMD ["server", "--config", "/srv/metacrypt/metacrypt.toml"]
|
||||
|
||||
+6
-12
@@ -12,23 +12,17 @@ RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X main.version=${VERSION}"
|
||||
|
||||
FROM alpine:3.21
|
||||
|
||||
RUN apk add --no-cache ca-certificates tzdata \
|
||||
&& addgroup -S metacrypt \
|
||||
&& adduser -S -G metacrypt -h /srv/metacrypt -s /sbin/nologin metacrypt \
|
||||
&& mkdir -p /srv/metacrypt && chown metacrypt:metacrypt /srv/metacrypt
|
||||
RUN apk add --no-cache ca-certificates tzdata
|
||||
|
||||
COPY --from=builder /metacrypt-web /usr/local/bin/metacrypt-web
|
||||
|
||||
# /srv/metacrypt is the single volume mount point.
|
||||
# It must contain:
|
||||
# metacrypt.toml — configuration file
|
||||
# certs/ — TLS certificate and key
|
||||
VOLUME /srv/metacrypt
|
||||
WORKDIR /srv/metacrypt
|
||||
# /srv/metacrypt is bind-mounted at runtime by MCP (config + certs/). The
|
||||
# image deliberately does NOT declare a VOLUME or pre-create/chown the
|
||||
# directory, and does NOT set USER (the agent supplies --user 0:0), so it
|
||||
# unpacks and runs cleanly under rootless podman.
|
||||
WORKDIR /
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
USER metacrypt
|
||||
|
||||
ENTRYPOINT ["metacrypt-web"]
|
||||
CMD ["--config", "/srv/metacrypt/metacrypt.toml"]
|
||||
|
||||
@@ -4,7 +4,7 @@ go 1.25.7
|
||||
|
||||
require (
|
||||
git.wntrmute.dev/kyle/goutils v1.21.0
|
||||
git.wntrmute.dev/mc/mcdsl v1.6.0
|
||||
git.wntrmute.dev/mc/mcdsl v1.9.0
|
||||
github.com/go-chi/chi/v5 v5.2.5
|
||||
github.com/spf13/cobra v1.10.2
|
||||
github.com/spf13/viper v1.21.0
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
git.wntrmute.dev/kyle/goutils v1.21.0 h1:ZR7ovV400hsF09zc8tkdHs6vyen8TDJ7flong/dnFXM=
|
||||
git.wntrmute.dev/kyle/goutils v1.21.0/go.mod h1:JQ8NL5lHSEYl719UMf20p4G1ei70RVGma0hjjNXCR2c=
|
||||
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=
|
||||
git.wntrmute.dev/mc/mcdsl v1.6.0 h1:Vn1uy6b1yZ4Y8fsl1+kLucVprrFKlQ4SN2cjUH/Eg2k=
|
||||
git.wntrmute.dev/mc/mcdsl v1.6.0/go.mod h1:MhYahIu7Sg53lE2zpQ20nlrsoNRjQzOJBAlCmom2wJc=
|
||||
git.wntrmute.dev/mc/mcdsl v1.9.0 h1:TGqVhf9uhhh5jpMhN+8eNtBPSi/wwNXQn/NFDAcU4wg=
|
||||
git.wntrmute.dev/mc/mcdsl v1.9.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=
|
||||
|
||||
@@ -37,8 +37,16 @@ type MCIASConfig struct {
|
||||
// SSOConfig holds SSO redirect settings for the web UI.
|
||||
type SSOConfig struct {
|
||||
// RedirectURI is the callback URL that MCIAS redirects to after login.
|
||||
// Must exactly match the redirect_uri registered in MCIAS config.
|
||||
// Must exactly match the redirect_uri registered in MCIAS config. For
|
||||
// public (non-Tailnet) browser access this must be the public hostname.
|
||||
RedirectURI string `toml:"redirect_uri"`
|
||||
|
||||
// PublicURL is the browser-facing MCIAS base URL used to build the SSO
|
||||
// authorize redirect (e.g. "https://mcias.metacircular.net"). When empty,
|
||||
// the backend [mcias].server_url is used for the redirect too. Set this
|
||||
// when browsers cannot resolve the internal MCIAS name; the
|
||||
// server-to-server code exchange still uses [mcias].server_url.
|
||||
PublicURL string `toml:"public_url"`
|
||||
}
|
||||
|
||||
// WebConfig holds settings for the standalone web UI server (metacrypt-web).
|
||||
|
||||
@@ -175,6 +175,7 @@ func New(cfg *config.Config, logger *slog.Logger) (*WebServer, error) {
|
||||
if cfg.SSO.RedirectURI != "" {
|
||||
ssoClient, ssoErr := mcdsso.New(mcdsso.Config{
|
||||
MciasURL: cfg.MCIAS.ServerURL,
|
||||
PublicURL: cfg.SSO.PublicURL,
|
||||
ClientID: "metacrypt",
|
||||
RedirectURI: cfg.SSO.RedirectURI,
|
||||
CACert: cfg.MCIAS.CACert,
|
||||
@@ -183,7 +184,12 @@ func New(cfg *config.Config, logger *slog.Logger) (*WebServer, error) {
|
||||
return nil, fmt.Errorf("webserver: create SSO client: %w", ssoErr)
|
||||
}
|
||||
ws.ssoClient = ssoClient
|
||||
logger.Info("SSO enabled: redirecting to MCIAS for login", "mcias_url", cfg.MCIAS.ServerURL)
|
||||
authorizeURL := cfg.SSO.PublicURL
|
||||
if authorizeURL == "" {
|
||||
authorizeURL = cfg.MCIAS.ServerURL
|
||||
}
|
||||
logger.Info("SSO enabled: redirecting to MCIAS for login",
|
||||
"authorize_url", authorizeURL, "exchange_url", cfg.MCIAS.ServerURL)
|
||||
}
|
||||
|
||||
if tok := cfg.MCIAS.ServiceToken; tok != "" {
|
||||
|
||||
+6
-8
@@ -65,11 +65,11 @@ func Open(path string) (*sql.DB, error) {
|
||||
// connection to serialize all access and eliminate busy errors.
|
||||
database.SetMaxOpenConns(1)
|
||||
|
||||
// Ensure permissions are correct even if the file already existed.
|
||||
if err := os.Chmod(path, 0600); err != nil {
|
||||
_ = database.Close()
|
||||
return nil, fmt.Errorf("db: chmod %s: %w", path, err)
|
||||
}
|
||||
// Best-effort permissions tightening. This may fail inside rootless
|
||||
// podman containers where fchmod is denied in the user namespace.
|
||||
// The database still functions correctly without it.
|
||||
// See: log/2026-04-03-uid-incident.md
|
||||
_ = os.Chmod(path, 0600)
|
||||
|
||||
return database, nil
|
||||
}
|
||||
@@ -168,9 +168,7 @@ func Snapshot(database *sql.DB, destPath string) error {
|
||||
return fmt.Errorf("db: snapshot: %w", err)
|
||||
}
|
||||
|
||||
if err := os.Chmod(destPath, 0600); err != nil {
|
||||
return fmt.Errorf("db: chmod snapshot %s: %w", destPath, err)
|
||||
}
|
||||
_ = os.Chmod(destPath, 0600) // best-effort; may fail in rootless containers
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
+38
-4
@@ -22,6 +22,7 @@ import (
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"html"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
@@ -38,9 +39,18 @@ const (
|
||||
// Config holds the SSO client configuration. The values must match the
|
||||
// SSO client registration in MCIAS config.
|
||||
type Config struct {
|
||||
// MciasURL is the base URL of the MCIAS server.
|
||||
// MciasURL is the base URL of the MCIAS server used for the
|
||||
// server-to-server authorization-code exchange. This is typically the
|
||||
// internal/Tailnet address so the exchange does not depend on the public
|
||||
// edge.
|
||||
MciasURL string
|
||||
|
||||
// PublicURL, when set, is the browser-facing MCIAS base URL used to build
|
||||
// the authorize redirect. It must be resolvable and reachable by end-user
|
||||
// browsers (e.g. the public hostname). When empty, MciasURL is used for
|
||||
// both, which only works when MciasURL is itself browser-reachable.
|
||||
PublicURL string
|
||||
|
||||
// ClientID is the registered SSO client identifier.
|
||||
ClientID string
|
||||
|
||||
@@ -103,9 +113,19 @@ func New(cfg Config) (*Client, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
// AuthorizeURL returns the MCIAS authorize URL with the given state parameter.
|
||||
// authorizeBase returns the browser-facing MCIAS base URL: PublicURL when
|
||||
// configured, otherwise MciasURL.
|
||||
func (c *Client) authorizeBase() string {
|
||||
if c.cfg.PublicURL != "" {
|
||||
return c.cfg.PublicURL
|
||||
}
|
||||
return c.cfg.MciasURL
|
||||
}
|
||||
|
||||
// AuthorizeURL returns the MCIAS authorize URL (browser-facing) with the
|
||||
// given state parameter.
|
||||
func (c *Client) AuthorizeURL(state string) string {
|
||||
base := strings.TrimRight(c.cfg.MciasURL, "/")
|
||||
base := strings.TrimRight(c.authorizeBase(), "/")
|
||||
return base + "/sso/authorize?" + url.Values{
|
||||
"client_id": {c.cfg.ClientID},
|
||||
"redirect_uri": {c.cfg.RedirectURI},
|
||||
@@ -268,6 +288,12 @@ func ConsumeReturnToCookie(w http.ResponseWriter, r *http.Request, prefix string
|
||||
|
||||
// RedirectToLogin generates a state, sets the state and return-to cookies,
|
||||
// and redirects the user to the MCIAS authorize URL.
|
||||
//
|
||||
// The redirect is performed via a 200 response with an HTML meta-refresh
|
||||
// instead of a 302. Some browsers (notably Firefox) do not reliably store
|
||||
// Set-Cookie headers on 302 responses that redirect to a different origin,
|
||||
// even when the origins are same-site. Using a 200 response ensures the
|
||||
// cookies are stored before the browser navigates away.
|
||||
func RedirectToLogin(w http.ResponseWriter, r *http.Request, client *Client, cookiePrefix string) error {
|
||||
state, err := GenerateState()
|
||||
if err != nil {
|
||||
@@ -276,7 +302,15 @@ func RedirectToLogin(w http.ResponseWriter, r *http.Request, client *Client, coo
|
||||
|
||||
SetStateCookie(w, cookiePrefix, state)
|
||||
SetReturnToCookie(w, r, cookiePrefix)
|
||||
http.Redirect(w, r, client.AuthorizeURL(state), http.StatusFound)
|
||||
|
||||
authorizeURL := client.AuthorizeURL(state)
|
||||
escaped := html.EscapeString(authorizeURL)
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
_, _ = fmt.Fprintf(w, `<!DOCTYPE html>
|
||||
<html><head><meta http-equiv="refresh" content="0;url=%s"></head>
|
||||
<body><p>Redirecting to <a href="%s">MCIAS</a>...</p></body></html>`,
|
||||
escaped, escaped)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
||||
## explicit; go 1.24.0
|
||||
git.wntrmute.dev/kyle/goutils/certlib/certgen
|
||||
git.wntrmute.dev/kyle/goutils/lib
|
||||
# git.wntrmute.dev/mc/mcdsl v1.6.0
|
||||
# git.wntrmute.dev/mc/mcdsl v1.9.0
|
||||
## explicit; go 1.25.7
|
||||
git.wntrmute.dev/mc/mcdsl/auth
|
||||
git.wntrmute.dev/mc/mcdsl/config
|
||||
|
||||
Reference in New Issue
Block a user