Compare commits
25 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e1cb855529 | |||
| 51e9e5e42f | |||
| e27439e491 | |||
| cf8c5c9a04 | |||
| c7c0aa8cf5 | |||
| 538b939f9e | |||
| d61e661099 | |||
| 81046a186f | |||
| ab9d9301f0 | |||
| ffc8af562a | |||
| a308fc8bbc | |||
| b6c8fe5a89 | |||
| b1cfaa1046 | |||
| 2f0e291b29 | |||
| db2db5095b | |||
| 79f1f62318 | |||
| d8717fd613 | |||
| f8a213a3bf | |||
| f90d319eeb | |||
| 27ab105325 | |||
| 5aaec1b18a | |||
| 8c7648781e | |||
| 46815e681c | |||
| a888624f38 | |||
| 191ef0a55f |
@@ -2,7 +2,9 @@ name: Lint
|
|||||||
|
|
||||||
# theta-env has no app code of its own to unit-test (it orchestrates the
|
# theta-env has no app code of its own to unit-test (it orchestrates the
|
||||||
# proxy/sso-manager-node submodules) -- this checks the one thing that can
|
# proxy/sso-manager-node submodules) -- this checks the one thing that can
|
||||||
# actually break silently: setup.sh and bootstrap.js.
|
# actually break silently: setup.sh and bootstrap.js, plus a static
|
||||||
|
# consistency check on the config bootstrap.js generates for jump-host
|
||||||
|
# (test/check_jump_ldap_tls.js).
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
@@ -39,3 +41,6 @@ jobs:
|
|||||||
|
|
||||||
- name: Syntax check
|
- name: Syntax check
|
||||||
run: node --check bootstrap/bootstrap.js
|
run: node --check bootstrap/bootstrap.js
|
||||||
|
|
||||||
|
- name: Jump-host LDAP config consistency
|
||||||
|
run: node test/check_jump_ldap_tls.js
|
||||||
|
|||||||
+142
@@ -10,6 +10,148 @@ for what changed inside the apps it composes.
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.17.0] - 2026-07-28
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- **proxy's host modal now has a footer (created/updated-by/on metadata) and a linkable `/hosts/{host}` URL**, migrated onto the same shared `app.modal` component as sso-manager-node's resource modal — continuing the entity-modal standardization across the stack.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **proxy: the Let's-Encrypt challenge-type/wildcard-matching visibility logic could stop reacting to the hostname field after the first Add/Edit host**, and **the SSO allow-list autocomplete could go empty starting on the second Add/Edit** — both were DOM-rebuild timing bugs in the same class as the resource-modal fixes already shipped.
|
||||||
|
- **sso-manager-node: the resource modal's "Associated LDAP Groups" autocomplete went empty after the first Add/Edit** — same DOM-rebuild timing bug, now fixed.
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- sso-manager-node -> [v1.8.1](https://github.com/theta42/sso-manager-node/releases/tag/v1.8.1)
|
||||||
|
- proxy -> [v1.6.0](https://github.com/theta42/proxy/releases/tag/v1.6.0)
|
||||||
|
|
||||||
|
## [1.16.0] - 2026-07-28
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- **"Quick Jump" copy-to-clipboard section on the jump-host dashboard** — one-click-copy SSH commands (interactive-picker mode, plus a per-host `uid_-_target` grammar-mode command) instead of having to remember/reconstruct the format by hand.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **jump-host audit records for a failed downstream connection only ever said `upstream-unreachable`**, with no way to tell a network-layer failure from an auth failure — the real error (ECONNREFUSED, ETIMEDOUT, an ssh2 auth-failure message, etc.) is now captured and shown as a tooltip on the audit table's fail badge.
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- jump-host -> [v1.9.0](https://github.com/theta42/jump-host/releases/tag/v1.9.0)
|
||||||
|
|
||||||
|
## [1.15.0] - 2026-07-28
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **sso-manager's Directory data (every site/host/service/oauth-client resource and their relationships/LDAP-group associations) had no persistent volume** — `@simpleworkjs/orm` fell back to `./config/inventory.sqlite` (relative to the app's `/app` cwd) whenever `conf.orm` wasn't set, which sits in the container's ephemeral writable layer, not any mounted volume. Every container recreate (`docker compose up --build`, `down`/`up`, an image rebuild) silently wiped the entire Directory Management page. `setup.sh`'s generated `sso-secrets.js` (and the example template) now set `orm: { dialect: 'sqlite', storage: '/data/inventory.sqlite' }`, co-locating it with the already-persisted `sso-data` volume (where Redis lives). **Existing deployments**: this repo doesn't rewrite an operator's existing `config/sso-secrets.js` (re-running `setup.sh` leaves it untouched by design) — add the `orm` block above manually, and copy the container's current `/app/config/inventory.sqlite` to `/data/inventory.sqlite` *before* recreating the container, or the existing Directory data will be lost on the next recreate instead of migrated.
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- sso-manager-node -> [v1.8.0](https://github.com/theta42/sso-manager-node/releases/tag/v1.8.0)
|
||||||
|
|
||||||
|
## [1.14.0] - 2026-07-28
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **jump-host's Redis had zero persistence** (`--save '' --appendonly no`, no data-dir volume) — every container rebuild/recreation (including a `setup.sh` re-run) silently wiped all sessions, in-flight OAuth logins, and any admin-created API token. This is the root cause of the reported "re-running setup.sh breaks OAuth with jump" — the jump-host container gets recreated, and any token or in-flight login vanished with it, while proxy was unaffected because its Redis was already persisted. Now jump-host's Redis persists (AOF + periodic RDB) to `/data`, mounted as a new named volume, `jump-redis-data`. Verified live: minted a PAT, force-recreated the container, confirmed the same PAT still authenticated afterward.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- `docker-compose.yml`: added the `jump-redis-data` volume, mounted at `/data` on the `jump-host` service.
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- jump-host -> [v1.8.1](https://github.com/theta42/jump-host/releases/tag/v1.8.1)
|
||||||
|
|
||||||
|
## [1.13.0] - 2026-07-28
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
Found via feedback on a fresh install:
|
||||||
|
- **jump-host's OAuth client had no parent in the Directory.** `seedDirectory()` only ever linked the proxy's OAuth client; jump-host's own (minted by `provisionJumpHost`) was created but never passed through, so it never got a `ResourceEdge`. Existing deployments self-heal on the next `setup.sh` run.
|
||||||
|
- **TUI-mode SSH connections (bare `ssh user@host`) could drop** with "PTY allocation request failed" / "shell request failed" — a session-listener race in jump-host, same class of bug `runGrammar` already had a fix for.
|
||||||
|
- **Every form submit briefly showed literal HTML** instead of a loading spinner, across all three apps.
|
||||||
|
- **`POST /api/user/` and `PUT /api/user/password` had no success message** — a green notification with nothing in it right after adding a user.
|
||||||
|
- **The login page gave no explanation for why the user landed there** when redirected mid-OAuth-flow.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Directory: tree view is now the only view; clicking a resource's name opens its detail modal.**
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- sso-manager-node -> [v1.7.0](https://github.com/theta42/sso-manager-node/releases/tag/v1.7.0)
|
||||||
|
- proxy -> [v1.5.3](https://github.com/theta42/proxy/releases/tag/v1.5.3)
|
||||||
|
- jump-host -> [v1.8.0](https://github.com/theta42/jump-host/releases/tag/v1.8.0)
|
||||||
|
|
||||||
|
No `setup.sh` or compose change. Also confirmed (no fix needed): the Let's Encrypt ACME account key persists correctly across container rebuilds — `lua-resty-auto-ssl`'s Redis storage adapter writes through the bundled Redis, which is started with `--appendonly yes` into `/data`, mapped to the persisted `proxy-data` volume. Only an explicit `docker-compose down -v` / volume removal would lose it (which is also what's required, and expected, on a domain change).
|
||||||
|
|
||||||
|
## [1.12.0] - 2026-07-28
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- sso-manager-node -> [v1.6.3](https://github.com/theta42/sso-manager-node/releases/tag/v1.6.3) — fixes the root cause of a real "lost user" report: `routes/group.js` never invalidated the User cache on membership changes, so an account added to the `app_sso_service_account` marker group (which hides accounts from the Users page's People tab) could look like it had vanished for up to 5 minutes — and, separately, could be added to that group with no warning at all. Both fixed; see the linked release for detail.
|
||||||
|
|
||||||
|
No `setup.sh` or compose change.
|
||||||
|
|
||||||
|
## [1.11.0] - 2026-07-28
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- **`test/check_jump_ldap_tls.js`**, wired into the `Lint` workflow: a static consistency check on the jump-secrets.js template `bootstrap.js` generates, so the `ldap://` + `tlsOptions` mistake that broke every SSH login in 1.10.0 fails CI before it ever reaches a real deployment again.
|
||||||
|
- **A static "no native `alert()`/`confirm()`/`prompt()`" check** is now part of all three apps' own test suites (they block all further browser events on the page — see 1.9.0/1.10.0's release notes).
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- sso-manager-node -> [v1.6.2](https://github.com/theta42/sso-manager-node/releases/tag/v1.6.2) — fixes `DELETE /api/oauth/client/:id` (`client.remove is not a function`, a genuine 500 masked by tests that never checked the response status), plus the regression test above.
|
||||||
|
- proxy -> [v1.5.2](https://github.com/theta42/proxy/releases/tag/v1.5.2) — the regression test above.
|
||||||
|
- jump-host -> [v1.7.1](https://github.com/theta42/jump-host/releases/tag/v1.7.1) — the regression test above.
|
||||||
|
|
||||||
|
No `setup.sh` or compose change.
|
||||||
|
|
||||||
|
## [1.10.0] - 2026-07-27
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **`bootstrap/bootstrap.js`'s jump-secrets.js template now points jump-host at `ldaps://sso-manager:636`**, not `ldap://sso-manager:389`. The plain-port URL combined with jump-host's `tlsOptions` made `ldapts` attempt implicit TLS against a port serving plaintext LDAP — slapd dropped every connection before any LDAP message parsed, so SSH password login failed for every account, with any password, indistinguishable from a wrong credential. Root-caused by standing up a local jump-host, editing its config, and calling `getUser`/`checkPassword` directly inside the container. **Existing deployments must edit `./config/jump-secrets.js` themselves** (this template only affects fresh bootstraps) — see theta42/theta-env#99. Companion defensive fix: [simpleworkjs/ldap v1.0.2](https://github.com/simpleworkjs/ldap/releases/tag/v1.0.2) now rejects this `ldap://` + `tlsOptions` combination outright.
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- jump-host -> [v1.7.0](https://github.com/theta42/jump-host/releases/tag/v1.7.0) — adds self-service API tokens (create/list/rotate/revoke from its dashboard); jump-host previously had none.
|
||||||
|
|
||||||
|
No `setup.sh` or compose change.
|
||||||
|
|
||||||
|
## [1.9.0] - 2026-07-27
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- sso-manager-node -> [v1.6.1](https://github.com/theta42/sso-manager-node/releases/tag/v1.6.1)
|
||||||
|
- proxy -> [v1.5.1](https://github.com/theta42/proxy/releases/tag/v1.5.1)
|
||||||
|
|
||||||
|
Both apps had every native `alert()`/`confirm()` call removed, replaced by
|
||||||
|
`@simpleworkjs/frontend`'s `app.messages.action`/`confirm`/`toast` (the
|
||||||
|
same modules adopted in [1.8.0](#180---2026-07-27)). This was found live,
|
||||||
|
mid browser-verification of that release: clicking sso-manager-node
|
||||||
|
directory.ejs's "Rotate Client Secret" triggered a native `confirm()`,
|
||||||
|
which blocks all further browser events on the page — a real hazard for
|
||||||
|
anyone driving the app with browser automation, not just a cosmetic
|
||||||
|
inconsistency. sso-manager-node also dropped `app.user.remove`/
|
||||||
|
`app.oauthClient.remove` from `public/js/app.js` (dead code with a native
|
||||||
|
`confirm()` guard and zero callers).
|
||||||
|
|
||||||
|
No `setup.sh`, compose, or config change.
|
||||||
|
|
||||||
|
## [1.8.0] - 2026-07-27
|
||||||
|
|
||||||
|
### Bumped
|
||||||
|
- sso-manager-node -> [v1.6.0](https://github.com/theta42/sso-manager-node/releases/tag/v1.6.0)
|
||||||
|
- proxy -> [v1.5.0](https://github.com/theta42/proxy/releases/tag/v1.5.0)
|
||||||
|
- jump-host -> [v1.6.0](https://github.com/theta42/jump-host/releases/tag/v1.6.0)
|
||||||
|
|
||||||
|
All three apps adopt the newly published `@simpleworkjs/frontend` package's
|
||||||
|
`app.messages`, `app.modal`, and `app.validate` modules, replacing the
|
||||||
|
vendored `app.util.actionMessage`/`actionConfirm`/`alert` in
|
||||||
|
`public/lib/js/app-base.js` (byte-identical across all three apps) and the
|
||||||
|
vendored `public/lib/js/val.js` (byte-identical in sso-manager-node and
|
||||||
|
jump-host, and the same engine plus proxy-only DNS/hostname rules in proxy).
|
||||||
|
Message content is now HTML-escaped — the ad hoc `app.util.alert()` this
|
||||||
|
replaces had none — and `app.messages.action` falls back to a page-wide
|
||||||
|
toast when there's no inline `.actionMessage` target on the page. proxy's
|
||||||
|
`host`/`target`/`hostname` wildcard-DNS validation rules (mirroring
|
||||||
|
`utils/hostname_validate.js`) move to its own `public/js/app.js`, registered
|
||||||
|
via `$.validateSettings`, since they're proxy-specific and don't belong in
|
||||||
|
the shared package's generic rule set (`eq`/`user`/`password`/`ip`).
|
||||||
|
jump-host doesn't currently use any `[validate]` attributes, so its `val.js`
|
||||||
|
swap is dedup/future-proofing rather than a behavior change.
|
||||||
|
|
||||||
|
`app.api`/`app.auth`/`app.pubsub`/`app.socket` in each app's `app-base.js`
|
||||||
|
are untouched: they're app-specific (a dual-mode callback/promise API with
|
||||||
|
`auth-token` header injection) and not something the frontend package's
|
||||||
|
generic `app.js` provides, so it isn't loaded.
|
||||||
|
|
||||||
|
No `setup.sh`, compose, or config change.
|
||||||
|
|
||||||
## [1.7.0] - 2026-07-27
|
## [1.7.0] - 2026-07-27
|
||||||
|
|
||||||
### Bumped
|
### Bumped
|
||||||
|
|||||||
Vendored
+38
-17
@@ -334,7 +334,7 @@ const HOST_FACTS = {
|
|||||||
kernel: process.env.STACK_HOST_KERNEL || '',
|
kernel: process.env.STACK_HOST_KERNEL || '',
|
||||||
};
|
};
|
||||||
|
|
||||||
async function seedDirectory(token, clientId) {
|
async function seedDirectory(token, clientId, jumpClientId) {
|
||||||
let resources = ((await dirGet(token, 'resources')).results) || [];
|
let resources = ((await dirGet(token, 'resources')).results) || [];
|
||||||
|
|
||||||
// Create a resource unless its slug (or a legacy alternate from an earlier
|
// Create a resource unless its slug (or a legacy alternate from an earlier
|
||||||
@@ -420,9 +420,10 @@ async function seedDirectory(token, clientId) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Optional SSH jump host service.
|
// Optional SSH jump host service.
|
||||||
|
let jumpSvc = null;
|
||||||
if (/^(1|true|yes)$/i.test(process.env.CFG_JUMP_HOST_ENABLED || '')) {
|
if (/^(1|true|yes)$/i.test(process.env.CFG_JUMP_HOST_ENABLED || '')) {
|
||||||
const jumpHost = process.env.CFG_JUMP_HOST || (DOMAIN ? `jump.${DOMAIN}` : '');
|
const jumpHost = process.env.CFG_JUMP_HOST || (DOMAIN ? `jump.${DOMAIN}` : '');
|
||||||
await ensure('service', 'SSH Jump Host', 'jump-host', host.id, {
|
jumpSvc = await ensure('service', 'SSH Jump Host', 'jump-host', host.id, {
|
||||||
address: jumpHost ? `https://${jumpHost}` : '',
|
address: jumpHost ? `https://${jumpHost}` : '',
|
||||||
port: 3002,
|
port: 3002,
|
||||||
gitRepo: 'https://github.com/theta42/jump-host',
|
gitRepo: 'https://github.com/theta42/jump-host',
|
||||||
@@ -430,19 +431,21 @@ async function seedDirectory(token, clientId) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Link the proxy's OAuth client (Resource-backed since sso-manager 1.3.0)
|
// Link an OAuth client (Resource-backed since sso-manager 1.3.0) under its
|
||||||
// under its service, if it appears in the directory and isn't linked yet.
|
// owning service, if it appears in the directory and isn't linked yet.
|
||||||
if (clientId) {
|
async function linkOauthClient(id, parent, label) {
|
||||||
const oauthRes = resources.find((r) => r.id === clientId);
|
if (!id || !parent) return;
|
||||||
if (oauthRes) {
|
const oauthRes = resources.find((r) => r.id === id);
|
||||||
const edges = ((await dirGet(token, 'edges')).results) || [];
|
if (!oauthRes) return;
|
||||||
const linked = edges.some((e) => e.childId === clientId);
|
const edges = ((await dirGet(token, 'edges')).results) || [];
|
||||||
if (!linked) {
|
const linked = edges.some((e) => e.childId === id);
|
||||||
await dirPost(token, 'edges', { parentId: psvc.id, childId: clientId, relation: 'oauth' });
|
if (!linked) {
|
||||||
log(` directory: linked OAuth client under 'proxy'`);
|
await dirPost(token, 'edges', { parentId: parent.id, childId: id, relation: 'oauth' });
|
||||||
}
|
log(` directory: linked OAuth client under '${label}'`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await linkOauthClient(clientId, psvc, 'proxy');
|
||||||
|
await linkOauthClient(jumpClientId, jumpSvc, 'jump-host');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write the OAuth client creds back into /config/proxy-secrets.js so the proxy
|
// Write the OAuth client creds back into /config/proxy-secrets.js so the proxy
|
||||||
@@ -527,7 +530,16 @@ function writeJumpSecrets(apiToken, oidc, localAdminPass) {
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
\tname: ${JSON.stringify(sso.name || 'SSO Manager')},
|
\tname: ${JSON.stringify(sso.name || 'SSO Manager')},
|
||||||
\tldap: {
|
\tldap: {
|
||||||
\t\turl: 'ldap://sso-manager:389',
|
\t\t// ldaps:// (636), not ldap:// (389): @simpleworkjs/ldap's client always
|
||||||
|
\t\t// sets tlsOptions (see jump-host's models/user_ldap.js), and ldapts
|
||||||
|
\t\t// treats a non-empty tlsOptions as "use implicit TLS" regardless of the
|
||||||
|
\t\t// URL scheme -- pointed at the plain port, that means it opens a raw TLS
|
||||||
|
\t\t// handshake against a server expecting plaintext LDAP, which slapd just
|
||||||
|
\t\t// drops (logged as "connection lost", no BIND ever attempted). This bit
|
||||||
|
\t\t// jump-host silently: every SSH login failed with the generic
|
||||||
|
\t\t// "Permission denied" for any password, because getUser()/checkPassword()
|
||||||
|
\t\t// never even reached slapd.
|
||||||
|
\t\turl: 'ldaps://sso-manager:636',
|
||||||
\t\tbindDN: ${JSON.stringify(BIND_DN)},
|
\t\tbindDN: ${JSON.stringify(BIND_DN)},
|
||||||
\t\tbindPassword: ${JSON.stringify(ADMIN_PASS)},
|
\t\tbindPassword: ${JSON.stringify(ADMIN_PASS)},
|
||||||
\t\tuserBase: ${JSON.stringify(`ou=people,${BASE_DN}`)},
|
\t\tuserBase: ${JSON.stringify(`ou=people,${BASE_DN}`)},
|
||||||
@@ -573,10 +585,17 @@ module.exports = {
|
|||||||
fs.writeFileSync(JUMP_SECRETS, body, { mode: 0o600 });
|
fs.writeFileSync(JUMP_SECRETS, body, { mode: 0o600 });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Returns the jump host's OAuth client id (so seedDirectory can link it under
|
||||||
|
// the SSH Jump Host service), whether or not this run actually wrote a fresh
|
||||||
|
// jump-secrets.js -- otherwise re-runs on an already-configured deployment
|
||||||
|
// never get a chance to self-heal a missing directory link (see the "no
|
||||||
|
// parent" bug this was written for).
|
||||||
async function provisionJumpHost(token) {
|
async function provisionJumpHost(token) {
|
||||||
if (jumpFileComplete()) {
|
if (jumpFileComplete()) {
|
||||||
log('Jump host: /config/jump-secrets.js already has API token + OIDC client — keeping.');
|
log('Jump host: /config/jump-secrets.js already has API token + OIDC client — keeping.');
|
||||||
return;
|
const clients = await listClients(token);
|
||||||
|
const existing = clients.find((c) => c.name === JUMP_CLIENT_NAME);
|
||||||
|
return existing ? existing.client_id : null;
|
||||||
}
|
}
|
||||||
const apiToken = await mintApiToken(token, JUMP_TOKEN_NAME);
|
const apiToken = await mintApiToken(token, JUMP_TOKEN_NAME);
|
||||||
|
|
||||||
@@ -598,6 +617,7 @@ async function provisionJumpHost(token) {
|
|||||||
writeJumpSecrets(apiToken, oidc, localAdminPass);
|
writeJumpSecrets(apiToken, oidc, localAdminPass);
|
||||||
log(`Jump host: wrote /config/jump-secrets.js (API token + OAuth client ${oidc.id}).`);
|
log(`Jump host: wrote /config/jump-secrets.js (API token + OAuth client ${oidc.id}).`);
|
||||||
log(`Jump host: local admin 'jumpadmin' password: ${localAdminPass}`);
|
log(`Jump host: local admin 'jumpadmin' password: ${localAdminPass}`);
|
||||||
|
return oidc.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
(async function main() {
|
(async function main() {
|
||||||
@@ -645,9 +665,10 @@ async function provisionJumpHost(token) {
|
|||||||
|
|
||||||
// Provision the jump host (mint token + write config) when enabled.
|
// Provision the jump host (mint token + write config) when enabled.
|
||||||
// Warn-only — never fail the whole bring-up over the optional service.
|
// Warn-only — never fail the whole bring-up over the optional service.
|
||||||
|
let jumpClientId = null;
|
||||||
if (JUMP_ENABLED) {
|
if (JUMP_ENABLED) {
|
||||||
try {
|
try {
|
||||||
await provisionJumpHost(token);
|
jumpClientId = await provisionJumpHost(token);
|
||||||
out('JUMP_HOST_CONFIGURED', '1');
|
out('JUMP_HOST_CONFIGURED', '1');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(`WARNING: jump host provisioning failed (${e.message || e}) — continuing`);
|
log(`WARNING: jump host provisioning failed (${e.message || e}) — continuing`);
|
||||||
@@ -658,7 +679,7 @@ async function provisionJumpHost(token) {
|
|||||||
// fails the bootstrap — warn and continue.
|
// fails the bootstrap — warn and continue.
|
||||||
try {
|
try {
|
||||||
log('Seeding directory resources...');
|
log('Seeding directory resources...');
|
||||||
await seedDirectory(token, resolvedClientId);
|
await seedDirectory(token, resolvedClientId, jumpClientId);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(`WARNING: directory seed failed (${e.message || e}) — continuing`);
|
log(`WARNING: directory seed failed (${e.message || e}) — continuing`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,16 @@ module.exports = {
|
|||||||
jwtSecret: 'CHANGE-ME', // signs all tokens — keep secret
|
jwtSecret: 'CHANGE-ME', // signs all tokens — keep secret
|
||||||
token_lifetime: { access_token: 3600, refresh_token: 2592000 },
|
token_lifetime: { access_token: 3600, refresh_token: 2592000 },
|
||||||
},
|
},
|
||||||
|
// Without this, @simpleworkjs/orm falls back to './config/inventory.sqlite'
|
||||||
|
// (relative to the app's /app cwd) -- inside the container's ephemeral
|
||||||
|
// layer, not any mounted volume, so every Resource/site/host/service/oauth
|
||||||
|
// row (the whole Directory Management page) would be silently wiped on
|
||||||
|
// every container recreate. /data is already a persisted volume (Redis
|
||||||
|
// lives there too), so this just co-locates the sqlite file with it.
|
||||||
|
orm: {
|
||||||
|
dialect: 'sqlite',
|
||||||
|
storage: '/data/inventory.sqlite',
|
||||||
|
},
|
||||||
|
|
||||||
// ── Orchestrator-only (ignored by the app; read by setup.sh + bootstrap) ──
|
// ── Orchestrator-only (ignored by the app; read by setup.sh + bootstrap) ──
|
||||||
stack: {
|
stack: {
|
||||||
|
|||||||
+34
-1
@@ -36,6 +36,12 @@ services:
|
|||||||
# setup.sh sets this from the host, where the submodule resolves
|
# setup.sh sets this from the host, where the submodule resolves
|
||||||
# correctly (git -C sso-manager-node rev-parse --short HEAD).
|
# correctly (git -C sso-manager-node rev-parse --short HEAD).
|
||||||
GIT_COMMIT: ${SSO_GIT_COMMIT:-}
|
GIT_COMMIT: ${SSO_GIT_COMMIT:-}
|
||||||
|
# Optional upstream HTTP(S) proxy for npm/apt during the build (NOT
|
||||||
|
# the theta42 "proxy" app). Set CFG_HTTP_PROXY in setup.env; empty by
|
||||||
|
# default, so this is a no-op unless configured.
|
||||||
|
HTTP_PROXY: ${CFG_HTTP_PROXY:-}
|
||||||
|
HTTPS_PROXY: ${CFG_HTTPS_PROXY:-}
|
||||||
|
NO_PROXY: ${CFG_NO_PROXY:-}
|
||||||
container_name: sso-manager
|
container_name: sso-manager
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks: [theta-net]
|
networks: [theta-net]
|
||||||
@@ -58,6 +64,11 @@ services:
|
|||||||
- NODE_PORT=3001
|
- NODE_PORT=3001
|
||||||
- LDAP_SERVER_ID=${LDAP_SERVER_ID:-}
|
- LDAP_SERVER_ID=${LDAP_SERVER_ID:-}
|
||||||
- LDAP_REPLICATION_HOSTS=${LDAP_REPLICATION_HOSTS:-}
|
- LDAP_REPLICATION_HOSTS=${LDAP_REPLICATION_HOSTS:-}
|
||||||
|
# Optional upstream HTTP(S) proxy for outbound calls (SMTP, etc.) at
|
||||||
|
# runtime. See the build args above for the same setting during build.
|
||||||
|
- HTTP_PROXY=${CFG_HTTP_PROXY:-}
|
||||||
|
- HTTPS_PROXY=${CFG_HTTPS_PROXY:-}
|
||||||
|
- NO_PROXY=${CFG_NO_PROXY:-}
|
||||||
volumes:
|
volumes:
|
||||||
# Operator-edited SSO secrets (sso-secrets.js). Read-WRITE so the bootstrap
|
# Operator-edited SSO secrets (sso-secrets.js). Read-WRITE so the bootstrap
|
||||||
# can write the generated OAuth client creds into proxy-secrets.js. The
|
# can write the generated OAuth client creds into proxy-secrets.js. The
|
||||||
@@ -91,6 +102,11 @@ services:
|
|||||||
# setup.sh sets this from the host, where the submodule resolves
|
# setup.sh sets this from the host, where the submodule resolves
|
||||||
# correctly (git -C proxy rev-parse --short HEAD).
|
# correctly (git -C proxy rev-parse --short HEAD).
|
||||||
GIT_COMMIT: ${PROXY_GIT_COMMIT:-}
|
GIT_COMMIT: ${PROXY_GIT_COMMIT:-}
|
||||||
|
# Optional upstream HTTP(S) proxy for npm/apt during the build. See
|
||||||
|
# the sso-manager service above for details.
|
||||||
|
HTTP_PROXY: ${CFG_HTTP_PROXY:-}
|
||||||
|
HTTPS_PROXY: ${CFG_HTTPS_PROXY:-}
|
||||||
|
NO_PROXY: ${CFG_NO_PROXY:-}
|
||||||
container_name: proxy
|
container_name: proxy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks: [theta-net]
|
networks: [theta-net]
|
||||||
@@ -110,6 +126,11 @@ services:
|
|||||||
# not from env. NODE_ENV/NODE_PORT are process env the app reads directly.
|
# not from env. NODE_ENV/NODE_PORT are process env the app reads directly.
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- NODE_PORT=3000
|
- NODE_PORT=3000
|
||||||
|
# Optional upstream HTTP(S) proxy for outbound calls (ACME/Let's
|
||||||
|
# Encrypt, DNS providers) at runtime.
|
||||||
|
- HTTP_PROXY=${CFG_HTTP_PROXY:-}
|
||||||
|
- HTTPS_PROXY=${CFG_HTTPS_PROXY:-}
|
||||||
|
- NO_PROXY=${CFG_NO_PROXY:-}
|
||||||
volumes:
|
volumes:
|
||||||
# Operator-edited proxy secrets (proxy-secrets.js). READ-ONLY — the proxy
|
# Operator-edited proxy secrets (proxy-secrets.js). READ-ONLY — the proxy
|
||||||
# only reads it; the sso-manager bootstrap writes the OAuth creds. The
|
# only reads it; the sso-manager bootstrap writes the OAuth creds. The
|
||||||
@@ -142,6 +163,11 @@ services:
|
|||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
GIT_COMMIT: ${JUMP_GIT_COMMIT:-}
|
GIT_COMMIT: ${JUMP_GIT_COMMIT:-}
|
||||||
|
# Optional upstream HTTP(S) proxy for npm/apt during the build. See
|
||||||
|
# the sso-manager service above for details.
|
||||||
|
HTTP_PROXY: ${CFG_HTTP_PROXY:-}
|
||||||
|
HTTPS_PROXY: ${CFG_HTTPS_PROXY:-}
|
||||||
|
NO_PROXY: ${CFG_NO_PROXY:-}
|
||||||
container_name: jump-host
|
container_name: jump-host
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks: [theta-net]
|
networks: [theta-net]
|
||||||
@@ -153,9 +179,15 @@ services:
|
|||||||
- "${JUMP_WEB_BIND:-0.0.0.0}:${JUMP_WEB_PORT:-3002}:3002" # web UI/API
|
- "${JUMP_WEB_BIND:-0.0.0.0}:${JUMP_WEB_PORT:-3002}:3002" # web UI/API
|
||||||
environment:
|
environment:
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
|
# Optional upstream HTTP(S) proxy for outbound calls (the directory API
|
||||||
|
# client) at runtime.
|
||||||
|
- HTTP_PROXY=${CFG_HTTP_PROXY:-}
|
||||||
|
- HTTPS_PROXY=${CFG_HTTPS_PROXY:-}
|
||||||
|
- NO_PROXY=${CFG_NO_PROXY:-}
|
||||||
volumes:
|
volumes:
|
||||||
- ./config:/config:ro # jump-secrets.js (written by ensure_config/bootstrap)
|
- ./config:/config:ro # jump-secrets.js (written by ensure_config/bootstrap)
|
||||||
- jump-data:/var/lib/jump-host # generated host keys persist here
|
- jump-data:/var/lib/jump-host # generated host keys persist here
|
||||||
|
- jump-redis-data:/data # Redis (sessions, OAuth state, API tokens) persists here
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
theta-net:
|
theta-net:
|
||||||
@@ -168,4 +200,5 @@ volumes:
|
|||||||
proxy-data:
|
proxy-data:
|
||||||
proxy-cache:
|
proxy-cache:
|
||||||
proxy-logs:
|
proxy-logs:
|
||||||
jump-data:
|
jump-data:
|
||||||
|
jump-redis-data:
|
||||||
+1
-1
Submodule jump-host updated: fd863b89ca...8a76f71edd
+1
-1
Submodule proxy updated: 75045b4b33...130d4a2c9b
@@ -49,6 +49,19 @@ CFG_DOMAIN=example.com
|
|||||||
# under an OU-style prefix). Leave unset to use the DN built from CFG_DOMAIN:
|
# under an OU-style prefix). Leave unset to use the DN built from CFG_DOMAIN:
|
||||||
#CFG_BASE_DN=dc=example,dc=com
|
#CFG_BASE_DN=dc=example,dc=com
|
||||||
|
|
||||||
|
# ── Optional outbound HTTP(S) proxy ──────────────────────────────────────────
|
||||||
|
# For an isolated/offline/corporate-network test host that only reaches the
|
||||||
|
# internet through an upstream HTTP proxy — NOT the theta42 "proxy" app.
|
||||||
|
# Wired into every service's docker build (npm/apt) AND its running container
|
||||||
|
# (SMTP, ACME/Let's Encrypt, DNS provider calls, the jump-host directory API
|
||||||
|
# client). Leave unset to disable (the default); CFG_HTTPS_PROXY falls back to
|
||||||
|
# CFG_HTTP_PROXY if unset, and CFG_NO_PROXY defaults to covering the stack's
|
||||||
|
# own internal service names so container-to-container traffic never goes
|
||||||
|
# through the proxy.
|
||||||
|
#CFG_HTTP_PROXY=http://proxy.example.com:3128
|
||||||
|
#CFG_HTTPS_PROXY=http://proxy.example.com:3128
|
||||||
|
#CFG_NO_PROXY=localhost,127.0.0.1,sso-manager,proxy,jump-host
|
||||||
|
|
||||||
# Optional — sensible defaults if left blank:
|
# Optional — sensible defaults if left blank:
|
||||||
#CFG_ORG=SSO Manager # app display name + outbound email org
|
#CFG_ORG=SSO Manager # app display name + outbound email org
|
||||||
#CFG_ADMIN_UID=admin # initial SSO admin username
|
#CFG_ADMIN_UID=admin # initial SSO admin username
|
||||||
|
|||||||
@@ -165,6 +165,22 @@ export CFG_JUMP_HOST_ENABLED CFG_JUMP_HOST
|
|||||||
# When enabled, activate the compose profile so `up`/`ps` include the service.
|
# When enabled, activate the compose profile so `up`/`ps` include the service.
|
||||||
if [[ "$JUMP_ENABLED" == "1" ]]; then export COMPOSE_PROFILES="jump-host"; fi
|
if [[ "$JUMP_ENABLED" == "1" ]]; then export COMPOSE_PROFILES="jump-host"; fi
|
||||||
|
|
||||||
|
# ── Optional outbound HTTP(S) proxy for docker build + the running containers ─
|
||||||
|
# CFG_HTTP_PROXY / CFG_HTTPS_PROXY / CFG_NO_PROXY (from ./setup.env or the
|
||||||
|
# environment) — NOT the theta42 "proxy" app; this is an upstream HTTP proxy
|
||||||
|
# for reaching the internet (npm/apt during image builds, and SMTP/ACME/DNS
|
||||||
|
# provider calls at runtime), useful on isolated/offline/corporate-network
|
||||||
|
# test hosts. Off by default. docker-compose.yml passes these through as both
|
||||||
|
# build args (Docker also recognizes them as predefined build ARGs) and
|
||||||
|
# container environment on every service, so one setup.env entry covers the
|
||||||
|
# whole stack.
|
||||||
|
export CFG_HTTP_PROXY="${CFG_HTTP_PROXY:-}"
|
||||||
|
export CFG_HTTPS_PROXY="${CFG_HTTPS_PROXY:-${CFG_HTTP_PROXY:-}}"
|
||||||
|
export CFG_NO_PROXY="${CFG_NO_PROXY:-localhost,127.0.0.1,sso-manager,proxy,jump-host}"
|
||||||
|
if [[ -n "$CFG_HTTP_PROXY" ]]; then
|
||||||
|
info "Using HTTP proxy for docker build + containers: $CFG_HTTP_PROXY"
|
||||||
|
fi
|
||||||
|
|
||||||
# ── 1. Update submodules to their latest release tag, verify build contexts ───
|
# ── 1. Update submodules to their latest release tag, verify build contexts ───
|
||||||
# Submodules track release tags (vX.Y.Z), not the tip of master -- so
|
# Submodules track release tags (vX.Y.Z), not the tip of master -- so
|
||||||
# "update" means "move to the newest tag", not "move to the newest commit".
|
# "update" means "move to the newest tag", not "move to the newest commit".
|
||||||
@@ -276,6 +292,16 @@ module.exports = {
|
|||||||
jwtSecret: $(js_str "$CFG_JWT_SECRET"),
|
jwtSecret: $(js_str "$CFG_JWT_SECRET"),
|
||||||
token_lifetime: { access_token: 3600, refresh_token: 2592000 },
|
token_lifetime: { access_token: 3600, refresh_token: 2592000 },
|
||||||
},
|
},
|
||||||
|
// Without this, @simpleworkjs/orm falls back to './config/inventory.sqlite'
|
||||||
|
// relative to the app's /app cwd -- inside the container's ephemeral layer,
|
||||||
|
// not any mounted volume -- so every Resource/site/host/service/oauth row
|
||||||
|
// (the whole Directory Management page) would be silently wiped on every
|
||||||
|
// container recreate. /data is already a persisted volume (Redis lives
|
||||||
|
// there too), so this just co-locates the sqlite file with it.
|
||||||
|
orm: {
|
||||||
|
dialect: 'sqlite',
|
||||||
|
storage: '/data/inventory.sqlite',
|
||||||
|
},
|
||||||
|
|
||||||
// ── Orchestrator-only (ignored by the app) ───────────────────────────────
|
// ── Orchestrator-only (ignored by the app) ───────────────────────────────
|
||||||
stack: {
|
stack: {
|
||||||
|
|||||||
+1
-1
Submodule sso-manager-node updated: 5665504bc1...b54da5c64c
@@ -0,0 +1,66 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
// Regression guard for bootstrap.js's generated jump-secrets.js template:
|
||||||
|
// its ldap block must use ldaps:// (implicit TLS, :636), never ldap:// (:389),
|
||||||
|
// as long as tlsOptions is set alongside it.
|
||||||
|
//
|
||||||
|
// ldapts treats a non-empty tlsOptions as "use implicit TLS" regardless of URL
|
||||||
|
// scheme, and jump-host's LDAP client always sets tlsOptions -- so ldap://
|
||||||
|
// + tlsOptions opens a raw TLS handshake against a port serving plaintext
|
||||||
|
// LDAP. The server silently drops the connection before any LDAP message
|
||||||
|
// parses, and every operation (getUser, checkPassword, ...) then fails
|
||||||
|
// identically -- indistinguishable from a wrong password. This shipped once
|
||||||
|
// (every SSH login to jump-host failed, for any account, any password) before
|
||||||
|
// being root-caused against a real deployment. Static, not a require()+exec
|
||||||
|
// of bootstrap.js, because bootstrap.js is a self-running provisioning script
|
||||||
|
// with real side effects (LDAP writes, API calls), not a library.
|
||||||
|
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
|
const BOOTSTRAP_PATH = path.join(__dirname, '..', 'bootstrap', 'bootstrap.js');
|
||||||
|
const src = fs.readFileSync(BOOTSTRAP_PATH, 'utf8');
|
||||||
|
|
||||||
|
// Isolate the generated jump-secrets.js template (the backtick string
|
||||||
|
// assigned to `body` inside writeJumpSecrets) rather than scanning the whole
|
||||||
|
// file, so this only ever looks at what's actually written to the deployed
|
||||||
|
// config -- not, say, a comment or an unrelated ldap:// URL elsewhere.
|
||||||
|
// bootstrap.js's own source has literal backslash-t escape sequences inside
|
||||||
|
// the backtick string (they only become real tabs when the template
|
||||||
|
// literal is actually evaluated) -- so these patterns match `\t` as two
|
||||||
|
// literal characters, not a real tab byte.
|
||||||
|
const bodyMatch = /const body = `([\s\S]*?)`;\n\tfs\.writeFileSync\(JUMP_SECRETS/.exec(src);
|
||||||
|
if (!bodyMatch) {
|
||||||
|
console.error('check_jump_ldap_tls: could not locate the jump-secrets.js template in bootstrap.js — did writeJumpSecrets change shape?');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
const template = bodyMatch[1];
|
||||||
|
|
||||||
|
// Bounded by the next top-level key (sso:) rather than the ldap block's own
|
||||||
|
// closing brace, which is more robust to exactly how it's indented/escaped.
|
||||||
|
const ldapBlockMatch = /ldap:\s*\{([\s\S]*?)\\tsso:\s*\{/.exec(template);
|
||||||
|
if (!ldapBlockMatch) {
|
||||||
|
console.error('check_jump_ldap_tls: could not find the ldap: {...} block in the jump-secrets.js template.');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
const ldapBlock = ldapBlockMatch[1];
|
||||||
|
|
||||||
|
const hasTlsOptions = /tlsOptions\s*:/.test(ldapBlock);
|
||||||
|
const urlMatch = /url:\s*'([^']+)'/.exec(ldapBlock);
|
||||||
|
const url = urlMatch ? urlMatch[1] : null;
|
||||||
|
|
||||||
|
if (!url) {
|
||||||
|
console.error('check_jump_ldap_tls: no url found in the ldap block.');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasTlsOptions && !url.startsWith('ldaps://')) {
|
||||||
|
console.error(
|
||||||
|
`check_jump_ldap_tls: jump-secrets.js template sets tlsOptions but url is "${url}" (not ldaps://). ` +
|
||||||
|
'This is the exact bug that broke every SSH login to jump-host -- see the comment above this check.'
|
||||||
|
);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`check_jump_ldap_tls: OK (url=${url}, tlsOptions=${hasTlsOptions})`);
|
||||||
Reference in New Issue
Block a user