@push.rocks/smartvpn 1.22.0 → 2.1.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/assets/third-party-licenses.md +157 -0
- package/dist_rust/{smartvpn_daemon_linux_amd64 → smartvpn_daemon_linux_amd64_musl} +0 -0
- package/dist_rust/smartvpn_daemon_linux_amd64_musl.tsrust-build.json +14 -0
- package/dist_rust/{smartvpn_daemon_linux_arm64 → smartvpn_daemon_linux_arm64_musl} +0 -0
- package/dist_rust/smartvpn_daemon_linux_arm64_musl.tsrust-build.json +14 -0
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/smartvpn.classes.vpnbridge.d.ts +4 -3
- package/dist_ts/smartvpn.classes.vpnbridge.js +27 -47
- package/dist_ts/smartvpn.classes.vpnclient.d.ts +5 -4
- package/dist_ts/smartvpn.classes.vpnclient.js +10 -5
- package/dist_ts/smartvpn.classes.vpnconfig.d.ts +1 -0
- package/dist_ts/smartvpn.classes.vpnconfig.js +52 -14
- package/dist_ts/smartvpn.classes.vpnserver.d.ts +17 -4
- package/dist_ts/smartvpn.classes.vpnserver.js +80 -40
- package/dist_ts/smartvpn.interfaces.d.ts +155 -16
- package/dist_ts/smartvpn.paths.d.ts +2 -0
- package/dist_ts/smartvpn.paths.js +14 -1
- package/notices/aho-corasick-license.txt +21 -0
- package/notices/cargo-dependencies.html +5202 -0
- package/notices/compiler-builtins-license.txt +275 -0
- package/notices/defmt-license.txt +25 -0
- package/notices/inventory.json +1427 -0
- package/notices/llvm-libunwind-license.txt +311 -0
- package/notices/mit-source-attributions.txt +31 -0
- package/notices/musl-copyright.txt +193 -0
- package/notices/proc-macro-error2-license.txt +21 -0
- package/notices/rust-standard-library.html +8266 -0
- package/notices/valuable-license.txt +25 -0
- package/package.json +15 -7
- package/readme.md +344 -5
- package/third-party-notices.md +81 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/smartvpn.classes.vpnbridge.ts +27 -52
- package/ts/smartvpn.classes.vpnclient.ts +10 -5
- package/ts/smartvpn.classes.vpnconfig.ts +49 -13
- package/ts/smartvpn.classes.vpnserver.ts +94 -40
- package/ts/smartvpn.interfaces.ts +159 -16
- package/ts/smartvpn.paths.ts +19 -0
- package/readme.hints.md +0 -8
- package/readme.plan.md +0 -253
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
# Third-party notices: managed Linux routing
|
|
2
|
+
|
|
3
|
+
The Linux daemon links the following unmodified registry dependencies. Their
|
|
4
|
+
exact upstream LICENSE-MIT texts are reproduced below. This file is distributed
|
|
5
|
+
under package.json's assets/**/* inclusion.
|
|
6
|
+
|
|
7
|
+
## rtnetlink 0.23.0
|
|
8
|
+
|
|
9
|
+
Source: https://crates.io/crates/rtnetlink/0.23.0
|
|
10
|
+
|
|
11
|
+
```text
|
|
12
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
13
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
14
|
+
the Software without restriction, including without limitation the rights to
|
|
15
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
16
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
17
|
+
so, subject to the following conditions:
|
|
18
|
+
|
|
19
|
+
The above copyright notice and this permission notice shall be included in all
|
|
20
|
+
copies or substantial portions of the Software.
|
|
21
|
+
|
|
22
|
+
Distributions of all or part of the Software intended to be used by the
|
|
23
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
24
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
25
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
26
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
27
|
+
and urls are either replaced with the contact information of the parties
|
|
28
|
+
responsible for the changes, or removed entirely.
|
|
29
|
+
|
|
30
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
31
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
32
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
33
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
34
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
35
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
36
|
+
SOFTWARE.
|
|
37
|
+
```
|
|
38
|
+
|
|
39
|
+
## netlink-packet-core 0.9.0
|
|
40
|
+
|
|
41
|
+
Source: https://crates.io/crates/netlink-packet-core/0.9.0
|
|
42
|
+
|
|
43
|
+
```text
|
|
44
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
45
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
46
|
+
the Software without restriction, including without limitation the rights to
|
|
47
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
48
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
49
|
+
so, subject to the following conditions:
|
|
50
|
+
|
|
51
|
+
The above copyright notice and this permission notice shall be included in all
|
|
52
|
+
copies or substantial portions of the Software.
|
|
53
|
+
|
|
54
|
+
Distributions of all or part of the Software intended to be used by the
|
|
55
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
56
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
57
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
58
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
59
|
+
and urls are either replaced with the contact information of the parties
|
|
60
|
+
responsible for the changes, or removed entirely.
|
|
61
|
+
|
|
62
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
63
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
64
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
65
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
66
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
67
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
68
|
+
SOFTWARE.
|
|
69
|
+
```
|
|
70
|
+
|
|
71
|
+
## netlink-packet-route 0.33.0
|
|
72
|
+
|
|
73
|
+
Source: https://crates.io/crates/netlink-packet-route/0.33.0
|
|
74
|
+
|
|
75
|
+
```text
|
|
76
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
77
|
+
this software and associated documentation files (the “Software”), to deal in
|
|
78
|
+
the Software without restriction, including without limitation the rights to
|
|
79
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
80
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
81
|
+
so, subject to the following conditions:
|
|
82
|
+
|
|
83
|
+
The above copyright notice and this permission notice shall be included in all
|
|
84
|
+
copies or substantial portions of the Software.
|
|
85
|
+
|
|
86
|
+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
87
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
88
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
89
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
90
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
91
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
92
|
+
SOFTWARE.
|
|
93
|
+
```
|
|
94
|
+
|
|
95
|
+
## netlink-proto 0.13.0
|
|
96
|
+
|
|
97
|
+
Source: https://crates.io/crates/netlink-proto/0.13.0
|
|
98
|
+
|
|
99
|
+
```text
|
|
100
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
101
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
102
|
+
the Software without restriction, including without limitation the rights to
|
|
103
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
104
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
105
|
+
so, subject to the following conditions:
|
|
106
|
+
|
|
107
|
+
The above copyright notice and this permission notice shall be included in all
|
|
108
|
+
copies or substantial portions of the Software.
|
|
109
|
+
|
|
110
|
+
Distributions of all or part of the Software intended to be used by the
|
|
111
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
112
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
113
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
114
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
115
|
+
and urls are either replaced with the contact information of the parties
|
|
116
|
+
responsible for the changes, or removed entirely.
|
|
117
|
+
|
|
118
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
119
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
120
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
121
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
122
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
123
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
124
|
+
SOFTWARE.
|
|
125
|
+
```
|
|
126
|
+
|
|
127
|
+
## netlink-sys 0.9.0
|
|
128
|
+
|
|
129
|
+
Source: https://crates.io/crates/netlink-sys/0.9.0
|
|
130
|
+
|
|
131
|
+
```text
|
|
132
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
133
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
134
|
+
the Software without restriction, including without limitation the rights to
|
|
135
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
136
|
+
of the Software, and to permit persons to whom the Software is furnished to do
|
|
137
|
+
so, subject to the following conditions:
|
|
138
|
+
|
|
139
|
+
The above copyright notice and this permission notice shall be included in all
|
|
140
|
+
copies or substantial portions of the Software.
|
|
141
|
+
|
|
142
|
+
Distributions of all or part of the Software intended to be used by the
|
|
143
|
+
recipients as they would use the unmodified Software, containing modifications
|
|
144
|
+
that substantially alter, remove, or disable functionality of the Software,
|
|
145
|
+
outside of the documented configuration mechanisms provided by the Software,
|
|
146
|
+
shall be modified such that the Original Author's bug reporting email addresses
|
|
147
|
+
and urls are either replaced with the contact information of the parties
|
|
148
|
+
responsible for the changes, or removed entirely.
|
|
149
|
+
|
|
150
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
151
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
152
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
153
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
154
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
155
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
156
|
+
SOFTWARE.
|
|
157
|
+
```
|
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "8fed8d22e6597530ad96882e4593b8022d3b903aef769814ff17c212cfd7c21a",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartvpn",
|
|
6
|
+
"projectVersion": "2.1.0",
|
|
7
|
+
"gitCommit": "5debd57a3aea77860e63e478a4eb3e0dcc5256d8",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-09-13T12:10:30.143Z",
|
|
10
|
+
"tsrustVersion": "1.13.0",
|
|
11
|
+
"binary": "smartvpn_daemon",
|
|
12
|
+
"target": "linux_amd64_musl"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
Binary file
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"format": "tsrust.build-provenance.v2",
|
|
3
|
+
"binarySha256": "df65b1e62dfabe53dff69d62b6d9e9ad1ef6e5990d2a4032993244d6f9d779bb",
|
|
4
|
+
"buildInfo": {
|
|
5
|
+
"projectName": "@push.rocks/smartvpn",
|
|
6
|
+
"projectVersion": "2.1.0",
|
|
7
|
+
"gitCommit": "5debd57a3aea77860e63e478a4eb3e0dcc5256d8",
|
|
8
|
+
"gitDirty": false,
|
|
9
|
+
"builtAt": "2026-09-13T12:10:37.839Z",
|
|
10
|
+
"tsrustVersion": "1.13.0",
|
|
11
|
+
"binary": "smartvpn_daemon",
|
|
12
|
+
"target": "linux_arm64_musl"
|
|
13
|
+
}
|
|
14
|
+
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartvpn',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '2.1.0',
|
|
7
7
|
description: 'A VPN solution with TypeScript control plane and Rust data plane daemon'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHlFQUF5RTtDQUN2RixDQUFBIn0=
|
|
@@ -13,16 +13,17 @@ export declare class VpnBridge<TCommands extends TCommandMap> extends plugins.ev
|
|
|
13
13
|
transport: TVpnTransportOptions;
|
|
14
14
|
mode: 'client' | 'server';
|
|
15
15
|
binaryName?: string;
|
|
16
|
+
networkNamespaceFd?: number;
|
|
16
17
|
});
|
|
17
18
|
/**
|
|
18
19
|
* Start the bridge: spawn in stdio mode or connect in socket mode.
|
|
19
20
|
*/
|
|
20
21
|
start(): Promise<boolean>;
|
|
21
22
|
/**
|
|
22
|
-
*
|
|
23
|
-
*
|
|
23
|
+
* Confirm closure of the owned transport. Socket mode leaves the remote daemon alive;
|
|
24
|
+
* stdio mode waits for child exit and stdio closure. Failure remains retryable upstream.
|
|
24
25
|
*/
|
|
25
|
-
stop(): void
|
|
26
|
+
stop(): Promise<void>;
|
|
26
27
|
/**
|
|
27
28
|
* Send a typed command to the daemon.
|
|
28
29
|
*/
|
|
@@ -1,42 +1,5 @@
|
|
|
1
1
|
import * as plugins from './smartvpn.plugins.js';
|
|
2
2
|
import * as paths from './smartvpn.paths.js';
|
|
3
|
-
/**
|
|
4
|
-
* Get the package root directory.
|
|
5
|
-
*/
|
|
6
|
-
function getPackageRoot() {
|
|
7
|
-
const thisDir = plugins.path.dirname(plugins.url.fileURLToPath(import.meta.url));
|
|
8
|
-
return plugins.path.resolve(thisDir, '..');
|
|
9
|
-
}
|
|
10
|
-
/**
|
|
11
|
-
* Map Node.js platform/arch to tsrust's platform suffix.
|
|
12
|
-
*/
|
|
13
|
-
function getTsrustPlatformSuffix() {
|
|
14
|
-
const archMap = { x64: 'amd64', arm64: 'arm64' };
|
|
15
|
-
const osMap = { linux: 'linux', darwin: 'macos' };
|
|
16
|
-
const os = osMap[process.platform];
|
|
17
|
-
const arch = archMap[process.arch];
|
|
18
|
-
if (os && arch) {
|
|
19
|
-
return `${os}_${arch}`;
|
|
20
|
-
}
|
|
21
|
-
return null;
|
|
22
|
-
}
|
|
23
|
-
/**
|
|
24
|
-
* Build local search paths for the smartvpn daemon binary.
|
|
25
|
-
*/
|
|
26
|
-
function buildLocalPaths(binaryName) {
|
|
27
|
-
const packageRoot = getPackageRoot();
|
|
28
|
-
const suffix = getTsrustPlatformSuffix();
|
|
29
|
-
const paths = [];
|
|
30
|
-
// dist_rust/ (tsrust cross-compiled output)
|
|
31
|
-
if (suffix) {
|
|
32
|
-
paths.push(plugins.path.join(packageRoot, 'dist_rust', `${binaryName}_${suffix}`));
|
|
33
|
-
}
|
|
34
|
-
paths.push(plugins.path.join(packageRoot, 'dist_rust', binaryName));
|
|
35
|
-
// Local dev build paths
|
|
36
|
-
paths.push(plugins.path.resolve(process.cwd(), 'rust', 'target', 'release', binaryName));
|
|
37
|
-
paths.push(plugins.path.resolve(process.cwd(), 'rust', 'target', 'debug', binaryName));
|
|
38
|
-
return paths;
|
|
39
|
-
}
|
|
40
3
|
/**
|
|
41
4
|
* Shared bridge wrapper around smartrust RustBridge.
|
|
42
5
|
* Supports stdio mode (dev: spawn child process) and socket mode (production: connect to running daemon).
|
|
@@ -44,15 +7,29 @@ function buildLocalPaths(binaryName) {
|
|
|
44
7
|
export class VpnBridge extends plugins.events.EventEmitter {
|
|
45
8
|
constructor(options) {
|
|
46
9
|
super();
|
|
10
|
+
const namespaceFd = options.networkNamespaceFd;
|
|
11
|
+
if (namespaceFd !== undefined) {
|
|
12
|
+
if (plugins.os.platform() !== 'linux' || options.mode !== 'client' || options.transport.transport !== 'stdio') {
|
|
13
|
+
throw new Error('VpnBridge networkNamespaceFd requires a Linux stdio client');
|
|
14
|
+
}
|
|
15
|
+
if (!Number.isInteger(namespaceFd) || namespaceFd < 0 || namespaceFd > 0x7fff_ffff) {
|
|
16
|
+
throw new Error('VpnBridge networkNamespaceFd must be a non-negative native descriptor');
|
|
17
|
+
}
|
|
18
|
+
}
|
|
47
19
|
const binaryName = options.binaryName || 'smartvpn_daemon';
|
|
48
|
-
|
|
20
|
+
// Keep the validated process transport stable even if the caller edits its options.
|
|
21
|
+
this.transportOptions = { ...options.transport };
|
|
49
22
|
this.mode = options.mode;
|
|
50
23
|
this.bridge = new plugins.smartrust.RustBridge({
|
|
51
24
|
binaryName,
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
25
|
+
binaryPath: options.transport.transport === 'stdio'
|
|
26
|
+
? paths.getBinaryPath(binaryName)
|
|
27
|
+
: undefined,
|
|
28
|
+
localPaths: [],
|
|
29
|
+
searchSystemPath: false,
|
|
30
|
+
cliArgs: ['--management', '--mode', this.mode,
|
|
31
|
+
...(namespaceFd === undefined ? [] : ['--network-namespace-fd', '3'])],
|
|
32
|
+
inheritedFileDescriptors: namespaceFd === undefined ? undefined : [namespaceFd],
|
|
56
33
|
maxPayloadSize: 10 * 1024 * 1024, // 10 MB
|
|
57
34
|
});
|
|
58
35
|
// Forward events from inner bridge
|
|
@@ -62,6 +39,9 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
62
39
|
this.bridge.on('reconnected', () => {
|
|
63
40
|
this.emit('reconnected');
|
|
64
41
|
});
|
|
42
|
+
this.bridge.on('stderr', (line) => {
|
|
43
|
+
this.emit('stderr', line);
|
|
44
|
+
});
|
|
65
45
|
// Forward management events from the daemon
|
|
66
46
|
// smartrust emits 'management:<eventName>' for unsolicited events
|
|
67
47
|
this.bridge.on('management:status', (data) => {
|
|
@@ -101,11 +81,11 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
101
81
|
}
|
|
102
82
|
}
|
|
103
83
|
/**
|
|
104
|
-
*
|
|
105
|
-
*
|
|
84
|
+
* Confirm closure of the owned transport. Socket mode leaves the remote daemon alive;
|
|
85
|
+
* stdio mode waits for child exit and stdio closure. Failure remains retryable upstream.
|
|
106
86
|
*/
|
|
107
|
-
stop() {
|
|
108
|
-
this.bridge.
|
|
87
|
+
async stop() {
|
|
88
|
+
await this.bridge.terminate();
|
|
109
89
|
}
|
|
110
90
|
/**
|
|
111
91
|
* Send a typed command to the daemon.
|
|
@@ -120,4 +100,4 @@ export class VpnBridge extends plugins.events.EventEmitter {
|
|
|
120
100
|
return this.bridge.running;
|
|
121
101
|
}
|
|
122
102
|
}
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2cG4uY2xhc3Nlcy52cG5icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHZwbi5jbGFzc2VzLnZwbmJyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBQ2pELE9BQU8sS0FBSyxLQUFLLE1BQU0scUJBQXFCLENBQUM7QUFPN0M7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFNBQXlDLFNBQVEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxZQUFZO0lBS3ZGLFlBQVksT0FLWDtRQUNDLEtBQUssRUFBRSxDQUFDO1FBRVIsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDO1FBQy9DLElBQUksV0FBVyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzlCLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsS0FBSyxPQUFPLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxRQUFRLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEtBQUssT0FBTyxFQUFFLENBQUM7Z0JBQzlHLE1BQU0sSUFBSSxLQUFLLENBQUMsNERBQTRELENBQUMsQ0FBQztZQUNoRixDQUFDO1lBQ0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLElBQUksV0FBVyxHQUFHLENBQUMsSUFBSSxXQUFXLEdBQUcsV0FBVyxFQUFFLENBQUM7Z0JBQ25GLE1BQU0sSUFBSSxLQUFLLENBQUMsdUVBQXVFLENBQUMsQ0FBQztZQUMzRixDQUFDO1FBQ0gsQ0FBQztRQUNELE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxVQUFVLElBQUksaUJBQWlCLENBQUM7UUFDM0Qsb0ZBQW9GO1FBQ3BGLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxFQUFFLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ2pELElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztRQUV6QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQVk7WUFDeEQsVUFBVTtZQUNWLFVBQVUsRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLFNBQVMsS0FBSyxPQUFPO2dCQUNqRCxDQUFDLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUM7Z0JBQ2pDLENBQUMsQ0FBQyxTQUFTO1lBQ2IsVUFBVSxFQUFFLEVBQUU7WUFDZCxnQkFBZ0IsRUFBRSxLQUFLO1lBQ3ZCLE9BQU8sRUFBRSxDQUFDLGNBQWMsRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUk7Z0JBQzNDLEdBQUcsQ0FBQyxXQUFXLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsd0JBQXdCLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztZQUN4RSx3QkFBd0IsRUFBRSxXQUFXLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDO1lBQy9FLGNBQWMsRUFBRSxFQUFFLEdBQUcsSUFBSSxHQUFHLElBQUksRUFBRSxRQUFRO1NBQzNDLENBQUMsQ0FBQztRQUVILG1DQUFtQztRQUNuQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFtQixFQUFFLE1BQXFCLEVBQUUsRUFBRTtZQUNwRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDbEMsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxhQUFhLEVBQUUsR0FBRyxFQUFFO1lBQ2pDLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFZLEVBQUUsRUFBRTtZQUN4QyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM1QixDQUFDLENBQUMsQ0FBQztRQUVILDRDQUE0QztRQUM1QyxrRUFBa0U7UUFDbEUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxJQUFTLEVBQUUsRUFBRTtZQUNoRCxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM1QixDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGtCQUFrQixFQUFFLENBQUMsSUFBUyxFQUFFLEVBQUU7WUFDL0MsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRSxDQUFDLElBQVMsRUFBRSxFQUFFO1lBQzFELElBQUksQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDdEMsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBRSxDQUFDLElBQVMsRUFBRSxFQUFFO1lBQzdELElBQUksQ0FBQyxJQUFJLENBQUMscUJBQXFCLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDekMsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxvQkFBb0IsRUFBRSxDQUFDLElBQVMsRUFBRSxFQUFFO1lBQ2pELElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzdCLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsb0JBQW9CLEVBQUUsQ0FBQyxJQUFTLEVBQUUsRUFBRTtZQUNqRCxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM3QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLElBQUksSUFBSSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUNqRCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsZ0JBQXVDLENBQUM7WUFDaEUsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxFQUFFO2dCQUNoRCxhQUFhLEVBQUUsVUFBVSxDQUFDLGFBQWE7Z0JBQ3ZDLG9CQUFvQixFQUFFLFVBQVUsQ0FBQyxvQkFBb0I7Z0JBQ3JELG1CQUFtQixFQUFFLFVBQVUsQ0FBQyxtQkFBbUI7Z0JBQ25ELG9CQUFvQixFQUFFLFVBQVUsQ0FBQyxvQkFBb0I7YUFDdEQsQ0FBQyxDQUFDO1FBQ0wsQ0FBQzthQUFNLENBQUM7WUFDTixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsQ0FBQztJQUNILENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNoQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsV0FBVyxDQUN0QixNQUFTLEVBQ1QsTUFBOEI7UUFFOUIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBVyxPQUFPO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUM7SUFDN0IsQ0FBQztDQUNGIn0=
|
|
@@ -34,13 +34,14 @@ export declare class VpnClient extends plugins.events.EventEmitter {
|
|
|
34
34
|
*/
|
|
35
35
|
getConnectionQuality(): Promise<IVpnConnectionQuality>;
|
|
36
36
|
/**
|
|
37
|
-
* Get MTU information
|
|
37
|
+
* Get active runtime MTU information, or null when disconnected.
|
|
38
|
+
* Unknown outer-path measurements remain null.
|
|
38
39
|
*/
|
|
39
|
-
getMtuInfo(): Promise<IVpnMtuInfo>;
|
|
40
|
+
getMtuInfo(): Promise<IVpnMtuInfo | null>;
|
|
40
41
|
/**
|
|
41
|
-
* Stop the daemon bridge.
|
|
42
|
+
* Stop the daemon bridge and wait for confirmed ownership release.
|
|
42
43
|
*/
|
|
43
|
-
stop(): void
|
|
44
|
+
stop(): Promise<void>;
|
|
44
45
|
/**
|
|
45
46
|
* Whether the bridge is running.
|
|
46
47
|
*/
|
|
@@ -10,6 +10,7 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
10
10
|
this.bridge = new VpnBridge({
|
|
11
11
|
transport: options.transport,
|
|
12
12
|
mode: 'client',
|
|
13
|
+
networkNamespaceFd: options.networkNamespaceFd,
|
|
13
14
|
});
|
|
14
15
|
// Forward bridge events
|
|
15
16
|
this.bridge.on('exit', (code, signal) => {
|
|
@@ -18,6 +19,9 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
18
19
|
this.bridge.on('reconnected', () => {
|
|
19
20
|
this.emit('reconnected');
|
|
20
21
|
});
|
|
22
|
+
this.bridge.on('stderr', (line) => {
|
|
23
|
+
this.emit('stderr', line);
|
|
24
|
+
});
|
|
21
25
|
}
|
|
22
26
|
/**
|
|
23
27
|
* Start the daemon bridge (spawn or connect).
|
|
@@ -60,16 +64,17 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
60
64
|
return this.bridge.sendCommand('getConnectionQuality', {});
|
|
61
65
|
}
|
|
62
66
|
/**
|
|
63
|
-
* Get MTU information
|
|
67
|
+
* Get active runtime MTU information, or null when disconnected.
|
|
68
|
+
* Unknown outer-path measurements remain null.
|
|
64
69
|
*/
|
|
65
70
|
async getMtuInfo() {
|
|
66
71
|
return this.bridge.sendCommand('getMtuInfo', {});
|
|
67
72
|
}
|
|
68
73
|
/**
|
|
69
|
-
* Stop the daemon bridge.
|
|
74
|
+
* Stop the daemon bridge and wait for confirmed ownership release.
|
|
70
75
|
*/
|
|
71
|
-
stop() {
|
|
72
|
-
this.bridge.stop();
|
|
76
|
+
async stop() {
|
|
77
|
+
await this.bridge.stop();
|
|
73
78
|
}
|
|
74
79
|
/**
|
|
75
80
|
* Whether the bridge is running.
|
|
@@ -78,4 +83,4 @@ export class VpnClient extends plugins.events.EventEmitter {
|
|
|
78
83
|
return this.bridge.running;
|
|
79
84
|
}
|
|
80
85
|
}
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR2cG4uY2xhc3Nlcy52cG5jbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHZwbi5jbGFzc2VzLnZwbmNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHVCQUF1QixDQUFDO0FBQ2pELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQVc1RDs7R0FFRztBQUNILE1BQU0sT0FBTyxTQUFVLFNBQVEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxZQUFZO0lBSXhELFlBQVksT0FBMEI7UUFDcEMsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksU0FBUyxDQUFxQjtZQUM5QyxTQUFTLEVBQUUsT0FBTyxDQUFDLFNBQVM7WUFDNUIsSUFBSSxFQUFFLFFBQVE7WUFDZCxrQkFBa0IsRUFBRSxPQUFPLENBQUMsa0JBQWtCO1NBQy9DLENBQUMsQ0FBQztRQUVILHdCQUF3QjtRQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFtQixFQUFFLE1BQXFCLEVBQUUsRUFBRTtZQUNwRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ3RDLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRTtZQUNqQyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBWSxFQUFFLEVBQUU7WUFDeEMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDNUIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUF5QjtRQUM1QyxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUM7UUFDMUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ1QsTUFBTSxJQUFJLEtBQUssQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO1FBQzNELENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFNBQVMsRUFBRSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxVQUFVO1FBQ3JCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsWUFBWSxFQUFFLEVBQTJCLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsU0FBUztRQUNwQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFdBQVcsRUFBRSxFQUEyQixDQUFDLENBQUM7SUFDM0UsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLGFBQWE7UUFDeEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsRUFBMkIsQ0FBQyxDQUFDO0lBQy9FLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxvQkFBb0I7UUFDL0IsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsRUFBRSxFQUEyQixDQUFDLENBQUM7SUFDdEYsQ0FBQztJQUVEOzs7T0FHRztJQUNJLEtBQUssQ0FBQyxVQUFVO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsWUFBWSxFQUFFLEVBQTJCLENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFXLE9BQU87UUFDaEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQztJQUM3QixDQUFDO0NBQ0YifQ==
|
|
@@ -3,6 +3,7 @@ import type { IVpnClientConfig, IVpnServerConfig } from './smartvpn.interfaces.j
|
|
|
3
3
|
* VPN configuration loader, saver, and validator.
|
|
4
4
|
*/
|
|
5
5
|
export declare class VpnConfig {
|
|
6
|
+
private static validateMtu;
|
|
6
7
|
/**
|
|
7
8
|
* Validate a client config object. Throws on invalid config.
|
|
8
9
|
*/
|
|
@@ -3,6 +3,11 @@ import * as plugins from './smartvpn.plugins.js';
|
|
|
3
3
|
* VPN configuration loader, saver, and validator.
|
|
4
4
|
*/
|
|
5
5
|
export class VpnConfig {
|
|
6
|
+
static validateMtu(mtu) {
|
|
7
|
+
if (mtu !== undefined && (!Number.isInteger(mtu) || mtu < 576 || mtu > 65472)) {
|
|
8
|
+
throw new Error('VpnConfig: mtu must be an integer between 576 and 65472 inner IP bytes');
|
|
9
|
+
}
|
|
10
|
+
}
|
|
6
11
|
/**
|
|
7
12
|
* Validate a client config object. Throws on invalid config.
|
|
8
13
|
*/
|
|
@@ -26,15 +31,27 @@ export class VpnConfig {
|
|
|
26
31
|
if (config.wgPresharedKey) {
|
|
27
32
|
VpnConfig.validateBase64Key(config.wgPresharedKey, 'wgPresharedKey');
|
|
28
33
|
}
|
|
29
|
-
if (config.wgAllowedIps) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
+
if (!Array.isArray(config.wgAllowedIps) || config.wgAllowedIps.length === 0) {
|
|
35
|
+
throw new Error('VpnConfig: wgAllowedIps must be a nonempty array for WireGuard transport');
|
|
36
|
+
}
|
|
37
|
+
for (const cidr of config.wgAllowedIps) {
|
|
38
|
+
if (!VpnConfig.isValidCidr(cidr)) {
|
|
39
|
+
throw new Error(`VpnConfig: invalid allowedIp CIDR: ${cidr}`);
|
|
34
40
|
}
|
|
35
41
|
}
|
|
42
|
+
if (!VpnConfig.isValidIp(config.wgAddress)) {
|
|
43
|
+
throw new Error('VpnConfig: wgAddress must be an IPv4 address');
|
|
44
|
+
}
|
|
45
|
+
if (config.wgAddressPrefix !== undefined && (!Number.isInteger(config.wgAddressPrefix) || config.wgAddressPrefix < 0 || config.wgAddressPrefix > 32)) {
|
|
46
|
+
throw new Error('VpnConfig: wgAddressPrefix must be an integer from 0 through 32');
|
|
47
|
+
}
|
|
36
48
|
}
|
|
37
49
|
else {
|
|
50
|
+
if (config.managedNetwork && (!config.managedNetwork.authorityId || !config.managedNetwork.nodeId
|
|
51
|
+
|| config.managedNetwork.authorityId.trim() !== config.managedNetwork.authorityId
|
|
52
|
+
|| config.managedNetwork.nodeId.trim() !== config.managedNetwork.nodeId)) {
|
|
53
|
+
throw new Error('VpnConfig: managedNetwork requires an explicit authorityId and nodeId');
|
|
54
|
+
}
|
|
38
55
|
if (!config.serverUrl) {
|
|
39
56
|
throw new Error('VpnConfig: serverUrl is required');
|
|
40
57
|
}
|
|
@@ -57,9 +74,7 @@ export class VpnConfig {
|
|
|
57
74
|
}
|
|
58
75
|
VpnConfig.validateBase64Key(config.clientPublicKey, 'clientPublicKey');
|
|
59
76
|
}
|
|
60
|
-
|
|
61
|
-
throw new Error('VpnConfig: mtu must be between 576 and 65535');
|
|
62
|
-
}
|
|
77
|
+
VpnConfig.validateMtu(config.mtu);
|
|
63
78
|
if (config.keepaliveIntervalSecs !== undefined && config.keepaliveIntervalSecs < 1) {
|
|
64
79
|
throw new Error('VpnConfig: keepaliveIntervalSecs must be >= 1');
|
|
65
80
|
}
|
|
@@ -75,16 +90,41 @@ export class VpnConfig {
|
|
|
75
90
|
* Validate a server config object. Throws on invalid config.
|
|
76
91
|
*/
|
|
77
92
|
static validateServerConfig(config) {
|
|
93
|
+
if (config.forwardingMode === 'managed') {
|
|
94
|
+
if (!config.managedAuthorityId || config.managedAuthorityId.trim() !== config.managedAuthorityId) {
|
|
95
|
+
throw new Error('VpnConfig: managed mode requires managedAuthorityId');
|
|
96
|
+
}
|
|
97
|
+
if (config.clients?.length || config.wgPeers?.length || config.enableNat === true
|
|
98
|
+
|| config.destinationPolicy !== undefined || config.clientAllowedIPs !== undefined || config.dns !== undefined
|
|
99
|
+
|| config.bridgeLanSubnet !== undefined || config.bridgePhysicalInterface !== undefined
|
|
100
|
+
|| config.bridgeIpRangeStart !== undefined || config.bridgeIpRangeEnd !== undefined
|
|
101
|
+
|| config.socketForwardProxyProtocol === true || config.socketForwardProxyProtocolSource !== undefined
|
|
102
|
+
|| config.socketForwardProxyProtocolVpnMetadata === true) {
|
|
103
|
+
throw new Error('VpnConfig: managed mode does not accept standalone clients, peers, routing, DNS, NAT or bridge configuration');
|
|
104
|
+
}
|
|
105
|
+
if (config.wgPrivateKey && ['all', 'wireguard'].includes(config.transportMode ?? 'all') && !config.serverEndpoint) {
|
|
106
|
+
throw new Error('VpnConfig: managed WireGuard requires an explicit serverEndpoint');
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
else if (config.managedAuthorityId !== undefined) {
|
|
110
|
+
throw new Error('VpnConfig: managedAuthorityId requires managed mode');
|
|
111
|
+
}
|
|
112
|
+
if (config.wgPrivateKey) {
|
|
113
|
+
VpnConfig.validateBase64Key(config.wgPrivateKey, 'wgPrivateKey');
|
|
114
|
+
}
|
|
78
115
|
if (config.transportMode === 'wireguard') {
|
|
79
116
|
// WireGuard server validation
|
|
80
117
|
if (!config.privateKey) {
|
|
81
118
|
throw new Error('VpnConfig: privateKey is required');
|
|
82
119
|
}
|
|
83
120
|
VpnConfig.validateBase64Key(config.privateKey, 'privateKey');
|
|
84
|
-
if (
|
|
121
|
+
if (config.forwardingMode === 'managed' && !config.wgPrivateKey) {
|
|
122
|
+
throw new Error('VpnConfig: managed WireGuard requires wgPrivateKey');
|
|
123
|
+
}
|
|
124
|
+
if (config.forwardingMode !== 'managed' && (!config.wgPeers || config.wgPeers.length === 0)) {
|
|
85
125
|
throw new Error('VpnConfig: at least one wgPeers entry is required for WireGuard mode');
|
|
86
126
|
}
|
|
87
|
-
for (const peer of config.wgPeers) {
|
|
127
|
+
for (const peer of config.wgPeers ?? []) {
|
|
88
128
|
if (!peer.publicKey) {
|
|
89
129
|
throw new Error('VpnConfig: peer publicKey is required');
|
|
90
130
|
}
|
|
@@ -134,9 +174,7 @@ export class VpnConfig {
|
|
|
134
174
|
}
|
|
135
175
|
}
|
|
136
176
|
}
|
|
137
|
-
|
|
138
|
-
throw new Error('VpnConfig: mtu must be between 576 and 65535');
|
|
139
|
-
}
|
|
177
|
+
VpnConfig.validateMtu(config.mtu);
|
|
140
178
|
if (config.keepaliveIntervalSecs !== undefined && config.keepaliveIntervalSecs < 1) {
|
|
141
179
|
throw new Error('VpnConfig: keepaliveIntervalSecs must be >= 1');
|
|
142
180
|
}
|
|
@@ -219,4 +257,4 @@ export class VpnConfig {
|
|
|
219
257
|
}
|
|
220
258
|
}
|
|
221
259
|
}
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartvpn.classes.vpnconfig.js","sourceRoot":"","sources":["../ts/smartvpn.classes.vpnconfig.ts"],"names":[],"mappings":"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"}
|
|
260
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartvpn.classes.vpnconfig.js","sourceRoot":"","sources":["../ts/smartvpn.classes.vpnconfig.ts"],"names":[],"mappings":"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"}
|