@dcupl/cli 1.4.0-beta.6 → 1.4.0-beta.8
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/cli.js +8 -0
- package/dist/cli.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server-access.guard.d.ts +11 -0
- package/dist/functions/serve/dev-server/dev-server-access.guard.js +41 -0
- package/dist/functions/serve/dev-server/dev-server-access.guard.js.map +1 -0
- package/dist/functions/serve/dev-server/dev-server.controller.d.ts +3 -0
- package/dist/functions/serve/dev-server/dev-server.controller.js +20 -0
- package/dist/functions/serve/dev-server/dev-server.controller.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server.module.d.ts +3 -0
- package/dist/functions/serve/dev-server/dev-server.module.js +34 -23
- package/dist/functions/serve/dev-server/dev-server.module.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server.options.d.ts +8 -0
- package/dist/functions/serve/dev-server/dev-server.options.js +5 -0
- package/dist/functions/serve/dev-server/dev-server.options.js.map +1 -0
- package/dist/functions/serve/dev-server/dev-server.service.d.ts +11 -3
- package/dist/functions/serve/dev-server/dev-server.service.js +72 -65
- package/dist/functions/serve/dev-server/dev-server.service.js.map +1 -1
- package/dist/functions/serve/dev-server/path-scope.d.ts +5 -0
- package/dist/functions/serve/dev-server/path-scope.js +88 -0
- package/dist/functions/serve/dev-server/path-scope.js.map +1 -0
- package/dist/functions/serve/dev-server/request-security.d.ts +34 -0
- package/dist/functions/serve/dev-server/request-security.js +145 -0
- package/dist/functions/serve/dev-server/request-security.js.map +1 -0
- package/dist/functions/serve/main.d.ts +13 -0
- package/dist/functions/serve/main.js +80 -11
- package/dist/functions/serve/main.js.map +1 -1
- package/files/dev-server/index.html +2 -1
- package/package.json +5 -5
- package/dist/functions/serve/guards/apiKey.guard.d.ts +0 -4
- package/dist/functions/serve/guards/apiKey.guard.js +0 -23
- package/dist/functions/serve/guards/apiKey.guard.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-server.options.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/dev-server.options.ts"],"names":[],"mappings":";;;AAEa,QAAA,kBAAkB,GAAG,oBAAoB,CAAC"}
|
|
@@ -4,8 +4,14 @@ import { DcuplApplicationTestingConfig, DcuplTestScenario, TestRunnerOptions } f
|
|
|
4
4
|
import { Observable } from 'rxjs';
|
|
5
5
|
import { ApiFiles } from '@dcupl/common-internal';
|
|
6
6
|
import { CreateFolderBody, DeleteFileBody, MoveFileBody, ReadFileBody, WriteFileBody } from './types/file.types';
|
|
7
|
+
import { DevServerOptions } from './dev-server.options';
|
|
7
8
|
export declare class DevServerService {
|
|
9
|
+
private readonly options;
|
|
8
10
|
runner: TestRunner;
|
|
11
|
+
private readonly fileApiBlocked;
|
|
12
|
+
constructor(options: DevServerOptions);
|
|
13
|
+
private get workspaceRoot();
|
|
14
|
+
private get baseFolder();
|
|
9
15
|
get config(): DcuplCliConfig;
|
|
10
16
|
watchFiles(): Observable<ApiFiles.InternalEvent> | undefined;
|
|
11
17
|
writeFile(data: WriteFileBody): string;
|
|
@@ -20,10 +26,12 @@ export declare class DevServerService {
|
|
|
20
26
|
runTests(data: TestRunnerOptions): Promise<unknown>;
|
|
21
27
|
getTestConfigs(): Promise<DcuplApplicationTestingConfig[] | undefined>;
|
|
22
28
|
getTestLoader(): Promise<DcuplTestScenario[] | undefined>;
|
|
23
|
-
getFile(data:
|
|
24
|
-
deleteFile(data:
|
|
29
|
+
getFile(data: ReadFileBody): string | null;
|
|
30
|
+
deleteFile(data: DeleteFileBody): boolean | null;
|
|
25
31
|
moveFile(data: MoveFileBody): boolean | null;
|
|
26
32
|
private getFiles;
|
|
27
|
-
private
|
|
33
|
+
private assertFileApiEnabled;
|
|
34
|
+
private resolveInBaseFolder;
|
|
28
35
|
updateConfig(config: Partial<DcuplCliConfig>): void;
|
|
36
|
+
setOpenBrowser(openBrowser: unknown): void;
|
|
29
37
|
}
|
|
@@ -7,30 +7,37 @@ const fs_1 = require("fs");
|
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const rxjs_1 = require("rxjs");
|
|
9
9
|
const config_helper_1 = require("../../helper/config.helper");
|
|
10
|
-
const generate_helper_1 = require("../../generate/files/generate.helper");
|
|
11
10
|
const glob_1 = require("glob");
|
|
12
11
|
const testing_1 = require("../../testing/testing");
|
|
13
12
|
const kleur_1 = require("kleur");
|
|
14
13
|
const lodash_1 = require("lodash");
|
|
15
14
|
const fs_extra_1 = require("fs-extra");
|
|
16
|
-
const
|
|
15
|
+
const dev_server_options_1 = require("./dev-server.options");
|
|
16
|
+
const path_scope_1 = require("./path-scope");
|
|
17
17
|
let DevServerService = class DevServerService {
|
|
18
|
-
constructor() {
|
|
18
|
+
constructor(options) {
|
|
19
|
+
this.options = options;
|
|
19
20
|
this.runner = new testing_1.TestRunner();
|
|
21
|
+
this.fileApiBlocked = (0, path_scope_1.fileApiBlockReason)(options.workspaceRoot, options.baseFolder);
|
|
22
|
+
}
|
|
23
|
+
get workspaceRoot() {
|
|
24
|
+
return this.options.workspaceRoot;
|
|
25
|
+
}
|
|
26
|
+
get baseFolder() {
|
|
27
|
+
return this.options.baseFolder;
|
|
20
28
|
}
|
|
21
29
|
get config() {
|
|
22
|
-
const configFile = (0, config_helper_1.getConfigFileValue)(
|
|
30
|
+
const configFile = (0, config_helper_1.getConfigFileValue)(this.workspaceRoot);
|
|
23
31
|
if (configFile) {
|
|
24
32
|
return configFile;
|
|
25
33
|
}
|
|
26
34
|
else {
|
|
27
|
-
throw new Error(`Please make sure you have a valid config file with an existing projectId at ${
|
|
35
|
+
throw new Error(`Please make sure you have a valid config file with an existing projectId at ${this.workspaceRoot}/dcupl.config.json`);
|
|
28
36
|
}
|
|
29
37
|
}
|
|
30
38
|
watchFiles() {
|
|
31
39
|
const subject = new rxjs_1.Subject();
|
|
32
|
-
const
|
|
33
|
-
const baseFolderPath = (0, path_1.join)(currentBasePath, baseFolderName);
|
|
40
|
+
const baseFolderPath = this.baseFolder;
|
|
34
41
|
if (!(0, fs_extra_1.existsSync)(baseFolderPath)) {
|
|
35
42
|
console.log(`${(0, kleur_1.blue)((0, kleur_1.bold)('INFO'))} ${(0, kleur_1.underline)('dcupl')} folder not found at ${baseFolderPath}`);
|
|
36
43
|
return;
|
|
@@ -46,14 +53,19 @@ let DevServerService = class DevServerService {
|
|
|
46
53
|
return subject.asObservable().pipe((0, rxjs_1.debounceTime)(300));
|
|
47
54
|
}
|
|
48
55
|
writeFile(data) {
|
|
49
|
-
const
|
|
50
|
-
|
|
56
|
+
const pathToFile = this.resolveInBaseFolder(data?.path);
|
|
57
|
+
if (typeof data.content !== 'string') {
|
|
58
|
+
throw new common_1.BadRequestException('content must be a string');
|
|
59
|
+
}
|
|
60
|
+
(0, fs_extra_1.outputFileSync)(pathToFile, data.content, { encoding: 'utf-8' });
|
|
61
|
+
return data.content;
|
|
51
62
|
}
|
|
52
63
|
createFolder(data) {
|
|
53
|
-
|
|
54
|
-
return
|
|
64
|
+
(0, fs_extra_1.ensureDirSync)(this.resolveInBaseFolder(data?.path));
|
|
65
|
+
return true;
|
|
55
66
|
}
|
|
56
67
|
async listFiles(search) {
|
|
68
|
+
this.assertFileApiEnabled();
|
|
57
69
|
let list = await this.getFilesAsFlatList();
|
|
58
70
|
if (search) {
|
|
59
71
|
list = list.filter((item) => item.includes(`${search}`));
|
|
@@ -62,29 +74,13 @@ let DevServerService = class DevServerService {
|
|
|
62
74
|
return { list, nested: nested };
|
|
63
75
|
}
|
|
64
76
|
async getFilesAsFlatList() {
|
|
65
|
-
const
|
|
66
|
-
|
|
67
|
-
const includedFiles = await Promise.all(includes.map((pattern) => this.getFiles(pattern, config.baseFolder)));
|
|
68
|
-
const list = includedFiles
|
|
69
|
-
.flat()
|
|
70
|
-
.filter((item) => (0, fs_1.statSync)(item).isFile())
|
|
71
|
-
.map((filePath) => {
|
|
72
|
-
return filePath.slice(config.baseFolder.length + 1);
|
|
73
|
-
});
|
|
74
|
-
return list;
|
|
77
|
+
const files = await this.getFiles();
|
|
78
|
+
return files.filter((item) => (0, fs_1.statSync)((0, path_1.join)(this.baseFolder, item)).isFile());
|
|
75
79
|
}
|
|
76
80
|
async getFilesAndFoldersAsNested() {
|
|
77
|
-
|
|
78
|
-
const config = this.config;
|
|
79
|
-
const includedFiles = await Promise.all(includes.map((pattern) => this.getFiles(pattern, config.baseFolder)));
|
|
80
|
-
const cleanFiles = includedFiles.flat().map((filePath) => {
|
|
81
|
-
return filePath.slice(config.baseFolder.length + 1);
|
|
82
|
-
});
|
|
83
|
-
const fileTree = this.createFileTree(cleanFiles);
|
|
84
|
-
return fileTree;
|
|
81
|
+
return this.createFileTree(await this.getFiles());
|
|
85
82
|
}
|
|
86
83
|
createFileTree(paths) {
|
|
87
|
-
const config = this.config;
|
|
88
84
|
const emptyMetadata = {
|
|
89
85
|
size: '0',
|
|
90
86
|
timeCreated: '',
|
|
@@ -107,7 +103,7 @@ let DevServerService = class DevServerService {
|
|
|
107
103
|
parts.forEach((part) => {
|
|
108
104
|
let child = current.children.find((child) => child.path === part);
|
|
109
105
|
const fullPath = current.fullPath ? `${current.fullPath}/${part}` : part;
|
|
110
|
-
const fullPathIncludingBaseFolder = (0, path_1.join)(
|
|
106
|
+
const fullPathIncludingBaseFolder = (0, path_1.join)(this.baseFolder, path);
|
|
111
107
|
const stat = (0, fs_1.statSync)(fullPathIncludingBaseFolder);
|
|
112
108
|
const type = stat.isDirectory() ? 'dir' : 'file';
|
|
113
109
|
if (!child) {
|
|
@@ -148,56 +144,67 @@ let DevServerService = class DevServerService {
|
|
|
148
144
|
}
|
|
149
145
|
}
|
|
150
146
|
getFile(data) {
|
|
151
|
-
const
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
throw new Error('File not in scope');
|
|
147
|
+
const pathToFile = this.resolveInBaseFolder(data?.path);
|
|
148
|
+
if (!(0, fs_extra_1.pathExistsSync)(pathToFile)) {
|
|
149
|
+
return null;
|
|
155
150
|
}
|
|
156
|
-
return (0,
|
|
151
|
+
return (0, fs_extra_1.readFileSync)(pathToFile, { encoding: 'utf-8' });
|
|
157
152
|
}
|
|
158
153
|
deleteFile(data) {
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
throw new Error('File not in scope');
|
|
154
|
+
const pathToFile = this.resolveInBaseFolder(data?.path);
|
|
155
|
+
if (!(0, fs_extra_1.pathExistsSync)(pathToFile)) {
|
|
156
|
+
return null;
|
|
163
157
|
}
|
|
164
|
-
|
|
158
|
+
(0, fs_extra_1.removeSync)(pathToFile);
|
|
159
|
+
return true;
|
|
165
160
|
}
|
|
166
161
|
moveFile(data) {
|
|
167
|
-
const
|
|
168
|
-
const
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
throw new Error('File not in scope');
|
|
172
|
-
}
|
|
173
|
-
if (!this.isInScope(pathToToFile)) {
|
|
174
|
-
throw new Error('File not in scope');
|
|
162
|
+
const pathToFromFile = this.resolveInBaseFolder(data?.from);
|
|
163
|
+
const pathToToFile = this.resolveInBaseFolder(data?.to);
|
|
164
|
+
if (!(0, fs_extra_1.pathExistsSync)(pathToFromFile)) {
|
|
165
|
+
return null;
|
|
175
166
|
}
|
|
176
|
-
|
|
167
|
+
(0, fs_extra_1.moveSync)(pathToFromFile, pathToToFile);
|
|
168
|
+
return true;
|
|
177
169
|
}
|
|
178
|
-
getFiles(
|
|
179
|
-
|
|
180
|
-
|
|
170
|
+
async getFiles() {
|
|
171
|
+
const name = (0, path_1.basename)(this.baseFolder);
|
|
172
|
+
const matches = await (0, glob_1.glob)(`${(0, glob_1.escape)(name)}/**/*`, { cwd: (0, path_1.dirname)(this.baseFolder) });
|
|
173
|
+
return matches.map((match) => match.slice(name.length + 1));
|
|
174
|
+
}
|
|
175
|
+
assertFileApiEnabled() {
|
|
176
|
+
if (this.fileApiBlocked) {
|
|
177
|
+
throw new common_1.ForbiddenException(this.fileApiBlocked);
|
|
181
178
|
}
|
|
182
|
-
return (0, glob_1.glob)(pattern);
|
|
183
179
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
180
|
+
resolveInBaseFolder(requested) {
|
|
181
|
+
this.assertFileApiEnabled();
|
|
182
|
+
try {
|
|
183
|
+
return (0, path_scope_1.resolveInScope)(this.baseFolder, requested);
|
|
184
|
+
}
|
|
185
|
+
catch (err) {
|
|
186
|
+
if (err instanceof path_scope_1.PathScopeError) {
|
|
187
|
+
throw new common_1.ForbiddenException(err.message);
|
|
188
|
+
}
|
|
189
|
+
throw err;
|
|
190
|
+
}
|
|
187
191
|
}
|
|
188
192
|
updateConfig(config) {
|
|
189
|
-
|
|
190
|
-
const currentConfig = (0, config_helper_1.getConfigFileValue)(currentBasePath);
|
|
191
|
-
console.log('currentConfig', currentConfig);
|
|
193
|
+
const currentConfig = (0, config_helper_1.getConfigFileValue)(this.workspaceRoot);
|
|
192
194
|
const newConfig = { ...currentConfig, ...config };
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
(
|
|
195
|
+
(0, config_helper_1.setConfigFileValue)(this.workspaceRoot, newConfig);
|
|
196
|
+
}
|
|
197
|
+
setOpenBrowser(openBrowser) {
|
|
198
|
+
if (typeof openBrowser !== 'boolean') {
|
|
199
|
+
throw new common_1.BadRequestException('openBrowser must be a boolean');
|
|
200
|
+
}
|
|
201
|
+
this.updateConfig({ openBrowser });
|
|
197
202
|
}
|
|
198
203
|
};
|
|
199
204
|
exports.DevServerService = DevServerService;
|
|
200
205
|
exports.DevServerService = DevServerService = tslib_1.__decorate([
|
|
201
|
-
(0, common_1.Injectable)()
|
|
206
|
+
(0, common_1.Injectable)(),
|
|
207
|
+
tslib_1.__param(0, (0, common_1.Inject)(dev_server_options_1.DEV_SERVER_OPTIONS)),
|
|
208
|
+
tslib_1.__metadata("design:paramtypes", [Object])
|
|
202
209
|
], DevServerService);
|
|
203
210
|
//# sourceMappingURL=dev-server.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.service.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/dev-server.service.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dev-server.service.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/dev-server.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare class PathScopeError extends Error {
|
|
2
|
+
constructor(message: string);
|
|
3
|
+
}
|
|
4
|
+
export declare function resolveInScope(baseDir: string, requested: unknown): string;
|
|
5
|
+
export declare function fileApiBlockReason(workspaceRoot: string, baseFolder: string): string | null;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PathScopeError = void 0;
|
|
4
|
+
exports.resolveInScope = resolveInScope;
|
|
5
|
+
exports.fileApiBlockReason = fileApiBlockReason;
|
|
6
|
+
const fs_1 = require("fs");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
class PathScopeError extends Error {
|
|
9
|
+
constructor(message) {
|
|
10
|
+
super(message);
|
|
11
|
+
this.name = 'PathScopeError';
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.PathScopeError = PathScopeError;
|
|
15
|
+
function resolveInScope(baseDir, requested) {
|
|
16
|
+
if (typeof requested !== 'string') {
|
|
17
|
+
throw new PathScopeError('path must be a string');
|
|
18
|
+
}
|
|
19
|
+
if (requested.includes('\0')) {
|
|
20
|
+
throw new PathScopeError('path must not contain NUL bytes');
|
|
21
|
+
}
|
|
22
|
+
if ((0, path_1.isAbsolute)(requested) || path_1.win32.isAbsolute(requested) || /^[a-zA-Z]:/.test(requested)) {
|
|
23
|
+
throw new PathScopeError(`absolute paths are not allowed: ${requested}`);
|
|
24
|
+
}
|
|
25
|
+
if (requested.split(/[\\/]/).includes('..')) {
|
|
26
|
+
throw new PathScopeError(`".." segments are not allowed: ${requested}`);
|
|
27
|
+
}
|
|
28
|
+
const base = (0, path_1.resolve)(baseDir);
|
|
29
|
+
const target = (0, path_1.resolve)(base, requested);
|
|
30
|
+
if (!isStrictlyInside(base, target)) {
|
|
31
|
+
throw new PathScopeError(`path must point inside the served folder: ${requested}`);
|
|
32
|
+
}
|
|
33
|
+
if (!isStrictlyInside(realpathOfNearestExisting(base), realpathOfNearestExisting(target))) {
|
|
34
|
+
throw new PathScopeError(`path leads outside the served folder through a symlink: ${requested}`);
|
|
35
|
+
}
|
|
36
|
+
return target;
|
|
37
|
+
}
|
|
38
|
+
function fileApiBlockReason(workspaceRoot, baseFolder) {
|
|
39
|
+
const root = realpathOrSelf((0, path_1.resolve)(workspaceRoot));
|
|
40
|
+
const base = realpathOrSelf((0, path_1.resolve)(baseFolder));
|
|
41
|
+
if (root !== base && !isStrictlyInside(base, root)) {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
return (`The file API is disabled: baseFolder "${(0, path_1.relative)(workspaceRoot, baseFolder) || '.'}" contains the workspace ` +
|
|
45
|
+
'root with dcupl.config.json and dcupl.secrets.json. Point baseFolder in dcupl.config.json at a subfolder ' +
|
|
46
|
+
'such as "dcupl" and restart dcupl serve.');
|
|
47
|
+
}
|
|
48
|
+
function realpathOrSelf(path) {
|
|
49
|
+
try {
|
|
50
|
+
return fs_1.realpathSync.native(path);
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
return path;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function isStrictlyInside(parent, child) {
|
|
57
|
+
const rel = (0, path_1.relative)(parent, child);
|
|
58
|
+
return rel !== '' && rel !== '..' && !rel.startsWith(`..${path_1.sep}`) && !(0, path_1.isAbsolute)(rel);
|
|
59
|
+
}
|
|
60
|
+
function realpathOfNearestExisting(path) {
|
|
61
|
+
const missing = [];
|
|
62
|
+
let current = path;
|
|
63
|
+
while (!entryExists(current)) {
|
|
64
|
+
const parent = (0, path_1.dirname)(current);
|
|
65
|
+
if (parent === current)
|
|
66
|
+
break;
|
|
67
|
+
missing.unshift((0, path_1.basename)(current));
|
|
68
|
+
current = parent;
|
|
69
|
+
}
|
|
70
|
+
try {
|
|
71
|
+
return (0, path_1.join)(fs_1.realpathSync.native(current), ...missing);
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
throw new PathScopeError(`path leads through a broken symlink: ${path}`);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
function entryExists(path) {
|
|
78
|
+
try {
|
|
79
|
+
(0, fs_1.lstatSync)(path);
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
if (err?.code === 'ENOENT' || err?.code === 'ENOTDIR')
|
|
84
|
+
return false;
|
|
85
|
+
throw err;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=path-scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"path-scope.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/path-scope.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export declare const DEFAULT_SERVE_HOST = "127.0.0.1";
|
|
2
|
+
export declare const SERVE_TOKEN_HEADER = "x-dcupl-serve-token";
|
|
3
|
+
export declare const DCUPL_CONSOLE_ORIGINS: readonly string[];
|
|
4
|
+
export type DevServerSecurity = {
|
|
5
|
+
token: string;
|
|
6
|
+
allowedHosts: string[];
|
|
7
|
+
trustedOrigins: string[];
|
|
8
|
+
};
|
|
9
|
+
export type DevServerAccessLevel = 'read' | 'edit' | 'admin';
|
|
10
|
+
export type AccessRequest = {
|
|
11
|
+
origin?: string;
|
|
12
|
+
token?: unknown;
|
|
13
|
+
remoteAddress?: string;
|
|
14
|
+
proxied?: boolean;
|
|
15
|
+
};
|
|
16
|
+
export type AccessDecision = {
|
|
17
|
+
allowed: true;
|
|
18
|
+
} | {
|
|
19
|
+
allowed: false;
|
|
20
|
+
reason: string;
|
|
21
|
+
};
|
|
22
|
+
export declare function resolveServeHost(flag: string | string[] | undefined): string;
|
|
23
|
+
export declare function parseAllowedOrigins(values: unknown): string[];
|
|
24
|
+
export declare function isLoopbackAddress(address: string): boolean;
|
|
25
|
+
export declare function isAllowedHost(hostHeader: string | undefined, allowedHosts: readonly string[]): boolean;
|
|
26
|
+
export declare function isTrustedOrigin(origin: string, trustedOrigins: readonly string[]): boolean;
|
|
27
|
+
export declare function isProxiedRequest(headers: Record<string, unknown>): boolean;
|
|
28
|
+
export declare function createServeToken(): string;
|
|
29
|
+
export declare function tokenMatches(expected: string, provided: unknown): boolean;
|
|
30
|
+
export declare function admitRequest(request: {
|
|
31
|
+
host?: string;
|
|
32
|
+
origin?: string;
|
|
33
|
+
}, security: DevServerSecurity): string | null;
|
|
34
|
+
export declare function authorizeRequest(level: DevServerAccessLevel, request: AccessRequest, security: DevServerSecurity): AccessDecision;
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DCUPL_CONSOLE_ORIGINS = exports.SERVE_TOKEN_HEADER = exports.DEFAULT_SERVE_HOST = void 0;
|
|
4
|
+
exports.resolveServeHost = resolveServeHost;
|
|
5
|
+
exports.parseAllowedOrigins = parseAllowedOrigins;
|
|
6
|
+
exports.isLoopbackAddress = isLoopbackAddress;
|
|
7
|
+
exports.isAllowedHost = isAllowedHost;
|
|
8
|
+
exports.isTrustedOrigin = isTrustedOrigin;
|
|
9
|
+
exports.isProxiedRequest = isProxiedRequest;
|
|
10
|
+
exports.createServeToken = createServeToken;
|
|
11
|
+
exports.tokenMatches = tokenMatches;
|
|
12
|
+
exports.admitRequest = admitRequest;
|
|
13
|
+
exports.authorizeRequest = authorizeRequest;
|
|
14
|
+
const crypto_1 = require("crypto");
|
|
15
|
+
const net_1 = require("net");
|
|
16
|
+
exports.DEFAULT_SERVE_HOST = '127.0.0.1';
|
|
17
|
+
const ALL_INTERFACES = '0.0.0.0';
|
|
18
|
+
exports.SERVE_TOKEN_HEADER = 'x-dcupl-serve-token';
|
|
19
|
+
exports.DCUPL_CONSOLE_ORIGINS = [
|
|
20
|
+
'https://console.dcupl.com',
|
|
21
|
+
'https://next.console.dcupl.com',
|
|
22
|
+
'https://dev.console.dcupl.com',
|
|
23
|
+
];
|
|
24
|
+
function resolveServeHost(flag) {
|
|
25
|
+
const value = Array.isArray(flag) ? flag[flag.length - 1] : flag;
|
|
26
|
+
if (value === undefined)
|
|
27
|
+
return exports.DEFAULT_SERVE_HOST;
|
|
28
|
+
const host = String(value).trim();
|
|
29
|
+
if (host === '')
|
|
30
|
+
return ALL_INTERFACES;
|
|
31
|
+
return host.toLowerCase() === 'localhost' ? exports.DEFAULT_SERVE_HOST : host;
|
|
32
|
+
}
|
|
33
|
+
function parseAllowedOrigins(values) {
|
|
34
|
+
const list = values === undefined ? [] : Array.isArray(values) ? values : [values];
|
|
35
|
+
return list.map((value) => {
|
|
36
|
+
const url = parseHttpUrl(String(value));
|
|
37
|
+
if (!url) {
|
|
38
|
+
throw new Error(`Invalid --allow-origin "${value}": expected an http(s) origin such as https://app.example.com`);
|
|
39
|
+
}
|
|
40
|
+
return url.origin;
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
function isLoopbackAddress(address) {
|
|
44
|
+
const ip = address.toLowerCase().replace(/^::ffff:/, '');
|
|
45
|
+
return ip === '::1' || ((0, net_1.isIP)(ip) === 4 && ip.startsWith('127.'));
|
|
46
|
+
}
|
|
47
|
+
function isAllowedHost(hostHeader, allowedHosts) {
|
|
48
|
+
if (hostHeader === undefined)
|
|
49
|
+
return true;
|
|
50
|
+
if (/[\s@/?#\\]/.test(hostHeader))
|
|
51
|
+
return false;
|
|
52
|
+
const hostname = hostnameOf(`http://${hostHeader}`);
|
|
53
|
+
if (!hostname)
|
|
54
|
+
return false;
|
|
55
|
+
return ((0, net_1.isIP)(hostname) !== 0 ||
|
|
56
|
+
isLocalhostName(hostname) ||
|
|
57
|
+
allowedHosts.some((allowed) => normalizeHostName(allowed) === hostname));
|
|
58
|
+
}
|
|
59
|
+
function isTrustedOrigin(origin, trustedOrigins) {
|
|
60
|
+
const url = parseHttpUrl(origin);
|
|
61
|
+
if (!url)
|
|
62
|
+
return false;
|
|
63
|
+
const hostname = hostnameOf(url.href);
|
|
64
|
+
if (isLocalhostName(hostname) || ((0, net_1.isIP)(hostname) !== 0 && isLoopbackAddress(hostname)))
|
|
65
|
+
return true;
|
|
66
|
+
return exports.DCUPL_CONSOLE_ORIGINS.includes(url.origin) || trustedOrigins.includes(url.origin);
|
|
67
|
+
}
|
|
68
|
+
function isEditorOrigin(origin, trustedOrigins) {
|
|
69
|
+
const url = parseHttpUrl(origin);
|
|
70
|
+
return !!url && (exports.DCUPL_CONSOLE_ORIGINS.includes(url.origin) || trustedOrigins.includes(url.origin));
|
|
71
|
+
}
|
|
72
|
+
function isProxiedRequest(headers) {
|
|
73
|
+
return ['forwarded', 'x-forwarded-for', 'x-real-ip'].some((name) => headers[name] !== undefined);
|
|
74
|
+
}
|
|
75
|
+
function createServeToken() {
|
|
76
|
+
return (0, crypto_1.randomBytes)(32).toString('hex');
|
|
77
|
+
}
|
|
78
|
+
function tokenMatches(expected, provided) {
|
|
79
|
+
if (typeof provided !== 'string' || provided.length === 0)
|
|
80
|
+
return false;
|
|
81
|
+
const a = Buffer.from(expected);
|
|
82
|
+
const b = Buffer.from(provided);
|
|
83
|
+
return a.length === b.length && (0, crypto_1.timingSafeEqual)(a, b);
|
|
84
|
+
}
|
|
85
|
+
function admitRequest(request, security) {
|
|
86
|
+
if (!isAllowedHost(request.host, security.allowedHosts)) {
|
|
87
|
+
return `Blocked request: host "${request.host}" is not allowed. dcupl serve accepts localhost, IP addresses and the --host name.`;
|
|
88
|
+
}
|
|
89
|
+
const { origin } = request;
|
|
90
|
+
if (origin === undefined || isTrustedOrigin(origin, security.trustedOrigins) || isSameOrigin(origin, request.host)) {
|
|
91
|
+
return null;
|
|
92
|
+
}
|
|
93
|
+
return `Blocked request: origin "${origin}" is not allowed. Trust it with dcupl serve --allow-origin <origin>.`;
|
|
94
|
+
}
|
|
95
|
+
function authorizeRequest(level, request, security) {
|
|
96
|
+
if (level === 'read' || tokenMatches(security.token, request.token)) {
|
|
97
|
+
return { allowed: true };
|
|
98
|
+
}
|
|
99
|
+
if (level === 'edit') {
|
|
100
|
+
const fromThisMachine = !request.proxied && request.remoteAddress !== undefined && isLoopbackAddress(request.remoteAddress);
|
|
101
|
+
if (fromThisMachine && request.origin !== undefined && isEditorOrigin(request.origin, security.trustedOrigins)) {
|
|
102
|
+
return { allowed: true };
|
|
103
|
+
}
|
|
104
|
+
return {
|
|
105
|
+
allowed: false,
|
|
106
|
+
reason: `File edits need the token printed by dcupl serve, sent in the ${exports.SERVE_TOKEN_HEADER} header. ` +
|
|
107
|
+
'Without it, only the dcupl Console and --allow-origin origins can edit, from this machine.',
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
return {
|
|
111
|
+
allowed: false,
|
|
112
|
+
reason: `This endpoint needs the token printed by dcupl serve, sent in the ${exports.SERVE_TOKEN_HEADER} header.`,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
function isSameOrigin(origin, host) {
|
|
116
|
+
const url = parseHttpUrl(origin);
|
|
117
|
+
return !!url && !!host && url.host === host.toLowerCase();
|
|
118
|
+
}
|
|
119
|
+
function isLocalhostName(hostname) {
|
|
120
|
+
return hostname === 'localhost' || hostname.endsWith('.localhost');
|
|
121
|
+
}
|
|
122
|
+
function parseHttpUrl(value) {
|
|
123
|
+
try {
|
|
124
|
+
const url = new URL(value);
|
|
125
|
+
return url.protocol === 'http:' || url.protocol === 'https:' ? url : null;
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
return null;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
function hostnameOf(href) {
|
|
132
|
+
try {
|
|
133
|
+
return normalizeHostName(new URL(href).hostname);
|
|
134
|
+
}
|
|
135
|
+
catch {
|
|
136
|
+
return null;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
function normalizeHostName(name) {
|
|
140
|
+
return name
|
|
141
|
+
.toLowerCase()
|
|
142
|
+
.replace(/^\[(.*)\]$/, '$1')
|
|
143
|
+
.replace(/\.$/, '');
|
|
144
|
+
}
|
|
145
|
+
//# sourceMappingURL=request-security.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-security.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/request-security.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,19 @@
|
|
|
1
|
+
import { AddressInfo } from 'net';
|
|
2
|
+
import { INestApplication, NestApplicationOptions } from '@nestjs/common';
|
|
3
|
+
import { DevServerOptions } from './dev-server/dev-server.options';
|
|
1
4
|
export type DcuplServeOptions = {
|
|
2
5
|
path: string;
|
|
3
6
|
port: string;
|
|
7
|
+
host?: string | string[];
|
|
8
|
+
allowOrigin?: string | string[];
|
|
4
9
|
openBrowser?: boolean;
|
|
5
10
|
};
|
|
11
|
+
export type DevServerAppOptions = DevServerOptions & {
|
|
12
|
+
nestOptions?: NestApplicationOptions;
|
|
13
|
+
};
|
|
14
|
+
export declare function createDevServerApp(options: DevServerAppOptions): Promise<INestApplication>;
|
|
15
|
+
export declare function listenDevServer(app: INestApplication, listen: {
|
|
16
|
+
port: number | string;
|
|
17
|
+
host?: string;
|
|
18
|
+
}): Promise<AddressInfo>;
|
|
6
19
|
export declare function bootstrap(argv: DcuplServeOptions): Promise<void>;
|