@oneuptime/common 11.5.3 → 11.5.4
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/Models/DatabaseModels/Dashboard.ts +3 -3
- package/Server/Services/DashboardService.ts +11 -2
- package/Server/Utils/Execute.ts +33 -13
- package/Tests/Server/API/DashboardMasterPasswordAPI.test.ts +225 -0
- package/build/dist/Models/DatabaseModels/Dashboard.js +3 -3
- package/build/dist/Models/DatabaseModels/Dashboard.js.map +1 -1
- package/build/dist/Server/Services/DashboardService.js +8 -2
- package/build/dist/Server/Services/DashboardService.js.map +1 -1
- package/build/dist/Server/Utils/Execute.js +21 -11
- package/build/dist/Server/Utils/Execute.js.map +1 -1
- package/package.json +1 -1
|
@@ -790,7 +790,7 @@ export default class Dashboard extends BaseModel {
|
|
|
790
790
|
type: TableColumnType.Boolean,
|
|
791
791
|
title: "Enable Master Password",
|
|
792
792
|
description:
|
|
793
|
-
"Require visitors to enter a master password before viewing a
|
|
793
|
+
"Require visitors to enter a master password before viewing a public dashboard.",
|
|
794
794
|
defaultValue: false,
|
|
795
795
|
})
|
|
796
796
|
@Column({
|
|
@@ -824,7 +824,7 @@ export default class Dashboard extends BaseModel {
|
|
|
824
824
|
@TableColumn({
|
|
825
825
|
title: "Master Password",
|
|
826
826
|
description:
|
|
827
|
-
"Password required to unlock a
|
|
827
|
+
"Password required to unlock a public dashboard. This value is stored as a secure hash.",
|
|
828
828
|
hashed: true,
|
|
829
829
|
type: TableColumnType.HashedString,
|
|
830
830
|
placeholder: "Enter a new master password",
|
|
@@ -865,7 +865,7 @@ export default class Dashboard extends BaseModel {
|
|
|
865
865
|
type: TableColumnType.VeryLongText,
|
|
866
866
|
title: "IP Whitelist",
|
|
867
867
|
description:
|
|
868
|
-
"IP Whitelist for this
|
|
868
|
+
"IP Whitelist for this dashboard. One IP per line. Only used when the dashboard is public.",
|
|
869
869
|
})
|
|
870
870
|
@Column({
|
|
871
871
|
type: ColumnType.VeryLongText,
|
|
@@ -214,11 +214,20 @@ export class Service extends DatabaseService<Model> {
|
|
|
214
214
|
const shouldEnforceMasterPassword: boolean = Boolean(
|
|
215
215
|
dashboard &&
|
|
216
216
|
dashboard.isPublicDashboard &&
|
|
217
|
-
dashboard.enableMasterPassword
|
|
218
|
-
dashboard.masterPassword,
|
|
217
|
+
dashboard.enableMasterPassword,
|
|
219
218
|
);
|
|
220
219
|
|
|
221
220
|
if (shouldEnforceMasterPassword) {
|
|
221
|
+
// Fail closed if protection was enabled before a password was set.
|
|
222
|
+
if (!dashboard?.masterPassword) {
|
|
223
|
+
return {
|
|
224
|
+
hasReadAccess: false,
|
|
225
|
+
error: new MasterPasswordRequiredException(
|
|
226
|
+
DASHBOARD_MASTER_PASSWORD_REQUIRED_MESSAGE,
|
|
227
|
+
),
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
|
|
222
231
|
const hasValidMasterPassword: boolean =
|
|
223
232
|
this.hasValidMasterPasswordCookie({
|
|
224
233
|
req,
|
package/Server/Utils/Execute.ts
CHANGED
|
@@ -27,22 +27,30 @@ export default class Execute {
|
|
|
27
27
|
{
|
|
28
28
|
...options,
|
|
29
29
|
},
|
|
30
|
-
(
|
|
30
|
+
(
|
|
31
|
+
err: ExecException | null,
|
|
32
|
+
stdout: string | Buffer,
|
|
33
|
+
stderr: string | Buffer,
|
|
34
|
+
) => {
|
|
35
|
+
// See executeCommandFile: string | Buffer for @types/node drift.
|
|
36
|
+
const stdoutText: string = stdout.toString();
|
|
37
|
+
const stderrText: string = stderr.toString();
|
|
38
|
+
|
|
31
39
|
if (err) {
|
|
32
40
|
logger.error(`Error executing command: ${command}`);
|
|
33
41
|
logger.error(err);
|
|
34
|
-
logger.error(
|
|
35
|
-
if (
|
|
36
|
-
logger.error(
|
|
42
|
+
logger.error(stdoutText);
|
|
43
|
+
if (stderrText) {
|
|
44
|
+
logger.error(stderrText);
|
|
37
45
|
}
|
|
38
46
|
return reject(err);
|
|
39
47
|
}
|
|
40
48
|
|
|
41
|
-
if (
|
|
42
|
-
logger.debug(
|
|
49
|
+
if (stderrText) {
|
|
50
|
+
logger.debug(stderrText);
|
|
43
51
|
}
|
|
44
52
|
|
|
45
|
-
return resolve(
|
|
53
|
+
return resolve(stdoutText);
|
|
46
54
|
},
|
|
47
55
|
);
|
|
48
56
|
},
|
|
@@ -81,22 +89,34 @@ export default class Execute {
|
|
|
81
89
|
? { timeout: data.timeoutInMS, killSignal: "SIGKILL" }
|
|
82
90
|
: {}),
|
|
83
91
|
},
|
|
84
|
-
(
|
|
92
|
+
(
|
|
93
|
+
err: ExecException | null,
|
|
94
|
+
stdout: string | Buffer,
|
|
95
|
+
stderr: string | Buffer,
|
|
96
|
+
) => {
|
|
97
|
+
/*
|
|
98
|
+
* Newer @types/node type execFile's callback output as
|
|
99
|
+
* string | Buffer — coerce so this compiles on both the pinned
|
|
100
|
+
* and freshly-resolved typings (caret ranges drift in CI).
|
|
101
|
+
*/
|
|
102
|
+
const stdoutText: string = stdout.toString();
|
|
103
|
+
const stderrText: string = stderr.toString();
|
|
104
|
+
|
|
85
105
|
if (err) {
|
|
86
106
|
logger.error(
|
|
87
107
|
`Error executing command: ${data.command} ${data.args.join(" ")}`,
|
|
88
108
|
);
|
|
89
109
|
logger.error(err);
|
|
90
|
-
logger.error(
|
|
91
|
-
logger.error(
|
|
110
|
+
logger.error(stdoutText);
|
|
111
|
+
logger.error(stderrText);
|
|
92
112
|
return reject(err);
|
|
93
113
|
}
|
|
94
114
|
|
|
95
|
-
if (
|
|
96
|
-
logger.debug(
|
|
115
|
+
if (stderrText) {
|
|
116
|
+
logger.debug(stderrText);
|
|
97
117
|
}
|
|
98
118
|
|
|
99
|
-
return resolve(
|
|
119
|
+
return resolve(stdoutText);
|
|
100
120
|
},
|
|
101
121
|
);
|
|
102
122
|
},
|
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
import Dashboard from "../../../Models/DatabaseModels/Dashboard";
|
|
2
|
+
import DashboardAPI from "../../../Server/API/DashboardAPI";
|
|
3
|
+
import { EncryptionSecret } from "../../../Server/EnvironmentConfig";
|
|
4
|
+
import DashboardService from "../../../Server/Services/DashboardService";
|
|
5
|
+
import CookieUtil from "../../../Server/Utils/Cookie";
|
|
6
|
+
import {
|
|
7
|
+
ExpressRequest,
|
|
8
|
+
ExpressResponse,
|
|
9
|
+
NextFunction,
|
|
10
|
+
} from "../../../Server/Utils/Express";
|
|
11
|
+
import Response from "../../../Server/Utils/Response";
|
|
12
|
+
import {
|
|
13
|
+
DASHBOARD_MASTER_PASSWORD_INVALID_MESSAGE,
|
|
14
|
+
DASHBOARD_MASTER_PASSWORD_REQUIRED_MESSAGE,
|
|
15
|
+
} from "../../../Types/Dashboard/MasterPassword";
|
|
16
|
+
import BadDataException from "../../../Types/Exception/BadDataException";
|
|
17
|
+
import MasterPasswordRequiredException from "../../../Types/Exception/MasterPasswordRequiredException";
|
|
18
|
+
import HashedString from "../../../Types/HashedString";
|
|
19
|
+
import ObjectID from "../../../Types/ObjectID";
|
|
20
|
+
import { mockRouter } from "./Helpers";
|
|
21
|
+
import {
|
|
22
|
+
afterEach,
|
|
23
|
+
beforeAll,
|
|
24
|
+
beforeEach,
|
|
25
|
+
describe,
|
|
26
|
+
expect,
|
|
27
|
+
it,
|
|
28
|
+
} from "@jest/globals";
|
|
29
|
+
|
|
30
|
+
jest.mock("../../../Server/Utils/Express", () => {
|
|
31
|
+
return {
|
|
32
|
+
getRouter: () => {
|
|
33
|
+
return mockRouter;
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
jest.mock("../../../Server/Utils/Response", () => {
|
|
39
|
+
return {
|
|
40
|
+
sendEntityArrayResponse: jest.fn().mockImplementation((...args: []) => {
|
|
41
|
+
return args;
|
|
42
|
+
}),
|
|
43
|
+
sendJsonObjectResponse: jest.fn().mockImplementation((...args: []) => {
|
|
44
|
+
return args;
|
|
45
|
+
}),
|
|
46
|
+
sendEmptySuccessResponse: jest.fn(),
|
|
47
|
+
sendEntityResponse: jest.fn().mockImplementation((...args: []) => {
|
|
48
|
+
return args;
|
|
49
|
+
}),
|
|
50
|
+
sendErrorResponse: jest.fn().mockImplementation((...args: []) => {
|
|
51
|
+
return args;
|
|
52
|
+
}),
|
|
53
|
+
};
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
describe("DashboardAPI master password", () => {
|
|
57
|
+
const password: string = "correct horse battery staple";
|
|
58
|
+
|
|
59
|
+
let dashboardId: ObjectID;
|
|
60
|
+
let dashboard: Dashboard;
|
|
61
|
+
let mockRequest: ExpressRequest;
|
|
62
|
+
let mockResponse: ExpressResponse;
|
|
63
|
+
let nextFunction: NextFunction;
|
|
64
|
+
|
|
65
|
+
beforeAll(() => {
|
|
66
|
+
mockRouter.routes.length = 0;
|
|
67
|
+
new DashboardAPI();
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
beforeEach(async () => {
|
|
71
|
+
jest.clearAllMocks();
|
|
72
|
+
|
|
73
|
+
dashboardId = ObjectID.generate();
|
|
74
|
+
dashboard = new Dashboard();
|
|
75
|
+
dashboard.id = dashboardId;
|
|
76
|
+
dashboard.isPublicDashboard = true;
|
|
77
|
+
dashboard.enableMasterPassword = true;
|
|
78
|
+
dashboard.masterPassword = new HashedString(
|
|
79
|
+
await HashedString.hashValue(password, EncryptionSecret),
|
|
80
|
+
true,
|
|
81
|
+
);
|
|
82
|
+
|
|
83
|
+
jest.spyOn(DashboardService, "findOneById").mockResolvedValue(dashboard);
|
|
84
|
+
|
|
85
|
+
mockRequest = {
|
|
86
|
+
params: {
|
|
87
|
+
dashboardId: dashboardId.toString(),
|
|
88
|
+
},
|
|
89
|
+
body: {
|
|
90
|
+
password,
|
|
91
|
+
},
|
|
92
|
+
cookies: {},
|
|
93
|
+
headers: {},
|
|
94
|
+
socket: {},
|
|
95
|
+
ips: [],
|
|
96
|
+
} as unknown as ExpressRequest;
|
|
97
|
+
|
|
98
|
+
mockResponse = {
|
|
99
|
+
cookie: jest.fn(),
|
|
100
|
+
send: jest.fn(),
|
|
101
|
+
json: jest.fn(),
|
|
102
|
+
status: jest.fn().mockReturnThis(),
|
|
103
|
+
} as unknown as ExpressResponse;
|
|
104
|
+
|
|
105
|
+
nextFunction = jest.fn();
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
afterEach(() => {
|
|
109
|
+
jest.restoreAllMocks();
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
it("denies a protected public dashboard when no master-password cookie is present", async () => {
|
|
113
|
+
const result: Awaited<ReturnType<typeof DashboardService.hasReadAccess>> =
|
|
114
|
+
await DashboardService.hasReadAccess({
|
|
115
|
+
dashboardId,
|
|
116
|
+
req: mockRequest,
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
expect(result.hasReadAccess).toBe(false);
|
|
120
|
+
expect(result.error).toBeInstanceOf(MasterPasswordRequiredException);
|
|
121
|
+
expect(result.error?.message).toBe(
|
|
122
|
+
DASHBOARD_MASTER_PASSWORD_REQUIRED_MESSAGE,
|
|
123
|
+
);
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
it("fails closed when master-password protection is enabled without a stored password", async () => {
|
|
127
|
+
delete dashboard.masterPassword;
|
|
128
|
+
|
|
129
|
+
const result: Awaited<ReturnType<typeof DashboardService.hasReadAccess>> =
|
|
130
|
+
await DashboardService.hasReadAccess({
|
|
131
|
+
dashboardId,
|
|
132
|
+
req: mockRequest,
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
expect(result.hasReadAccess).toBe(false);
|
|
136
|
+
expect(result.error).toBeInstanceOf(MasterPasswordRequiredException);
|
|
137
|
+
expect(result.error?.message).toBe(
|
|
138
|
+
DASHBOARD_MASTER_PASSWORD_REQUIRED_MESSAGE,
|
|
139
|
+
);
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
it("issues a dashboard-scoped cookie for the correct password and unlocks only that dashboard", async () => {
|
|
143
|
+
await mockRouter
|
|
144
|
+
.match("post", "/dashboard/master-password/:dashboardId")
|
|
145
|
+
.handlerFunction(mockRequest, mockResponse, nextFunction);
|
|
146
|
+
|
|
147
|
+
expect(nextFunction).not.toHaveBeenCalled();
|
|
148
|
+
expect(Response.sendEmptySuccessResponse).toHaveBeenCalledWith(
|
|
149
|
+
mockRequest,
|
|
150
|
+
mockResponse,
|
|
151
|
+
);
|
|
152
|
+
expect(mockResponse.cookie).toHaveBeenCalledTimes(1);
|
|
153
|
+
|
|
154
|
+
const cookieCall: Array<unknown> = (mockResponse.cookie as jest.Mock).mock
|
|
155
|
+
.calls[0] as Array<unknown>;
|
|
156
|
+
const cookieName: string = cookieCall[0] as string;
|
|
157
|
+
const cookieToken: string = cookieCall[1] as string;
|
|
158
|
+
|
|
159
|
+
expect(cookieName).toBe(
|
|
160
|
+
CookieUtil.getDashboardMasterPasswordKey(dashboardId),
|
|
161
|
+
);
|
|
162
|
+
expect(cookieToken).toEqual(expect.any(String));
|
|
163
|
+
|
|
164
|
+
const unlockedRequest: ExpressRequest = {
|
|
165
|
+
cookies: {
|
|
166
|
+
[cookieName]: cookieToken,
|
|
167
|
+
},
|
|
168
|
+
headers: {},
|
|
169
|
+
socket: {},
|
|
170
|
+
ips: [],
|
|
171
|
+
} as unknown as ExpressRequest;
|
|
172
|
+
|
|
173
|
+
const unlockedResult: Awaited<
|
|
174
|
+
ReturnType<typeof DashboardService.hasReadAccess>
|
|
175
|
+
> = await DashboardService.hasReadAccess({
|
|
176
|
+
dashboardId,
|
|
177
|
+
req: unlockedRequest,
|
|
178
|
+
});
|
|
179
|
+
|
|
180
|
+
expect(unlockedResult.hasReadAccess).toBe(true);
|
|
181
|
+
expect(unlockedResult.error).toBeUndefined();
|
|
182
|
+
|
|
183
|
+
const otherDashboardId: ObjectID = ObjectID.generate();
|
|
184
|
+
const copiedCookieRequest: ExpressRequest = {
|
|
185
|
+
cookies: {
|
|
186
|
+
[CookieUtil.getDashboardMasterPasswordKey(otherDashboardId)]:
|
|
187
|
+
cookieToken,
|
|
188
|
+
},
|
|
189
|
+
headers: {},
|
|
190
|
+
socket: {},
|
|
191
|
+
ips: [],
|
|
192
|
+
} as unknown as ExpressRequest;
|
|
193
|
+
|
|
194
|
+
const isolatedResult: Awaited<
|
|
195
|
+
ReturnType<typeof DashboardService.hasReadAccess>
|
|
196
|
+
> = await DashboardService.hasReadAccess({
|
|
197
|
+
dashboardId: otherDashboardId,
|
|
198
|
+
req: copiedCookieRequest,
|
|
199
|
+
});
|
|
200
|
+
|
|
201
|
+
expect(isolatedResult.hasReadAccess).toBe(false);
|
|
202
|
+
expect(isolatedResult.error).toBeInstanceOf(
|
|
203
|
+
MasterPasswordRequiredException,
|
|
204
|
+
);
|
|
205
|
+
});
|
|
206
|
+
|
|
207
|
+
it("rejects an incorrect password without issuing a cookie", async () => {
|
|
208
|
+
mockRequest.body["password"] = "incorrect password";
|
|
209
|
+
|
|
210
|
+
await mockRouter
|
|
211
|
+
.match("post", "/dashboard/master-password/:dashboardId")
|
|
212
|
+
.handlerFunction(mockRequest, mockResponse, nextFunction);
|
|
213
|
+
|
|
214
|
+
expect(nextFunction).toHaveBeenCalledTimes(1);
|
|
215
|
+
|
|
216
|
+
const error: unknown = (nextFunction as jest.Mock).mock.calls[0]?.[0];
|
|
217
|
+
|
|
218
|
+
expect(error).toBeInstanceOf(BadDataException);
|
|
219
|
+
expect((error as BadDataException).message).toBe(
|
|
220
|
+
DASHBOARD_MASTER_PASSWORD_INVALID_MESSAGE,
|
|
221
|
+
);
|
|
222
|
+
expect(mockResponse.cookie).not.toHaveBeenCalled();
|
|
223
|
+
expect(Response.sendEmptySuccessResponse).not.toHaveBeenCalled();
|
|
224
|
+
});
|
|
225
|
+
});
|
|
@@ -756,7 +756,7 @@ __decorate([
|
|
|
756
756
|
isDefaultValueColumn: true,
|
|
757
757
|
type: TableColumnType.Boolean,
|
|
758
758
|
title: "Enable Master Password",
|
|
759
|
-
description: "Require visitors to enter a master password before viewing a
|
|
759
|
+
description: "Require visitors to enter a master password before viewing a public dashboard.",
|
|
760
760
|
defaultValue: false,
|
|
761
761
|
}),
|
|
762
762
|
Column({
|
|
@@ -790,7 +790,7 @@ __decorate([
|
|
|
790
790
|
}),
|
|
791
791
|
TableColumn({
|
|
792
792
|
title: "Master Password",
|
|
793
|
-
description: "Password required to unlock a
|
|
793
|
+
description: "Password required to unlock a public dashboard. This value is stored as a secure hash.",
|
|
794
794
|
hashed: true,
|
|
795
795
|
type: TableColumnType.HashedString,
|
|
796
796
|
placeholder: "Enter a new master password",
|
|
@@ -831,7 +831,7 @@ __decorate([
|
|
|
831
831
|
required: false,
|
|
832
832
|
type: TableColumnType.VeryLongText,
|
|
833
833
|
title: "IP Whitelist",
|
|
834
|
-
description: "IP Whitelist for this
|
|
834
|
+
description: "IP Whitelist for this dashboard. One IP per line. Only used when the dashboard is public.",
|
|
835
835
|
}),
|
|
836
836
|
Column({
|
|
837
837
|
type: ColumnType.VeryLongText,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/Dashboard.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/Dashboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -148,9 +148,15 @@ export class Service extends DatabaseService {
|
|
|
148
148
|
}
|
|
149
149
|
const shouldEnforceMasterPassword = Boolean(dashboard &&
|
|
150
150
|
dashboard.isPublicDashboard &&
|
|
151
|
-
dashboard.enableMasterPassword
|
|
152
|
-
dashboard.masterPassword);
|
|
151
|
+
dashboard.enableMasterPassword);
|
|
153
152
|
if (shouldEnforceMasterPassword) {
|
|
153
|
+
// Fail closed if protection was enabled before a password was set.
|
|
154
|
+
if (!(dashboard === null || dashboard === void 0 ? void 0 : dashboard.masterPassword)) {
|
|
155
|
+
return {
|
|
156
|
+
hasReadAccess: false,
|
|
157
|
+
error: new MasterPasswordRequiredException(DASHBOARD_MASTER_PASSWORD_REQUIRED_MESSAGE),
|
|
158
|
+
};
|
|
159
|
+
}
|
|
154
160
|
const hasValidMasterPassword = this.hasValidMasterPasswordCookie({
|
|
155
161
|
req,
|
|
156
162
|
dashboardId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DashboardService.js","sourceRoot":"","sources":["../../../../Server/Services/DashboardService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DashboardService.js","sourceRoot":"","sources":["../../../../Server/Services/DashboardService.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAEzC,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,MAAyB,MAAM,iBAAiB,CAAC;AACxD,OAAO,+BAA+B,MAAM,mCAAmC,CAAC;AAChF,OAAO,+BAA+B,MAAM,mCAAmC,CAAC;AAChF,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,yBAAyB,MAAM,iDAAiD,CAAC;AACxF,OAAO,kBAAkB,MAAM,0CAA0C,CAAC;AAC1E,OAAO,+BAA+B,MAAM,uDAAuD,CAAC;AACpG,OAAO,KAAK,MAAM,uCAAuC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,EACL,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,0CAA0C,CAAC;AAElD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAGzD,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACnC,OAAO,EACL,2CAA2C,EAC3C,0CAA0C,GAC3C,MAAM,sCAAsC,CAAC;AAE9C,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;;QAEzB,IAAI,gBAAgB,EAAE,CAAC;YACrB,6DAA6D;YAE7D,IAAI,QAAQ,CAAC,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACjD,2BAA2B;gBAC3B,MAAM,KAAK,GAAW,CACpB,MAAM,IAAI,CAAC,OAAO,CAAC;oBACjB,KAAK,EAAE;wBACL,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS;qBACnC;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CACH,CAAC,QAAQ,EAAE,CAAC;gBAEb,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;oBACd,MAAM,IAAI,gBAAgB,CACxB,gEAAgE,CACjE,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,0DAA0D;QAC1D,MAAM,YAAY,GAAuB,MAAA,QAAQ,CAAC,aAAa,0CAC7D,uBAAuB,CACF,CAAC;QAExB,IACE,YAAY;YACZ,YAAY,KAAK,qBAAqB,CAAC,KAAK;YAC5C,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAC3C,YAAqC,CACtC,EACD,CAAC;YACD,MAAM,cAAc,GAA+B,iBAAiB,CAClE,YAAqC,CACtC,CAAC;YAEF,IAAI,cAAc,EAAE,CAAC;gBACnB,QAAQ,CAAC,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAC;YACrD,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,IACE,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB;YAClC,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU;YAC7C,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EACzD,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,mBAAmB;gBAC/B,uBAAuB,CAAC,gCAAgC,EAAE,CAAC;QAC/D,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,SAA0B,EAC1B,WAAkB;QAElB,IAAI,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE,EAAE,CAAC;YAC5C;;;;eAIG;YACH,OAAO,CAAC,OAAO,EAAE;iBACd,IAAI,CAAC,KAAK,IAAI,EAAE;gBACf,MAAM,+BAA+B,CAAC,qBAAqB,CACzD,WAAW,CACZ,CAAC;YACJ,CAAC,CAAC;iBACD,IAAI,CAAC,KAAK,IAAI,EAAE;gBACf,MAAM,+BAA+B,CAAC,qBAAqB,CACzD,WAAW,CACZ,CAAC;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;;gBACtB,MAAM,CAAC,KAAK,CACV,uEAAuE,KAAK,EAAE,EAC9E;oBACE,SAAS,EAAE,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,EAAE;oBAC5C,WAAW,EAAE,MAAA,WAAW,CAAC,EAAE,0CAAE,QAAQ,EAAE;iBACvB,CACnB,CAAC;YACJ,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAG1B;;QAIC,MAAM,WAAW,GAAa,IAAI,CAAC,WAAW,CAAC;QAC/C,MAAM,GAAG,GAAmB,IAAI,CAAC,GAAG,CAAC;QAErC,IAAI,CAAC;YACH,MAAM,SAAS,GAAiB,MAAM,IAAI,CAAC,WAAW,CAAC;gBACrD,EAAE,EAAE,WAAW;gBACf,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;gBACD,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI;oBACT,iBAAiB,EAAE,IAAI;oBACvB,WAAW,EAAE,IAAI;oBACjB,oBAAoB,EAAE,IAAI;oBAC1B,cAAc,EAAE,IAAI;iBACrB;aACF,CAAC,CAAC;YAEH,0CAA0C;YAC1C,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC;gBAC9C,OAAO;oBACL,aAAa,EAAE,KAAK;oBACpB,KAAK,EAAE,IAAI,yBAAyB,CAClC,kCAAkC,CACnC;iBACF,CAAC;YACJ,CAAC;YAED,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,KAAI,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/D,MAAM,WAAW,GAAkB,MAAA,SAAS,CAAC,WAAW,0CAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBAEtE,MAAM,cAAc,GAClB,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,0CAAE,QAAQ,EAAE;qBAC1C,MAAA,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,0CAAE,QAAQ,EAAE,CAAA;oBACpC,GAAG,CAAC,MAAM,CAAC,aAAa;oBACxB,GAAG,CAAC,EAAE;oBACN,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAEb,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;wBAC/C,WAAW,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE;qBACpB,CAAC,CAAC;oBACpB,OAAO;wBACL,aAAa,EAAE,KAAK;wBACpB,KAAK,EAAE,IAAI,kBAAkB,CAC3B,mDAAmD,CACpD;qBACF,CAAC;gBACJ,CAAC;gBAED,MAAM,eAAe,GAAY,EAAE,CAAC,aAAa,CAAC;oBAChD,GAAG,EACD,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;wBAC3C,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;oBAClB,CAAC,CAAC,KAAI,EAAE;oBACV,SAAS,EAAE,WAAW;iBACvB,CAAC,CAAC;gBAEH,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,MAAM,CAAC,KAAK,CACV,cAAc,cAAc,qCAAqC,WAAW,CAAC,QAAQ,EAAE,GAAG,EAC1F,EAAE,WAAW,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE,EAAmB,CAC1D,CAAC;oBAEF,OAAO;wBACL,aAAa,EAAE,KAAK;wBACpB,KAAK,EAAE,IAAI,kBAAkB,CAC3B,mBAAmB,cAAc,4CAA4C,CAC9E;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,MAAM,2BAA2B,GAAY,OAAO,CAClD,SAAS;gBACP,SAAS,CAAC,iBAAiB;gBAC3B,SAAS,CAAC,oBAAoB,CACjC,CAAC;YAEF,IAAI,2BAA2B,EAAE,CAAC;gBAChC,mEAAmE;gBACnE,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,CAAA,EAAE,CAAC;oBAC/B,OAAO;wBACL,aAAa,EAAE,KAAK;wBACpB,KAAK,EAAE,IAAI,+BAA+B,CACxC,0CAA0C,CAC3C;qBACF,CAAC;gBACJ,CAAC;gBAED,MAAM,sBAAsB,GAC1B,IAAI,CAAC,4BAA4B,CAAC;oBAChC,GAAG;oBACH,WAAW;iBACZ,CAAC,CAAC;gBAEL,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,OAAO;wBACL,aAAa,EAAE,IAAI;qBACpB,CAAC;gBACJ,CAAC;gBAED,OAAO;oBACL,aAAa,EAAE,KAAK;oBACpB,KAAK,EAAE,IAAI,+BAA+B,CACxC,0CAA0C,CAC3C;iBACF,CAAC;YACJ,CAAC;YAED,0DAA0D;YAC1D,IAAI,SAAS,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAAC;gBAC7C,OAAO;oBACL,aAAa,EAAE,IAAI;iBACpB,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChB,WAAW,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE;aACpB,CAAC,CAAC;QACtB,CAAC;QAED,OAAO;YACL,aAAa,EAAE,KAAK;YACpB,KAAK,EAAE,IAAI,yBAAyB,CAClC,2CAA2C,CAC5C;SACF,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,IAGpC;;QACC,MAAM,KAAK,GAAuB,UAAU,CAAC,2BAA2B,CACtE,IAAI,CAAC,GAAG,EACR,UAAU,CAAC,6BAA6B,CAAC,IAAI,CAAC,WAAW,CAAC,CAC3D,CAAC;QAEF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAe,YAAY,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAElE,OAAO,CACL,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;gBACtD,OAAO,CAAC,MAAM,CAAC,KAAK,2CAA2C,CAChE,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChB,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,0CAAE,QAAQ,EAAE;aACzB,CAAC,CAAC;QACtB,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AArQ0B;IADxB,WAAW,EAAE;;;;6CA4Db;AAGwB;IADxB,WAAW,EAAE;;6CAGC,KAAK;;8CA8BnB;AAyKH,eAAe,IAAI,OAAO,EAAE,CAAC"}
|
|
@@ -14,19 +14,22 @@ export default class Execute {
|
|
|
14
14
|
static executeCommand(command, options) {
|
|
15
15
|
return new Promise((resolve, reject) => {
|
|
16
16
|
exec(`${command}`, Object.assign({}, options), (err, stdout, stderr) => {
|
|
17
|
+
// See executeCommandFile: string | Buffer for @types/node drift.
|
|
18
|
+
const stdoutText = stdout.toString();
|
|
19
|
+
const stderrText = stderr.toString();
|
|
17
20
|
if (err) {
|
|
18
21
|
logger.error(`Error executing command: ${command}`);
|
|
19
22
|
logger.error(err);
|
|
20
|
-
logger.error(
|
|
21
|
-
if (
|
|
22
|
-
logger.error(
|
|
23
|
+
logger.error(stdoutText);
|
|
24
|
+
if (stderrText) {
|
|
25
|
+
logger.error(stderrText);
|
|
23
26
|
}
|
|
24
27
|
return reject(err);
|
|
25
28
|
}
|
|
26
|
-
if (
|
|
27
|
-
logger.debug(
|
|
29
|
+
if (stderrText) {
|
|
30
|
+
logger.debug(stderrText);
|
|
28
31
|
}
|
|
29
|
-
return resolve(
|
|
32
|
+
return resolve(stdoutText);
|
|
30
33
|
});
|
|
31
34
|
});
|
|
32
35
|
}
|
|
@@ -35,17 +38,24 @@ export default class Execute {
|
|
|
35
38
|
execFile(data.command, data.args, Object.assign(Object.assign({ cwd: data.cwd }, (data.maxBuffer ? { maxBuffer: data.maxBuffer } : {})), (data.timeoutInMS
|
|
36
39
|
? { timeout: data.timeoutInMS, killSignal: "SIGKILL" }
|
|
37
40
|
: {})), (err, stdout, stderr) => {
|
|
41
|
+
/*
|
|
42
|
+
* Newer @types/node type execFile's callback output as
|
|
43
|
+
* string | Buffer — coerce so this compiles on both the pinned
|
|
44
|
+
* and freshly-resolved typings (caret ranges drift in CI).
|
|
45
|
+
*/
|
|
46
|
+
const stdoutText = stdout.toString();
|
|
47
|
+
const stderrText = stderr.toString();
|
|
38
48
|
if (err) {
|
|
39
49
|
logger.error(`Error executing command: ${data.command} ${data.args.join(" ")}`);
|
|
40
50
|
logger.error(err);
|
|
41
|
-
logger.error(
|
|
42
|
-
logger.error(
|
|
51
|
+
logger.error(stdoutText);
|
|
52
|
+
logger.error(stderrText);
|
|
43
53
|
return reject(err);
|
|
44
54
|
}
|
|
45
|
-
if (
|
|
46
|
-
logger.debug(
|
|
55
|
+
if (stderrText) {
|
|
56
|
+
logger.debug(stderrText);
|
|
47
57
|
}
|
|
48
|
-
return resolve(
|
|
58
|
+
return resolve(stdoutText);
|
|
49
59
|
});
|
|
50
60
|
});
|
|
51
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Execute.js","sourceRoot":"","sources":["../../../../Server/Utils/Execute.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAKL,IAAI,EACJ,QAAQ,EACR,KAAK,GACN,MAAM,oBAAoB,CAAC;AAC5B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,OAAO;IAEZ,AAAP,MAAM,CAAC,cAAc,CAC1B,OAAe,EACf,OAAqB;QAErB,OAAO,IAAI,OAAO,CAChB,CACE,OAAiC,EACjC,MAAkC,EAClC,EAAE;YACF,IAAI,CACF,GAAG,OAAO,EAAE,oBAEP,OAAO,GAEZ,
|
|
1
|
+
{"version":3,"file":"Execute.js","sourceRoot":"","sources":["../../../../Server/Utils/Execute.ts"],"names":[],"mappings":"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"}
|