mirror of
https://github.com/Dvorinka/Primora.git
synced 2026-10-28 15:51:23 +00:00
Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61f0974c61 | ||
|
|
769d04471f | ||
|
|
da294aaa2b | ||
|
|
1226d44872 | ||
|
|
ac4ca9a3ae | ||
|
|
597db3287e | ||
|
|
bbc57f9c0d | ||
|
|
9ab9b550d1 | ||
|
|
49ca9067a9 | ||
|
|
805a58e32f | ||
|
|
d09b0a1c2d | ||
|
|
92b1810c07 | ||
|
|
3ad37c190b |
No files matched your search
@@ -327,6 +327,8 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
packages: read
|
||||
# contents: write — the job uploads SBOM assets onto the release.
|
||||
contents: write
|
||||
env:
|
||||
VERSION: ${{ needs.verify.outputs.version }}
|
||||
steps:
|
||||
|
||||
@@ -4,6 +4,24 @@ All notable changes to Primora. Format follows [Keep a Changelog](https://keepac
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.8.3] - 2026-09-28
|
||||
|
||||
### Added
|
||||
|
||||
- **Install script asks for the public URL** — `install.sh` now prompts for where you'll open the app and accepts a full URL: `https://primora.example.com` (TLS at your proxy, hints printed at the end), `primora.example.com`, or `192.168.1.50:8085` (the port becomes `NGINX_PORT`). The answer rewrites every public URL var in `.env` and `COOKIE_DOMAIN` for real DNS names. The prompt reads the controlling terminal so it appears under `curl | bash`; no tty (CI, cron) falls back to `localhost`. Non-interactive via `PUBLIC_URL=`; legacy `DOMAIN`/`NGINX_PORT` envs still work; reruns over an existing `.env` skip the question.
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Auth origins behind external TLS terminators** — trusted origins now accept both URL schemes on the serving host. Verified live over a Cloudflare quick tunnel: a real browser session cookie + `https://*.trycloudflare.com` origin was 403'd on v0.8.2 (nginx reports `X-Forwarded-Proto: http` inbound); the same request now signs in cleanly while cross-site origins still 403.
|
||||
|
||||
## [0.8.2] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Self-hosted sign-up works on any origin** — trusted origins are now derived from the request's public host (forwarded by nginx), so browsing the instance via a LAN IP, hostname, or custom port no longer fails every auth POST with a 403. Static `VITE_APP_URL`/`AUTH_BASE_URL` origins and `BETTER_AUTH_TRUSTED_ORIGINS` still apply.
|
||||
- **Sign-up/sign-in failures are surfaced, not swallowed** — better-auth resolves `{ data, error }` instead of throwing, so a failed request previously showed "Account created — signing you in" and bounced back to the bootstrap screen. The real server error (invalid origin, rate limit, disabled sign-up) is now displayed.
|
||||
- **Mail probe can no longer break auth** — `hasMailTransport` degrades to "no transport" instead of throwing when `core.settings` is unreadable, and the no-transport startup backfill is best-effort. Previously, auth could crash-loop while the backend was still migrating on a fresh volume — every sign-up 502'd during the window.
|
||||
|
||||
## [0.8.1] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -77,7 +77,9 @@ Prerequisites: Docker with the Compose plugin.
|
||||
curl -fsSL https://raw.githubusercontent.com/Dvorinka/Primora/master/install.sh | bash
|
||||
```
|
||||
|
||||
Installs into `./primora`, generates secrets, and starts the stack on port 80.
|
||||
Installs into `./primora`, asks one question — the URL you'll open the app on
|
||||
(domain, IP, optional port) — generates secrets, and starts the stack.
|
||||
Non-interactive: `PUBLIC_URL=https://primora.example.com bash install.sh`.
|
||||
Or from a clone:
|
||||
|
||||
```bash
|
||||
|
||||
@@ -53,7 +53,22 @@ export const auth = betterAuth({
|
||||
appName: "Primora",
|
||||
secret: env.BETTER_AUTH_SECRET,
|
||||
baseURL: env.BETTER_AUTH_URL,
|
||||
trustedOrigins: [env.VITE_APP_URL, env.AUTH_BASE_URL],
|
||||
// Self-host: the browser reaches /auth through the same nginx origin as the
|
||||
// app, so whatever host actually served this request is trusted — static
|
||||
// localhost defaults alone 403 every sign-up on LAN IPs or custom ports.
|
||||
// An attacker's cross-site Origin still won't match the server host.
|
||||
trustedOrigins: (request) => {
|
||||
const origins = [env.VITE_APP_URL, env.AUTH_BASE_URL];
|
||||
const host = request?.headers.get("x-forwarded-host") ?? request?.headers.get("host");
|
||||
if (host) {
|
||||
const proto = request?.headers.get("x-forwarded-proto") ?? "http";
|
||||
origins.push(`${proto}://${host}`);
|
||||
// TLS often terminates at an external proxy — nginx then reports http.
|
||||
// Both schemes on the serving host are legitimately this instance.
|
||||
origins.push(proto === "https" ? `http://${host}` : `https://${host}`);
|
||||
}
|
||||
return origins;
|
||||
},
|
||||
database: authPool,
|
||||
emailAndPassword: {
|
||||
enabled: true,
|
||||
@@ -155,10 +170,15 @@ export async function runAuthMigrations() {
|
||||
await migrations.runMigrations();
|
||||
}
|
||||
|
||||
/** No transport → existing unverified users can never resolve that state. */
|
||||
/** No transport → existing unverified users can never resolve that state.
|
||||
* Best-effort: a startup failure here must never take the service down. */
|
||||
export async function verifyUsersWithoutMailTransport() {
|
||||
if (await hasMailTransport()) return;
|
||||
await authPool.query(`update "user" set "emailVerified" = true where "emailVerified" = false`);
|
||||
try {
|
||||
if (await hasMailTransport()) return;
|
||||
await authPool.query(`update "user" set "emailVerified" = true where "emailVerified" = false`);
|
||||
} catch (error) {
|
||||
console.warn(JSON.stringify({ level: "warn", msg: "verify_without_transport_failed", error }));
|
||||
}
|
||||
}
|
||||
|
||||
/** Bootstrap admins by email — run after migrations so the role column exists. */
|
||||
|
||||
@@ -32,10 +32,17 @@ async function resolveMailConfig() {
|
||||
|
||||
// True when a mail transport exists (Resend key or SMTP host). Verification
|
||||
// and reset mails only make sense when mail can actually leave the box.
|
||||
// Mail is optional — a failed settings read must degrade to "no transport",
|
||||
// never break sign-up.
|
||||
export async function hasMailTransport(): Promise<boolean> {
|
||||
const cfg = await resolveMailConfig();
|
||||
if ("resendApiKey" in cfg && cfg.resendApiKey) return true;
|
||||
return "smtp" in cfg && Boolean(cfg.smtp);
|
||||
try {
|
||||
const cfg = await resolveMailConfig();
|
||||
if ("resendApiKey" in cfg && cfg.resendApiKey) return true;
|
||||
return "smtp" in cfg && Boolean(cfg.smtp);
|
||||
} catch (error) {
|
||||
console.warn(JSON.stringify({ level: "warn", msg: "mail_transport_probe_failed", error }));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export async function sendTransactionalEmail(input: {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@primora/desktop",
|
||||
"version": "0.8.1",
|
||||
"version": "0.8.3",
|
||||
"private": true,
|
||||
"description": "Primora desktop shell — thin Tauri client for a self-hosted deployment",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "Primora",
|
||||
"version": "0.8.1",
|
||||
"version": "0.8.3",
|
||||
"identifier": "dev.tdvorak.primora",
|
||||
"build": {
|
||||
"frontendDist": "../ui"
|
||||
|
||||
@@ -735,11 +735,22 @@ export default function App() {
|
||||
await runPending("auth-submit", async () => {
|
||||
setAuthMessage("");
|
||||
try {
|
||||
// better-auth client resolves { data, error } instead of throwing on
|
||||
// HTTP failures — surface res.error or the UI claims success while
|
||||
// nothing was created.
|
||||
if (mode() === "sign-up") {
|
||||
await authClient.signUp.email({ email: email(), password: password(), name: name() });
|
||||
const res = await authClient.signUp.email({ email: email(), password: password(), name: name() });
|
||||
if (res.error) {
|
||||
setAuthMessage(res.error.message ?? "Sign-up failed");
|
||||
return;
|
||||
}
|
||||
setAuthMessage("Account created — signing you in.");
|
||||
} else {
|
||||
await authClient.signIn.email({ email: email(), password: password() });
|
||||
const res = await authClient.signIn.email({ email: email(), password: password() });
|
||||
if (res.error) {
|
||||
setAuthMessage(res.error.message ?? "Sign-in failed");
|
||||
return;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
setAuthMessage(getErrorMessage(error, "Authentication failed"));
|
||||
|
||||
+69
-14
@@ -3,8 +3,14 @@
|
||||
#
|
||||
# curl -fsSL https://raw.githubusercontent.com/Dvorinka/Primora/master/install.sh | bash
|
||||
#
|
||||
# Installs into ./primora (override with PRIMORA_DIR). Non-interactive:
|
||||
# DOMAIN=example.com NGINX_PORT=8080 bash install.sh
|
||||
# Installs into ./primora (override with PRIMORA_DIR). On a fresh install,
|
||||
# interactive shells get one question — the URL the app will be opened on
|
||||
# (domain or IP, optional port). Non-interactive:
|
||||
# PUBLIC_URL=https://primora.example.com bash install.sh
|
||||
# DOMAIN=192.168.1.50 NGINX_PORT=8085 bash install.sh (legacy form)
|
||||
#
|
||||
# https URLs mean TLS terminates at your own proxy in front of Primora's
|
||||
# bundled nginx (which always speaks http on NGINX_PORT).
|
||||
#
|
||||
# Pulls prebuilt GHCR images when available; otherwise downloads the source
|
||||
# tarball and builds locally. Either way the result is the same compose stack.
|
||||
@@ -14,8 +20,8 @@ set -euo pipefail
|
||||
REPO="Dvorinka/Primora"
|
||||
REF="${PRIMORA_REF:-master}"
|
||||
DIR="${PRIMORA_DIR:-primora}"
|
||||
DOMAIN="${DOMAIN:-localhost}"
|
||||
NGINX_PORT="${NGINX_PORT:-80}"
|
||||
PUBLIC_URL="${PUBLIC_URL:-}"
|
||||
|
||||
info() { echo "==> $*"; }
|
||||
die() { echo "ERROR: $*" >&2; exit 1; }
|
||||
@@ -37,7 +43,52 @@ for f in docker-compose.yml .env.example infra/nginx/default.conf; do
|
||||
curl -fsSL "https://raw.githubusercontent.com/$REPO/$REF/$f" -o "$f"
|
||||
done
|
||||
|
||||
if [ ! -f .env ]; then
|
||||
if [ -f .env ]; then
|
||||
info "Existing .env kept"
|
||||
# Display URL comes from the file — answers here would change nothing.
|
||||
PUBLIC_URL="$(grep -E '^VITE_APP_URL=' .env | tail -1 | cut -d= -f2- || true)"
|
||||
[ -z "$PUBLIC_URL" ] && PUBLIC_URL="http://localhost"
|
||||
else
|
||||
# Public URL — the single question. Env wins, then prompt, then default.
|
||||
if [ -z "$PUBLIC_URL" ] && [ -n "${DOMAIN:-}" ]; then
|
||||
PUBLIC_URL="http://${DOMAIN}"
|
||||
[ "$NGINX_PORT" != "80" ] && PUBLIC_URL="$PUBLIC_URL:$NGINX_PORT"
|
||||
fi
|
||||
if [ -z "$PUBLIC_URL" ]; then
|
||||
DEFAULT_URL="http://localhost"
|
||||
[ "$NGINX_PORT" != "80" ] && DEFAULT_URL="http://localhost:$NGINX_PORT"
|
||||
# Under `curl | bash` stdin is the script pipe — prompt on the
|
||||
# controlling terminal instead. No tty (CI/cron) → default silently.
|
||||
if exec 9</dev/tty 2>/dev/null; then
|
||||
read -rp "URL where you'll open Primora (domain or IP, e.g. https://primora.example.com) [$DEFAULT_URL]: " PUBLIC_URL <&9 || true
|
||||
exec 9>&-
|
||||
fi
|
||||
PUBLIC_URL="${PUBLIC_URL:-$DEFAULT_URL}"
|
||||
fi
|
||||
|
||||
# Normalize: default scheme http, strip trailing slash.
|
||||
case "$PUBLIC_URL" in
|
||||
http://*|https://*) ;;
|
||||
*) PUBLIC_URL="http://$PUBLIC_URL" ;;
|
||||
esac
|
||||
PUBLIC_URL="${PUBLIC_URL%/}"
|
||||
|
||||
# Split host[:port]; URL paths aren't supported — nginx mounts auth at /auth.
|
||||
REST="${PUBLIC_URL#*://}"
|
||||
HOSTPORT="${REST%%/*}"
|
||||
[ "$REST" != "$HOSTPORT" ] && die "URL paths are not supported — use a domain or port instead: $PUBLIC_URL"
|
||||
if [[ "$HOSTPORT" == *:* ]]; then
|
||||
HOST="${HOSTPORT%%:*}"
|
||||
PORT="${HOSTPORT##*:}"
|
||||
else
|
||||
HOST="$HOSTPORT"; PORT=""
|
||||
fi
|
||||
[ -z "$HOST" ] && die "could not parse a host from: $PUBLIC_URL"
|
||||
if [ -n "$PORT" ]; then
|
||||
[[ "$PORT" =~ ^[0-9]+$ ]] || die "invalid port in: $PUBLIC_URL"
|
||||
NGINX_PORT="$PORT"
|
||||
fi
|
||||
|
||||
info "Generating .env with random secrets"
|
||||
cp .env.example .env
|
||||
|
||||
@@ -53,12 +104,15 @@ if [ ! -f .env ]; then
|
||||
"${SED[@]}" "s|^PRIMORA_ENCRYPTION_KEY=.*|PRIMORA_ENCRYPTION_KEY=$ENCRYPTION_KEY|" .env
|
||||
"${SED[@]}" "s|^NGINX_PORT=.*|NGINX_PORT=$NGINX_PORT|" .env
|
||||
|
||||
if [ "$DOMAIN" != "localhost" ]; then
|
||||
"${SED[@]}" "s|http://localhost|http://$DOMAIN|g" .env
|
||||
"${SED[@]}" "s|^COOKIE_DOMAIN=.*|COOKIE_DOMAIN=$DOMAIN|" .env
|
||||
# Every public URL var (VITE_APP_URL, BETTER_AUTH_URL, AUTH_BASE_URL,
|
||||
# VITE_AUTH_BASE_URL, VITE_API_BASE_URL, BACKEND_PUBLIC_URL) is built on the
|
||||
# http://localhost prefix in .env.example — one rewrite covers them all.
|
||||
"${SED[@]}" "s|http://localhost|$PUBLIC_URL|g" .env
|
||||
|
||||
# Cookie domains only apply to real DNS names — never IPs or localhost.
|
||||
if [ "$HOST" != "localhost" ] && ! [[ "$HOST" =~ ^[0-9.]+$ ]]; then
|
||||
"${SED[@]}" "s|^COOKIE_DOMAIN=.*|COOKIE_DOMAIN=$HOST|" .env
|
||||
fi
|
||||
else
|
||||
info "Existing .env kept"
|
||||
fi
|
||||
|
||||
# Compose v5 skips `pull` for services that declare build:, so fetch the
|
||||
@@ -79,11 +133,12 @@ else
|
||||
docker compose up -d --build
|
||||
fi
|
||||
|
||||
DISPLAY_URL="http://$DOMAIN"
|
||||
[ "$NGINX_PORT" != "80" ] && DISPLAY_URL="$DISPLAY_URL:$NGINX_PORT"
|
||||
|
||||
info "Primora is starting"
|
||||
echo " Dashboard: $DISPLAY_URL"
|
||||
echo " Health: $DISPLAY_URL/api/v1/health/liveness"
|
||||
echo " Dashboard: $PUBLIC_URL"
|
||||
echo " Health: $PUBLIC_URL/api/v1/health/liveness"
|
||||
echo " Logs: cd $DIR && docker compose logs -f"
|
||||
echo " Stop: cd $DIR && docker compose down"
|
||||
if [[ "$PUBLIC_URL" == https://* ]]; then
|
||||
echo
|
||||
echo " Primora listens on http port $NGINX_PORT — point your TLS proxy there."
|
||||
fi
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "primora",
|
||||
"version": "0.8.1",
|
||||
"version": "0.8.3",
|
||||
"private": true,
|
||||
"packageManager": "[email protected]",
|
||||
"workspaces": [
|
||||
|
||||
Reference in new issue
Block a user