@qodalis/cli-server-node 1.0.0-beta.11 → 1.0.0-beta.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +67 -1
- package/dist/package.json +1 -1
- package/dist/src/auth/cli-server-auth.d.ts +21 -1
- package/dist/src/auth/cli-server-auth.d.ts.map +1 -1
- package/dist/src/auth/cli-server-auth.js.map +1 -1
- package/dist/src/auth/index.d.ts +1 -1
- package/dist/src/auth/index.d.ts.map +1 -1
- package/dist/src/auth/index.js.map +1 -1
- package/dist/src/create-cli-server.d.ts +7 -1
- package/dist/src/create-cli-server.d.ts.map +1 -1
- package/dist/src/create-cli-server.js +9 -2
- package/dist/src/create-cli-server.js.map +1 -1
- package/dist/src/extensions/cli-builder.d.ts +7 -0
- package/dist/src/extensions/cli-builder.d.ts.map +1 -1
- package/dist/src/extensions/cli-builder.js +6 -0
- package/dist/src/extensions/cli-builder.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/services/cli-event-socket-manager.d.ts +3 -1
- package/dist/src/services/cli-event-socket-manager.d.ts.map +1 -1
- package/dist/src/services/cli-event-socket-manager.js +9 -3
- package/dist/src/services/cli-event-socket-manager.js.map +1 -1
- package/dist/src/services/cli-log-socket-manager.d.ts +8 -1
- package/dist/src/services/cli-log-socket-manager.d.ts.map +1 -1
- package/dist/src/services/cli-log-socket-manager.js +13 -3
- package/dist/src/services/cli-log-socket-manager.js.map +1 -1
- package/dist/src/services/cli-shell-options.d.ts +8 -0
- package/dist/src/services/cli-shell-options.d.ts.map +1 -1
- package/dist/src/services/cli-shell-options.js +9 -0
- package/dist/src/services/cli-shell-options.js.map +1 -1
- package/dist/src/services/cli-shell-session-manager.d.ts.map +1 -1
- package/dist/src/services/cli-shell-session-manager.js +1 -1
- package/dist/src/services/cli-shell-session-manager.js.map +1 -1
- package/dist/src/services/session-bound-sockets.d.ts +32 -5
- package/dist/src/services/session-bound-sockets.d.ts.map +1 -1
- package/dist/src/services/session-bound-sockets.js +54 -9
- package/dist/src/services/session-bound-sockets.js.map +1 -1
- package/package.json +8 -8
package/README.md
CHANGED
|
@@ -337,7 +337,7 @@ createCliServer({
|
|
|
337
337
|
| `maxSessions` | `20` | Total concurrent shells |
|
|
338
338
|
| `idleTimeoutMs` | 15 min | Close after no stdin (`0` = off) |
|
|
339
339
|
| `maxDurationMs` | none | Absolute session limit |
|
|
340
|
-
| `sessionCheckIntervalMs` | `30000` | Users-mode re-check (max 60000) |
|
|
340
|
+
| `sessionCheckIntervalMs` | `30000` | Users-mode re-check (max 60000); also re-checks events/logs sockets opened through an external auth adapter, whether or not the shell is enabled |
|
|
341
341
|
| `cwd`, `shell` | home dir, detected | Working directory and shell binary |
|
|
342
342
|
| `env` | `{}` | `{ allow: string[], set: Record<string, string> }` |
|
|
343
343
|
|
|
@@ -354,6 +354,68 @@ createCliServer({
|
|
|
354
354
|
| 4429 | too many shell sessions |
|
|
355
355
|
| 1001 | server shutdown |
|
|
356
356
|
|
|
357
|
+
## Use with your app's sign-in
|
|
358
|
+
|
|
359
|
+
When your application already signs users in (cookies, JWT, an identity provider), the users plugin can take its users from your app instead of its own logins. The browser terminal, the MCP endpoint and the admin dashboard then all use your session.
|
|
360
|
+
|
|
361
|
+
```typescript
|
|
362
|
+
import express from 'express';
|
|
363
|
+
import http from 'http';
|
|
364
|
+
import { createCliServer } from '@qodalis/cli-server-node';
|
|
365
|
+
import { CliUsersBuilder } from '@qodalis/cli-server-plugin-users';
|
|
366
|
+
import { CliAdminBuilder } from '@qodalis/cli-server-plugin-admin';
|
|
367
|
+
|
|
368
|
+
// Your app's origin: the browser terminal and the dashboard call the API and open sockets from it
|
|
369
|
+
const cli = createCliServer({ allowedOrigins: ['https://app.example.com'] });
|
|
370
|
+
const { registry, builder, eventSocketManager, logSocketManager } = cli;
|
|
371
|
+
|
|
372
|
+
const usersPlugin = new CliUsersBuilder()
|
|
373
|
+
// Runs on every CLI request and WebSocket ticket, and again on open sockets (see below)
|
|
374
|
+
.setAuthAdapter(async (req) => {
|
|
375
|
+
const principal = (req as any).user; // set by your auth middleware below
|
|
376
|
+
if (!principal) return null;
|
|
377
|
+
const account = await accounts.findById(principal.sub);
|
|
378
|
+
if (!account) return null;
|
|
379
|
+
return {
|
|
380
|
+
user: { id: account.id, name: account.email, email: account.email, groups: [], disabled: account.disabled, createdAt: 0, updatedAt: 0 },
|
|
381
|
+
permissions: account.cliPermissions, // e.g. ['commands:execute', 'logs:read']
|
|
382
|
+
isAdmin: account.isAdmin,
|
|
383
|
+
};
|
|
384
|
+
})
|
|
385
|
+
// Your app owns accounts and roles: the CLI's user and group endpoints answer 501
|
|
386
|
+
.setReadOnlyUsers()
|
|
387
|
+
.setReadOnlyGroups()
|
|
388
|
+
.build((msg) => eventSocketManager.broadcastMessage(msg));
|
|
389
|
+
|
|
390
|
+
const adminPlugin = new CliAdminBuilder()
|
|
391
|
+
.setAuthProvider(usersPlugin.serverAuth)
|
|
392
|
+
.setSignInUrl('https://app.example.com/sign-in')
|
|
393
|
+
.build({ registry, eventSocketManager, builder });
|
|
394
|
+
|
|
395
|
+
cli.mountPlugin(adminPlugin);
|
|
396
|
+
cli.mountPlugin(usersPlugin); // protects every CLI route and socket
|
|
397
|
+
|
|
398
|
+
const app = express();
|
|
399
|
+
app.use(cookieParser());
|
|
400
|
+
app.use(authenticate); // your sign-in: sets req.user, and lets anonymous requests through
|
|
401
|
+
app.use(cli.app); // after your authentication: the CLI routes, its auth gate and the dashboard
|
|
402
|
+
|
|
403
|
+
const server = http.createServer(app);
|
|
404
|
+
eventSocketManager.attach(server);
|
|
405
|
+
logSocketManager.attach(server);
|
|
406
|
+
server.listen(8047);
|
|
407
|
+
```
|
|
408
|
+
|
|
409
|
+
The order matters: `createCliServer()` installs its auth gate inside `cli.app`, so your authentication must run before `cli.app` is reached. Mount `cli.app` under your own app (as above) rather than adding your middleware to `cli.app` with `cli.app.use(...)`, which would run after the gate. WebSocket upgrades never pass through Express middleware; they authenticate with tickets (below).
|
|
410
|
+
|
|
411
|
+
- **The adapter** (`setAuthAdapter`) returns the user for a request, or `null` when it is not signed in. It can be async, so it can load the account, its roles and its disabled state from your database. A user returned with `disabled: true` is refused (401 `account disabled`).
|
|
412
|
+
- **Permissions:** a command's `requiredPermissions` are checked against the user's permissions: those in the result's `permissions`, those of the groups the user is in (`user.groups`, from the group store), and every permission when `isAdmin` is set. Running commands needs `commands:execute`, the logs stream needs `logs:read`.
|
|
413
|
+
- **WebSockets:** the browser cannot send headers on a WebSocket, so clients first get a single-use ticket (`POST /api/v1/qcli/sessions/ws-ticket` with your session) and connect with `?ticket=`; the web CLI does this by itself. Open sockets are checked again through the adapter, on the ticket request (so `req.user` is set as above), every `shell.sessionCheckIntervalMs` (30 s by default, at most 60 s) and closed with `4401` when the user is gone, disabled, or lost the socket's permission.
|
|
414
|
+
- **Read-only stores:** with `setReadOnlyUsers()` / `setReadOnlyGroups()` the CLI's create, update and delete endpoints answer `501` instead of writing; the session response carries `usersReadOnly` / `groupsReadOnly` so clients can hide those commands.
|
|
415
|
+
- **Admin dashboard:** with `setAuthProvider(usersPlugin.serverAuth)` and an external adapter the dashboard signs in through your app: `GET /api/v1/qcli/auth/mode` answers `external` with the `setSignInUrl` URL, its own username/password form is off, and your app opens it as `/qcli/admin/#token=<your bearer token>` (a URL fragment, never sent to servers or logs). See [plugins/admin/README.md](plugins/admin/README.md#sign-in-with-the-host-apps-session).
|
|
416
|
+
|
|
417
|
+
Details: [plugins/users/README.md](plugins/users/README.md#external-auth-adapter).
|
|
418
|
+
|
|
357
419
|
## MCP endpoint
|
|
358
420
|
|
|
359
421
|
`POST {basePath}/mcp` (default `/api/qcli/mcp`) exposes the server to AI clients such as Claude Code over the [Model Context Protocol](https://modelcontextprotocol.io): stateless Streamable HTTP with JSON responses, methods `initialize`, `ping`, `tools/list`, `tools/call`. It is off by default.
|
|
@@ -425,6 +487,10 @@ docker run -p 8047:8047 ghcr.io/qodalis-solutions/cli-server-node
|
|
|
425
487
|
|
|
426
488
|
The image runs the standalone server and accepts the same environment variables. `docker-compose.yml` builds and runs the demo server (`demo/Dockerfile`) on port 8047.
|
|
427
489
|
|
|
490
|
+
## Versioning
|
|
491
|
+
|
|
492
|
+
Every package in this repository (`@qodalis/cli-server-node`, `@qodalis/cli-server-abstractions` and every `@qodalis/cli-server-plugin-*`) has the same version, and so do the .NET and Python servers' packages: `1.0.0-beta.13` today. A release bumps all of them together, even packages that did not change, so one version number describes a whole server release. Install the same version of every `@qodalis/cli-server-*` package you use.
|
|
493
|
+
|
|
428
494
|
## Development
|
|
429
495
|
|
|
430
496
|
```bash
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@qodalis/cli-server-node",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.13",
|
|
4
4
|
"description": "Node.js CLI server for Qodalis CLI ecosystem — use as a library in existing Express apps or run standalone",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -11,6 +11,21 @@ export interface CliServerAuthContext {
|
|
|
11
11
|
/** Effective permissions (`resource:action`, `*` wildcards). */
|
|
12
12
|
permissions: string[];
|
|
13
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Server-wide options that plugins set and read at runtime (one object per
|
|
16
|
+
* server: `CliServerResult.serverOptions`, also `CliBuilder.serverOptions`).
|
|
17
|
+
*/
|
|
18
|
+
export interface CliServerRuntimeOptions {
|
|
19
|
+
/**
|
|
20
|
+
* True when requests are authenticated by the host application rather than by
|
|
21
|
+
* the CLI's own sign-in (set by an auth provider, e.g. the users plugin with an
|
|
22
|
+
* external auth adapter). The admin dashboard then signs in through the host
|
|
23
|
+
* (`GET /api/v1/qcli/auth/mode`).
|
|
24
|
+
*/
|
|
25
|
+
externalAuthentication: boolean;
|
|
26
|
+
/** True once a job scheduler (the jobs plugin) is mounted. */
|
|
27
|
+
jobsEnabled: boolean;
|
|
28
|
+
}
|
|
14
29
|
/** Error thrown by {@link ICliServerAuth.authenticateRequest}; rendered as `{ error }`. */
|
|
15
30
|
export interface CliServerAuthError extends Error {
|
|
16
31
|
status?: number;
|
|
@@ -37,10 +52,15 @@ export interface ICliServerAuth {
|
|
|
37
52
|
*/
|
|
38
53
|
consumeTicket(ticket: string): Promise<CliServerAuthContext | undefined>;
|
|
39
54
|
hasPermission(ctx: CliServerAuthContext, permission: string): boolean;
|
|
40
|
-
/**
|
|
55
|
+
/**
|
|
56
|
+
* Called once when installed into a server. `serverOptions` is the server's
|
|
57
|
+
* runtime options object: a provider that delegates sign-in to the host sets
|
|
58
|
+
* `externalAuthentication` on it.
|
|
59
|
+
*/
|
|
41
60
|
attachToServer?(server: {
|
|
42
61
|
allowedOrigins?: string[];
|
|
43
62
|
broadcast: (message: Record<string, unknown>) => void;
|
|
63
|
+
serverOptions?: CliServerRuntimeOptions;
|
|
44
64
|
}): void;
|
|
45
65
|
/**
|
|
46
66
|
* Re-validates a socket identity without sliding the session: the session still
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-server-auth.d.ts","sourceRoot":"","sources":["../../../src/auth/cli-server-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,uEAAuE;AACvE,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,WAAW,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,2FAA2F;AAC3F,MAAM,WAAW,kBAAmB,SAAQ,KAAK;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC3B,wFAAwF;IACxF,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,kFAAkF;IAClF,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACnD;;;;OAIG;IACH,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACjE;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;IACzE,aAAa,CAAC,GAAG,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;IACtE
|
|
1
|
+
{"version":3,"file":"cli-server-auth.d.ts","sourceRoot":"","sources":["../../../src/auth/cli-server-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-server-auth.js","sourceRoot":"","sources":["../../../src/auth/cli-server-auth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cli-server-auth.js","sourceRoot":"","sources":["../../../src/auth/cli-server-auth.ts"],"names":[],"mappings":"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"}
|
package/dist/src/auth/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { CliServerAuthContext, CliServerAuthError, CliServerAuditEntry, CliServerSessionEvent, ICliServerAuth, CliServerPermissions, isOriginAllowed, isSameOrigin, requestOrigin, clientAddress, trustedProxyHops, } from './cli-server-auth';
|
|
1
|
+
export { CliServerAuthContext, CliServerAuthError, CliServerAuditEntry, CliServerSessionEvent, CliServerRuntimeOptions, ICliServerAuth, CliServerPermissions, isOriginAllowed, isSameOrigin, requestOrigin, clientAddress, trustedProxyHops, } from './cli-server-auth';
|
|
2
2
|
export { createServerAuthGate, ServerAuthGateOptions, requiredServerPermissions, processorPermissions, normalizePath, } from './cli-server-auth-gate';
|
|
3
3
|
export { authorizeWsUpgrade, rejectUpgrade, WsUpgradeAuthOptions, WsUpgradeAuthResult } from './ws-upgrade-auth';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,aAAa,EACb,aAAa,EACb,gBAAgB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACH,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EACpB,aAAa,GAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,aAAa,EACb,aAAa,EACb,gBAAgB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACH,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EACpB,aAAa,GAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/index.ts"],"names":[],"mappings":";;;AAAA,qDAa2B;AANvB,uHAAA,oBAAoB,OAAA;AACpB,kHAAA,eAAe,OAAA;AACf,+GAAA,YAAY,OAAA;AACZ,gHAAA,aAAa,OAAA;AACb,gHAAA,aAAa,OAAA;AACb,mHAAA,gBAAgB,OAAA;AAEpB,+DAMgC;AAL5B,4HAAA,oBAAoB,OAAA;AAEpB,iIAAA,yBAAyB,OAAA;AACzB,4HAAA,oBAAoB,OAAA;AACpB,qHAAA,aAAa,OAAA;AAEjB,qDAAiH;AAAxG,qHAAA,kBAAkB,OAAA;AAAE,gHAAA,aAAa,OAAA"}
|
|
@@ -2,7 +2,7 @@ import { Express, Router } from 'express';
|
|
|
2
2
|
import cors from 'cors';
|
|
3
3
|
import { CliCommandRegistry, CliCommandExecutorService, CliEventSocketManager, CliLogSocketManager } from './services';
|
|
4
4
|
import { CliBuilder } from './extensions';
|
|
5
|
-
import { ICliServerAuth } from './auth/cli-server-auth';
|
|
5
|
+
import { CliServerRuntimeOptions, ICliServerAuth } from './auth/cli-server-auth';
|
|
6
6
|
import { CliShellOptions } from './services/cli-shell-options';
|
|
7
7
|
import { CliMcpOptions, McpToolProvider } from './mcp';
|
|
8
8
|
/**
|
|
@@ -107,6 +107,12 @@ export interface CliServerResult {
|
|
|
107
107
|
executor: CliCommandExecutorService;
|
|
108
108
|
eventSocketManager: CliEventSocketManager;
|
|
109
109
|
logSocketManager: CliLogSocketManager;
|
|
110
|
+
/**
|
|
111
|
+
* Server-wide runtime options set by plugins (same object as `builder.serverOptions`):
|
|
112
|
+
* `externalAuthentication` (set by the users plugin with an external auth adapter)
|
|
113
|
+
* and `jobsEnabled` (set when a job scheduler is mounted).
|
|
114
|
+
*/
|
|
115
|
+
serverOptions: CliServerRuntimeOptions;
|
|
110
116
|
/**
|
|
111
117
|
* Mount a plugin using its built-in prefix.
|
|
112
118
|
* Reads `prefix` and `router` from the plugin result, and optionally
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-cli-server.d.ts","sourceRoot":"","sources":["../../src/create-cli-server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACvH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,EAAE,cAAc,EAAmD,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-cli-server.d.ts","sourceRoot":"","sources":["../../src/create-cli-server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACvH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAmD,MAAM,wBAAwB,CAAC;AAElI,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EACH,aAAa,EAKb,eAAe,EAOlB,MAAM,OAAO,CAAC;AAGf;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,oGAAoG;IACpG,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,uFAAuF;IACvF,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC;IACjC,uEAAuE;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,gDAAgD;AAChD,MAAM,WAAW,YAAY;IACzB,6CAA6C;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,4CAA4C;IAC5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;CAChD;AAID,6DAA6D;AAC7D,MAAM,WAAW,gBAAgB;IAC7B,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC;IAClC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,4FAA4F;IAC5F,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC9B;;;OAGG;IACH,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB;;;;;OAKG;IACH,GAAG,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC9B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;CAC7C;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC5B,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,yBAAyB,CAAC;IACpC,kBAAkB,EAAE,qBAAqB,CAAC;IAC1C,gBAAgB,EAAE,mBAAmB,CAAC;IACtC;;;;OAIG;IACH,aAAa,EAAE,uBAAuB,CAAC;IACvC;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IAC3C,oFAAoF;IACpF,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,CAAC;IAChD,oEAAoE;IACpE,GAAG,EAAE,YAAY,CAAC;CACrB;AAED,wBAAgB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,eAAe,CA0M/E"}
|
|
@@ -86,7 +86,7 @@ function createCliServer(options = {}) {
|
|
|
86
86
|
}
|
|
87
87
|
const executor = new services_1.CliCommandExecutorService(registry, { maxTableRows: options.maxTableRows });
|
|
88
88
|
const eventSocketManager = new services_1.CliEventSocketManager({ enableShell, shell, allowedOrigins, trustProxy });
|
|
89
|
-
const logSocketManager = new services_1.CliLogSocketManager({ allowedOrigins, trustProxy });
|
|
89
|
+
const logSocketManager = new services_1.CliLogSocketManager({ allowedOrigins, trustProxy, sessionCheckIntervalMs: shell?.sessionCheckIntervalMs });
|
|
90
90
|
const shellCapabilities = () => {
|
|
91
91
|
const mode = eventSocketManager.shellAuthMode;
|
|
92
92
|
return mode ? { shell: true, shellAuth: mode } : { shell: false };
|
|
@@ -147,13 +147,17 @@ function createCliServer(options = {}) {
|
|
|
147
147
|
mcpFeatures.add('data-explorer');
|
|
148
148
|
}
|
|
149
149
|
logger.info('CLI server created with %d processors', registry.processors.length);
|
|
150
|
+
const serverOptions = builder.serverOptions;
|
|
150
151
|
const setAuth = (auth) => {
|
|
151
152
|
serverAuth = auth;
|
|
152
153
|
eventSocketManager.setAuth(auth);
|
|
153
154
|
logSocketManager.setAuth(auth);
|
|
155
|
+
// The new provider says again whether the host signs users in.
|
|
156
|
+
serverOptions.externalAuthentication = false;
|
|
154
157
|
auth?.attachToServer?.({
|
|
155
158
|
allowedOrigins,
|
|
156
159
|
broadcast: (msg) => eventSocketManager.broadcastMessage(msg),
|
|
160
|
+
serverOptions,
|
|
157
161
|
});
|
|
158
162
|
};
|
|
159
163
|
if (options.auth) {
|
|
@@ -171,6 +175,9 @@ function createCliServer(options = {}) {
|
|
|
171
175
|
if (plugin.dashboardPrefix && plugin.dashboardRouter) {
|
|
172
176
|
app.use(plugin.dashboardPrefix, plugin.dashboardRouter);
|
|
173
177
|
}
|
|
178
|
+
if (isJobScheduler(plugin.scheduler)) {
|
|
179
|
+
serverOptions.jobsEnabled = true;
|
|
180
|
+
}
|
|
174
181
|
if (isJobScheduler(plugin.scheduler) && !mcpFeatures.has('jobs')) {
|
|
175
182
|
mcpFeatureProviders.push(new mcp_1.JobsMcpToolProvider(plugin.scheduler));
|
|
176
183
|
mcpFeatures.add('jobs');
|
|
@@ -186,7 +193,7 @@ function createCliServer(options = {}) {
|
|
|
186
193
|
builder.addMcpToolProvider(provider);
|
|
187
194
|
},
|
|
188
195
|
};
|
|
189
|
-
return { app, registry, builder, executor, eventSocketManager, logSocketManager, mountPlugin, setAuth, mcp };
|
|
196
|
+
return { app, registry, builder, executor, eventSocketManager, logSocketManager, serverOptions, mountPlugin, setAuth, mcp };
|
|
190
197
|
}
|
|
191
198
|
/** Duck-typed check (the jobs plugin may be a different package copy than the server's). */
|
|
192
199
|
function isJobScheduler(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-cli-server.js","sourceRoot":"","sources":["../../src/create-cli-server.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"create-cli-server.js","sourceRoot":"","sources":["../../src/create-cli-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ICliCommandProcessor, ICliModule, IDataExplorerProvider, DataExplorerProviderOptions } from '../abstractions';
|
|
2
|
+
import type { CliServerRuntimeOptions } from '../auth/cli-server-auth';
|
|
2
3
|
import { FileSystemApiOptions, FileSystemOptions } from '../filesystem';
|
|
3
4
|
import { IFileStorageProvider } from '@qodalis/cli-server-plugin-filesystem';
|
|
4
5
|
import { DataExplorerBuilder, DataExplorerProviderFactory } from '@qodalis/cli-server-plugin-data-explorer';
|
|
@@ -16,6 +17,12 @@ export declare class CliBuilder {
|
|
|
16
17
|
private _fileSystemApiOptions;
|
|
17
18
|
private _dataExplorerBuilder?;
|
|
18
19
|
private readonly _mcpToolProviders;
|
|
20
|
+
/**
|
|
21
|
+
* Server-wide runtime options set by plugins (e.g. `externalAuthentication`,
|
|
22
|
+
* set by the users plugin with an external auth adapter) and read by others
|
|
23
|
+
* (the admin dashboard's sign-in mode).
|
|
24
|
+
*/
|
|
25
|
+
readonly serverOptions: CliServerRuntimeOptions;
|
|
19
26
|
constructor(registry: CliCommandRegistry);
|
|
20
27
|
/** Registers a single command processor. */
|
|
21
28
|
addProcessor(processor: ICliCommandProcessor): CliBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-builder.d.ts","sourceRoot":"","sources":["../../../src/extensions/cli-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACvH,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAC5G,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;;GAGG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,kBAAkB,CAAC,CAAoB;IAC/C,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,qBAAqB,CAA4B;IACzD,OAAO,CAAC,oBAAoB,CAAC,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyB;
|
|
1
|
+
{"version":3,"file":"cli-builder.d.ts","sourceRoot":"","sources":["../../../src/extensions/cli-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACvH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAC5G,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;;GAGG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,kBAAkB,CAAC,CAAoB;IAC/C,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,qBAAqB,CAA4B;IACzD,OAAO,CAAC,oBAAoB,CAAC,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyB;IAE3D;;;;OAIG;IACH,QAAQ,CAAC,aAAa,EAAE,uBAAuB,CAAyD;gBAE5F,QAAQ,EAAE,kBAAkB;IAIxC,4CAA4C;IAC5C,YAAY,CAAC,SAAS,EAAE,oBAAoB,GAAG,UAAU;IAKzD,4DAA4D;IAC5D,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU;IAQzC,sCAAsC;IACtC,IAAI,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAEvC;IAED,2FAA2F;IAC3F,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,UAAU;IAMrD,+CAA+C;IAC/C,IAAI,QAAQ,IAAI,kBAAkB,CAEjC;IAED;;;OAGG;IACH,sBAAsB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,UAAU;IAQlG,6DAA6D;IAC7D,IAAI,oBAAoB,IAAI,oBAAoB,CAE/C;IAED,yDAAyD;IACzD,IAAI,iBAAiB,IAAI,iBAAiB,GAAG,SAAS,CAErD;IAED,4DAA4D;IAC5D,IAAI,mBAAmB,IAAI,oBAAoB,GAAG,SAAS,CAE1D;IAED,yEAAyE;IACzE,uBAAuB,CACnB,iBAAiB,EAAE,qBAAqB,GAAG,2BAA2B,EACtE,OAAO,EAAE,2BAA2B,GACrC,UAAU;IAQb,gFAAgF;IAChF,IAAI,mBAAmB,IAAI,mBAAmB,GAAG,SAAS,CAEzD;IAED;;;;OAIG;IACH,kBAAkB,CAAC,QAAQ,EAAE,eAAe,GAAG,UAAU;IAKzD,oFAAoF;IACpF,IAAI,gBAAgB,IAAI,aAAa,CAAC,eAAe,CAAC,CAErD;CACJ"}
|
|
@@ -14,6 +14,12 @@ class CliBuilder {
|
|
|
14
14
|
_fileSystemApiOptions = {};
|
|
15
15
|
_dataExplorerBuilder;
|
|
16
16
|
_mcpToolProviders = [];
|
|
17
|
+
/**
|
|
18
|
+
* Server-wide runtime options set by plugins (e.g. `externalAuthentication`,
|
|
19
|
+
* set by the users plugin with an external auth adapter) and read by others
|
|
20
|
+
* (the admin dashboard's sign-in mode).
|
|
21
|
+
*/
|
|
22
|
+
serverOptions = { externalAuthentication: false, jobsEnabled: false };
|
|
17
23
|
constructor(registry) {
|
|
18
24
|
this._registry = registry;
|
|
19
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-builder.js","sourceRoot":"","sources":["../../../src/extensions/cli-builder.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cli-builder.js","sourceRoot":"","sources":["../../../src/extensions/cli-builder.ts"],"names":[],"mappings":";;;AAIA,8FAA4G;AAI5G;;;GAGG;AACH,MAAa,UAAU;IACF,SAAS,CAAqB;IAC9B,QAAQ,GAAiB,EAAE,CAAC;IACrC,kBAAkB,CAAqB;IACvC,oBAAoB,CAAwB;IAC5C,qBAAqB,GAAyB,EAAE,CAAC;IACjD,oBAAoB,CAAuB;IAClC,iBAAiB,GAAsB,EAAE,CAAC;IAE3D;;;;OAIG;IACM,aAAa,GAA4B,EAAE,sBAAsB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAExG,YAAY,QAA4B;QACpC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAED,4CAA4C;IAC5C,YAAY,CAAC,SAA+B;QACxC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,4DAA4D;IAC5D,SAAS,CAAC,MAAkB;QACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,sCAAsC;IACtC,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,2FAA2F;IAC3F,aAAa,CAAC,OAA0B;QACpC,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC;QAClC,IAAI,CAAC,qBAAqB,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC;QACxE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+CAA+C;IAC/C,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,QAA8B,EAAE,OAA8B;QACjF,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC;QACrC,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,qBAAqB,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,6DAA6D;IAC7D,IAAI,oBAAoB;QACpB,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,CAAC;IAED,yDAAyD;IACzD,IAAI,iBAAiB;QACjB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED,4DAA4D;IAC5D,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;IAED,yEAAyE;IACzE,uBAAuB,CACnB,iBAAsE,EACtE,OAAoC;QAEpC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC7B,IAAI,CAAC,oBAAoB,GAAG,IAAI,qDAAmB,EAAE,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gFAAgF;IAChF,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,QAAyB;QACxC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,oFAAoF;IACpF,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACJ;AA9GD,gCA8GC"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { ICliCommandAuthor, CliCommandAuthor, DefaultLibraryAuthor, CliProcessCommand, splitShellWords, getPositionals, getPositionalText, quoteShellWord, ICliCommandParameterDescriptor, CliCommandParameterDescriptor, ICliCommandProcessor, CliCommandProcessor, ICliModule, CliModule, ICliProcessorFilter, CliTablePage, CliPageRequest, CliPaging, DEFAULT_TAKE, MAX_TAKE, } from './abstractions';
|
|
2
2
|
export { CliServerOutput, CliServerResponse, CliServerCommandDescriptor, CliServerCommandParameterDescriptorDto, } from './models';
|
|
3
3
|
export { ICliCommandRegistry, CliCommandRegistry, ICliResponseBuilder, CliResponseBuilder, ICliCommandExecutorService, CliCommandExecutorService, CliCommandExecutorOptions, CliOutputLimits, DEFAULT_MAX_TABLE_ROWS, CliEventSocketManager, CliShellSessionManager, CliShellSessionInfo, CliLogSocketManager, CliShellOptions, CliShellEnvOptions, CliShellAuthMode, CliShellAuthorizeContext, ShellCloseCodes, } from './services';
|
|
4
|
-
export { CliServerAuthContext, CliServerAuthError, CliServerAuditEntry, CliServerSessionEvent, ICliServerAuth, CliServerPermissions, isOriginAllowed, isSameOrigin, requestOrigin, clientAddress, trustedProxyHops, createServerAuthGate, ServerAuthGateOptions, requiredServerPermissions, authorizeWsUpgrade, rejectUpgrade, } from './auth';
|
|
4
|
+
export { CliServerAuthContext, CliServerAuthError, CliServerAuditEntry, CliServerSessionEvent, CliServerRuntimeOptions, ICliServerAuth, CliServerPermissions, isOriginAllowed, isSameOrigin, requestOrigin, clientAddress, trustedProxyHops, createServerAuthGate, ServerAuthGateOptions, requiredServerPermissions, authorizeWsUpgrade, rejectUpgrade, } from './auth';
|
|
5
5
|
export { CliMcpOptions, MCP_PROTOCOL_VERSIONS, MCP_SERVER_NAME, MCP_SERVER_VERSION, createMcpController, createMcpPreGate, resolveMcpOptions, collectMcpTools, isMcpToolAllowed, McpTool, McpToolProvider, McpToolResult, McpToolCallContext, McpToolAnnotations, McpInputSchema, McpPropertySchema, mcpObjectSchema, mcpError, mcpJson, validateMcpArguments, renderOutputsAsText, describePage, CommandsMcpToolProvider, ServerMcpToolProvider, FilesystemMcpToolProvider, DataExplorerMcpToolProvider, JobsMcpToolProvider, mcpToolName, } from './mcp';
|
|
6
6
|
export { createCliController } from './controllers/cli-controller';
|
|
7
7
|
export { createCliVersionController } from './controllers/cli-version-controller';
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACH,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,8BAA8B,EAC9B,6BAA6B,EAC7B,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,EACV,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACd,SAAS,EACT,YAAY,EACZ,QAAQ,GACX,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACH,eAAe,EACf,iBAAiB,EACjB,0BAA0B,EAC1B,sCAAsC,GACzC,MAAM,UAAU,CAAC;AAGlB,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,0BAA0B,EAC1B,yBAAyB,EACzB,yBAAyB,EACzB,eAAe,EACf,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,EACxB,eAAe,GAClB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACH,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,kBAAkB,EAClB,aAAa,GAChB,MAAM,QAAQ,CAAC;AAGhB,OAAO,EACH,aAAa,EACb,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,OAAO,EACP,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,mBAAmB,EACnB,YAAY,EACZ,uBAAuB,EACvB,qBAAqB,EACrB,yBAAyB,EACzB,2BAA2B,EAC3B,mBAAmB,EACnB,WAAW,GACd,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAG7E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EACH,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,YAAY,EACZ,0BAA0B,EAC1B,MAAM,EACN,QAAQ,EACR,aAAa,EACb,uBAAuB,GAC1B,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAG1H,OAAO,EACH,oBAAoB,EACpB,SAAS,EACT,QAAQ,EACR,2BAA2B,EAC3B,qBAAqB,EACrB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,iBAAiB,GACpB,MAAM,uCAAuC,CAAC;AAG/C,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAG9G,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAGhH,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAGpG,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAGtF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,eAAe;AACf,+CAqBwB;AAnBpB,gHAAA,gBAAgB,OAAA;AAChB,oHAAA,oBAAoB,OAAA;AAEpB,+GAAA,eAAe,OAAA;AACf,8GAAA,cAAc,OAAA;AACd,iHAAA,iBAAiB,OAAA;AACjB,8GAAA,cAAc,OAAA;AAEd,6HAAA,6BAA6B,OAAA;AAE7B,mHAAA,mBAAmB,OAAA;AAEnB,yGAAA,SAAS,OAAA;AAIT,yGAAA,SAAS,OAAA;AACT,4GAAA,YAAY,OAAA;AACZ,wGAAA,QAAQ,OAAA;AAWZ,WAAW;AACX,uCAmBoB;AAjBhB,8GAAA,kBAAkB,OAAA;AAElB,8GAAA,kBAAkB,OAAA;AAElB,qHAAA,yBAAyB,OAAA;AAEzB,2GAAA,eAAe,OAAA;AACf,kHAAA,sBAAsB,OAAA;AACtB,iHAAA,qBAAqB,OAAA;AACrB,kHAAA,sBAAsB,OAAA;AAEtB,+GAAA,mBAAmB,OAAA;AAKnB,2GAAA,eAAe,OAAA;AAGnB,gDAAgD;AAChD,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,9 @@ export interface CliEventSocketManagerOptions {
|
|
|
29
29
|
* upgrades need a single-use `?ticket=`; `session-kicked` is delivered only to
|
|
30
30
|
* the affected user. Sockets authenticated with a stored session are bound to
|
|
31
31
|
* it: once it ends they are closed with 4401 `session ended` (after
|
|
32
|
-
* `session-kicked` for revocations; see {@link SessionBoundSockets})
|
|
32
|
+
* `session-kicked` for revocations; see {@link SessionBoundSockets}); sockets
|
|
33
|
+
* opened through an external auth adapter are re-checked through it every
|
|
34
|
+
* `shell.sessionCheckIntervalMs` (default 30 s, at most 60 s). Shell
|
|
33
35
|
* access (modes, limits, session binding) is decided by {@link CliShellSessionManager}.
|
|
34
36
|
*/
|
|
35
37
|
export declare class CliEventSocketManager {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-event-socket-manager.d.ts","sourceRoot":"","sources":["../../../src/services/cli-event-socket-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,MAAM,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAA8C,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAMrG,4DAA4D;AAC5D,MAAM,WAAW,sBAAsB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,QAAQ,CAAC;CAClB;AAUD,MAAM,WAAW,4BAA4B;IACzC,gFAAgF;IAChF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2EAA2E;IAC3E,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC9B,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAKD
|
|
1
|
+
{"version":3,"file":"cli-event-socket-manager.d.ts","sourceRoot":"","sources":["../../../src/services/cli-event-socket-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,MAAM,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAA8C,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAMrG,4DAA4D;AAC5D,MAAM,WAAW,sBAAsB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,QAAQ,CAAC;CAClB;AAUD,MAAM,WAAW,4BAA4B;IACzC,gFAAgF;IAChF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2EAA2E;IAC3E,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC9B,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAKD;;;;;;;;;;;GAWG;AACH,qBAAa,qBAAqB;IAC9B,OAAO,CAAC,IAAI,CAAgC;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqC;IACjE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IACvD,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,KAAK,CAAC,CAAiB;IAC/B,OAAO,CAAC,eAAe,CAAC,CAAW;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;gBAExC,OAAO,GAAE,4BAAiC;IActD,4FAA4F;IAC5F,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI;IAM/C,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAItD,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIvC,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,mEAAmE;IACnE,IAAI,aAAa,IAAI,gBAAgB,GAAG,SAAS,CAEhD;IAED,kEAAkE;IAClE,IAAI,YAAY,IAAI,sBAAsB,CAEzC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAGhC;IAEH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAGhC;IAEH;;;OAGG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IA+E5B;;OAEG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAyCxD;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;OAEG;IACH,UAAU,IAAI,sBAAsB,EAAE;IAkBtC,kEAAkE;IAClE,OAAO,IAAI,IAAI;CAUlB"}
|
|
@@ -18,7 +18,9 @@ const USER_SCOPED_EVENTS = new Set(['session-kicked']);
|
|
|
18
18
|
* upgrades need a single-use `?ticket=`; `session-kicked` is delivered only to
|
|
19
19
|
* the affected user. Sockets authenticated with a stored session are bound to
|
|
20
20
|
* it: once it ends they are closed with 4401 `session ended` (after
|
|
21
|
-
* `session-kicked` for revocations; see {@link SessionBoundSockets})
|
|
21
|
+
* `session-kicked` for revocations; see {@link SessionBoundSockets}); sockets
|
|
22
|
+
* opened through an external auth adapter are re-checked through it every
|
|
23
|
+
* `shell.sessionCheckIntervalMs` (default 30 s, at most 60 s). Shell
|
|
22
24
|
* access (modes, limits, session binding) is decided by {@link CliShellSessionManager}.
|
|
23
25
|
*/
|
|
24
26
|
class CliEventSocketManager {
|
|
@@ -30,8 +32,12 @@ class CliEventSocketManager {
|
|
|
30
32
|
_auth;
|
|
31
33
|
_allowedOrigins;
|
|
32
34
|
_trustProxy;
|
|
33
|
-
_sessionBound
|
|
35
|
+
_sessionBound;
|
|
34
36
|
constructor(options = {}) {
|
|
37
|
+
this._sessionBound = new session_bound_sockets_1.SessionBoundSockets({
|
|
38
|
+
awaitKick: true,
|
|
39
|
+
sessionCheckIntervalMs: options.shell?.sessionCheckIntervalMs,
|
|
40
|
+
});
|
|
35
41
|
this._shellManager = new cli_shell_session_manager_1.CliShellSessionManager({
|
|
36
42
|
enabled: options.enableShell ?? false,
|
|
37
43
|
shell: options.shell,
|
|
@@ -132,7 +138,7 @@ class CliEventSocketManager {
|
|
|
132
138
|
remoteAddress: request.socket.remoteAddress ?? 'unknown',
|
|
133
139
|
auth,
|
|
134
140
|
});
|
|
135
|
-
this._sessionBound.bind(ws, auth);
|
|
141
|
+
this._sessionBound.bind(ws, auth, request);
|
|
136
142
|
logger.info('Client connected (id=%s)', id);
|
|
137
143
|
ws.send(JSON.stringify({ type: 'connected' }));
|
|
138
144
|
const disconnected = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-event-socket-manager.js","sourceRoot":"","sources":["../../../src/services/cli-event-socket-manager.ts"],"names":[],"mappings":";;;AAAA,2BAAgD;AAEhD,6BAA0B;AAC1B,2EAAqE;AAErE,4CAA+C;AAC/C,6DAAqG;AACrG,6DAA4E;AAC5E,mEAA8D;AAE9D,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,aAAa,CAAC,CAAC;AAgC3C,0EAA0E;AAC1E,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAEvD
|
|
1
|
+
{"version":3,"file":"cli-event-socket-manager.js","sourceRoot":"","sources":["../../../src/services/cli-event-socket-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,9 @@ export interface CliLogWebSocketClientInfo {
|
|
|
14
14
|
* Parity with CliLogSocketManager in the .NET and Python servers.
|
|
15
15
|
* Handles `/ws/v1/qcli/logs` and `/ws/qcli/logs` upgrade paths. Sockets
|
|
16
16
|
* authenticated with a stored session are bound to it: once it ends they are
|
|
17
|
-
* closed with 4401 `session ended` (see {@link SessionBoundSockets}).
|
|
17
|
+
* closed with 4401 `session ended` (see {@link SessionBoundSockets}). Sockets
|
|
18
|
+
* opened through an external auth adapter are re-checked through it every
|
|
19
|
+
* `sessionCheckIntervalMs` and close once it fails or the user lost `logs:read`.
|
|
18
20
|
*/
|
|
19
21
|
export declare class CliLogSocketManager {
|
|
20
22
|
private _wss;
|
|
@@ -24,9 +26,14 @@ export declare class CliLogSocketManager {
|
|
|
24
26
|
private _allowedOrigins?;
|
|
25
27
|
private readonly _trustProxy;
|
|
26
28
|
private readonly _sessionBound;
|
|
29
|
+
/**
|
|
30
|
+
* @param options.sessionCheckIntervalMs Re-check interval of sockets opened through an
|
|
31
|
+
* external auth adapter (the shell's `sessionCheckIntervalMs`: default 30 s, at most 60 s).
|
|
32
|
+
*/
|
|
27
33
|
constructor(options?: {
|
|
28
34
|
allowedOrigins?: string[];
|
|
29
35
|
trustProxy?: boolean | number;
|
|
36
|
+
sessionCheckIntervalMs?: number;
|
|
30
37
|
});
|
|
31
38
|
/** Installs the auth provider; when it protects the server, upgrades need a ticket and `logs:read`. */
|
|
32
39
|
setAuth(auth: ICliServerAuth | undefined): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-log-socket-manager.d.ts","sourceRoot":"","sources":["../../../src/services/cli-log-socket-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,MAAM,CAAC;AAGpD,OAAO,EAA8C,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAMrG,oEAAoE;AACpE,MAAM,WAAW,yBAAyB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CAChB;AAsCD
|
|
1
|
+
{"version":3,"file":"cli-log-socket-manager.d.ts","sourceRoot":"","sources":["../../../src/services/cli-log-socket-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,MAAM,CAAC;AAGpD,OAAO,EAA8C,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAMrG,oEAAoE;AACpE,MAAM,WAAW,yBAAyB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CAChB;AAsCD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB;IAC5B,OAAO,CAAC,IAAI,CAAgC;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,KAAK,CAAC,CAAiB;IAC/B,OAAO,CAAC,eAAe,CAAC,CAAW;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IAEpD;;;OAGG;gBACS,OAAO,GAAE;QAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;QAAC,sBAAsB,CAAC,EAAE,MAAM,CAAA;KAAO;IASvH,uGAAuG;IACvG,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI;IAK/C,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAItD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAG9B;IAEH;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;IAY3E;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM;IAUzF;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAmC5B;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAsB5E;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;OAEG;IACH,UAAU,IAAI,yBAAyB,EAAE;IAgBzC,kEAAkE;IAClE,OAAO,IAAI,IAAI;IASf,OAAO,CAAC,iBAAiB;CAwB5B"}
|
|
@@ -39,7 +39,9 @@ function normalizeLevel(level) {
|
|
|
39
39
|
* Parity with CliLogSocketManager in the .NET and Python servers.
|
|
40
40
|
* Handles `/ws/v1/qcli/logs` and `/ws/qcli/logs` upgrade paths. Sockets
|
|
41
41
|
* authenticated with a stored session are bound to it: once it ends they are
|
|
42
|
-
* closed with 4401 `session ended` (see {@link SessionBoundSockets}).
|
|
42
|
+
* closed with 4401 `session ended` (see {@link SessionBoundSockets}). Sockets
|
|
43
|
+
* opened through an external auth adapter are re-checked through it every
|
|
44
|
+
* `sessionCheckIntervalMs` and close once it fails or the user lost `logs:read`.
|
|
43
45
|
*/
|
|
44
46
|
class CliLogSocketManager {
|
|
45
47
|
_wss = null;
|
|
@@ -48,8 +50,16 @@ class CliLogSocketManager {
|
|
|
48
50
|
_auth;
|
|
49
51
|
_allowedOrigins;
|
|
50
52
|
_trustProxy;
|
|
51
|
-
_sessionBound
|
|
53
|
+
_sessionBound;
|
|
54
|
+
/**
|
|
55
|
+
* @param options.sessionCheckIntervalMs Re-check interval of sockets opened through an
|
|
56
|
+
* external auth adapter (the shell's `sessionCheckIntervalMs`: default 30 s, at most 60 s).
|
|
57
|
+
*/
|
|
52
58
|
constructor(options = {}) {
|
|
59
|
+
this._sessionBound = new session_bound_sockets_1.SessionBoundSockets({
|
|
60
|
+
externalPermission: cli_server_auth_1.CliServerPermissions.LogsRead,
|
|
61
|
+
sessionCheckIntervalMs: options.sessionCheckIntervalMs,
|
|
62
|
+
});
|
|
53
63
|
this._allowedOrigins = options.allowedOrigins;
|
|
54
64
|
this._trustProxy = options.trustProxy ?? false;
|
|
55
65
|
}
|
|
@@ -209,7 +219,7 @@ class CliLogSocketManager {
|
|
|
209
219
|
levelFilter,
|
|
210
220
|
};
|
|
211
221
|
this._clients.set(id, entry);
|
|
212
|
-
this._sessionBound.bind(ws, auth);
|
|
222
|
+
this._sessionBound.bind(ws, auth, request);
|
|
213
223
|
ws.send(JSON.stringify({ type: 'connected' }));
|
|
214
224
|
logger.info('Log client connected (id=%s, level=%s)', id, levelFilter ?? 'all');
|
|
215
225
|
const disconnected = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-log-socket-manager.js","sourceRoot":"","sources":["../../../src/services/cli-log-socket-manager.ts"],"names":[],"mappings":";;;AAAA,2BAAgD;AAEhD,6BAA0B;AAC1B,4CAA+C;AAC/C,6DAAqG;AACrG,6DAA4E;AAC5E,mEAA8D;AAE9D,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,WAAW,CAAC,CAAC;AAmBzC;;;GAGG;AACH,MAAM,WAAW,GAA2B;IACxC,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,WAAW,EAAE,CAAC;IACd,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;CACX,CAAC;AAEF;;;GAGG;AACH,MAAM,aAAa,GAA2B;IAC1C,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,SAAS;IACf,GAAG,EAAE,OAAO;CACf,CAAC;AAEF,SAAS,cAAc,CAAC,KAAa;IACjC,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,OAAO,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC;AACzC,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"cli-log-socket-manager.js","sourceRoot":"","sources":["../../../src/services/cli-log-socket-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,8 @@ export interface CliShellOptions {
|
|
|
55
55
|
/**
|
|
56
56
|
* How often open users-mode shells re-check their session and `shell:execute` (ms).
|
|
57
57
|
* Default 30 000, maximum 60 000. Session/user/group changes trigger an immediate re-check.
|
|
58
|
+
* Also the interval at which events and logs sockets opened through an external auth
|
|
59
|
+
* adapter are re-checked, whether or not the shell is enabled.
|
|
58
60
|
*/
|
|
59
61
|
sessionCheckIntervalMs?: number;
|
|
60
62
|
/** Working directory of the shell. Default: the server user's home directory. */
|
|
@@ -73,6 +75,12 @@ export declare const SHELL_DEFAULTS: {
|
|
|
73
75
|
/** stdin touches the users session at most this often. */
|
|
74
76
|
readonly touchIntervalMs: number;
|
|
75
77
|
};
|
|
78
|
+
/**
|
|
79
|
+
* The effective session re-check interval of shells and of events/logs sockets
|
|
80
|
+
* opened through an external auth adapter: `sessionCheckIntervalMs` (default
|
|
81
|
+
* 30 s), at least 10 ms and at most 60 s.
|
|
82
|
+
*/
|
|
83
|
+
export declare function effectiveSessionCheckIntervalMs(configured: number | undefined): number;
|
|
76
84
|
/** WebSocket close codes used by the shell socket (accept, then close). */
|
|
77
85
|
export declare const ShellCloseCodes: {
|
|
78
86
|
readonly LoginRequired: 4401;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-shell-options.d.ts","sourceRoot":"","sources":["../../../src/services/cli-shell-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAI5C,4FAA4F;AAC5F,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,CAAC;AAErF,oFAAoF;AACpF,MAAM,WAAW,wBAAwB;IACrC,yCAAyC;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,oCAAoC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;CACnC;AAED,8CAA8C;AAC9C,MAAM,WAAW,kBAAkB;IAC/B,2FAA2F;IAC3F,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,gEAAgE;IAChE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,wBAAwB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxG;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,8FAA8F;IAC9F,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wFAAwF;IACxF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oFAAoF;IACpF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB
|
|
1
|
+
{"version":3,"file":"cli-shell-options.d.ts","sourceRoot":"","sources":["../../../src/services/cli-shell-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAI5C,4FAA4F;AAC5F,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,CAAC;AAErF,oFAAoF;AACpF,MAAM,WAAW,wBAAwB;IACrC,yCAAyC;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,oCAAoC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;CACnC;AAED,8CAA8C;AAC9C,MAAM,WAAW,kBAAkB;IAC/B,2FAA2F;IAC3F,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,gEAAgE;IAChE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,wBAAwB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxG;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,8FAA8F;IAC9F,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wFAAwF;IACxF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oFAAoF;IACpF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,iFAAiF;IACjF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mFAAmF;IACnF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8DAA8D;IAC9D,GAAG,CAAC,EAAE,kBAAkB,CAAC;CAC5B;AAED,eAAO,MAAM,cAAc;;;;;;IAMvB,0DAA0D;;CAEpD,CAAC;AAEX;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAKtF;AAED,2EAA2E;AAC3E,eAAO,MAAM,eAAe;;;;;;CAMlB,CAAC;AAEX;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,EAAE,YAAY,EAAE,OAAO,GAAG,gBAAgB,CAMlH;AAED,gFAAgF;AAChF,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIxE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAatF;AAMD;;;;GAIG;AACH,wBAAgB,aAAa,CACzB,OAAO,EAAE,kBAAkB,GAAG,SAAS,EACvC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACnD,MAAM,GAAE,MAAM,CAAC,UAAwB,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA0BxB"}
|
|
@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.ShellCloseCodes = exports.SHELL_DEFAULTS = void 0;
|
|
37
|
+
exports.effectiveSessionCheckIntervalMs = effectiveSessionCheckIntervalMs;
|
|
37
38
|
exports.resolveShellAuthMode = resolveShellAuthMode;
|
|
38
39
|
exports.tokensEqual = tokensEqual;
|
|
39
40
|
exports.readBearerToken = readBearerToken;
|
|
@@ -49,6 +50,14 @@ exports.SHELL_DEFAULTS = {
|
|
|
49
50
|
/** stdin touches the users session at most this often. */
|
|
50
51
|
touchIntervalMs: 30 * 1000,
|
|
51
52
|
};
|
|
53
|
+
/**
|
|
54
|
+
* The effective session re-check interval of shells and of events/logs sockets
|
|
55
|
+
* opened through an external auth adapter: `sessionCheckIntervalMs` (default
|
|
56
|
+
* 30 s), at least 10 ms and at most 60 s.
|
|
57
|
+
*/
|
|
58
|
+
function effectiveSessionCheckIntervalMs(configured) {
|
|
59
|
+
return Math.min(Math.max(configured ?? exports.SHELL_DEFAULTS.sessionCheckIntervalMs, 10), exports.SHELL_DEFAULTS.maxSessionCheckIntervalMs);
|
|
60
|
+
}
|
|
52
61
|
/** WebSocket close codes used by the shell socket (accept, then close). */
|
|
53
62
|
exports.ShellCloseCodes = {
|
|
54
63
|
LoginRequired: 4401,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-shell-options.js","sourceRoot":"","sources":["../../../src/services/cli-shell-options.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"cli-shell-options.js","sourceRoot":"","sources":["../../../src/services/cli-shell-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-shell-session-manager.d.ts","sourceRoot":"","sources":["../../../src/services/cli-shell-session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAK5C,OAAO,EAIH,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,gBAAgB,EAChB,eAAe,
|
|
1
|
+
{"version":3,"file":"cli-shell-session-manager.d.ts","sourceRoot":"","sources":["../../../src/services/cli-shell-session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAK5C,OAAO,EAIH,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,gBAAgB,EAChB,eAAe,EAQlB,MAAM,qBAAqB,CAAC;AAwC7B,4CAA4C;AAC5C,MAAM,WAAW,mBAAmB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACrB;AAiCD;;;;GAIG;AACH,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,KAAK,CAAC,CAAiB;IAC/B,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;IACrD,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,WAAW,CAAC,CAAiB;IAErC,OAAO,CAAC,WAAW,CAAmB;gBAE1B,OAAO,GAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAO;IAMvG;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAI5C,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIlC,IAAI,OAAO,IAAI,eAAe,CAE7B;IAED,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAI1C,qEAAqE;IACrE,IAAI,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAE3C;IAED,mFAAmF;IACnF,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI;IAU/C,yEAAyE;IACzE,eAAe,IAAI,IAAI;IAevB,qBAAqB;IACrB,WAAW,IAAI,mBAAmB,EAAE;IAapC;;;OAGG;IACG,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAkE9E,yCAAyC;YAC3B,SAAS;IA0DvB,OAAO,CAAC,KAAK;IA4Eb,2DAA2D;IAC3D,OAAO,CAAC,SAAS;IAoCjB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;IAO5B;;;;;;;OAOG;IACG,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,kGAAkG;YACpF,iBAAiB;IA0B/B,OAAO,CAAC,QAAQ;IAQhB;;;;OAIG;IACH,OAAO,CAAC,GAAG;IA2BX,OAAO,CAAC,KAAK;IAqBb,iDAAiD;IACjD,OAAO,IAAI,IAAI;IAYf,OAAO,CAAC,eAAe;IAIvB,iGAAiG;IACjG,OAAO,CAAC,YAAY;IASpB,uEAAuE;IACvE,OAAO,CAAC,IAAI;CAKf"}
|
|
@@ -391,7 +391,7 @@ class CliShellSessionManager {
|
|
|
391
391
|
ensureCheckTimer() {
|
|
392
392
|
if (this._checkTimer || !this._auth)
|
|
393
393
|
return;
|
|
394
|
-
const interval =
|
|
394
|
+
const interval = (0, cli_shell_options_1.effectiveSessionCheckIntervalMs)(this._options.sessionCheckIntervalMs);
|
|
395
395
|
this._checkTimer = setInterval(() => void this.recheck(), interval);
|
|
396
396
|
this._checkTimer.unref?.();
|
|
397
397
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-shell-session-manager.js","sourceRoot":"","sources":["../../../src/services/cli-shell-session-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli-shell-session-manager.js","sourceRoot":"","sources":["../../../src/services/cli-shell-session-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { IncomingMessage } from 'http';
|
|
1
2
|
import { WebSocket } from 'ws';
|
|
2
3
|
import { CliServerAuthContext, ICliServerAuth } from '../auth/cli-server-auth';
|
|
3
4
|
/** Close code and reason of a socket whose session ended. */
|
|
@@ -10,6 +11,16 @@ export interface SessionBoundSocketsOptions {
|
|
|
10
11
|
* short grace period when it never comes.
|
|
11
12
|
*/
|
|
12
13
|
awaitKick?: boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Permission an identity without a stored session (external auth adapter)
|
|
16
|
+
* must still hold at each re-check (`logs:read` for the logs socket).
|
|
17
|
+
*/
|
|
18
|
+
externalPermission?: string;
|
|
19
|
+
/**
|
|
20
|
+
* How often sockets of identities without a stored session are re-checked
|
|
21
|
+
* (the shell's `sessionCheckIntervalMs`: default 30 s, at most 60 s).
|
|
22
|
+
*/
|
|
23
|
+
sessionCheckIntervalMs?: number;
|
|
13
24
|
}
|
|
14
25
|
/**
|
|
15
26
|
* Binds authenticated events/logs WebSockets to the stored session behind
|
|
@@ -17,27 +28,43 @@ export interface SessionBoundSocketsOptions {
|
|
|
17
28
|
* the socket is closed with 4401 `session ended`. The auth provider's session
|
|
18
29
|
* events drive it: `session-ended` closes the session's sockets, any other
|
|
19
30
|
* event (users/groups changes, the expiry sweep) re-checks every bound socket.
|
|
20
|
-
* Identities without a stored session (external adapter) are
|
|
31
|
+
* Identities without a stored session or token (external auth adapter) are
|
|
32
|
+
* re-authenticated through the provider's `revalidate` (which runs the adapter
|
|
33
|
+
* again on the request the identity came from) every `sessionCheckIntervalMs`
|
|
34
|
+
* and on those events; they close when it fails or, with `externalPermission`,
|
|
35
|
+
* when the identity no longer holds that permission. Checks never stack: a
|
|
36
|
+
* socket whose check is still running is skipped.
|
|
21
37
|
*/
|
|
22
38
|
export declare class SessionBoundSockets {
|
|
23
39
|
private readonly _options;
|
|
24
40
|
private readonly _bound;
|
|
25
41
|
private _auth?;
|
|
26
42
|
private _unsubscribe?;
|
|
43
|
+
private _externalTimer?;
|
|
27
44
|
constructor(_options?: SessionBoundSocketsOptions);
|
|
28
45
|
/** Installs the auth provider and subscribes to its session events. */
|
|
29
46
|
setAuth(auth: ICliServerAuth | undefined): void;
|
|
30
|
-
/**
|
|
31
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Tracks `ws` when `ctx` comes from a stored session or an API token, or —
|
|
49
|
+
* when the provider can re-validate it — from an external auth adapter.
|
|
50
|
+
* `request` is the socket's upgrade request.
|
|
51
|
+
*/
|
|
52
|
+
bind(ws: WebSocket, ctx: CliServerAuthContext | undefined, request?: IncomingMessage): void;
|
|
32
53
|
unbind(ws: WebSocket): void;
|
|
33
54
|
/** True once the socket's session ended (it must not receive server-wide events any more). */
|
|
34
55
|
isEnding(ws: WebSocket): boolean;
|
|
35
56
|
/** `session-kicked` was delivered to `ws` for its own session: close it now. */
|
|
36
57
|
kicked(ws: WebSocket): void;
|
|
37
|
-
/**
|
|
38
|
-
|
|
58
|
+
/**
|
|
59
|
+
* Re-checks every bound socket (optionally only `userId`'s, or only the
|
|
60
|
+
* external-adapter ones) and closes those whose session ended.
|
|
61
|
+
*/
|
|
62
|
+
recheck(userId?: string, externalOnly?: boolean): Promise<void>;
|
|
39
63
|
dispose(): void;
|
|
40
64
|
private onSessionEvent;
|
|
65
|
+
/** Re-checks external-adapter sockets every `sessionCheckIntervalMs` while any is bound. */
|
|
66
|
+
private ensureExternalTimer;
|
|
67
|
+
private stopExternalTimerIfIdle;
|
|
41
68
|
/** The session behind `ws` ended; `mayBeKicked`: a `session-kicked` event may still follow. */
|
|
42
69
|
private ended;
|
|
43
70
|
private close;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-bound-sockets.d.ts","sourceRoot":"","sources":["../../../src/services/session-bound-sockets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAyB,cAAc,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"session-bound-sockets.d.ts","sourceRoot":"","sources":["../../../src/services/session-bound-sockets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAyB,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAKtG,6DAA6D;AAC7D,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,eAAO,MAAM,oBAAoB,kBAAkB,CAAC;AAQpD,MAAM,WAAW,0BAA0B;IACvC;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACnC;AAaD;;;;;;;;;;;;GAYG;AACH,qBAAa,mBAAmB;IAMhB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IALrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;IACtD,OAAO,CAAC,KAAK,CAAC,CAAiB;IAC/B,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,cAAc,CAAC,CAAiC;gBAE3B,QAAQ,GAAE,0BAA+B;IAEtE,uEAAuE;IACvE,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI;IAS/C;;;;OAIG;IACH,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAU3F,MAAM,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAO3B,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO;IAIhC,gFAAgF;IAChF,MAAM,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAI3B;;;OAGG;IACG,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BnE,OAAO,IAAI,IAAI;IAWf,OAAO,CAAC,cAAc;IAUtB,4FAA4F;IAC5F,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,uBAAuB;IAO/B,+FAA+F;IAC/F,OAAO,CAAC,KAAK;IAUb,OAAO,CAAC,KAAK;CAUhB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.SessionBoundSockets = exports.SESSION_ENDED_REASON = exports.SESSION_ENDED_CLOSE_CODE = void 0;
|
|
4
4
|
const ws_1 = require("ws");
|
|
5
5
|
const logger_1 = require("../utils/logger");
|
|
6
|
+
const cli_shell_options_1 = require("./cli-shell-options");
|
|
6
7
|
const logger = (0, logger_1.createLogger)('SessionBoundSockets');
|
|
7
8
|
/** Close code and reason of a socket whose session ended. */
|
|
8
9
|
exports.SESSION_ENDED_CLOSE_CODE = 4401;
|
|
@@ -18,13 +19,19 @@ const KICK_GRACE_MS = 1000;
|
|
|
18
19
|
* the socket is closed with 4401 `session ended`. The auth provider's session
|
|
19
20
|
* events drive it: `session-ended` closes the session's sockets, any other
|
|
20
21
|
* event (users/groups changes, the expiry sweep) re-checks every bound socket.
|
|
21
|
-
* Identities without a stored session (external adapter) are
|
|
22
|
+
* Identities without a stored session or token (external auth adapter) are
|
|
23
|
+
* re-authenticated through the provider's `revalidate` (which runs the adapter
|
|
24
|
+
* again on the request the identity came from) every `sessionCheckIntervalMs`
|
|
25
|
+
* and on those events; they close when it fails or, with `externalPermission`,
|
|
26
|
+
* when the identity no longer holds that permission. Checks never stack: a
|
|
27
|
+
* socket whose check is still running is skipped.
|
|
22
28
|
*/
|
|
23
29
|
class SessionBoundSockets {
|
|
24
30
|
_options;
|
|
25
31
|
_bound = new Map();
|
|
26
32
|
_auth;
|
|
27
33
|
_unsubscribe;
|
|
34
|
+
_externalTimer;
|
|
28
35
|
constructor(_options = {}) {
|
|
29
36
|
this._options = _options;
|
|
30
37
|
}
|
|
@@ -37,16 +44,28 @@ class SessionBoundSockets {
|
|
|
37
44
|
this._unsubscribe = auth.onSessionEvent((event) => this.onSessionEvent(event));
|
|
38
45
|
}
|
|
39
46
|
}
|
|
40
|
-
/**
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Tracks `ws` when `ctx` comes from a stored session or an API token, or —
|
|
49
|
+
* when the provider can re-validate it — from an external auth adapter.
|
|
50
|
+
* `request` is the socket's upgrade request.
|
|
51
|
+
*/
|
|
52
|
+
bind(ws, ctx, request) {
|
|
53
|
+
if (!ctx)
|
|
54
|
+
return;
|
|
55
|
+
if (ctx.sessionId || ctx.tokenId) {
|
|
56
|
+
this._bound.set(ws, { ctx, request, external: false });
|
|
57
|
+
}
|
|
58
|
+
else if (this._auth?.revalidate) {
|
|
59
|
+
this._bound.set(ws, { ctx, request, external: true });
|
|
60
|
+
this.ensureExternalTimer();
|
|
61
|
+
}
|
|
44
62
|
}
|
|
45
63
|
unbind(ws) {
|
|
46
64
|
const entry = this._bound.get(ws);
|
|
47
65
|
if (entry?.ending)
|
|
48
66
|
clearTimeout(entry.ending);
|
|
49
67
|
this._bound.delete(ws);
|
|
68
|
+
this.stopExternalTimerIfIdle();
|
|
50
69
|
}
|
|
51
70
|
/** True once the socket's session ended (it must not receive server-wide events any more). */
|
|
52
71
|
isEnding(ws) {
|
|
@@ -56,20 +75,29 @@ class SessionBoundSockets {
|
|
|
56
75
|
kicked(ws) {
|
|
57
76
|
this.close(ws);
|
|
58
77
|
}
|
|
59
|
-
/**
|
|
60
|
-
|
|
78
|
+
/**
|
|
79
|
+
* Re-checks every bound socket (optionally only `userId`'s, or only the
|
|
80
|
+
* external-adapter ones) and closes those whose session ended.
|
|
81
|
+
*/
|
|
82
|
+
async recheck(userId, externalOnly = false) {
|
|
61
83
|
const auth = this._auth;
|
|
62
84
|
if (!auth?.revalidate)
|
|
63
85
|
return;
|
|
86
|
+
const permission = this._options.externalPermission;
|
|
64
87
|
const checks = [];
|
|
65
88
|
for (const [ws, entry] of this._bound) {
|
|
66
89
|
if (entry.ending || entry.checking || (userId && entry.ctx.userId !== userId))
|
|
67
90
|
continue;
|
|
91
|
+
if (externalOnly && !entry.external)
|
|
92
|
+
continue;
|
|
68
93
|
entry.checking = true;
|
|
69
94
|
checks.push((async () => {
|
|
70
95
|
let alive;
|
|
71
96
|
try {
|
|
72
|
-
|
|
97
|
+
const fresh = await auth.revalidate(entry.ctx, entry.request);
|
|
98
|
+
alive = !!fresh && (!entry.external || !permission || auth.hasPermission(fresh, permission));
|
|
99
|
+
if (fresh && alive && entry.external)
|
|
100
|
+
entry.ctx = { ...entry.ctx, permissions: fresh.permissions };
|
|
73
101
|
}
|
|
74
102
|
catch (err) {
|
|
75
103
|
logger.warn('Socket session check failed; closing the socket: %s', err?.message ?? err);
|
|
@@ -77,7 +105,7 @@ class SessionBoundSockets {
|
|
|
77
105
|
}
|
|
78
106
|
entry.checking = false;
|
|
79
107
|
if (!alive && this._bound.get(ws) === entry)
|
|
80
|
-
this.ended(ws, entry,
|
|
108
|
+
this.ended(ws, entry, !entry.external);
|
|
81
109
|
})());
|
|
82
110
|
}
|
|
83
111
|
await Promise.all(checks);
|
|
@@ -85,6 +113,9 @@ class SessionBoundSockets {
|
|
|
85
113
|
dispose() {
|
|
86
114
|
this._unsubscribe?.();
|
|
87
115
|
this._unsubscribe = undefined;
|
|
116
|
+
if (this._externalTimer)
|
|
117
|
+
clearInterval(this._externalTimer);
|
|
118
|
+
this._externalTimer = undefined;
|
|
88
119
|
for (const entry of this._bound.values()) {
|
|
89
120
|
if (entry.ending)
|
|
90
121
|
clearTimeout(entry.ending);
|
|
@@ -102,6 +133,20 @@ class SessionBoundSockets {
|
|
|
102
133
|
void this.recheck(event.userId);
|
|
103
134
|
}
|
|
104
135
|
}
|
|
136
|
+
/** Re-checks external-adapter sockets every `sessionCheckIntervalMs` while any is bound. */
|
|
137
|
+
ensureExternalTimer() {
|
|
138
|
+
if (this._externalTimer)
|
|
139
|
+
return;
|
|
140
|
+
const interval = (0, cli_shell_options_1.effectiveSessionCheckIntervalMs)(this._options.sessionCheckIntervalMs);
|
|
141
|
+
this._externalTimer = setInterval(() => void this.recheck(undefined, true), interval);
|
|
142
|
+
this._externalTimer.unref?.();
|
|
143
|
+
}
|
|
144
|
+
stopExternalTimerIfIdle() {
|
|
145
|
+
if (this._externalTimer && ![...this._bound.values()].some((e) => e.external)) {
|
|
146
|
+
clearInterval(this._externalTimer);
|
|
147
|
+
this._externalTimer = undefined;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
105
150
|
/** The session behind `ws` ended; `mayBeKicked`: a `session-kicked` event may still follow. */
|
|
106
151
|
ended(ws, entry, mayBeKicked) {
|
|
107
152
|
if (!this._options.awaitKick || !mayBeKicked) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-bound-sockets.js","sourceRoot":"","sources":["../../../src/services/session-bound-sockets.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"session-bound-sockets.js","sourceRoot":"","sources":["../../../src/services/session-bound-sockets.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@qodalis/cli-server-node",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.13",
|
|
4
4
|
"description": "Node.js CLI server for Qodalis CLI ecosystem — use as a library in existing Express apps or run standalone",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -37,10 +37,10 @@
|
|
|
37
37
|
},
|
|
38
38
|
"homepage": "https://qodalis.com/",
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@qodalis/cli-server-abstractions": "^1.0.0-beta.
|
|
41
|
-
"@qodalis/cli-server-plugin-data-explorer": "^1.0.0-beta.
|
|
42
|
-
"@qodalis/cli-server-plugin-filesystem": "^1.0.0-beta.
|
|
43
|
-
"@qodalis/cli-server-plugin-jobs": "^1.0.0-beta.
|
|
40
|
+
"@qodalis/cli-server-abstractions": "^1.0.0-beta.13",
|
|
41
|
+
"@qodalis/cli-server-plugin-data-explorer": "^1.0.0-beta.13",
|
|
42
|
+
"@qodalis/cli-server-plugin-filesystem": "^1.0.0-beta.13",
|
|
43
|
+
"@qodalis/cli-server-plugin-jobs": "^1.0.0-beta.13",
|
|
44
44
|
"cors": "^2.8.5",
|
|
45
45
|
"express": "^4.22.3",
|
|
46
46
|
"multer": "^2.5.0",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
},
|
|
50
50
|
"optionalDependencies": {
|
|
51
51
|
"@elastic/elasticsearch": "^8.16.0",
|
|
52
|
-
"@qodalis/cli-server-plugin-filesystem-json": "^1.0.0-beta.
|
|
53
|
-
"@qodalis/cli-server-plugin-filesystem-s3": "^1.0.0-beta.
|
|
54
|
-
"@qodalis/cli-server-plugin-filesystem-sqlite": "^1.0.0-beta.
|
|
52
|
+
"@qodalis/cli-server-plugin-filesystem-json": "^1.0.0-beta.13",
|
|
53
|
+
"@qodalis/cli-server-plugin-filesystem-s3": "^1.0.0-beta.13",
|
|
54
|
+
"@qodalis/cli-server-plugin-filesystem-sqlite": "^1.0.0-beta.13",
|
|
55
55
|
"better-sqlite3": "^13.0.3",
|
|
56
56
|
"ioredis": "^5.4.0",
|
|
57
57
|
"mongodb": "^6.0.0",
|