@serve.zone/dcrouter 12.10.0 → 13.0.0
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/dist_serve/bundle.js +957 -866
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/classes.dcrouter.d.ts +5 -4
- package/dist_ts/classes.dcrouter.js +25 -49
- package/dist_ts/config/classes.reference-resolver.d.ts +7 -7
- package/dist_ts/config/classes.reference-resolver.js +27 -27
- package/dist_ts/config/classes.route-config-manager.d.ts +2 -2
- package/dist_ts/config/classes.route-config-manager.js +12 -15
- package/dist_ts/config/classes.target-profile-manager.d.ts +63 -0
- package/dist_ts/config/classes.target-profile-manager.js +295 -0
- package/dist_ts/config/index.d.ts +1 -0
- package/dist_ts/config/index.js +2 -1
- package/dist_ts/db/documents/{classes.security-profile.doc.d.ts → classes.source-profile.doc.d.ts} +4 -4
- package/dist_ts/db/documents/{classes.security-profile.doc.js → classes.source-profile.doc.js} +9 -9
- package/dist_ts/db/documents/classes.target-profile.doc.d.ts +17 -0
- package/dist_ts/db/documents/classes.target-profile.doc.js +124 -0
- package/dist_ts/db/documents/classes.vpn-client.doc.d.ts +1 -1
- package/dist_ts/db/documents/classes.vpn-client.doc.js +8 -8
- package/dist_ts/db/documents/index.d.ts +2 -1
- package/dist_ts/db/documents/index.js +3 -2
- package/dist_ts/opsserver/classes.opsserver.d.ts +2 -1
- package/dist_ts/opsserver/classes.opsserver.js +5 -3
- package/dist_ts/opsserver/handlers/index.d.ts +2 -1
- package/dist_ts/opsserver/handlers/index.js +3 -2
- package/dist_ts/opsserver/handlers/{security-profile.handler.d.ts → source-profile.handler.d.ts} +1 -1
- package/dist_ts/opsserver/handlers/{security-profile.handler.js → source-profile.handler.js} +20 -20
- package/dist_ts/opsserver/handlers/target-profile.handler.d.ts +10 -0
- package/dist_ts/opsserver/handlers/target-profile.handler.js +115 -0
- package/dist_ts/opsserver/handlers/vpn.handler.js +5 -5
- package/dist_ts/vpn/classes.vpn-manager.d.ts +6 -10
- package/dist_ts/vpn/classes.vpn-manager.js +11 -34
- package/dist_ts_interfaces/data/index.d.ts +1 -0
- package/dist_ts_interfaces/data/index.js +2 -1
- package/dist_ts_interfaces/data/remoteingress.d.ts +4 -15
- package/dist_ts_interfaces/data/route-management.d.ts +9 -6
- package/dist_ts_interfaces/data/target-profile.d.ts +28 -0
- package/dist_ts_interfaces/data/target-profile.js +2 -0
- package/dist_ts_interfaces/data/vpn.d.ts +2 -1
- package/dist_ts_interfaces/requests/index.d.ts +2 -1
- package/dist_ts_interfaces/requests/index.js +3 -2
- package/dist_ts_interfaces/requests/{security-profiles.d.ts → source-profiles.d.ts} +21 -21
- package/dist_ts_interfaces/requests/source-profiles.js +2 -0
- package/dist_ts_interfaces/requests/target-profiles.d.ts +103 -0
- package/dist_ts_interfaces/requests/target-profiles.js +2 -0
- package/dist_ts_interfaces/requests/vpn.d.ts +2 -2
- package/dist_ts_web/00_commitinfo_data.js +2 -2
- package/dist_ts_web/appstate.d.ts +36 -3
- package/dist_ts_web/appstate.js +127 -10
- package/dist_ts_web/elements/index.d.ts +2 -1
- package/dist_ts_web/elements/index.js +3 -2
- package/dist_ts_web/elements/ops-dashboard.js +10 -4
- package/dist_ts_web/elements/ops-view-routes.js +8 -8
- package/dist_ts_web/elements/{ops-view-securityprofiles.d.ts → ops-view-sourceprofiles.d.ts} +2 -2
- package/dist_ts_web/elements/{ops-view-securityprofiles.js → ops-view-sourceprofiles.js} +12 -12
- package/dist_ts_web/elements/ops-view-targetprofiles.d.ts +19 -0
- package/dist_ts_web/elements/ops-view-targetprofiles.js +412 -0
- package/dist_ts_web/elements/ops-view-vpn.js +13 -13
- package/dist_ts_web/router.d.ts +1 -1
- package/dist_ts_web/router.js +2 -2
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +33 -50
- package/ts/config/classes.reference-resolver.ts +34 -34
- package/ts/config/classes.route-config-manager.ts +9 -12
- package/ts/config/classes.target-profile-manager.ts +348 -0
- package/ts/config/index.ts +2 -1
- package/ts/db/documents/{classes.security-profile.doc.ts → classes.source-profile.doc.ts} +7 -7
- package/ts/db/documents/classes.target-profile.doc.ts +52 -0
- package/ts/db/documents/classes.vpn-client.doc.ts +1 -1
- package/ts/db/documents/index.ts +2 -1
- package/ts/opsserver/classes.opsserver.ts +4 -2
- package/ts/opsserver/handlers/index.ts +2 -1
- package/ts/opsserver/handlers/{security-profile.handler.ts → source-profile.handler.ts} +25 -25
- package/ts/opsserver/handlers/target-profile.handler.ts +155 -0
- package/ts/opsserver/handlers/vpn.handler.ts +4 -4
- package/ts/vpn/classes.vpn-manager.ts +14 -38
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +180 -17
- package/ts_web/elements/index.ts +2 -1
- package/ts_web/elements/ops-dashboard.ts +9 -3
- package/ts_web/elements/ops-view-routes.ts +7 -7
- package/ts_web/elements/{ops-view-securityprofiles.ts → ops-view-sourceprofiles.ts} +13 -13
- package/ts_web/elements/ops-view-targetprofiles.ts +379 -0
- package/ts_web/elements/ops-view-vpn.ts +12 -12
- package/ts_web/router.ts +1 -1
- package/dist_ts_interfaces/requests/security-profiles.js +0 -2
|
@@ -42,7 +42,6 @@ export class VpnManager {
|
|
|
42
42
|
publicKey: client.noisePublicKey,
|
|
43
43
|
wgPublicKey: client.wgPublicKey,
|
|
44
44
|
enabled: client.enabled,
|
|
45
|
-
serverDefinedClientTags: client.serverDefinedClientTags,
|
|
46
45
|
description: client.description,
|
|
47
46
|
assignedIp: client.assignedIp,
|
|
48
47
|
expiresAt: client.expiresAt,
|
|
@@ -113,7 +112,7 @@ export class VpnManager {
|
|
|
113
112
|
if (!this.clients.has(initial.clientId)) {
|
|
114
113
|
const bundle = await this.createClient({
|
|
115
114
|
clientId: initial.clientId,
|
|
116
|
-
|
|
115
|
+
targetProfileIds: initial.targetProfileIds,
|
|
117
116
|
description: initial.description,
|
|
118
117
|
});
|
|
119
118
|
logger.log('info', `VPN: Created initial client '${initial.clientId}' (IP: ${bundle.entry.assignedIp})`);
|
|
@@ -148,19 +147,18 @@ export class VpnManager {
|
|
|
148
147
|
}
|
|
149
148
|
const bundle = await this.vpnServer.createClient({
|
|
150
149
|
clientId: opts.clientId,
|
|
151
|
-
serverDefinedClientTags: opts.serverDefinedClientTags,
|
|
152
150
|
description: opts.description,
|
|
153
151
|
});
|
|
154
|
-
// Override AllowedIPs with per-client values based on
|
|
152
|
+
// Override AllowedIPs with per-client values based on target profiles
|
|
155
153
|
if (this.config.getClientAllowedIPs && bundle.wireguardConfig) {
|
|
156
|
-
const allowedIPs = await this.config.getClientAllowedIPs(opts.
|
|
154
|
+
const allowedIPs = await this.config.getClientAllowedIPs(opts.targetProfileIds || []);
|
|
157
155
|
bundle.wireguardConfig = bundle.wireguardConfig.replace(/AllowedIPs\s*=\s*.+/, `AllowedIPs = ${allowedIPs.join(', ')}`);
|
|
158
156
|
}
|
|
159
157
|
// Persist client entry (including WG private key for export/QR)
|
|
160
158
|
const doc = new VpnClientDoc();
|
|
161
159
|
doc.clientId = bundle.entry.clientId;
|
|
162
160
|
doc.enabled = bundle.entry.enabled ?? true;
|
|
163
|
-
doc.
|
|
161
|
+
doc.targetProfileIds = opts.targetProfileIds;
|
|
164
162
|
doc.description = bundle.entry.description;
|
|
165
163
|
doc.assignedIp = bundle.entry.assignedIp;
|
|
166
164
|
doc.noisePublicKey = bundle.entry.publicKey;
|
|
@@ -256,7 +254,7 @@ export class VpnManager {
|
|
|
256
254
|
this.config.onClientChanged?.();
|
|
257
255
|
}
|
|
258
256
|
/**
|
|
259
|
-
* Update a client's metadata (description,
|
|
257
|
+
* Update a client's metadata (description, target profiles) without rotating keys.
|
|
260
258
|
*/
|
|
261
259
|
async updateClient(clientId, update) {
|
|
262
260
|
const client = this.clients.get(clientId);
|
|
@@ -264,8 +262,8 @@ export class VpnManager {
|
|
|
264
262
|
throw new Error(`Client not found: ${clientId}`);
|
|
265
263
|
if (update.description !== undefined)
|
|
266
264
|
client.description = update.description;
|
|
267
|
-
if (update.
|
|
268
|
-
client.
|
|
265
|
+
if (update.targetProfileIds !== undefined)
|
|
266
|
+
client.targetProfileIds = update.targetProfileIds;
|
|
269
267
|
if (update.forceDestinationSmartproxy !== undefined)
|
|
270
268
|
client.forceDestinationSmartproxy = update.forceDestinationSmartproxy;
|
|
271
269
|
if (update.destinationAllowList !== undefined)
|
|
@@ -323,30 +321,15 @@ export class VpnManager {
|
|
|
323
321
|
if (persisted?.wgPrivateKey) {
|
|
324
322
|
config = config.replace('[Interface]\n', `[Interface]\nPrivateKey = ${persisted.wgPrivateKey}\n`);
|
|
325
323
|
}
|
|
326
|
-
// Override AllowedIPs with per-client values based on
|
|
324
|
+
// Override AllowedIPs with per-client values based on target profiles
|
|
327
325
|
if (this.config.getClientAllowedIPs) {
|
|
328
|
-
const
|
|
329
|
-
const allowedIPs = await this.config.getClientAllowedIPs(
|
|
326
|
+
const profileIds = persisted?.targetProfileIds || [];
|
|
327
|
+
const allowedIPs = await this.config.getClientAllowedIPs(profileIds);
|
|
330
328
|
config = config.replace(/AllowedIPs\s*=\s*.+/, `AllowedIPs = ${allowedIPs.join(', ')}`);
|
|
331
329
|
}
|
|
332
330
|
}
|
|
333
331
|
return config;
|
|
334
332
|
}
|
|
335
|
-
// ── Tag-based access control ───────────────────────────────────────────
|
|
336
|
-
/**
|
|
337
|
-
* Get assigned IPs for all enabled clients matching any of the given server-defined tags.
|
|
338
|
-
*/
|
|
339
|
-
getClientIpsForServerDefinedTags(tags) {
|
|
340
|
-
const ips = [];
|
|
341
|
-
for (const client of this.clients.values()) {
|
|
342
|
-
if (!client.enabled || !client.assignedIp)
|
|
343
|
-
continue;
|
|
344
|
-
if (client.serverDefinedClientTags?.some(t => tags.includes(t))) {
|
|
345
|
-
ips.push(client.assignedIp);
|
|
346
|
-
}
|
|
347
|
-
}
|
|
348
|
-
return ips;
|
|
349
|
-
}
|
|
350
333
|
// ── Status and telemetry ───────────────────────────────────────────────
|
|
351
334
|
/**
|
|
352
335
|
* Get server status.
|
|
@@ -446,12 +429,6 @@ export class VpnManager {
|
|
|
446
429
|
async loadPersistedClients() {
|
|
447
430
|
const docs = await VpnClientDoc.findAll();
|
|
448
431
|
for (const doc of docs) {
|
|
449
|
-
// Migrate legacy `tags` → `serverDefinedClientTags`
|
|
450
|
-
if (!doc.serverDefinedClientTags && doc.tags) {
|
|
451
|
-
doc.serverDefinedClientTags = doc.tags;
|
|
452
|
-
doc.tags = undefined;
|
|
453
|
-
await doc.save();
|
|
454
|
-
}
|
|
455
432
|
this.clients.set(doc.clientId, doc);
|
|
456
433
|
}
|
|
457
434
|
if (this.clients.size > 0) {
|
|
@@ -462,4 +439,4 @@ export class VpnManager {
|
|
|
462
439
|
await client.save();
|
|
463
440
|
}
|
|
464
441
|
}
|
|
465
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.vpn-manager.js","sourceRoot":"","sources":["../../../ts/vpn/classes.vpn-manager.ts"],"names":[],"mappings":"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"}
|
|
442
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.vpn-manager.js","sourceRoot":"","sources":["../../../ts/vpn/classes.vpn-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,6 @@ export * from './auth.js';
|
|
|
2
2
|
export * from './stats.js';
|
|
3
3
|
export * from './remoteingress.js';
|
|
4
4
|
export * from './route-management.js';
|
|
5
|
+
export * from './target-profile.js';
|
|
5
6
|
export * from './vpn.js';
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19pbnRlcmZhY2VzL2RhdGEvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxVQUFVLENBQUMifQ==
|
|
@@ -47,25 +47,14 @@ export interface IRouteRemoteIngress {
|
|
|
47
47
|
* When absent, the route applies to all edges. */
|
|
48
48
|
edgeFilter?: string[];
|
|
49
49
|
}
|
|
50
|
-
/**
|
|
51
|
-
* Route-level VPN access configuration.
|
|
52
|
-
* When attached to a route, controls VPN client access.
|
|
53
|
-
*/
|
|
54
|
-
export interface IRouteVpn {
|
|
55
|
-
/** Enable VPN client access for this route */
|
|
56
|
-
enabled: boolean;
|
|
57
|
-
/** When true (default), ONLY VPN clients can access this route (replaces ipAllowList).
|
|
58
|
-
* When false, VPN client IPs are added alongside the existing allowlist. */
|
|
59
|
-
mandatory?: boolean;
|
|
60
|
-
/** Only allow VPN clients with these server-defined tags. Omitted = all VPN clients. */
|
|
61
|
-
allowedServerDefinedClientTags?: string[];
|
|
62
|
-
}
|
|
63
50
|
/**
|
|
64
51
|
* Extended route config used within dcrouter.
|
|
65
|
-
* Adds optional `remoteIngress` and `
|
|
52
|
+
* Adds optional `remoteIngress` and `vpnOnly` properties to SmartProxy's IRouteConfig.
|
|
66
53
|
* SmartProxy ignores unknown properties at runtime.
|
|
67
54
|
*/
|
|
68
55
|
export type IDcRouterRouteConfig = IRouteConfig & {
|
|
69
56
|
remoteIngress?: IRouteRemoteIngress;
|
|
70
|
-
|
|
57
|
+
/** When true, only VPN clients whose TargetProfile matches this route get access.
|
|
58
|
+
* Matching is determined by domain overlap, target overlap, or direct routeRef. */
|
|
59
|
+
vpnOnly?: boolean;
|
|
71
60
|
};
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import type { IRouteConfig } from '@push.rocks/smartproxy';
|
|
2
2
|
import type { IDcRouterRouteConfig } from './remoteingress.js';
|
|
3
3
|
export type IRouteSecurity = NonNullable<IRouteConfig['security']>;
|
|
4
|
-
export type TApiTokenScope = 'routes:read' | 'routes:write' | 'config:read' | 'tokens:read' | 'tokens:manage' | 'profiles:read' | 'profiles:write' | 'targets:read' | 'targets:write';
|
|
4
|
+
export type TApiTokenScope = 'routes:read' | 'routes:write' | 'config:read' | 'tokens:read' | 'tokens:manage' | 'source-profiles:read' | 'source-profiles:write' | 'target-profiles:read' | 'target-profiles:write' | 'targets:read' | 'targets:write';
|
|
5
5
|
/**
|
|
6
|
-
* A reusable, named
|
|
6
|
+
* A reusable, named source profile that can be referenced by routes.
|
|
7
7
|
* Stores the full IRouteSecurity shape from SmartProxy.
|
|
8
|
+
*
|
|
9
|
+
* SourceProfile = source-side (who can access: ipAllowList, rateLimit, auth)
|
|
10
|
+
* TargetProfile = target-side (what can be accessed: domains, IP:port targets, route refs)
|
|
8
11
|
*/
|
|
9
|
-
export interface
|
|
12
|
+
export interface ISourceProfile {
|
|
10
13
|
id: string;
|
|
11
14
|
name: string;
|
|
12
15
|
description?: string;
|
|
@@ -35,12 +38,12 @@ export interface INetworkTarget {
|
|
|
35
38
|
* Metadata on a stored route tracking where its resolved values came from.
|
|
36
39
|
*/
|
|
37
40
|
export interface IRouteMetadata {
|
|
38
|
-
/** ID of the
|
|
39
|
-
|
|
41
|
+
/** ID of the SourceProfileDoc used to resolve this route's security. */
|
|
42
|
+
sourceProfileRef?: string;
|
|
40
43
|
/** ID of the NetworkTargetDoc used to resolve this route's targets. */
|
|
41
44
|
networkTargetRef?: string;
|
|
42
45
|
/** Snapshot of the profile name at resolution time, for display. */
|
|
43
|
-
|
|
46
|
+
sourceProfileName?: string;
|
|
44
47
|
/** Snapshot of the target name at resolution time, for display. */
|
|
45
48
|
networkTargetName?: string;
|
|
46
49
|
/** Timestamp of last reference resolution. */
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A specific IP:port target within a TargetProfile.
|
|
3
|
+
*/
|
|
4
|
+
export interface ITargetProfileTarget {
|
|
5
|
+
host: string;
|
|
6
|
+
port: number;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* A reusable, named target profile that defines what resources a VPN client can reach.
|
|
10
|
+
* Assigned to VPN clients via targetProfileIds.
|
|
11
|
+
*
|
|
12
|
+
* SourceProfile = source-side (who can access: ipAllowList, rateLimit, auth)
|
|
13
|
+
* TargetProfile = target-side (what can be accessed: domains, IP:port targets, route refs)
|
|
14
|
+
*/
|
|
15
|
+
export interface ITargetProfile {
|
|
16
|
+
id: string;
|
|
17
|
+
name: string;
|
|
18
|
+
description?: string;
|
|
19
|
+
/** Domain patterns this profile grants access to (supports wildcards: '*.example.com') */
|
|
20
|
+
domains?: string[];
|
|
21
|
+
/** Specific IP:port targets this profile grants access to */
|
|
22
|
+
targets?: ITargetProfileTarget[];
|
|
23
|
+
/** Route references by stored route ID or route name */
|
|
24
|
+
routeRefs?: string[];
|
|
25
|
+
createdAt: number;
|
|
26
|
+
updatedAt: number;
|
|
27
|
+
createdBy: string;
|
|
28
|
+
}
|
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
export interface IVpnClient {
|
|
5
5
|
clientId: string;
|
|
6
6
|
enabled: boolean;
|
|
7
|
-
|
|
7
|
+
/** IDs of TargetProfiles assigned to this client */
|
|
8
|
+
targetProfileIds?: string[];
|
|
8
9
|
description?: string;
|
|
9
10
|
assignedIp?: string;
|
|
10
11
|
createdAt: number;
|
|
@@ -10,5 +10,6 @@ export * from './remoteingress.js';
|
|
|
10
10
|
export * from './route-management.js';
|
|
11
11
|
export * from './api-tokens.js';
|
|
12
12
|
export * from './vpn.js';
|
|
13
|
-
export * from './
|
|
13
|
+
export * from './source-profiles.js';
|
|
14
|
+
export * from './target-profiles.js';
|
|
14
15
|
export * from './network-targets.js';
|
|
@@ -10,6 +10,7 @@ export * from './remoteingress.js';
|
|
|
10
10
|
export * from './route-management.js';
|
|
11
11
|
export * from './api-tokens.js';
|
|
12
12
|
export * from './vpn.js';
|
|
13
|
-
export * from './
|
|
13
|
+
export * from './source-profiles.js';
|
|
14
|
+
export * from './target-profiles.js';
|
|
14
15
|
export * from './network-targets.js';
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19pbnRlcmZhY2VzL3JlcXVlc3RzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHNCQUFzQixDQUFDIn0=
|
|
@@ -1,38 +1,38 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import type * as authInterfaces from '../data/auth.js';
|
|
3
|
-
import type {
|
|
3
|
+
import type { ISourceProfile, IRouteSecurity } from '../data/route-management.js';
|
|
4
4
|
/**
|
|
5
|
-
* Get all
|
|
5
|
+
* Get all source profiles.
|
|
6
6
|
*/
|
|
7
|
-
export interface
|
|
8
|
-
method: '
|
|
7
|
+
export interface IReq_GetSourceProfiles extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetSourceProfiles> {
|
|
8
|
+
method: 'getSourceProfiles';
|
|
9
9
|
request: {
|
|
10
10
|
identity?: authInterfaces.IIdentity;
|
|
11
11
|
apiToken?: string;
|
|
12
12
|
};
|
|
13
13
|
response: {
|
|
14
|
-
profiles:
|
|
14
|
+
profiles: ISourceProfile[];
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
|
-
* Get a single
|
|
18
|
+
* Get a single source profile by ID.
|
|
19
19
|
*/
|
|
20
|
-
export interface
|
|
21
|
-
method: '
|
|
20
|
+
export interface IReq_GetSourceProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetSourceProfile> {
|
|
21
|
+
method: 'getSourceProfile';
|
|
22
22
|
request: {
|
|
23
23
|
identity?: authInterfaces.IIdentity;
|
|
24
24
|
apiToken?: string;
|
|
25
25
|
id: string;
|
|
26
26
|
};
|
|
27
27
|
response: {
|
|
28
|
-
profile:
|
|
28
|
+
profile: ISourceProfile | null;
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
|
-
* Create a new
|
|
32
|
+
* Create a new source profile.
|
|
33
33
|
*/
|
|
34
|
-
export interface
|
|
35
|
-
method: '
|
|
34
|
+
export interface IReq_CreateSourceProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_CreateSourceProfile> {
|
|
35
|
+
method: 'createSourceProfile';
|
|
36
36
|
request: {
|
|
37
37
|
identity?: authInterfaces.IIdentity;
|
|
38
38
|
apiToken?: string;
|
|
@@ -48,10 +48,10 @@ export interface IReq_CreateSecurityProfile extends plugins.typedrequestInterfac
|
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
|
-
* Update a
|
|
51
|
+
* Update a source profile.
|
|
52
52
|
*/
|
|
53
|
-
export interface
|
|
54
|
-
method: '
|
|
53
|
+
export interface IReq_UpdateSourceProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_UpdateSourceProfile> {
|
|
54
|
+
method: 'updateSourceProfile';
|
|
55
55
|
request: {
|
|
56
56
|
identity?: authInterfaces.IIdentity;
|
|
57
57
|
apiToken?: string;
|
|
@@ -68,10 +68,10 @@ export interface IReq_UpdateSecurityProfile extends plugins.typedrequestInterfac
|
|
|
68
68
|
};
|
|
69
69
|
}
|
|
70
70
|
/**
|
|
71
|
-
* Delete a
|
|
71
|
+
* Delete a source profile.
|
|
72
72
|
*/
|
|
73
|
-
export interface
|
|
74
|
-
method: '
|
|
73
|
+
export interface IReq_DeleteSourceProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_DeleteSourceProfile> {
|
|
74
|
+
method: 'deleteSourceProfile';
|
|
75
75
|
request: {
|
|
76
76
|
identity?: authInterfaces.IIdentity;
|
|
77
77
|
apiToken?: string;
|
|
@@ -84,10 +84,10 @@ export interface IReq_DeleteSecurityProfile extends plugins.typedrequestInterfac
|
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
86
|
/**
|
|
87
|
-
* Get which routes reference a
|
|
87
|
+
* Get which routes reference a source profile.
|
|
88
88
|
*/
|
|
89
|
-
export interface
|
|
90
|
-
method: '
|
|
89
|
+
export interface IReq_GetSourceProfileUsage extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetSourceProfileUsage> {
|
|
90
|
+
method: 'getSourceProfileUsage';
|
|
91
91
|
request: {
|
|
92
92
|
identity?: authInterfaces.IIdentity;
|
|
93
93
|
apiToken?: string;
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlLXByb2ZpbGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfaW50ZXJmYWNlcy9yZXF1ZXN0cy9zb3VyY2UtcHJvZmlsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUMifQ==
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import type * as authInterfaces from '../data/auth.js';
|
|
3
|
+
import type { ITargetProfile, ITargetProfileTarget } from '../data/target-profile.js';
|
|
4
|
+
/**
|
|
5
|
+
* Get all target profiles.
|
|
6
|
+
*/
|
|
7
|
+
export interface IReq_GetTargetProfiles extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetTargetProfiles> {
|
|
8
|
+
method: 'getTargetProfiles';
|
|
9
|
+
request: {
|
|
10
|
+
identity?: authInterfaces.IIdentity;
|
|
11
|
+
apiToken?: string;
|
|
12
|
+
};
|
|
13
|
+
response: {
|
|
14
|
+
profiles: ITargetProfile[];
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Get a single target profile by ID.
|
|
19
|
+
*/
|
|
20
|
+
export interface IReq_GetTargetProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetTargetProfile> {
|
|
21
|
+
method: 'getTargetProfile';
|
|
22
|
+
request: {
|
|
23
|
+
identity?: authInterfaces.IIdentity;
|
|
24
|
+
apiToken?: string;
|
|
25
|
+
id: string;
|
|
26
|
+
};
|
|
27
|
+
response: {
|
|
28
|
+
profile: ITargetProfile | null;
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Create a new target profile.
|
|
33
|
+
*/
|
|
34
|
+
export interface IReq_CreateTargetProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_CreateTargetProfile> {
|
|
35
|
+
method: 'createTargetProfile';
|
|
36
|
+
request: {
|
|
37
|
+
identity?: authInterfaces.IIdentity;
|
|
38
|
+
apiToken?: string;
|
|
39
|
+
name: string;
|
|
40
|
+
description?: string;
|
|
41
|
+
domains?: string[];
|
|
42
|
+
targets?: ITargetProfileTarget[];
|
|
43
|
+
routeRefs?: string[];
|
|
44
|
+
};
|
|
45
|
+
response: {
|
|
46
|
+
success: boolean;
|
|
47
|
+
id?: string;
|
|
48
|
+
message?: string;
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Update a target profile.
|
|
53
|
+
*/
|
|
54
|
+
export interface IReq_UpdateTargetProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_UpdateTargetProfile> {
|
|
55
|
+
method: 'updateTargetProfile';
|
|
56
|
+
request: {
|
|
57
|
+
identity?: authInterfaces.IIdentity;
|
|
58
|
+
apiToken?: string;
|
|
59
|
+
id: string;
|
|
60
|
+
name?: string;
|
|
61
|
+
description?: string;
|
|
62
|
+
domains?: string[];
|
|
63
|
+
targets?: ITargetProfileTarget[];
|
|
64
|
+
routeRefs?: string[];
|
|
65
|
+
};
|
|
66
|
+
response: {
|
|
67
|
+
success: boolean;
|
|
68
|
+
message?: string;
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Delete a target profile.
|
|
73
|
+
*/
|
|
74
|
+
export interface IReq_DeleteTargetProfile extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_DeleteTargetProfile> {
|
|
75
|
+
method: 'deleteTargetProfile';
|
|
76
|
+
request: {
|
|
77
|
+
identity?: authInterfaces.IIdentity;
|
|
78
|
+
apiToken?: string;
|
|
79
|
+
id: string;
|
|
80
|
+
force?: boolean;
|
|
81
|
+
};
|
|
82
|
+
response: {
|
|
83
|
+
success: boolean;
|
|
84
|
+
message?: string;
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Get which VPN clients reference a target profile.
|
|
89
|
+
*/
|
|
90
|
+
export interface IReq_GetTargetProfileUsage extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetTargetProfileUsage> {
|
|
91
|
+
method: 'getTargetProfileUsage';
|
|
92
|
+
request: {
|
|
93
|
+
identity?: authInterfaces.IIdentity;
|
|
94
|
+
apiToken?: string;
|
|
95
|
+
id: string;
|
|
96
|
+
};
|
|
97
|
+
response: {
|
|
98
|
+
clients: Array<{
|
|
99
|
+
clientId: string;
|
|
100
|
+
description?: string;
|
|
101
|
+
}>;
|
|
102
|
+
};
|
|
103
|
+
}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFyZ2V0LXByb2ZpbGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfaW50ZXJmYWNlcy9yZXF1ZXN0cy90YXJnZXQtcHJvZmlsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUMifQ==
|
|
@@ -33,7 +33,7 @@ export interface IReq_CreateVpnClient extends plugins.typedrequestInterfaces.imp
|
|
|
33
33
|
request: {
|
|
34
34
|
identity: authInterfaces.IIdentity;
|
|
35
35
|
clientId: string;
|
|
36
|
-
|
|
36
|
+
targetProfileIds?: string[];
|
|
37
37
|
description?: string;
|
|
38
38
|
forceDestinationSmartproxy?: boolean;
|
|
39
39
|
destinationAllowList?: string[];
|
|
@@ -61,7 +61,7 @@ export interface IReq_UpdateVpnClient extends plugins.typedrequestInterfaces.imp
|
|
|
61
61
|
identity: authInterfaces.IIdentity;
|
|
62
62
|
clientId: string;
|
|
63
63
|
description?: string;
|
|
64
|
-
|
|
64
|
+
targetProfileIds?: string[];
|
|
65
65
|
forceDestinationSmartproxy?: boolean;
|
|
66
66
|
destinationAllowList?: string[];
|
|
67
67
|
destinationBlockList?: string[];
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '
|
|
6
|
+
version: '13.0.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
|
@@ -203,7 +203,7 @@ export declare const vpnStatePart: plugins.deesElement.domtools.plugins.smartsta
|
|
|
203
203
|
export declare const fetchVpnAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IVpnState, unknown>;
|
|
204
204
|
export declare const createVpnClientAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IVpnState, {
|
|
205
205
|
clientId: string;
|
|
206
|
-
|
|
206
|
+
targetProfileIds?: string[];
|
|
207
207
|
description?: string;
|
|
208
208
|
forceDestinationSmartproxy?: boolean;
|
|
209
209
|
destinationAllowList?: string[];
|
|
@@ -222,7 +222,7 @@ export declare const toggleVpnClientAction: plugins.deesElement.domtools.plugins
|
|
|
222
222
|
export declare const updateVpnClientAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IVpnState, {
|
|
223
223
|
clientId: string;
|
|
224
224
|
description?: string;
|
|
225
|
-
|
|
225
|
+
targetProfileIds?: string[];
|
|
226
226
|
forceDestinationSmartproxy?: boolean;
|
|
227
227
|
destinationAllowList?: string[];
|
|
228
228
|
destinationBlockList?: string[];
|
|
@@ -233,8 +233,41 @@ export declare const updateVpnClientAction: plugins.deesElement.domtools.plugins
|
|
|
233
233
|
vlanId?: number;
|
|
234
234
|
}>;
|
|
235
235
|
export declare const clearNewClientConfigAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IVpnState, unknown>;
|
|
236
|
+
export interface ITargetProfilesState {
|
|
237
|
+
profiles: interfaces.data.ITargetProfile[];
|
|
238
|
+
isLoading: boolean;
|
|
239
|
+
error: string | null;
|
|
240
|
+
lastUpdated: number;
|
|
241
|
+
}
|
|
242
|
+
export declare const targetProfilesStatePart: plugins.deesElement.domtools.plugins.smartstate.StatePart<string, ITargetProfilesState>;
|
|
243
|
+
export declare const fetchTargetProfilesAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<ITargetProfilesState, unknown>;
|
|
244
|
+
export declare const createTargetProfileAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<ITargetProfilesState, {
|
|
245
|
+
name: string;
|
|
246
|
+
description?: string;
|
|
247
|
+
domains?: string[];
|
|
248
|
+
targets?: Array<{
|
|
249
|
+
host: string;
|
|
250
|
+
port: number;
|
|
251
|
+
}>;
|
|
252
|
+
routeRefs?: string[];
|
|
253
|
+
}>;
|
|
254
|
+
export declare const updateTargetProfileAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<ITargetProfilesState, {
|
|
255
|
+
id: string;
|
|
256
|
+
name?: string;
|
|
257
|
+
description?: string;
|
|
258
|
+
domains?: string[];
|
|
259
|
+
targets?: Array<{
|
|
260
|
+
host: string;
|
|
261
|
+
port: number;
|
|
262
|
+
}>;
|
|
263
|
+
routeRefs?: string[];
|
|
264
|
+
}>;
|
|
265
|
+
export declare const deleteTargetProfileAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<ITargetProfilesState, {
|
|
266
|
+
id: string;
|
|
267
|
+
force?: boolean;
|
|
268
|
+
}>;
|
|
236
269
|
export interface IProfilesTargetsState {
|
|
237
|
-
profiles: interfaces.data.
|
|
270
|
+
profiles: interfaces.data.ISourceProfile[];
|
|
238
271
|
targets: interfaces.data.INetworkTarget[];
|
|
239
272
|
isLoading: boolean;
|
|
240
273
|
error: string | null;
|