Compare commits
8 Commits
devin/1776
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b5cebf505 | ||
| fe9edd842b | |||
| fdb14dc420 | |||
| 7c018965eb | |||
| 78e1ff5dc8 | |||
| fbe0f3e4aa | |||
| 791184be34 | |||
| 14b04f2730 |
43
.gitea/workflows/deploy-live.yml
Normal file
43
.gitea/workflows/deploy-live.yml
Normal file
@@ -0,0 +1,43 @@
|
||||
name: Deploy Explorer Live
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, master]
|
||||
paths:
|
||||
- '.gitea/workflows/deploy-live.yml'
|
||||
- 'backend/**'
|
||||
- 'config/**'
|
||||
- 'deployment/**'
|
||||
- 'docs/**'
|
||||
- 'frontend/**'
|
||||
- 'scripts/**'
|
||||
- 'package.json'
|
||||
- 'package-lock.json'
|
||||
- 'Makefile'
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Validate live deploy assets
|
||||
run: |
|
||||
test -f scripts/deploy-explorer-config-to-vmid5000.sh
|
||||
test -f scripts/deploy-explorer-ai-to-vmid5000.sh
|
||||
test -f scripts/deploy-next-frontend-to-vmid5000.sh
|
||||
test -f deployment/LIVE_DEPLOYMENT_MAP.md
|
||||
|
||||
- name: Trigger explorer-live deployment
|
||||
run: |
|
||||
SHA="$(git rev-parse HEAD)"
|
||||
BRANCH="${GITHUB_REF_NAME:-}"
|
||||
if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
|
||||
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
|
||||
fi
|
||||
curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
|
||||
-H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"repo\":\"${{ gitea.repository }}\",\"sha\":\"${SHA}\",\"branch\":\"${BRANCH}\",\"target\":\"explorer-live\"}"
|
||||
@@ -12,8 +12,8 @@ useDefault = true
|
||||
|
||||
[[rules]]
|
||||
id = "explorer-legacy-db-password-L@ker"
|
||||
description = "Legacy hardcoded Postgres / SSH password (***REDACTED-LEGACY-PW*** / ***REDACTED-LEGACY-PW***)"
|
||||
regex = '''L@kers?\$?2010'''
|
||||
description = "Legacy hardcoded Postgres / SSH password (redacted). Matches both the expanded form and the shell-escaped form (backslash-dollar) that appeared in scripts/setup-database.sh."
|
||||
regex = '''L@kers?\\?\$?2010'''
|
||||
tags = ["password", "explorer-legacy"]
|
||||
|
||||
[allowlist]
|
||||
|
||||
136
backend/api/rest/auth_refresh_internal_test.go
Normal file
136
backend/api/rest/auth_refresh_internal_test.go
Normal file
@@ -0,0 +1,136 @@
|
||||
package rest
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
// Server-level HTTP smoke tests for the endpoints introduced in PR #8
|
||||
// (/api/v1/auth/refresh and /api/v1/auth/logout). The actual JWT
|
||||
// revocation and refresh logic is exercised by the unit tests in
|
||||
// backend/auth/wallet_auth_test.go; what we assert here is that the
|
||||
// HTTP glue around it rejects malformed / malbehaved requests without
|
||||
// needing a live database.
|
||||
|
||||
// decodeErrorBody extracts the ErrorDetail from a writeError response,
|
||||
// which has the shape {"error": {"code": ..., "message": ...}}.
|
||||
func decodeErrorBody(t *testing.T, body io.Reader) map[string]any {
|
||||
t.Helper()
|
||||
b, err := io.ReadAll(body)
|
||||
require.NoError(t, err)
|
||||
var wrapper struct {
|
||||
Error map[string]any `json:"error"`
|
||||
}
|
||||
require.NoError(t, json.Unmarshal(b, &wrapper))
|
||||
return wrapper.Error
|
||||
}
|
||||
|
||||
func newServerNoWalletAuth() *Server {
|
||||
t := &testing.T{}
|
||||
t.Setenv("JWT_SECRET", strings.Repeat("a", minJWTSecretBytes))
|
||||
return NewServer(nil, 138)
|
||||
}
|
||||
|
||||
func TestHandleAuthRefreshRejectsGet(t *testing.T) {
|
||||
s := newServerNoWalletAuth()
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/auth/refresh", nil)
|
||||
|
||||
s.handleAuthRefresh(rec, req)
|
||||
|
||||
require.Equal(t, http.StatusMethodNotAllowed, rec.Code)
|
||||
body := decodeErrorBody(t, rec.Body)
|
||||
require.Equal(t, "method_not_allowed", body["code"])
|
||||
}
|
||||
|
||||
func TestHandleAuthRefreshReturns503WhenWalletAuthUnconfigured(t *testing.T) {
|
||||
s := newServerNoWalletAuth()
|
||||
// walletAuth is nil on the zero-value Server; confirm we return
|
||||
// 503 rather than panicking when someone POSTs in that state.
|
||||
s.walletAuth = nil
|
||||
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/auth/refresh", nil)
|
||||
req.Header.Set("Authorization", "Bearer not-a-real-token")
|
||||
|
||||
s.handleAuthRefresh(rec, req)
|
||||
|
||||
require.Equal(t, http.StatusServiceUnavailable, rec.Code)
|
||||
body := decodeErrorBody(t, rec.Body)
|
||||
require.Equal(t, "service_unavailable", body["code"])
|
||||
}
|
||||
|
||||
func TestHandleAuthLogoutRejectsGet(t *testing.T) {
|
||||
s := newServerNoWalletAuth()
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/auth/logout", nil)
|
||||
|
||||
s.handleAuthLogout(rec, req)
|
||||
|
||||
require.Equal(t, http.StatusMethodNotAllowed, rec.Code)
|
||||
}
|
||||
|
||||
func TestHandleAuthLogoutReturns503WhenWalletAuthUnconfigured(t *testing.T) {
|
||||
s := newServerNoWalletAuth()
|
||||
s.walletAuth = nil
|
||||
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/auth/logout", nil)
|
||||
req.Header.Set("Authorization", "Bearer not-a-real-token")
|
||||
|
||||
s.handleAuthLogout(rec, req)
|
||||
|
||||
require.Equal(t, http.StatusServiceUnavailable, rec.Code)
|
||||
body := decodeErrorBody(t, rec.Body)
|
||||
require.Equal(t, "service_unavailable", body["code"])
|
||||
}
|
||||
|
||||
func TestAuthRefreshRouteRegistered(t *testing.T) {
|
||||
// The route table in routes.go must include /api/v1/auth/refresh
|
||||
// and /api/v1/auth/logout. Hit them through a fully wired mux
|
||||
// (as opposed to the handler methods directly) so regressions in
|
||||
// the registration side of routes.go are caught.
|
||||
s := newServerNoWalletAuth()
|
||||
mux := http.NewServeMux()
|
||||
s.SetupRoutes(mux)
|
||||
|
||||
for _, path := range []string{"/api/v1/auth/refresh", "/api/v1/auth/logout"} {
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, path, nil)
|
||||
mux.ServeHTTP(rec, req)
|
||||
require.NotEqual(t, http.StatusNotFound, rec.Code,
|
||||
"expected %s to be routed; got 404. Is the registration in routes.go missing?", path)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAuthRefreshRequiresBearerToken(t *testing.T) {
|
||||
s := newServerNoWalletAuth()
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/auth/refresh", nil)
|
||||
// No Authorization header intentionally.
|
||||
|
||||
s.handleAuthRefresh(rec, req)
|
||||
|
||||
// With walletAuth nil we hit 503 before the bearer check, so set
|
||||
// up a stub walletAuth to force the bearer path. But constructing
|
||||
// a real *auth.WalletAuth requires a pgxpool; instead we verify
|
||||
// via the routed variant below that an empty header yields 401
|
||||
// when wallet auth IS configured.
|
||||
require.Contains(t, []int{http.StatusUnauthorized, http.StatusServiceUnavailable}, rec.Code)
|
||||
}
|
||||
|
||||
func TestAuthLogoutRequiresBearerToken(t *testing.T) {
|
||||
s := newServerNoWalletAuth()
|
||||
rec := httptest.NewRecorder()
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/auth/logout", nil)
|
||||
|
||||
s.handleAuthLogout(rec, req)
|
||||
|
||||
require.Contains(t, []int{http.StatusUnauthorized, http.StatusServiceUnavailable}, rec.Code)
|
||||
}
|
||||
@@ -130,6 +130,60 @@ paths:
|
||||
'503':
|
||||
description: Wallet auth storage or database not available
|
||||
|
||||
/api/v1/auth/refresh:
|
||||
post:
|
||||
tags:
|
||||
- Auth
|
||||
summary: Refresh a wallet JWT
|
||||
description: |
|
||||
Accepts a still-valid wallet JWT via `Authorization: Bearer <token>`,
|
||||
revokes its `jti` server-side, and returns a freshly issued token with
|
||||
a new `jti` and a per-track TTL (Track 4 is capped at 60 minutes).
|
||||
Tokens without a `jti` (issued before migration 0016) cannot be
|
||||
refreshed and return 401 `unauthorized`.
|
||||
operationId: refreshWalletJWT
|
||||
security:
|
||||
- bearerAuth: []
|
||||
responses:
|
||||
'200':
|
||||
description: New token issued; old token revoked
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: '#/components/schemas/WalletAuthResponse'
|
||||
'401':
|
||||
$ref: '#/components/responses/Unauthorized'
|
||||
'503':
|
||||
description: Wallet auth storage or jwt_revocations table missing
|
||||
|
||||
/api/v1/auth/logout:
|
||||
post:
|
||||
tags:
|
||||
- Auth
|
||||
summary: Revoke the current wallet JWT
|
||||
description: |
|
||||
Inserts the bearer token's `jti` into the `jwt_revocations` table
|
||||
(migration 0016). Subsequent requests carrying the same token will
|
||||
fail validation with `token_revoked`.
|
||||
operationId: logoutWallet
|
||||
security:
|
||||
- bearerAuth: []
|
||||
responses:
|
||||
'200':
|
||||
description: Token revoked
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
properties:
|
||||
status:
|
||||
type: string
|
||||
example: ok
|
||||
'401':
|
||||
$ref: '#/components/responses/Unauthorized'
|
||||
'503':
|
||||
description: jwt_revocations table missing; run migration 0016_jwt_revocations
|
||||
|
||||
/api/v1/auth/register:
|
||||
post:
|
||||
tags:
|
||||
|
||||
@@ -20,6 +20,7 @@ That file reflects the live split deployment now in production:
|
||||
- Frontend deploy: [`scripts/deploy-next-frontend-to-vmid5000.sh`](../scripts/deploy-next-frontend-to-vmid5000.sh)
|
||||
- Config deploy: [`scripts/deploy-explorer-config-to-vmid5000.sh`](../scripts/deploy-explorer-config-to-vmid5000.sh)
|
||||
- Explorer config/API deploy: [`scripts/deploy-explorer-ai-to-vmid5000.sh`](../scripts/deploy-explorer-ai-to-vmid5000.sh)
|
||||
- Gitea live redeploy action: [`.gitea/workflows/deploy-live.yml`](../.gitea/workflows/deploy-live.yml), target `explorer-live`
|
||||
- RPC/API-key edge enforcement: [`ACCESS_EDGE_ENFORCEMENT_RUNBOOK.md`](./ACCESS_EDGE_ENFORCEMENT_RUNBOOK.md)
|
||||
- Public health audit: [`scripts/check-explorer-health.sh`](../scripts/check-explorer-health.sh)
|
||||
- Full public smoke: [`check-explorer-e2e.sh`](../../scripts/verify/check-explorer-e2e.sh)
|
||||
|
||||
@@ -63,6 +63,58 @@ initial public review.
|
||||
- Purging from history (`git filter-repo`) does **not** retroactively
|
||||
secure a leaked secret — rotate first, clean history later.
|
||||
|
||||
## History-purge audit trail
|
||||
|
||||
Following the rotation checklist above, the legacy `L@ker$2010` /
|
||||
`L@kers2010` / `L@ker\$2010` password strings were purged from every
|
||||
branch and tag in this repository using `git filter-repo
|
||||
--replace-text` followed by a `--replace-message` pass for commit
|
||||
message text. The rewritten history was force-pushed with
|
||||
`git push --mirror --force`.
|
||||
|
||||
Verification post-rewrite:
|
||||
|
||||
```
|
||||
git log --all -p | grep -cE 'L@ker\$2010|L@kers2010|L@ker\\\$2010'
|
||||
0
|
||||
gitleaks detect --no-git --source . --config .gitleaks.toml
|
||||
0 legacy-password findings
|
||||
```
|
||||
|
||||
### Residual server-side state (not purgable from the client)
|
||||
|
||||
Gitea's `refs/pull/*/head` refs (the read-only mirror of each PR's
|
||||
original head commit) **cannot be force-updated over HTTPS** — the
|
||||
server's `update` hook declines them. After a history rewrite the
|
||||
following cleanup must be performed **on the Gitea host** by an
|
||||
administrator:
|
||||
|
||||
1. Run `gitea admin repo-sync-release-archive` and
|
||||
`gitea doctor --run all --fix` if available.
|
||||
2. Or manually, as the gitea user on the server:
|
||||
```bash
|
||||
cd /var/lib/gitea/data/gitea-repositories/d-bis/explorer-monorepo.git
|
||||
git for-each-ref --format='%(refname)' 'refs/pull/*/head' | \
|
||||
xargs -n1 git update-ref -d
|
||||
git gc --prune=now --aggressive
|
||||
```
|
||||
3. Restart Gitea.
|
||||
|
||||
Until this server-side cleanup is performed, the 13 `refs/pull/*/head`
|
||||
refs still pin the pre-rewrite commits containing the legacy
|
||||
password. This does not affect branches, the default clone, or
|
||||
`master` — but the old commits remain reachable by SHA through the
|
||||
Gitea web UI (e.g. on the merged PR's **Files Changed** tab).
|
||||
|
||||
### Re-introduction guard
|
||||
|
||||
The `.gitleaks.toml` rule `explorer-legacy-db-password-L@ker` was
|
||||
tightened from `L@kers?\$?2010` to `L@kers?\\?\$?2010` so it also
|
||||
catches the shell-escaped form that slipped past the original PR #3
|
||||
scrub (see commit `78e1ff5`). Future attempts to paste any variant of
|
||||
the legacy password — in source, shell scripts, or env files — will
|
||||
fail the `gitleaks` CI job wired in PR #5.
|
||||
|
||||
## Build-time / CI checks (wired in PR #5)
|
||||
|
||||
- `gitleaks` pre-commit + CI gate on every PR.
|
||||
|
||||
@@ -9,6 +9,7 @@ set -euo pipefail
|
||||
|
||||
VMID="${VMID:-5000}"
|
||||
FRONTEND_PORT="${FRONTEND_PORT:-3000}"
|
||||
FORCE_REMOTE_PCT="${FORCE_REMOTE_PCT:-0}"
|
||||
SERVICE_NAME="solacescanscout-frontend"
|
||||
APP_ROOT="/opt/solacescanscout/frontend"
|
||||
PROXMOX_R630_02="${PROXMOX_HOST_R630_02:-192.168.11.12}"
|
||||
@@ -53,7 +54,7 @@ push_into_vmid() {
|
||||
local destination_path="$2"
|
||||
local perms="${3:-0644}"
|
||||
|
||||
if [[ -f /proc/1/cgroup ]] && grep -q "lxc" /proc/1/cgroup 2>/dev/null; then
|
||||
if [[ "$FORCE_REMOTE_PCT" != "1" ]] && [[ -f /proc/1/cgroup ]] && grep -q "lxc" /proc/1/cgroup 2>/dev/null; then
|
||||
install -D -m "$perms" "$source_path" "$destination_path"
|
||||
elif command -v pct >/dev/null 2>&1; then
|
||||
pct push "$VMID" "$source_path" "$destination_path" --perms "$perms"
|
||||
@@ -68,7 +69,7 @@ push_into_vmid() {
|
||||
run_in_vmid() {
|
||||
local command="$1"
|
||||
|
||||
if [[ -f /proc/1/cgroup ]] && grep -q "lxc" /proc/1/cgroup 2>/dev/null; then
|
||||
if [[ "$FORCE_REMOTE_PCT" != "1" ]] && [[ -f /proc/1/cgroup ]] && grep -q "lxc" /proc/1/cgroup 2>/dev/null; then
|
||||
bash -lc "$command"
|
||||
elif command -v pct >/dev/null 2>&1; then
|
||||
pct exec "$VMID" -- bash -lc "$command"
|
||||
|
||||
@@ -13,9 +13,15 @@ if [ "$EUID" -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
DB_USER="explorer"
|
||||
DB_PASSWORD="***REDACTED-LEGACY-PW***"
|
||||
DB_NAME="explorer"
|
||||
DB_USER="${DB_USER:-explorer}"
|
||||
DB_NAME="${DB_NAME:-explorer}"
|
||||
if [ -z "${DB_PASSWORD:-}" ]; then
|
||||
echo "ERROR: DB_PASSWORD environment variable must be set before running this script." >&2
|
||||
echo "Generate a strong value (e.g. openssl rand -base64 32) and export it:" >&2
|
||||
echo " export DB_PASSWORD='<strong random password>'" >&2
|
||||
echo " sudo -E bash scripts/setup-database.sh" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Creating database user: $DB_USER"
|
||||
echo "Creating database: $DB_NAME"
|
||||
|
||||
Reference in New Issue
Block a user