@serve.zone/dcrouter 13.27.1 → 13.29.1
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/.smartconfig.json +32 -10
- package/dist_serve/bundle.js +930 -799
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +9 -1
- package/dist_ts/classes.dcrouter.js +22 -7
- package/dist_ts/config/classes.gateway-client-manager.d.ts +22 -0
- package/dist_ts/config/classes.gateway-client-manager.js +101 -0
- package/dist_ts/config/classes.route-config-manager.js +8 -7
- package/dist_ts/config/index.d.ts +1 -0
- package/dist_ts/config/index.js +2 -1
- package/dist_ts/db/documents/classes.gateway-client.doc.d.ts +18 -0
- package/dist_ts/db/documents/classes.gateway-client.doc.js +133 -0
- package/dist_ts/db/documents/index.d.ts +1 -0
- package/dist_ts/db/documents/index.js +2 -1
- package/dist_ts/opsserver/classes.opsserver.js +4 -1
- package/dist_ts/opsserver/handlers/admin.handler.d.ts +21 -6
- package/dist_ts/opsserver/handlers/admin.handler.js +188 -29
- package/dist_ts/opsserver/handlers/certificate.handler.js +5 -1
- package/dist_ts/opsserver/handlers/target-profile.handler.js +3 -1
- package/dist_ts/opsserver/handlers/users.handler.js +2 -2
- package/dist_ts/opsserver/handlers/workhoster.handler.d.ts +4 -0
- package/dist_ts/opsserver/handlers/workhoster.handler.js +146 -16
- package/dist_ts/plugins.d.ts +2 -0
- package/dist_ts/plugins.js +4 -1
- package/dist_ts/vpn/classes.vpn-manager.d.ts +2 -0
- package/dist_ts/vpn/classes.vpn-manager.js +41 -20
- package/dist_ts_apiclient/classes.workhoster.d.ts +1 -0
- package/dist_ts_apiclient/classes.workhoster.js +5 -1
- package/dist_ts_interfaces/data/workhoster.d.ts +28 -3
- package/dist_ts_interfaces/requests/admin.d.ts +38 -0
- package/dist_ts_interfaces/requests/users.d.ts +2 -5
- package/dist_ts_interfaces/requests/workhoster.d.ts +83 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +46 -0
- package/dist_ts_web/appstate.js +105 -1
- package/dist_ts_web/elements/access/ops-view-apitokens.js +2 -1
- package/dist_ts_web/elements/access/ops-view-gatewayclients.d.ts +15 -0
- package/dist_ts_web/elements/access/ops-view-gatewayclients.js +293 -0
- package/dist_ts_web/elements/domains/ops-view-certificates.d.ts +6 -0
- package/dist_ts_web/elements/domains/ops-view-certificates.js +155 -13
- package/dist_ts_web/elements/network/ops-view-routes.js +2 -1
- package/dist_ts_web/elements/ops-dashboard.d.ts +4 -0
- package/dist_ts_web/elements/ops-dashboard.js +102 -3
- package/dist_ts_web/router.js +3 -3
- package/package.json +15 -22
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +30 -6
- package/ts/config/classes.gateway-client-manager.ts +117 -0
- package/ts/config/classes.route-config-manager.ts +8 -6
- package/ts/config/index.ts +2 -1
- package/ts/db/documents/classes.gateway-client.doc.ts +54 -0
- package/ts/db/documents/index.ts +1 -0
- package/ts/opsserver/classes.opsserver.ts +3 -0
- package/ts/opsserver/handlers/admin.handler.ts +244 -32
- package/ts/opsserver/handlers/certificate.handler.ts +5 -0
- package/ts/opsserver/handlers/target-profile.handler.ts +2 -0
- package/ts/opsserver/handlers/users.handler.ts +1 -1
- package/ts/opsserver/handlers/workhoster.handler.ts +191 -17
- package/ts/plugins.ts +7 -0
- package/ts/vpn/classes.vpn-manager.ts +56 -25
- package/ts_apiclient/classes.workhoster.ts +8 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +160 -0
- package/ts_web/elements/access/ops-view-apitokens.ts +1 -0
- package/ts_web/elements/access/ops-view-gatewayclients.ts +250 -0
- package/ts_web/elements/domains/ops-view-certificates.ts +166 -11
- package/ts_web/elements/network/ops-view-routes.ts +1 -0
- package/ts_web/elements/ops-dashboard.ts +102 -0
- package/ts_web/router.ts +2 -2
|
@@ -55,6 +55,7 @@ import { OpsViewEmails } from './email/ops-view-emails.js';
|
|
|
55
55
|
import { OpsViewEmailSecurity } from './email/ops-view-email-security.js';
|
|
56
56
|
import { OpsViewEmailDomains } from './email/ops-view-email-domains.js';
|
|
57
57
|
// Access group
|
|
58
|
+
import { OpsViewGatewayClients } from './access/ops-view-gatewayclients.js';
|
|
58
59
|
import { OpsViewApiTokens } from './access/ops-view-apitokens.js';
|
|
59
60
|
import { OpsViewUsers } from './access/ops-view-users.js';
|
|
60
61
|
// Security group
|
|
@@ -101,14 +102,16 @@ let OpsDashboard = (() => {
|
|
|
101
102
|
});
|
|
102
103
|
get loginState() { return this.#loginState_accessor_storage; }
|
|
103
104
|
set loginState(value) { this.#loginState_accessor_storage = value; }
|
|
104
|
-
|
|
105
|
+
bootstrapStepper = __runInitializers(this, _loginState_extraInitializers);
|
|
106
|
+
bootstrapCheckPromise;
|
|
107
|
+
#uiState_accessor_storage = __runInitializers(this, _uiState_initializers, {
|
|
105
108
|
activeView: 'overview',
|
|
106
109
|
activeSubview: null,
|
|
107
110
|
sidebarCollapsed: false,
|
|
108
111
|
autoRefresh: true,
|
|
109
112
|
refreshInterval: 1000,
|
|
110
113
|
theme: 'light',
|
|
111
|
-
})
|
|
114
|
+
});
|
|
112
115
|
get uiState() { return this.#uiState_accessor_storage; }
|
|
113
116
|
set uiState(value) { this.#uiState_accessor_storage = value; }
|
|
114
117
|
#configState_accessor_storage = (__runInitializers(this, _uiState_extraInitializers), __runInitializers(this, _configState_initializers, {
|
|
@@ -159,6 +162,7 @@ let OpsDashboard = (() => {
|
|
|
159
162
|
name: 'Access',
|
|
160
163
|
iconName: 'lucide:keyRound',
|
|
161
164
|
subViews: [
|
|
165
|
+
{ slug: 'gatewayclients', name: 'Gateway Clients', iconName: 'lucide:plugZap', element: OpsViewGatewayClients },
|
|
162
166
|
{ slug: 'apitokens', name: 'API Tokens', iconName: 'lucide:key', element: OpsViewApiTokens },
|
|
163
167
|
{ slug: 'users', name: 'Users', iconName: 'lucide:users', element: OpsViewUsers },
|
|
164
168
|
],
|
|
@@ -354,6 +358,7 @@ let OpsDashboard = (() => {
|
|
|
354
358
|
await simpleLogin.switchToSlottedContent();
|
|
355
359
|
await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
|
|
356
360
|
await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
|
|
361
|
+
await this.ensureAdminBootstrap();
|
|
357
362
|
}
|
|
358
363
|
else {
|
|
359
364
|
// Server rejected the JWT — clear state, show login
|
|
@@ -388,6 +393,7 @@ let OpsDashboard = (() => {
|
|
|
388
393
|
await simpleLogin.switchToSlottedContent();
|
|
389
394
|
await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
|
|
390
395
|
await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
|
|
396
|
+
await this.ensureAdminBootstrap();
|
|
391
397
|
}
|
|
392
398
|
else {
|
|
393
399
|
form.setStatus('error', 'Login failed!');
|
|
@@ -395,6 +401,99 @@ let OpsDashboard = (() => {
|
|
|
395
401
|
form.reset();
|
|
396
402
|
}
|
|
397
403
|
}
|
|
404
|
+
async ensureAdminBootstrap() {
|
|
405
|
+
if (!this.loginState.identity || this.bootstrapStepper?.isConnected) {
|
|
406
|
+
return;
|
|
407
|
+
}
|
|
408
|
+
if (this.bootstrapCheckPromise) {
|
|
409
|
+
return this.bootstrapCheckPromise;
|
|
410
|
+
}
|
|
411
|
+
this.bootstrapCheckPromise = (async () => {
|
|
412
|
+
try {
|
|
413
|
+
const status = await appstate.getAdminBootstrapStatus();
|
|
414
|
+
if (status.needsBootstrap) {
|
|
415
|
+
await this.showAdminBootstrapStepper(status);
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
catch (error) {
|
|
419
|
+
console.error('Admin bootstrap status check failed:', error);
|
|
420
|
+
}
|
|
421
|
+
finally {
|
|
422
|
+
this.bootstrapCheckPromise = undefined;
|
|
423
|
+
}
|
|
424
|
+
})();
|
|
425
|
+
return this.bootstrapCheckPromise;
|
|
426
|
+
}
|
|
427
|
+
async showAdminBootstrapStepper(statusArg) {
|
|
428
|
+
const { DeesStepper } = await import('@design.estate/dees-catalog');
|
|
429
|
+
this.bootstrapStepper = await DeesStepper.createAndShow({
|
|
430
|
+
cancelable: false,
|
|
431
|
+
steps: [
|
|
432
|
+
{
|
|
433
|
+
title: 'Create Persisted Admin',
|
|
434
|
+
content: html `
|
|
435
|
+
<div style="display: grid; gap: 16px; color: var(--dees-color-text-secondary); font-size: 14px; line-height: 1.5;">
|
|
436
|
+
<p style="margin: 0;">
|
|
437
|
+
This router is currently using the temporary bootstrap admin. Create the first persisted admin account to continue.
|
|
438
|
+
</p>
|
|
439
|
+
<dees-form>
|
|
440
|
+
<dees-input-text .key=${'email'} .label=${'Admin email'} .required=${true}></dees-input-text>
|
|
441
|
+
<dees-input-text .key=${'name'} .label=${'Display name'}></dees-input-text>
|
|
442
|
+
<dees-input-text .key=${'password'} .label=${'Password'} .required=${true} .isPasswordBool=${true}></dees-input-text>
|
|
443
|
+
<dees-input-text .key=${'passwordConfirm'} .label=${'Confirm password'} .required=${true} .isPasswordBool=${true}></dees-input-text>
|
|
444
|
+
<dees-input-checkbox
|
|
445
|
+
.key=${'enableIdpGlobalAuth'}
|
|
446
|
+
.label=${'Allow idp.global login for this email'}
|
|
447
|
+
.description=${statusArg.idpGlobalConfigured
|
|
448
|
+
? 'The local account remains authoritative; idp.global only verifies identity.'
|
|
449
|
+
: 'Requires DCROUTER_IDP_GLOBAL_URL before idp.global logins can work.'}
|
|
450
|
+
></dees-input-checkbox>
|
|
451
|
+
</dees-form>
|
|
452
|
+
</div>
|
|
453
|
+
`,
|
|
454
|
+
menuOptions: [
|
|
455
|
+
{
|
|
456
|
+
name: 'Create admin',
|
|
457
|
+
action: async (stepperArg) => {
|
|
458
|
+
const form = stepperArg.shadowRoot?.querySelector('.selected dees-form');
|
|
459
|
+
if (!form)
|
|
460
|
+
return;
|
|
461
|
+
const formData = await form.collectFormData();
|
|
462
|
+
const email = String(formData.email || '').trim();
|
|
463
|
+
const name = String(formData.name || '').trim();
|
|
464
|
+
const password = String(formData.password || '');
|
|
465
|
+
const passwordConfirm = String(formData.passwordConfirm || '');
|
|
466
|
+
if (!email || !password) {
|
|
467
|
+
form.setStatus?.('error', 'Email and password are required.');
|
|
468
|
+
return;
|
|
469
|
+
}
|
|
470
|
+
if (password !== passwordConfirm) {
|
|
471
|
+
form.setStatus?.('error', 'Passwords do not match.');
|
|
472
|
+
return;
|
|
473
|
+
}
|
|
474
|
+
try {
|
|
475
|
+
form.setStatus?.('pending', 'Creating persisted admin...');
|
|
476
|
+
await appstate.createInitialAdminUser({
|
|
477
|
+
email,
|
|
478
|
+
name,
|
|
479
|
+
password,
|
|
480
|
+
enableIdpGlobalAuth: Boolean(formData.enableIdpGlobalAuth),
|
|
481
|
+
});
|
|
482
|
+
form.setStatus?.('success', 'Persisted admin created.');
|
|
483
|
+
await stepperArg.destroy();
|
|
484
|
+
this.bootstrapStepper = undefined;
|
|
485
|
+
await appstate.usersStatePart.dispatchAction(appstate.fetchUsersAction, null);
|
|
486
|
+
}
|
|
487
|
+
catch (error) {
|
|
488
|
+
form.setStatus?.('error', error instanceof Error ? error.message : 'Failed to create admin.');
|
|
489
|
+
}
|
|
490
|
+
},
|
|
491
|
+
},
|
|
492
|
+
],
|
|
493
|
+
},
|
|
494
|
+
],
|
|
495
|
+
});
|
|
496
|
+
}
|
|
398
497
|
static {
|
|
399
498
|
__runInitializers(_classThis, _classExtraInitializers);
|
|
400
499
|
}
|
|
@@ -402,4 +501,4 @@ let OpsDashboard = (() => {
|
|
|
402
501
|
return OpsDashboard = _classThis;
|
|
403
502
|
})();
|
|
404
503
|
export { OpsDashboard };
|
|
405
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-dashboard.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-dashboard.ts"],"names":[],"mappings":"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"}
|
|
504
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-dashboard.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-dashboard.ts"],"names":[],"mappings":"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"}
|
package/dist_ts_web/router.js
CHANGED
|
@@ -8,7 +8,7 @@ const subviewMap = {
|
|
|
8
8
|
overview: ['stats', 'configuration'],
|
|
9
9
|
network: ['activity', 'routes', 'sourceprofiles', 'networktargets', 'targetprofiles', 'remoteingress', 'vpn'],
|
|
10
10
|
email: ['log', 'security', 'domains'],
|
|
11
|
-
access: ['apitokens', 'users'],
|
|
11
|
+
access: ['gatewayclients', 'apitokens', 'users'],
|
|
12
12
|
security: ['overview', 'blocked', 'authentication'],
|
|
13
13
|
domains: ['providers', 'domains', 'dns', 'certificates'],
|
|
14
14
|
};
|
|
@@ -17,7 +17,7 @@ const defaultSubview = {
|
|
|
17
17
|
overview: 'stats',
|
|
18
18
|
network: 'activity',
|
|
19
19
|
email: 'log',
|
|
20
|
-
access: '
|
|
20
|
+
access: 'gatewayclients',
|
|
21
21
|
security: 'overview',
|
|
22
22
|
domains: 'domains',
|
|
23
23
|
};
|
|
@@ -148,4 +148,4 @@ class AppRouter {
|
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
export const appRouter = new AppRouter();
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViL3JvdXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssUUFBUSxNQUFNLGVBQWUsQ0FBQztBQUUxQyxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDO0FBRXJFLHFDQUFxQztBQUNyQyxNQUFNLFNBQVMsR0FBRyxDQUFDLE1BQU0sQ0FBVSxDQUFDO0FBRXBDLHdDQUF3QztBQUN4QyxNQUFNLFVBQVUsR0FBc0M7SUFDcEQsUUFBUSxFQUFFLENBQUMsT0FBTyxFQUFFLGVBQWUsQ0FBVTtJQUM3QyxPQUFPLEVBQUUsQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixFQUFFLGdCQUFnQixFQUFFLGdCQUFnQixFQUFFLGVBQWUsRUFBRSxLQUFLLENBQVU7SUFDdEgsS0FBSyxFQUFFLENBQUMsS0FBSyxFQUFFLFVBQVUsRUFBRSxTQUFTLENBQVU7SUFDOUMsTUFBTSxFQUFFLENBQUMsZ0JBQWdCLEVBQUUsV0FBVyxFQUFFLE9BQU8sQ0FBVTtJQUN6RCxRQUFRLEVBQUUsQ0FBQyxVQUFVLEVBQUUsU0FBUyxFQUFFLGdCQUFnQixDQUFVO0lBQzVELE9BQU8sRUFBRSxDQUFDLFdBQVcsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLGNBQWMsQ0FBVTtDQUNsRSxDQUFDO0FBRUYsdURBQXVEO0FBQ3ZELE1BQU0sY0FBYyxHQUEyQjtJQUM3QyxRQUFRLEVBQUUsT0FBTztJQUNqQixPQUFPLEVBQUUsVUFBVTtJQUNuQixLQUFLLEVBQUUsS0FBSztJQUNaLE1BQU0sRUFBRSxnQkFBZ0I7SUFDeEIsUUFBUSxFQUFFLFVBQVU7SUFDcEIsT0FBTyxFQUFFLFNBQVM7Q0FDbkIsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLGtC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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "13.
|
|
4
|
+
"version": "13.29.1",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -11,16 +11,6 @@
|
|
|
11
11
|
},
|
|
12
12
|
"author": "Task Venture Capital GmbH",
|
|
13
13
|
"license": "MIT",
|
|
14
|
-
"scripts": {
|
|
15
|
-
"test": "(tstest test/ --verbose --logfile --timeout 60)",
|
|
16
|
-
"start": "(node ./cli.js)",
|
|
17
|
-
"startTs": "(node cli.ts.js)",
|
|
18
|
-
"build": "(tsbuild tsfolders --allowimplicitany && npm run bundle)",
|
|
19
|
-
"build:docker": "tsdocker build --verbose",
|
|
20
|
-
"release:docker": "tsdocker push --verbose",
|
|
21
|
-
"bundle": "(tsbundle)",
|
|
22
|
-
"watch": "tswatch"
|
|
23
|
-
},
|
|
24
14
|
"devDependencies": {
|
|
25
15
|
"@git.zone/tsbuild": "^4.4.0",
|
|
26
16
|
"@git.zone/tsbundle": "^2.10.1",
|
|
@@ -38,6 +28,7 @@
|
|
|
38
28
|
"@apiclient.xyz/cloudflare": "^7.1.0",
|
|
39
29
|
"@design.estate/dees-catalog": "^3.81.0",
|
|
40
30
|
"@design.estate/dees-element": "^2.2.4",
|
|
31
|
+
"@idp.global/sdk": "^1.2.0",
|
|
41
32
|
"@push.rocks/lik": "^6.4.1",
|
|
42
33
|
"@push.rocks/projectinfo": "^5.1.0",
|
|
43
34
|
"@push.rocks/qenv": "^6.1.4",
|
|
@@ -61,7 +52,7 @@
|
|
|
61
52
|
"@push.rocks/smartrx": "^3.0.10",
|
|
62
53
|
"@push.rocks/smartstate": "^2.3.1",
|
|
63
54
|
"@push.rocks/smartunique": "^3.0.9",
|
|
64
|
-
"@push.rocks/smartvpn": "1.19.
|
|
55
|
+
"@push.rocks/smartvpn": "1.19.4",
|
|
65
56
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
66
57
|
"@serve.zone/catalog": "^2.12.4",
|
|
67
58
|
"@serve.zone/interfaces": "^5.5.0",
|
|
@@ -98,14 +89,6 @@
|
|
|
98
89
|
"VLAN assignment",
|
|
99
90
|
"MAC authentication"
|
|
100
91
|
],
|
|
101
|
-
"pnpm": {
|
|
102
|
-
"onlyBuiltDependencies": [
|
|
103
|
-
"esbuild",
|
|
104
|
-
"mongodb-memory-server",
|
|
105
|
-
"puppeteer"
|
|
106
|
-
]
|
|
107
|
-
},
|
|
108
|
-
"packageManager": "pnpm@10.11.0",
|
|
109
92
|
"files": [
|
|
110
93
|
"ts/**/*",
|
|
111
94
|
"ts_web/**/*",
|
|
@@ -119,5 +102,15 @@
|
|
|
119
102
|
"cli.js",
|
|
120
103
|
".smartconfig.json",
|
|
121
104
|
"readme.md"
|
|
122
|
-
]
|
|
123
|
-
|
|
105
|
+
],
|
|
106
|
+
"scripts": {
|
|
107
|
+
"test": "(tstest test/ --verbose --logfile --timeout 60)",
|
|
108
|
+
"start": "(node ./cli.js)",
|
|
109
|
+
"startTs": "(node cli.ts.js)",
|
|
110
|
+
"build": "(tsbuild tsfolders --allowimplicitany && npm run bundle)",
|
|
111
|
+
"build:docker": "tsdocker build --verbose",
|
|
112
|
+
"release:docker": "tsdocker push --verbose",
|
|
113
|
+
"bundle": "(tsbundle)",
|
|
114
|
+
"watch": "tswatch"
|
|
115
|
+
}
|
|
116
|
+
}
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.dcrouter.ts
CHANGED
|
@@ -25,7 +25,7 @@ import { MetricsManager } from './monitoring/index.js';
|
|
|
25
25
|
import { RadiusServer, type IRadiusServerConfig } from './radius/index.js';
|
|
26
26
|
import { RemoteIngressManager, TunnelManager } from './remoteingress/index.js';
|
|
27
27
|
import { VpnManager, type IVpnManagerConfig } from './vpn/index.js';
|
|
28
|
-
import { RouteConfigManager, ApiTokenManager, ReferenceResolver, DbSeeder, TargetProfileManager } from './config/index.js';
|
|
28
|
+
import { RouteConfigManager, ApiTokenManager, GatewayClientManager, ReferenceResolver, DbSeeder, TargetProfileManager } from './config/index.js';
|
|
29
29
|
import type { TIpAllowEntry } from './config/classes.route-config-manager.js';
|
|
30
30
|
import { SecurityLogger, ContentScanner, IPReputationChecker, SecurityPolicyManager } from './security/index.js';
|
|
31
31
|
import { type IHttp3Config, augmentRoutesWithHttp3 } from './http3/index.js';
|
|
@@ -167,6 +167,14 @@ export interface IDcRouterOptions {
|
|
|
167
167
|
/** Port for the OpsServer web UI (default: 3000) */
|
|
168
168
|
opsServerPort?: number;
|
|
169
169
|
|
|
170
|
+
/** Optional OpsServer account authentication settings. */
|
|
171
|
+
adminAuth?: {
|
|
172
|
+
/** Base URL for idp.global password authentication. Can also be set through DCROUTER_IDP_GLOBAL_URL. */
|
|
173
|
+
idpGlobalUrl?: string;
|
|
174
|
+
/** Test/integration hook for injecting an idp.global-compatible password client. */
|
|
175
|
+
idpClient?: Pick<plugins.idpSdkServer.IdpGlobalServerClient, 'loginWithEmailAndPassword' | 'stop'>;
|
|
176
|
+
};
|
|
177
|
+
|
|
170
178
|
remoteIngressConfig?: {
|
|
171
179
|
/** Enable remote ingress hub (default: false) */
|
|
172
180
|
enabled?: boolean;
|
|
@@ -276,6 +284,7 @@ export class DcRouter {
|
|
|
276
284
|
// Programmatic config API
|
|
277
285
|
public routeConfigManager?: RouteConfigManager;
|
|
278
286
|
public apiTokenManager?: ApiTokenManager;
|
|
287
|
+
public gatewayClientManager?: GatewayClientManager;
|
|
279
288
|
public referenceResolver?: ReferenceResolver;
|
|
280
289
|
public targetProfileManager?: TargetProfileManager;
|
|
281
290
|
|
|
@@ -617,6 +626,8 @@ export class DcRouter {
|
|
|
617
626
|
);
|
|
618
627
|
this.apiTokenManager = new ApiTokenManager();
|
|
619
628
|
await this.apiTokenManager.initialize();
|
|
629
|
+
this.gatewayClientManager = new GatewayClientManager();
|
|
630
|
+
await this.gatewayClientManager.initialize();
|
|
620
631
|
await this.routeConfigManager.initialize(
|
|
621
632
|
this.seedConfigRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
|
|
622
633
|
this.seedEmailRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
|
|
@@ -634,6 +645,7 @@ export class DcRouter {
|
|
|
634
645
|
.withStop(async () => {
|
|
635
646
|
this.routeConfigManager = undefined;
|
|
636
647
|
this.apiTokenManager = undefined;
|
|
648
|
+
this.gatewayClientManager = undefined;
|
|
637
649
|
this.referenceResolver = undefined;
|
|
638
650
|
this.targetProfileManager = undefined;
|
|
639
651
|
})
|
|
@@ -736,10 +748,14 @@ export class DcRouter {
|
|
|
736
748
|
|
|
737
749
|
// VPN Server: optional, depends on SmartProxy
|
|
738
750
|
if (this.options.vpnConfig?.enabled) {
|
|
751
|
+
const vpnServiceDeps = ['SmartProxy'];
|
|
752
|
+
if (this.options.dbConfig?.enabled !== false) {
|
|
753
|
+
vpnServiceDeps.push('ConfigManagers');
|
|
754
|
+
}
|
|
739
755
|
this.serviceManager.addService(
|
|
740
756
|
new plugins.taskbuffer.Service('VpnServer')
|
|
741
757
|
.optional()
|
|
742
|
-
.dependsOn(
|
|
758
|
+
.dependsOn(...vpnServiceDeps)
|
|
743
759
|
.withStart(async () => {
|
|
744
760
|
await this.setupVpnServer();
|
|
745
761
|
})
|
|
@@ -1101,6 +1117,7 @@ export class DcRouter {
|
|
|
1101
1117
|
});
|
|
1102
1118
|
|
|
1103
1119
|
const scheduler = this.certProvisionScheduler;
|
|
1120
|
+
smartProxyConfig.certProvisionFallbackToAcme = false;
|
|
1104
1121
|
smartProxyConfig.certProvisionFunction = async (domain, eventComms) => {
|
|
1105
1122
|
// If SmartAcme is not yet ready (still starting or retrying), fall back to HTTP-01
|
|
1106
1123
|
if (!this.smartAcmeReady) {
|
|
@@ -1149,10 +1166,10 @@ export class DcRouter {
|
|
|
1149
1166
|
await scheduler.clearBackoff(domain);
|
|
1150
1167
|
return result;
|
|
1151
1168
|
} catch (err: unknown) {
|
|
1152
|
-
|
|
1153
|
-
await scheduler.recordFailure(domain,
|
|
1154
|
-
eventComms.warn(
|
|
1155
|
-
|
|
1169
|
+
const message = `DNS-01 failed for ${domain}: ${(err as Error).message}`;
|
|
1170
|
+
await scheduler.recordFailure(domain, message);
|
|
1171
|
+
eventComms.warn(message);
|
|
1172
|
+
throw new Error(message);
|
|
1156
1173
|
}
|
|
1157
1174
|
};
|
|
1158
1175
|
}
|
|
@@ -2413,6 +2430,13 @@ export class DcRouter {
|
|
|
2413
2430
|
return;
|
|
2414
2431
|
}
|
|
2415
2432
|
|
|
2433
|
+
if (this.options.dbConfig?.enabled === false) {
|
|
2434
|
+
throw new Error('VPN requires dbConfig.enabled because clients, keys, routes, and target profiles are persisted in DcRouterDb');
|
|
2435
|
+
}
|
|
2436
|
+
if (!this.routeConfigManager || !this.targetProfileManager) {
|
|
2437
|
+
throw new Error('VPN requires initialized route and target profile managers');
|
|
2438
|
+
}
|
|
2439
|
+
|
|
2416
2440
|
logger.log('info', 'Setting up VPN server...');
|
|
2417
2441
|
|
|
2418
2442
|
this.vpnManager = new VpnManager({
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import { GatewayClientDoc } from '../db/index.js';
|
|
3
|
+
import type { IGatewayClient } from '../../ts_interfaces/data/workhoster.js';
|
|
4
|
+
|
|
5
|
+
const defaultCapabilities: IGatewayClient['capabilities'] = {
|
|
6
|
+
readDomains: true,
|
|
7
|
+
readDnsRecords: true,
|
|
8
|
+
syncRoutes: true,
|
|
9
|
+
syncDnsRecords: false,
|
|
10
|
+
requestCertificates: false,
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
export class GatewayClientManager {
|
|
14
|
+
public async initialize(): Promise<void> {}
|
|
15
|
+
|
|
16
|
+
public async listClients(): Promise<IGatewayClient[]> {
|
|
17
|
+
const docs = await GatewayClientDoc.findAll();
|
|
18
|
+
return docs.map((doc) => this.toPublicClient(doc));
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
public async getClient(id: string): Promise<IGatewayClient | null> {
|
|
22
|
+
const doc = await GatewayClientDoc.findById(id);
|
|
23
|
+
return doc ? this.toPublicClient(doc) : null;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
public async createClient(options: {
|
|
27
|
+
id?: string;
|
|
28
|
+
type: IGatewayClient['type'];
|
|
29
|
+
name: string;
|
|
30
|
+
description?: string;
|
|
31
|
+
hostnamePatterns?: string[];
|
|
32
|
+
allowedRouteTargets?: IGatewayClient['allowedRouteTargets'];
|
|
33
|
+
capabilities?: IGatewayClient['capabilities'];
|
|
34
|
+
createdBy: string;
|
|
35
|
+
}): Promise<IGatewayClient> {
|
|
36
|
+
const id = this.normalizeId(options.id || `${options.type}-${plugins.uuid.v4()}`);
|
|
37
|
+
if (!id) {
|
|
38
|
+
throw new Error('gateway client id is required');
|
|
39
|
+
}
|
|
40
|
+
if (await GatewayClientDoc.findById(id)) {
|
|
41
|
+
throw new Error('gateway client already exists');
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const now = Date.now();
|
|
45
|
+
const doc = new GatewayClientDoc();
|
|
46
|
+
doc.id = id;
|
|
47
|
+
doc.type = options.type;
|
|
48
|
+
doc.name = options.name.trim();
|
|
49
|
+
doc.description = options.description?.trim() || undefined;
|
|
50
|
+
doc.hostnamePatterns = this.normalizeStringList(options.hostnamePatterns || []);
|
|
51
|
+
doc.allowedRouteTargets = this.normalizeAllowedRouteTargets(options.allowedRouteTargets || []);
|
|
52
|
+
doc.capabilities = { ...defaultCapabilities, ...(options.capabilities || {}) };
|
|
53
|
+
doc.enabled = true;
|
|
54
|
+
doc.createdAt = now;
|
|
55
|
+
doc.updatedAt = now;
|
|
56
|
+
doc.createdBy = options.createdBy;
|
|
57
|
+
await doc.save();
|
|
58
|
+
return this.toPublicClient(doc);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
public async updateClient(
|
|
62
|
+
id: string,
|
|
63
|
+
patch: Partial<Pick<IGatewayClient, 'name' | 'description' | 'hostnamePatterns' | 'allowedRouteTargets' | 'capabilities' | 'enabled'>>,
|
|
64
|
+
): Promise<IGatewayClient | null> {
|
|
65
|
+
const doc = await GatewayClientDoc.findById(id);
|
|
66
|
+
if (!doc) return null;
|
|
67
|
+
if (patch.name !== undefined) doc.name = patch.name.trim();
|
|
68
|
+
if (patch.description !== undefined) doc.description = patch.description.trim() || undefined;
|
|
69
|
+
if (patch.hostnamePatterns !== undefined) doc.hostnamePatterns = this.normalizeStringList(patch.hostnamePatterns);
|
|
70
|
+
if (patch.allowedRouteTargets !== undefined) doc.allowedRouteTargets = this.normalizeAllowedRouteTargets(patch.allowedRouteTargets);
|
|
71
|
+
if (patch.capabilities !== undefined) doc.capabilities = { ...defaultCapabilities, ...patch.capabilities };
|
|
72
|
+
if (patch.enabled !== undefined) doc.enabled = patch.enabled;
|
|
73
|
+
doc.updatedAt = Date.now();
|
|
74
|
+
await doc.save();
|
|
75
|
+
return this.toPublicClient(doc);
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
public async deleteClient(id: string): Promise<boolean> {
|
|
79
|
+
const doc = await GatewayClientDoc.findById(id);
|
|
80
|
+
if (!doc) return false;
|
|
81
|
+
await doc.delete();
|
|
82
|
+
return true;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
private normalizeId(id: string): string {
|
|
86
|
+
return id.trim().toLowerCase().replace(/[^a-z0-9._-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
private normalizeStringList(values: string[]): string[] {
|
|
90
|
+
return values.map((value) => value.trim().toLowerCase()).filter(Boolean);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
private normalizeAllowedRouteTargets(targets: IGatewayClient['allowedRouteTargets']): IGatewayClient['allowedRouteTargets'] {
|
|
94
|
+
return targets
|
|
95
|
+
.map((target) => ({
|
|
96
|
+
host: target.host.trim().toLowerCase(),
|
|
97
|
+
ports: target.ports.filter((port) => Number.isInteger(port) && port > 0 && port <= 65535),
|
|
98
|
+
}))
|
|
99
|
+
.filter((target) => target.host && target.ports.length > 0);
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
private toPublicClient(doc: GatewayClientDoc): IGatewayClient {
|
|
103
|
+
return {
|
|
104
|
+
id: doc.id,
|
|
105
|
+
type: doc.type,
|
|
106
|
+
name: doc.name,
|
|
107
|
+
description: doc.description,
|
|
108
|
+
hostnamePatterns: doc.hostnamePatterns || [],
|
|
109
|
+
allowedRouteTargets: doc.allowedRouteTargets || [],
|
|
110
|
+
capabilities: doc.capabilities || {},
|
|
111
|
+
enabled: doc.enabled,
|
|
112
|
+
createdAt: doc.createdAt,
|
|
113
|
+
updatedAt: doc.updatedAt,
|
|
114
|
+
createdBy: doc.createdBy,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
}
|
|
@@ -607,19 +607,21 @@ export class RouteConfigManager {
|
|
|
607
607
|
route: plugins.smartproxy.IRouteConfig,
|
|
608
608
|
routeId?: string,
|
|
609
609
|
): plugins.smartproxy.IRouteConfig {
|
|
610
|
-
const vpnCallback = this.getVpnClientIpsForRoute;
|
|
611
|
-
if (!vpnCallback) return route;
|
|
612
|
-
|
|
613
610
|
const dcRoute = route as IDcRouterRouteConfig;
|
|
614
611
|
if (!dcRoute.vpnOnly) return route;
|
|
615
612
|
|
|
616
|
-
const vpnEntries =
|
|
617
|
-
const
|
|
613
|
+
const vpnEntries = this.getVpnClientIpsForRoute?.(dcRoute, routeId) || [];
|
|
614
|
+
const existingBlockList = route.security?.ipBlockList || [];
|
|
615
|
+
const ipBlockList = vpnEntries.length
|
|
616
|
+
? existingBlockList
|
|
617
|
+
: [...new Set([...existingBlockList, '*'])];
|
|
618
|
+
|
|
618
619
|
return {
|
|
619
620
|
...route,
|
|
620
621
|
security: {
|
|
621
622
|
...route.security,
|
|
622
|
-
ipAllowList:
|
|
623
|
+
ipAllowList: vpnEntries,
|
|
624
|
+
ipBlockList,
|
|
623
625
|
},
|
|
624
626
|
};
|
|
625
627
|
}
|
package/ts/config/index.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
export * from './validator.js';
|
|
3
3
|
export { RouteConfigManager } from './classes.route-config-manager.js';
|
|
4
4
|
export { ApiTokenManager } from './classes.api-token-manager.js';
|
|
5
|
+
export { GatewayClientManager } from './classes.gateway-client-manager.js';
|
|
5
6
|
export { ReferenceResolver } from './classes.reference-resolver.js';
|
|
6
7
|
export { DbSeeder } from './classes.db-seeder.js';
|
|
7
|
-
export { TargetProfileManager } from './classes.target-profile-manager.js';
|
|
8
|
+
export { TargetProfileManager } from './classes.target-profile-manager.js';
|