iobroker.js-controller 7.0.1 → 7.0.2
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/build/cjs/lib/upgradeManager.d.ts +5 -0
- package/build/cjs/lib/upgradeManager.js +39 -8
- package/build/cjs/lib/upgradeManager.js.map +3 -3
- package/build/cjs/main.js +10 -3
- package/build/cjs/main.js.map +2 -2
- package/build/esm/lib/upgradeManager.d.ts +5 -0
- package/build/esm/lib/upgradeManager.d.ts.map +1 -1
- package/build/esm/lib/upgradeManager.js +39 -2
- package/build/esm/lib/upgradeManager.js.map +1 -1
- package/build/esm/main.d.ts.map +1 -1
- package/build/esm/main.js +9 -2
- package/build/esm/main.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/io-package.json +2 -2
- package/package.json +12 -12
|
@@ -1,7 +1,12 @@
|
|
|
1
|
+
/** The upgrade arguments provided to the constructor of the UpgradeManager */
|
|
1
2
|
export interface UpgradeArguments {
|
|
2
3
|
/** Version of controller to upgrade too */
|
|
3
4
|
version: string;
|
|
4
5
|
/** Admin instance which triggered the upgrade */
|
|
5
6
|
adminInstance: number;
|
|
7
|
+
/** User id the process should run as */
|
|
8
|
+
uid: number;
|
|
9
|
+
/** Group id the process should run as */
|
|
10
|
+
gid: number;
|
|
6
11
|
}
|
|
7
12
|
//# sourceMappingURL=upgradeManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeManager.d.ts","sourceRoot":"","sources":["../../../src/lib/upgradeManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upgradeManager.d.ts","sourceRoot":"","sources":["../../../src/lib/upgradeManager.ts"],"names":[],"mappings":"AAeA,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC7B,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,iDAAiD;IACjD,aAAa,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,yCAAyC;IACzC,GAAG,EAAE,MAAM,CAAC;CACf"}
|
|
@@ -7,6 +7,7 @@ import https from 'node:https';
|
|
|
7
7
|
import { setTimeout as wait } from 'node:timers/promises';
|
|
8
8
|
import fs from 'fs-extra';
|
|
9
9
|
import url from 'node:url';
|
|
10
|
+
import process from 'node:process';
|
|
10
11
|
class UpgradeManager {
|
|
11
12
|
/** Wait ms until controller is stopped */
|
|
12
13
|
STOP_TIMEOUT_MS = 5_000;
|
|
@@ -16,6 +17,10 @@ class UpgradeManager {
|
|
|
16
17
|
adminInstance;
|
|
17
18
|
/** Desired controller version */
|
|
18
19
|
version;
|
|
20
|
+
/** Group id the process should run as */
|
|
21
|
+
gid;
|
|
22
|
+
/** User id the process should run as */
|
|
23
|
+
uid;
|
|
19
24
|
/** Response send by webserver */
|
|
20
25
|
response = {
|
|
21
26
|
running: true,
|
|
@@ -36,6 +41,28 @@ class UpgradeManager {
|
|
|
36
41
|
this.adminInstance = args.adminInstance;
|
|
37
42
|
this.version = args.version;
|
|
38
43
|
this.logger = this.setupLogger();
|
|
44
|
+
this.gid = args.gid;
|
|
45
|
+
this.uid = args.uid;
|
|
46
|
+
this.applyUser();
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* To prevent commands (including npm) running as root, we apply the passed in gid and uid
|
|
50
|
+
*/
|
|
51
|
+
applyUser() {
|
|
52
|
+
if (!process.setuid || !process.setgid) {
|
|
53
|
+
const errMessage = 'Cannot ensure user and group ids on this system, because no POSIX platform';
|
|
54
|
+
this.log(errMessage, true);
|
|
55
|
+
throw new Error(errMessage);
|
|
56
|
+
}
|
|
57
|
+
try {
|
|
58
|
+
process.setgid(this.gid);
|
|
59
|
+
process.setuid(this.uid);
|
|
60
|
+
}
|
|
61
|
+
catch (e) {
|
|
62
|
+
const errMessage = `Could not ensure user and group ids on this system: ${e.message}`;
|
|
63
|
+
this.log(errMessage, true);
|
|
64
|
+
throw new Error(errMessage);
|
|
65
|
+
}
|
|
39
66
|
}
|
|
40
67
|
/**
|
|
41
68
|
* Set up the logger, to stream to file and other configured transports
|
|
@@ -51,6 +78,8 @@ class UpgradeManager {
|
|
|
51
78
|
const additionalArgs = process.argv.slice(2);
|
|
52
79
|
const version = additionalArgs[0];
|
|
53
80
|
const adminInstance = parseInt(additionalArgs[1]);
|
|
81
|
+
const uid = parseInt(additionalArgs[2]);
|
|
82
|
+
const gid = parseInt(additionalArgs[3]);
|
|
54
83
|
const isValid = !!valid(version);
|
|
55
84
|
if (!isValid) {
|
|
56
85
|
UpgradeManager.printUsage();
|
|
@@ -60,7 +89,15 @@ class UpgradeManager {
|
|
|
60
89
|
UpgradeManager.printUsage();
|
|
61
90
|
throw new Error('Please provide a valid admin instance');
|
|
62
91
|
}
|
|
63
|
-
|
|
92
|
+
if (isNaN(uid)) {
|
|
93
|
+
UpgradeManager.printUsage();
|
|
94
|
+
throw new Error('Please provide a valid uid');
|
|
95
|
+
}
|
|
96
|
+
if (isNaN(gid)) {
|
|
97
|
+
UpgradeManager.printUsage();
|
|
98
|
+
throw new Error('Please provide a valid gid');
|
|
99
|
+
}
|
|
100
|
+
return { version, adminInstance, uid, gid };
|
|
64
101
|
}
|
|
65
102
|
/**
|
|
66
103
|
* Log via console and provide the logs for the server too
|
|
@@ -102,7 +139,7 @@ class UpgradeManager {
|
|
|
102
139
|
* Print how the module should be used
|
|
103
140
|
*/
|
|
104
141
|
static printUsage() {
|
|
105
|
-
console.info('Example usage: "node upgradeManager.js <version> <adminInstance>"');
|
|
142
|
+
console.info('Example usage: "node upgradeManager.js <version> <adminInstance> <uid> <gid>"');
|
|
106
143
|
}
|
|
107
144
|
/**
|
|
108
145
|
* Install given version of js-controller
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../../src/lib/upgradeManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,IAAI,IAAI,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,EAAE,UAAU,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,MAAM,UAAU,CAAC;AAG1B,OAAO,GAAG,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../../src/lib/upgradeManager.ts"],"names":[],"mappings":"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"}
|
package/build/esm/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AA8mKH;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmajE"}
|
package/build/esm/main.js
CHANGED
|
@@ -2317,7 +2317,12 @@ async function processMessage(msg) {
|
|
|
2317
2317
|
}
|
|
2318
2318
|
const { version, adminInstance } = msg.message;
|
|
2319
2319
|
logger.info(`${hostLogPrefix} Controller will upgrade itself to version ${version}`);
|
|
2320
|
-
await startUpgradeManager({
|
|
2320
|
+
await startUpgradeManager({
|
|
2321
|
+
version,
|
|
2322
|
+
adminInstance,
|
|
2323
|
+
uid: process.getuid ? process.getuid() : 0,
|
|
2324
|
+
gid: process.getgid ? process.getgid() : 0,
|
|
2325
|
+
});
|
|
2321
2326
|
if (msg.callback) {
|
|
2322
2327
|
sendTo(msg.from, msg.command, { result: true }, msg.callback);
|
|
2323
2328
|
}
|
|
@@ -4923,7 +4928,7 @@ async function upgradeOsPackages(packages) {
|
|
|
4923
4928
|
* @param options Arguments passed to the UpgradeManager process
|
|
4924
4929
|
*/
|
|
4925
4930
|
async function startUpgradeManager(options) {
|
|
4926
|
-
const { version, adminInstance } = options;
|
|
4931
|
+
const { version, adminInstance, uid, gid } = options;
|
|
4927
4932
|
const upgradeProcessPath = require.resolve('./lib/upgradeManager');
|
|
4928
4933
|
let upgradeProcess;
|
|
4929
4934
|
const isSystemd = await tools.isIoBrokerInstalledAsSystemd();
|
|
@@ -4935,6 +4940,8 @@ async function startUpgradeManager(options) {
|
|
|
4935
4940
|
upgradeProcessPath,
|
|
4936
4941
|
version,
|
|
4937
4942
|
adminInstance.toString(),
|
|
4943
|
+
uid.toString(),
|
|
4944
|
+
gid.toString(),
|
|
4938
4945
|
], {
|
|
4939
4946
|
detached: true,
|
|
4940
4947
|
stdio: 'ignore',
|