@push.rocks/smartdaemon 2.7.1 → 2.7.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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.systemdunit.d.ts +10 -7
- package/dist_ts/classes.systemdunit.js +29 -30
- package/dist_ts/classes.systemdunitfile.d.ts +13 -2
- package/dist_ts/classes.systemdunitfile.js +62 -35
- package/dist_ts/systemd.userenvironment.d.ts +33 -0
- package/dist_ts/systemd.userenvironment.js +33 -0
- package/package.json +1 -1
- package/readme.md +33 -14
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.systemdunit.ts +38 -35
- package/ts/classes.systemdunitfile.ts +76 -43
- package/ts/systemd.userenvironment.ts +63 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdaemon',
|
|
6
|
-
version: '2.7.
|
|
6
|
+
version: '2.7.2',
|
|
7
7
|
description: 'Start scripts as long running daemons and manage them.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
|
|
@@ -3,8 +3,9 @@ export interface ISystemdUnitOptions {
|
|
|
3
3
|
/** Defaults to the system manager. User scope addresses the calling user's manager only. */
|
|
4
4
|
scope?: 'system' | 'user';
|
|
5
5
|
/**
|
|
6
|
-
* User-manager socket directory. Defaults to a non-empty XDG_RUNTIME_DIR.
|
|
7
|
-
* construction
|
|
6
|
+
* User-manager socket directory. Defaults to a non-empty XDG_RUNTIME_DIR. A supplied option must
|
|
7
|
+
* be well formed at construction. The process default may be absent or malformed there; every
|
|
8
|
+
* call that contacts the user manager then refuses with `invalid_options`.
|
|
8
9
|
*/
|
|
9
10
|
runtimeDirectory?: string;
|
|
10
11
|
/** Absolute executable path supplied by trusted owning code. */
|
|
@@ -52,10 +53,8 @@ export declare class SystemdUnit {
|
|
|
52
53
|
private readonly executable;
|
|
53
54
|
private readonly timeout;
|
|
54
55
|
private readonly scope;
|
|
55
|
-
|
|
56
|
-
private readonly
|
|
57
|
-
private readonly configDirectory?;
|
|
58
|
-
private readonly dataDirectory?;
|
|
56
|
+
/** Present exactly for user scope. */
|
|
57
|
+
private readonly userEnvironment?;
|
|
59
58
|
constructor(optionsArg: ISystemdUnitOptions);
|
|
60
59
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
61
60
|
inspect(): Promise<ISystemdUnitState>;
|
|
@@ -72,6 +71,10 @@ export declare class SystemdUnit {
|
|
|
72
71
|
inspectConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
73
72
|
/** Reloads unit definitions globally; does not enable, unmask, start or stop a unit. */
|
|
74
73
|
reloadConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
75
|
-
|
|
74
|
+
/**
|
|
75
|
+
* Runs before every systemctl invocation, so an absent or malformed user environment and a
|
|
76
|
+
* missing or unsafe runtime directory refuse without side effects. Undefined for system scope.
|
|
77
|
+
*/
|
|
78
|
+
private userManagerEnvironment;
|
|
76
79
|
private command;
|
|
77
80
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from './smartdaemon.plugins.js';
|
|
2
|
+
import { captureUserEnvironment, isSafeDirectory, isUserManagerEnvironment, } from './systemd.userenvironment.js';
|
|
2
3
|
export class SystemdUnitError extends Error {
|
|
3
4
|
constructor(code) {
|
|
4
5
|
super(`Systemd unit operation failed: ${code}.`);
|
|
@@ -25,19 +26,13 @@ export class SystemdUnit {
|
|
|
25
26
|
this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
|
|
26
27
|
this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
|
|
27
28
|
this.scope = optionsArg?.scope ?? 'system';
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
const safeDirectory = (value) => typeof value === 'string' && value !== '/' && plugins.path.isAbsolute(value) &&
|
|
36
|
-
plugins.path.normalize(value) === value && !value.endsWith('/') &&
|
|
37
|
-
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
38
|
-
// Only a supplied runtime directory is validated here. Its absence matters solely to calls that
|
|
39
|
-
// reach the user manager, and those refuse it in validateUserRuntime(). Admitting absence lets
|
|
40
|
-
// owners read protected unit files from contexts without a login session (cron, plain ssh).
|
|
29
|
+
this.userEnvironment = this.scope === 'user'
|
|
30
|
+
? captureUserEnvironment(optionsArg?.runtimeDirectory) : undefined;
|
|
31
|
+
// Construction validates only the options it is given. The process-derived user environment
|
|
32
|
+
// (home, XDG config/data/runtime roots) is validated by userManagerEnvironment() before every
|
|
33
|
+
// systemctl call, because only those calls read it. SystemdUnitFile builds its unit at
|
|
34
|
+
// construction, so refusing that environment here would also refuse SystemdUnitFile.inspect(),
|
|
35
|
+
// which never contacts the manager.
|
|
41
36
|
if (typeof this.unitName !== 'string' ||
|
|
42
37
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
43
38
|
typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
|
|
@@ -45,11 +40,8 @@ export class SystemdUnit {
|
|
|
45
40
|
this.timeout < 1 || this.timeout > 600000 ||
|
|
46
41
|
!['system', 'user'].includes(this.scope) ||
|
|
47
42
|
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
48
|
-
(this.scope === 'user' &&
|
|
49
|
-
|
|
50
|
-
!safeDirectory(this.homeDirectory) ||
|
|
51
|
-
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
52
|
-
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory))))
|
|
43
|
+
(this.scope === 'user' && optionsArg?.runtimeDirectory !== undefined &&
|
|
44
|
+
!isSafeDirectory(optionsArg.runtimeDirectory)))
|
|
53
45
|
throw new SystemdUnitError('invalid_options');
|
|
54
46
|
}
|
|
55
47
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
@@ -158,13 +150,17 @@ export class SystemdUnit {
|
|
|
158
150
|
await this.command(['daemon-reload']);
|
|
159
151
|
return this.inspectConfiguration();
|
|
160
152
|
}
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
153
|
+
/**
|
|
154
|
+
* Runs before every systemctl invocation, so an absent or malformed user environment and a
|
|
155
|
+
* missing or unsafe runtime directory refuse without side effects. Undefined for system scope.
|
|
156
|
+
*/
|
|
157
|
+
async userManagerEnvironment() {
|
|
158
|
+
const environment = this.userEnvironment;
|
|
159
|
+
if (environment === undefined)
|
|
160
|
+
return undefined;
|
|
161
|
+
if (!isUserManagerEnvironment(environment))
|
|
167
162
|
throw new SystemdUnitError('invalid_options');
|
|
163
|
+
const runtimeDirectory = environment.runtimeDirectory;
|
|
168
164
|
try {
|
|
169
165
|
const uid = process.getuid?.();
|
|
170
166
|
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
@@ -179,9 +175,10 @@ export class SystemdUnit {
|
|
|
179
175
|
catch {
|
|
180
176
|
throw new SystemdUnitError('invalid_options');
|
|
181
177
|
}
|
|
178
|
+
return environment;
|
|
182
179
|
}
|
|
183
180
|
async command(argsArg) {
|
|
184
|
-
await this.
|
|
181
|
+
const userEnvironment = await this.userManagerEnvironment();
|
|
185
182
|
return new Promise((resolve, reject) => {
|
|
186
183
|
plugins.childProcess.execFile(this.executable, [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg], {
|
|
187
184
|
encoding: 'utf8',
|
|
@@ -189,11 +186,13 @@ export class SystemdUnit {
|
|
|
189
186
|
killSignal: 'SIGKILL',
|
|
190
187
|
maxBuffer: 16384,
|
|
191
188
|
windowsHide: true,
|
|
192
|
-
env:
|
|
189
|
+
env: userEnvironment
|
|
193
190
|
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
194
|
-
HOME:
|
|
195
|
-
...(
|
|
196
|
-
|
|
191
|
+
HOME: userEnvironment.homeDirectory, XDG_RUNTIME_DIR: userEnvironment.runtimeDirectory,
|
|
192
|
+
...(userEnvironment.configDirectory
|
|
193
|
+
? { XDG_CONFIG_HOME: userEnvironment.configDirectory } : {}),
|
|
194
|
+
...(userEnvironment.dataDirectory
|
|
195
|
+
? { XDG_DATA_HOME: userEnvironment.dataDirectory } : {}) }
|
|
197
196
|
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
198
197
|
}, (error, stdout) => {
|
|
199
198
|
// execFile settles after the client closes. A timed-out client's remote job may continue.
|
|
@@ -205,4 +204,4 @@ export class SystemdUnit {
|
|
|
205
204
|
});
|
|
206
205
|
}
|
|
207
206
|
}
|
|
208
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunit.js","sourceRoot":"","sources":["../ts/classes.systemdunit.ts"],"names":[],"mappings":"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"}
|
|
207
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunit.js","sourceRoot":"","sources":["../ts/classes.systemdunit.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,12 +23,23 @@ export declare class SystemdUnitFile {
|
|
|
23
23
|
private readonly directory;
|
|
24
24
|
private readonly uid;
|
|
25
25
|
private readonly scope;
|
|
26
|
-
|
|
27
|
-
private readonly
|
|
26
|
+
/** Present exactly for user scope; read only by the default path and by install(). */
|
|
27
|
+
private readonly userEnvironment?;
|
|
28
28
|
private readonly unit;
|
|
29
29
|
private readonly name;
|
|
30
30
|
private busy;
|
|
31
31
|
constructor(options: ISystemdUnitFileOptions);
|
|
32
|
+
/**
|
|
33
|
+
* Only the default location reads XDG_DATA_HOME, or the home directory when that is unset. The
|
|
34
|
+
* public path exists from construction, so a malformed source refuses there: joining would
|
|
35
|
+
* otherwise normalize a value such as `/data/../elsewhere` into a plausible directory.
|
|
36
|
+
*/
|
|
37
|
+
private defaultDirectory;
|
|
38
|
+
/**
|
|
39
|
+
* Directories whose entry for this unit is a mask the manager may report. Only install() reads
|
|
40
|
+
* them. Null when the user environment cannot drive the manager or name the config root.
|
|
41
|
+
*/
|
|
42
|
+
private maskDirectories;
|
|
32
43
|
/**
|
|
33
44
|
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
34
45
|
* Needs no user-manager runtime directory.
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from './smartdaemon.plugins.js';
|
|
2
2
|
import { SystemdServiceDefinition } from './classes.systemdservicedefinition.js';
|
|
3
3
|
import { SystemdUnit, } from './classes.systemdunit.js';
|
|
4
|
+
import { captureUserEnvironment, isSafeDirectory, isUserManagerEnvironment, } from './systemd.userenvironment.js';
|
|
4
5
|
export class SystemdUnitFileError extends Error {
|
|
5
6
|
constructor(code) {
|
|
6
7
|
super(`Systemd unit definition installation failed: ${code}.`);
|
|
@@ -27,31 +28,56 @@ const sameFile = (left, right) => left.dev === right.dev && left.ino === right.i
|
|
|
27
28
|
export class SystemdUnitFile {
|
|
28
29
|
constructor(options) {
|
|
29
30
|
this.busy = false;
|
|
31
|
+
// Validates the unit's explicit options, including a supplied runtime directory. Like this
|
|
32
|
+
// class, it captures but does not validate the process-derived user environment.
|
|
30
33
|
this.unit = new SystemdUnit(options);
|
|
31
34
|
this.name = options.unitName;
|
|
32
35
|
this.scope = options.scope ?? 'system';
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
?
|
|
36
|
-
|
|
37
|
-
? process.env.XDG_CONFIG_HOME || plugins.path.join(home, '.config') : undefined;
|
|
38
|
-
// Resolved exactly as SystemdUnit resolves it, so both agree on presence.
|
|
39
|
-
this.runtimeDirectory = this.scope === 'user'
|
|
40
|
-
? options.runtimeDirectory ?? (process.env.XDG_RUNTIME_DIR || undefined) : undefined;
|
|
41
|
-
this.directory = options.unitDirectory ?? (this.scope === 'user'
|
|
42
|
-
? plugins.path.join(dataDirectory, 'systemd/user') : '/usr/local/lib/systemd/system');
|
|
36
|
+
// Captured in the same synchronous step as the unit's own snapshot, so both read equal values.
|
|
37
|
+
this.userEnvironment = this.scope === 'user'
|
|
38
|
+
? captureUserEnvironment(options.runtimeDirectory) : undefined;
|
|
39
|
+
const directory = options.unitDirectory ?? this.defaultDirectory();
|
|
43
40
|
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
41
|
+
// inspect() reads the unit directory as this uid and nothing else. The config and runtime
|
|
42
|
+
// roots and the manager environment are refused later, by install(), before any effect.
|
|
43
|
+
if (!isSafeDirectory(directory) || !Number.isSafeInteger(this.uid) || this.uid < 0 ||
|
|
44
|
+
this.scope === 'user' && this.uid !== process.getuid?.())
|
|
45
|
+
throw new SystemdUnitFileError('invalid_options');
|
|
46
|
+
this.directory = directory;
|
|
47
|
+
this.path = plugins.path.join(directory, this.name);
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Only the default location reads XDG_DATA_HOME, or the home directory when that is unset. The
|
|
51
|
+
* public path exists from construction, so a malformed source refuses there: joining would
|
|
52
|
+
* otherwise normalize a value such as `/data/../elsewhere` into a plausible directory.
|
|
53
|
+
*/
|
|
54
|
+
defaultDirectory() {
|
|
55
|
+
const environment = this.userEnvironment;
|
|
56
|
+
if (environment === undefined)
|
|
57
|
+
return '/usr/local/lib/systemd/system';
|
|
58
|
+
const dataDirectory = environment.dataDirectory ?? (isSafeDirectory(environment.homeDirectory)
|
|
59
|
+
? plugins.path.join(environment.homeDirectory, '.local/share') : undefined);
|
|
60
|
+
return isSafeDirectory(dataDirectory) ? plugins.path.join(dataDirectory, 'systemd/user') : undefined;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Directories whose entry for this unit is a mask the manager may report. Only install() reads
|
|
64
|
+
* them. Null when the user environment cannot drive the manager or name the config root.
|
|
65
|
+
*/
|
|
66
|
+
maskDirectories() {
|
|
67
|
+
const environment = this.userEnvironment;
|
|
68
|
+
if (environment === undefined) {
|
|
69
|
+
return { persistent: ['/etc/systemd/system'], runtime: ['/run/systemd/system'] };
|
|
70
|
+
}
|
|
71
|
+
const configDirectory = environment.configDirectory ??
|
|
72
|
+
(isSafeDirectory(environment.homeDirectory)
|
|
73
|
+
? plugins.path.join(environment.homeDirectory, '.config') : undefined);
|
|
74
|
+
if (!isUserManagerEnvironment(environment) || !isSafeDirectory(configDirectory))
|
|
75
|
+
return null;
|
|
76
|
+
const userDirectories = (roots) => roots.map(root => plugins.path.join(root, 'systemd/user'));
|
|
77
|
+
return {
|
|
78
|
+
persistent: userDirectories([configDirectory, '/etc']),
|
|
79
|
+
runtime: userDirectories([environment.runtimeDirectory, '/run']),
|
|
80
|
+
};
|
|
55
81
|
}
|
|
56
82
|
/**
|
|
57
83
|
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
@@ -71,18 +97,21 @@ export class SystemdUnitFile {
|
|
|
71
97
|
requireValue(definition instanceof SystemdServiceDefinition && definition.unitName === this.name &&
|
|
72
98
|
definition.scope === this.scope &&
|
|
73
99
|
(expectedSha256 === null ||
|
|
74
|
-
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256))
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
100
|
+
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256)), 'invalid_options');
|
|
101
|
+
// Installation admits, reloads and verifies through the user manager and recognizes its
|
|
102
|
+
// persistent and runtime mask paths, so it needs the whole user environment. Refusing here,
|
|
103
|
+
// before the busy latch and any directory or systemctl effect, keeps the local error code
|
|
104
|
+
// instead of a wrapped write_failed.
|
|
105
|
+
const maskDirectories = this.maskDirectories();
|
|
106
|
+
if (maskDirectories === null)
|
|
107
|
+
throw new SystemdUnitFileError('invalid_options');
|
|
79
108
|
requireValue(!this.busy, 'busy');
|
|
80
109
|
this.busy = true;
|
|
81
110
|
let temporary;
|
|
82
111
|
let temporaryInfo;
|
|
83
112
|
try {
|
|
84
113
|
const before = await this.unit.inspect();
|
|
85
|
-
const beforeConfiguration = await this.admit(before);
|
|
114
|
+
const beforeConfiguration = await this.admit(before, maskDirectories);
|
|
86
115
|
await this.directories(true);
|
|
87
116
|
const parent = await plugins.fs.lstat(this.directory);
|
|
88
117
|
const previous = await this.read(this.path);
|
|
@@ -111,7 +140,7 @@ export class SystemdUnitFile {
|
|
|
111
140
|
requireValue(sameFile(parent, await plugins.fs.lstat(this.directory)), 'unsafe_path');
|
|
112
141
|
const rechecked = await this.unit.inspect();
|
|
113
142
|
requireValue(JSON.stringify(rechecked) === JSON.stringify(before), 'changed');
|
|
114
|
-
const recheckedConfiguration = await this.admit(rechecked);
|
|
143
|
+
const recheckedConfiguration = await this.admit(rechecked, maskDirectories);
|
|
115
144
|
requireValue(recheckedConfiguration.fragmentPath === beforeConfiguration.fragmentPath, 'changed');
|
|
116
145
|
await plugins.fs.rename(temporary, this.path);
|
|
117
146
|
temporary = undefined;
|
|
@@ -155,17 +184,15 @@ export class SystemdUnitFile {
|
|
|
155
184
|
}
|
|
156
185
|
}
|
|
157
186
|
}
|
|
158
|
-
async admit(state) {
|
|
187
|
+
async admit(state, maskDirectories) {
|
|
159
188
|
requireValue(quiet(state) && (masked(state) ||
|
|
160
189
|
state.loadState === 'loaded' &&
|
|
161
190
|
['enabled', 'enabled-runtime', 'disabled'].includes(state.unitFileState) ||
|
|
162
191
|
state.loadState === 'not-found' && state.unitFileState === ''), 'unsafe_unit');
|
|
163
192
|
const configuration = await this.unit.inspectConfiguration();
|
|
164
|
-
const maskPaths =
|
|
165
|
-
?
|
|
166
|
-
|
|
167
|
-
? [this.runtimeDirectory, '/run'].map(root => plugins.path.join(root, 'systemd/user', this.name))
|
|
168
|
-
: [this.configDirectory, '/etc'].map(root => plugins.path.join(root, 'systemd/user', this.name)));
|
|
193
|
+
const maskPaths = (state.unitFileState === 'masked-runtime'
|
|
194
|
+
? maskDirectories.runtime : maskDirectories.persistent)
|
|
195
|
+
.map(directory => plugins.path.join(directory, this.name));
|
|
169
196
|
requireValue(!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
170
197
|
(masked(state)
|
|
171
198
|
? configuration.fragmentPath !== this.path &&
|
|
@@ -273,4 +300,4 @@ export class SystemdUnitFile {
|
|
|
273
300
|
}
|
|
274
301
|
}
|
|
275
302
|
}
|
|
276
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
|
|
303
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The calling process's user-manager environment, captured once at construction so a unit file
|
|
3
|
+
* and the unit it drives read the same values. Nothing here is validated at capture: each value
|
|
4
|
+
* is checked by the operation that reads it, so a malformed variable that an operation never
|
|
5
|
+
* reads cannot stop that operation.
|
|
6
|
+
*/
|
|
7
|
+
export interface ISystemdUserEnvironment {
|
|
8
|
+
/** The account's home directory; absent when the calling uid has no passwd entry. */
|
|
9
|
+
readonly homeDirectory?: string;
|
|
10
|
+
/** A non-empty XDG_CONFIG_HOME. */
|
|
11
|
+
readonly configDirectory?: string;
|
|
12
|
+
/** A non-empty XDG_DATA_HOME. */
|
|
13
|
+
readonly dataDirectory?: string;
|
|
14
|
+
/** The explicit option, otherwise a non-empty XDG_RUNTIME_DIR. */
|
|
15
|
+
readonly runtimeDirectory?: string;
|
|
16
|
+
}
|
|
17
|
+
/** The environment every user-manager call passes to systemctl, once it has been admitted. */
|
|
18
|
+
export type TSystemdUserManagerEnvironment = ISystemdUserEnvironment & {
|
|
19
|
+
readonly homeDirectory: string;
|
|
20
|
+
readonly runtimeDirectory: string;
|
|
21
|
+
};
|
|
22
|
+
/** Absolute, normalized, bounded and printable; never the root itself or a trailing slash. */
|
|
23
|
+
export declare const isSafeDirectory: (value: unknown) => value is string;
|
|
24
|
+
/**
|
|
25
|
+
* An empty XDG variable counts as unset, as the XDG base directory specification defines. An
|
|
26
|
+
* explicit runtime directory option is never reinterpreted, so an empty option stays malformed.
|
|
27
|
+
*/
|
|
28
|
+
export declare const captureUserEnvironment: (runtimeDirectoryOption: string | undefined) => ISystemdUserEnvironment;
|
|
29
|
+
/**
|
|
30
|
+
* Every call that reaches the user manager passes the runtime and home directories and any set
|
|
31
|
+
* XDG config/data roots to systemctl, so all of them must be well formed before the first call.
|
|
32
|
+
*/
|
|
33
|
+
export declare const isUserManagerEnvironment: (environment: ISystemdUserEnvironment) => environment is TSystemdUserManagerEnvironment;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import * as plugins from './smartdaemon.plugins.js';
|
|
2
|
+
/** Absolute, normalized, bounded and printable; never the root itself or a trailing slash. */
|
|
3
|
+
export const isSafeDirectory = (value) => typeof value === 'string' && value !== '/' && plugins.path.isAbsolute(value) &&
|
|
4
|
+
plugins.path.normalize(value) === value && !value.endsWith('/') &&
|
|
5
|
+
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
6
|
+
/**
|
|
7
|
+
* An empty XDG variable counts as unset, as the XDG base directory specification defines. An
|
|
8
|
+
* explicit runtime directory option is never reinterpreted, so an empty option stays malformed.
|
|
9
|
+
*/
|
|
10
|
+
export const captureUserEnvironment = (runtimeDirectoryOption) => {
|
|
11
|
+
let homeDirectory;
|
|
12
|
+
try {
|
|
13
|
+
homeDirectory = plugins.os.userInfo().homedir;
|
|
14
|
+
}
|
|
15
|
+
catch {
|
|
16
|
+
// os.userInfo() throws for a uid without a passwd entry. The home directory is then absent,
|
|
17
|
+
// and every operation that reads it refuses with its own invalid_options code.
|
|
18
|
+
}
|
|
19
|
+
return Object.freeze({
|
|
20
|
+
homeDirectory,
|
|
21
|
+
configDirectory: process.env.XDG_CONFIG_HOME || undefined,
|
|
22
|
+
dataDirectory: process.env.XDG_DATA_HOME || undefined,
|
|
23
|
+
runtimeDirectory: runtimeDirectoryOption ?? (process.env.XDG_RUNTIME_DIR || undefined),
|
|
24
|
+
});
|
|
25
|
+
};
|
|
26
|
+
/**
|
|
27
|
+
* Every call that reaches the user manager passes the runtime and home directories and any set
|
|
28
|
+
* XDG config/data roots to systemctl, so all of them must be well formed before the first call.
|
|
29
|
+
*/
|
|
30
|
+
export const isUserManagerEnvironment = (environment) => isSafeDirectory(environment.runtimeDirectory) && isSafeDirectory(environment.homeDirectory) &&
|
|
31
|
+
(environment.configDirectory === undefined || isSafeDirectory(environment.configDirectory)) &&
|
|
32
|
+
(environment.dataDirectory === undefined || isSafeDirectory(environment.dataDirectory));
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3lzdGVtZC51c2VyZW52aXJvbm1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zeXN0ZW1kLnVzZXJlbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBeUJwRCw4RkFBOEY7QUFDOUYsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLENBQUMsS0FBYyxFQUFtQixFQUFFLENBQ2pFLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxLQUFLLEtBQUssR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztJQUM1RSxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsS0FBSyxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQztJQUMvRCxLQUFLLENBQUMsTUFBTSxJQUFJLElBQUksSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUV6RDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUNwQyxzQkFBMEMsRUFDakIsRUFBRTtJQUMzQixJQUFJLGFBQWlDLENBQUM7SUFDdEMsSUFBSSxDQUFDO1FBQ0gsYUFBYSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsT0FBTyxDQUFDO0lBQ2hELENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCw0RkFBNEY7UUFDNUYsK0VBQStFO0lBQ2pGLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUM7UUFDbkIsYUFBYTtRQUNiLGVBQWUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsSUFBSSxTQUFTO1FBQ3pELGFBQWEsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsSUFBSSxTQUFTO1FBQ3JELGdCQUFnQixFQUFFLHNCQUFzQixJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLElBQUksU0FBUyxDQUFDO0tBQ3ZGLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFHLENBQ3RDLFdBQW9DLEVBQ1csRUFBRSxDQUNqRCxlQUFlLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLElBQUksZUFBZSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUM7SUFDM0YsQ0FBQyxXQUFXLENBQUMsZUFBZSxLQUFLLFNBQVMsSUFBSSxlQUFlLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQzNGLENBQUMsV0FBVyxDQUFDLGFBQWEsS0FBSyxTQUFTLElBQUksZUFBZSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDIn0=
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -192,14 +192,20 @@ can choose another absolute executable path and `commandTimeoutMs` (default
|
|
|
192
192
|
The default `scope: 'system'` retains system-manager behavior. `scope: 'user'`
|
|
193
193
|
uses `systemctl --user` as the calling user. Every `SystemdUnit` operation contacts
|
|
194
194
|
the user manager, so each requires a real, owned, private `XDG_RUNTIME_DIR` (or an
|
|
195
|
-
explicit `runtimeDirectory`) and passes that directory with the user's home and
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
195
|
+
explicit `runtimeDirectory`) and passes that directory with the user's home and any
|
|
196
|
+
set `XDG_CONFIG_HOME` and `XDG_DATA_HOME` to the command. Before each call, all of
|
|
197
|
+
them must be absolute, normalized paths without a trailing slash, and the runtime
|
|
198
|
+
directory is checked again on disk; a missing, malformed, replaced, linked or
|
|
199
|
+
group-accessible runtime directory, a malformed XDG root and a missing or malformed
|
|
200
|
+
home directory each fail with `invalid_options` before contacting systemd.
|
|
201
|
+
|
|
202
|
+
Construction validates only the options it is given: the unit name, `systemctlPath`,
|
|
203
|
+
`commandTimeoutMs`, `scope` and a supplied `runtimeDirectory`, which must be a
|
|
204
|
+
well-formed path (and is refused for system scope). It reads, but does not validate,
|
|
205
|
+
the process environment above, so a unit can be constructed without a login session
|
|
206
|
+
(cron, a plain ssh command) or with a malformed XDG variable; its calls then refuse.
|
|
207
|
+
An empty XDG variable counts as unset. The environment is captured at construction;
|
|
208
|
+
later changes to `process.env` do not affect an existing unit.
|
|
203
209
|
|
|
204
210
|
`inspectConfiguration()` reports the selected `fragmentPath`, opaque `dropInPaths`
|
|
205
211
|
list and `needsReload` flag. `reloadConfiguration()` explicitly reloads the manager's
|
|
@@ -284,12 +290,25 @@ current user manager and do not escalate privileges. The installer rejects unsaf
|
|
|
284
290
|
ownership or group-writable path components; prepare those directories explicitly
|
|
285
291
|
before installation. It never changes the permissions of existing directories.
|
|
286
292
|
|
|
287
|
-
A user-scope `SystemdUnitFile`
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
`
|
|
291
|
-
|
|
292
|
-
|
|
293
|
+
A user-scope `SystemdUnitFile` validates each value where it is read:
|
|
294
|
+
|
|
295
|
+
- Construction validates the unit's options as `SystemdUnit` does, a supplied
|
|
296
|
+
`unitDirectory` and `expectedUid` (which must equal the caller's uid). Without
|
|
297
|
+
`unitDirectory`, it also derives the public `path` from `XDG_DATA_HOME`, or from the
|
|
298
|
+
home directory when that is unset, and rejects a missing or malformed source there
|
|
299
|
+
with `invalid_options`; no other process value is validated at construction.
|
|
300
|
+
- `inspect()` reads only the unit directory as that uid. It needs no user manager, no
|
|
301
|
+
runtime directory and no XDG config root, so with an explicit `unitDirectory` it
|
|
302
|
+
works whatever `XDG_CONFIG_HOME`, `XDG_DATA_HOME`, `XDG_RUNTIME_DIR` and the home
|
|
303
|
+
directory hold.
|
|
304
|
+
- `install()` admits, reloads and verifies through the manager and recognizes the
|
|
305
|
+
user's persistent and runtime mask paths. It therefore needs everything the manager
|
|
306
|
+
calls need, plus a well-formed config root (`XDG_CONFIG_HOME`, or `~/.config`), and
|
|
307
|
+
rejects anything missing or malformed with `invalid_options` before touching any
|
|
308
|
+
directory or running `systemctl`.
|
|
309
|
+
|
|
310
|
+
An owner can therefore ask whether its definition is installed from a context without
|
|
311
|
+
a login session:
|
|
293
312
|
|
|
294
313
|
```typescript
|
|
295
314
|
// Resolves to null when the file is absent, or { path, sha256 } for a protected definition.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
import * as plugins from './smartdaemon.plugins.js';
|
|
2
|
+
import {
|
|
3
|
+
type ISystemdUserEnvironment,
|
|
4
|
+
type TSystemdUserManagerEnvironment,
|
|
5
|
+
captureUserEnvironment,
|
|
6
|
+
isSafeDirectory,
|
|
7
|
+
isUserManagerEnvironment,
|
|
8
|
+
} from './systemd.userenvironment.js';
|
|
2
9
|
|
|
3
10
|
export interface ISystemdUnitOptions {
|
|
4
11
|
unitName: string;
|
|
5
12
|
/** Defaults to the system manager. User scope addresses the calling user's manager only. */
|
|
6
13
|
scope?: 'system' | 'user';
|
|
7
14
|
/**
|
|
8
|
-
* User-manager socket directory. Defaults to a non-empty XDG_RUNTIME_DIR.
|
|
9
|
-
* construction
|
|
15
|
+
* User-manager socket directory. Defaults to a non-empty XDG_RUNTIME_DIR. A supplied option must
|
|
16
|
+
* be well formed at construction. The process default may be absent or malformed there; every
|
|
17
|
+
* call that contacts the user manager then refuses with `invalid_options`.
|
|
10
18
|
*/
|
|
11
19
|
runtimeDirectory?: string;
|
|
12
20
|
/** Absolute executable path supplied by trusted owning code. */
|
|
@@ -74,30 +82,21 @@ export class SystemdUnit {
|
|
|
74
82
|
private readonly executable: string;
|
|
75
83
|
private readonly timeout: number;
|
|
76
84
|
private readonly scope: 'system' | 'user';
|
|
77
|
-
|
|
78
|
-
private readonly
|
|
79
|
-
private readonly configDirectory?: string;
|
|
80
|
-
private readonly dataDirectory?: string;
|
|
85
|
+
/** Present exactly for user scope. */
|
|
86
|
+
private readonly userEnvironment?: ISystemdUserEnvironment;
|
|
81
87
|
|
|
82
88
|
constructor(optionsArg: ISystemdUnitOptions) {
|
|
83
89
|
this.unitName = optionsArg?.unitName;
|
|
84
90
|
this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
|
|
85
91
|
this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
|
|
86
92
|
this.scope = optionsArg?.scope ?? 'system';
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
const safeDirectory = (value: unknown): value is string =>
|
|
95
|
-
typeof value === 'string' && value !== '/' && plugins.path.isAbsolute(value) &&
|
|
96
|
-
plugins.path.normalize(value) === value && !value.endsWith('/') &&
|
|
97
|
-
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
98
|
-
// Only a supplied runtime directory is validated here. Its absence matters solely to calls that
|
|
99
|
-
// reach the user manager, and those refuse it in validateUserRuntime(). Admitting absence lets
|
|
100
|
-
// owners read protected unit files from contexts without a login session (cron, plain ssh).
|
|
93
|
+
this.userEnvironment = this.scope === 'user'
|
|
94
|
+
? captureUserEnvironment(optionsArg?.runtimeDirectory) : undefined;
|
|
95
|
+
// Construction validates only the options it is given. The process-derived user environment
|
|
96
|
+
// (home, XDG config/data/runtime roots) is validated by userManagerEnvironment() before every
|
|
97
|
+
// systemctl call, because only those calls read it. SystemdUnitFile builds its unit at
|
|
98
|
+
// construction, so refusing that environment here would also refuse SystemdUnitFile.inspect(),
|
|
99
|
+
// which never contacts the manager.
|
|
101
100
|
if (
|
|
102
101
|
typeof this.unitName !== 'string' ||
|
|
103
102
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
@@ -106,11 +105,8 @@ export class SystemdUnit {
|
|
|
106
105
|
this.timeout < 1 || this.timeout > 600000 ||
|
|
107
106
|
!['system', 'user'].includes(this.scope) ||
|
|
108
107
|
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
109
|
-
(this.scope === 'user' &&
|
|
110
|
-
|
|
111
|
-
!safeDirectory(this.homeDirectory) ||
|
|
112
|
-
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
113
|
-
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory)))
|
|
108
|
+
(this.scope === 'user' && optionsArg?.runtimeDirectory !== undefined &&
|
|
109
|
+
!isSafeDirectory(optionsArg.runtimeDirectory))
|
|
114
110
|
) throw new SystemdUnitError('invalid_options');
|
|
115
111
|
}
|
|
116
112
|
|
|
@@ -227,11 +223,15 @@ export class SystemdUnit {
|
|
|
227
223
|
return this.inspectConfiguration();
|
|
228
224
|
}
|
|
229
225
|
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
226
|
+
/**
|
|
227
|
+
* Runs before every systemctl invocation, so an absent or malformed user environment and a
|
|
228
|
+
* missing or unsafe runtime directory refuse without side effects. Undefined for system scope.
|
|
229
|
+
*/
|
|
230
|
+
private async userManagerEnvironment(): Promise<TSystemdUserManagerEnvironment | undefined> {
|
|
231
|
+
const environment = this.userEnvironment;
|
|
232
|
+
if (environment === undefined) return undefined;
|
|
233
|
+
if (!isUserManagerEnvironment(environment)) throw new SystemdUnitError('invalid_options');
|
|
234
|
+
const runtimeDirectory = environment.runtimeDirectory;
|
|
235
235
|
try {
|
|
236
236
|
const uid = process.getuid?.();
|
|
237
237
|
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
@@ -244,10 +244,11 @@ export class SystemdUnit {
|
|
|
244
244
|
} catch {
|
|
245
245
|
throw new SystemdUnitError('invalid_options');
|
|
246
246
|
}
|
|
247
|
+
return environment;
|
|
247
248
|
}
|
|
248
249
|
|
|
249
250
|
private async command(argsArg: string[]): Promise<string> {
|
|
250
|
-
await this.
|
|
251
|
+
const userEnvironment = await this.userManagerEnvironment();
|
|
251
252
|
return new Promise((resolve, reject) => {
|
|
252
253
|
plugins.childProcess.execFile(
|
|
253
254
|
this.executable,
|
|
@@ -258,11 +259,13 @@ export class SystemdUnit {
|
|
|
258
259
|
killSignal: 'SIGKILL',
|
|
259
260
|
maxBuffer: 16384,
|
|
260
261
|
windowsHide: true,
|
|
261
|
-
env:
|
|
262
|
+
env: userEnvironment
|
|
262
263
|
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
263
|
-
HOME:
|
|
264
|
-
...(
|
|
265
|
-
|
|
264
|
+
HOME: userEnvironment.homeDirectory, XDG_RUNTIME_DIR: userEnvironment.runtimeDirectory,
|
|
265
|
+
...(userEnvironment.configDirectory
|
|
266
|
+
? { XDG_CONFIG_HOME: userEnvironment.configDirectory } : {}),
|
|
267
|
+
...(userEnvironment.dataDirectory
|
|
268
|
+
? { XDG_DATA_HOME: userEnvironment.dataDirectory } : {}) }
|
|
266
269
|
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
267
270
|
},
|
|
268
271
|
(error, stdout) => {
|
|
@@ -6,6 +6,12 @@ import {
|
|
|
6
6
|
type ISystemdUnitState,
|
|
7
7
|
SystemdUnit,
|
|
8
8
|
} from './classes.systemdunit.js';
|
|
9
|
+
import {
|
|
10
|
+
type ISystemdUserEnvironment,
|
|
11
|
+
captureUserEnvironment,
|
|
12
|
+
isSafeDirectory,
|
|
13
|
+
isUserManagerEnvironment,
|
|
14
|
+
} from './systemd.userenvironment.js';
|
|
9
15
|
|
|
10
16
|
export interface ISystemdUnitFileOptions extends ISystemdUnitOptions {
|
|
11
17
|
/** Local vendor definitions can be installed without removing an administrator's mask. */
|
|
@@ -13,6 +19,10 @@ export interface ISystemdUnitFileOptions extends ISystemdUnitOptions {
|
|
|
13
19
|
/** Trusted owning-code qualification only. Defaults to root for system, current uid for user. */
|
|
14
20
|
expectedUid?: number;
|
|
15
21
|
}
|
|
22
|
+
interface IMaskDirectories {
|
|
23
|
+
readonly persistent: readonly string[];
|
|
24
|
+
readonly runtime: readonly string[];
|
|
25
|
+
}
|
|
16
26
|
export interface ISystemdUnitFileRecord {
|
|
17
27
|
readonly path: string;
|
|
18
28
|
readonly sha256: string;
|
|
@@ -57,42 +67,65 @@ export class SystemdUnitFile {
|
|
|
57
67
|
private readonly directory: string;
|
|
58
68
|
private readonly uid: number;
|
|
59
69
|
private readonly scope: 'system' | 'user';
|
|
60
|
-
|
|
61
|
-
private readonly
|
|
70
|
+
/** Present exactly for user scope; read only by the default path and by install(). */
|
|
71
|
+
private readonly userEnvironment?: ISystemdUserEnvironment;
|
|
62
72
|
private readonly unit: SystemdUnit;
|
|
63
73
|
private readonly name: string;
|
|
64
74
|
private busy = false;
|
|
65
75
|
|
|
66
76
|
constructor(options: ISystemdUnitFileOptions) {
|
|
77
|
+
// Validates the unit's explicit options, including a supplied runtime directory. Like this
|
|
78
|
+
// class, it captures but does not validate the process-derived user environment.
|
|
67
79
|
this.unit = new SystemdUnit(options);
|
|
68
80
|
this.name = options.unitName;
|
|
69
81
|
this.scope = options.scope ?? 'system';
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
?
|
|
73
|
-
|
|
74
|
-
? process.env.XDG_CONFIG_HOME || plugins.path.join(home!, '.config') : undefined;
|
|
75
|
-
// Resolved exactly as SystemdUnit resolves it, so both agree on presence.
|
|
76
|
-
this.runtimeDirectory = this.scope === 'user'
|
|
77
|
-
? options.runtimeDirectory ?? (process.env.XDG_RUNTIME_DIR || undefined) : undefined;
|
|
78
|
-
this.directory = options.unitDirectory ?? (this.scope === 'user'
|
|
79
|
-
? plugins.path.join(dataDirectory!, 'systemd/user') : '/usr/local/lib/systemd/system');
|
|
82
|
+
// Captured in the same synchronous step as the unit's own snapshot, so both read equal values.
|
|
83
|
+
this.userEnvironment = this.scope === 'user'
|
|
84
|
+
? captureUserEnvironment(options.runtimeDirectory) : undefined;
|
|
85
|
+
const directory = options.unitDirectory ?? this.defaultDirectory();
|
|
80
86
|
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
87
|
+
// inspect() reads the unit directory as this uid and nothing else. The config and runtime
|
|
88
|
+
// roots and the manager environment are refused later, by install(), before any effect.
|
|
89
|
+
if (
|
|
90
|
+
!isSafeDirectory(directory) || !Number.isSafeInteger(this.uid) || this.uid < 0 ||
|
|
91
|
+
this.scope === 'user' && this.uid !== process.getuid?.()
|
|
92
|
+
) throw new SystemdUnitFileError('invalid_options');
|
|
93
|
+
this.directory = directory;
|
|
94
|
+
this.path = plugins.path.join(directory, this.name);
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* Only the default location reads XDG_DATA_HOME, or the home directory when that is unset. The
|
|
99
|
+
* public path exists from construction, so a malformed source refuses there: joining would
|
|
100
|
+
* otherwise normalize a value such as `/data/../elsewhere` into a plausible directory.
|
|
101
|
+
*/
|
|
102
|
+
private defaultDirectory(): string | undefined {
|
|
103
|
+
const environment = this.userEnvironment;
|
|
104
|
+
if (environment === undefined) return '/usr/local/lib/systemd/system';
|
|
105
|
+
const dataDirectory = environment.dataDirectory ?? (isSafeDirectory(environment.homeDirectory)
|
|
106
|
+
? plugins.path.join(environment.homeDirectory, '.local/share') : undefined);
|
|
107
|
+
return isSafeDirectory(dataDirectory) ? plugins.path.join(dataDirectory, 'systemd/user') : undefined;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* Directories whose entry for this unit is a mask the manager may report. Only install() reads
|
|
112
|
+
* them. Null when the user environment cannot drive the manager or name the config root.
|
|
113
|
+
*/
|
|
114
|
+
private maskDirectories(): IMaskDirectories | null {
|
|
115
|
+
const environment = this.userEnvironment;
|
|
116
|
+
if (environment === undefined) {
|
|
117
|
+
return { persistent: ['/etc/systemd/system'], runtime: ['/run/systemd/system'] };
|
|
118
|
+
}
|
|
119
|
+
const configDirectory = environment.configDirectory ??
|
|
120
|
+
(isSafeDirectory(environment.homeDirectory)
|
|
121
|
+
? plugins.path.join(environment.homeDirectory, '.config') : undefined);
|
|
122
|
+
if (!isUserManagerEnvironment(environment) || !isSafeDirectory(configDirectory)) return null;
|
|
123
|
+
const userDirectories = (roots: readonly string[]) =>
|
|
124
|
+
roots.map(root => plugins.path.join(root, 'systemd/user'));
|
|
125
|
+
return {
|
|
126
|
+
persistent: userDirectories([configDirectory, '/etc']),
|
|
127
|
+
runtime: userDirectories([environment.runtimeDirectory, '/run']),
|
|
128
|
+
};
|
|
96
129
|
}
|
|
97
130
|
|
|
98
131
|
/**
|
|
@@ -117,20 +150,22 @@ export class SystemdUnitFile {
|
|
|
117
150
|
definition instanceof SystemdServiceDefinition && definition.unitName === this.name &&
|
|
118
151
|
definition.scope === this.scope &&
|
|
119
152
|
(expectedSha256 === null ||
|
|
120
|
-
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256))
|
|
121
|
-
// Installation admits, reloads and verifies through the user manager and recognizes its
|
|
122
|
-
// runtime mask path. Refusing here, before the busy latch and any directory or systemctl
|
|
123
|
-
// effect, keeps the local error code instead of a wrapped write_failed.
|
|
124
|
-
(this.scope === 'system' || this.runtimeDirectory !== undefined),
|
|
153
|
+
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256)),
|
|
125
154
|
'invalid_options',
|
|
126
155
|
);
|
|
156
|
+
// Installation admits, reloads and verifies through the user manager and recognizes its
|
|
157
|
+
// persistent and runtime mask paths, so it needs the whole user environment. Refusing here,
|
|
158
|
+
// before the busy latch and any directory or systemctl effect, keeps the local error code
|
|
159
|
+
// instead of a wrapped write_failed.
|
|
160
|
+
const maskDirectories = this.maskDirectories();
|
|
161
|
+
if (maskDirectories === null) throw new SystemdUnitFileError('invalid_options');
|
|
127
162
|
requireValue(!this.busy, 'busy');
|
|
128
163
|
this.busy = true;
|
|
129
164
|
let temporary: string | undefined;
|
|
130
165
|
let temporaryInfo: plugins.Stats | undefined;
|
|
131
166
|
try {
|
|
132
167
|
const before = await this.unit.inspect();
|
|
133
|
-
const beforeConfiguration = await this.admit(before);
|
|
168
|
+
const beforeConfiguration = await this.admit(before, maskDirectories);
|
|
134
169
|
await this.directories(true);
|
|
135
170
|
const parent = await plugins.fs.lstat(this.directory);
|
|
136
171
|
const previous = await this.read(this.path);
|
|
@@ -163,7 +198,7 @@ export class SystemdUnitFile {
|
|
|
163
198
|
requireValue(sameFile(parent, await plugins.fs.lstat(this.directory)), 'unsafe_path');
|
|
164
199
|
const rechecked = await this.unit.inspect();
|
|
165
200
|
requireValue(JSON.stringify(rechecked) === JSON.stringify(before), 'changed');
|
|
166
|
-
const recheckedConfiguration = await this.admit(rechecked);
|
|
201
|
+
const recheckedConfiguration = await this.admit(rechecked, maskDirectories);
|
|
167
202
|
requireValue(
|
|
168
203
|
recheckedConfiguration.fragmentPath === beforeConfiguration.fragmentPath,
|
|
169
204
|
'changed',
|
|
@@ -214,7 +249,10 @@ export class SystemdUnitFile {
|
|
|
214
249
|
}
|
|
215
250
|
}
|
|
216
251
|
|
|
217
|
-
private async admit(
|
|
252
|
+
private async admit(
|
|
253
|
+
state: ISystemdUnitState,
|
|
254
|
+
maskDirectories: IMaskDirectories,
|
|
255
|
+
): Promise<ISystemdUnitConfigurationState> {
|
|
218
256
|
requireValue(
|
|
219
257
|
quiet(state) && (masked(state) ||
|
|
220
258
|
state.loadState === 'loaded' &&
|
|
@@ -223,14 +261,9 @@ export class SystemdUnitFile {
|
|
|
223
261
|
'unsafe_unit',
|
|
224
262
|
);
|
|
225
263
|
const configuration = await this.unit.inspectConfiguration();
|
|
226
|
-
const maskPaths =
|
|
227
|
-
?
|
|
228
|
-
|
|
229
|
-
this.name,
|
|
230
|
-
)]
|
|
231
|
-
: (state.unitFileState === 'masked-runtime'
|
|
232
|
-
? [this.runtimeDirectory!, '/run'].map(root => plugins.path.join(root, 'systemd/user', this.name))
|
|
233
|
-
: [this.configDirectory!, '/etc'].map(root => plugins.path.join(root, 'systemd/user', this.name)));
|
|
264
|
+
const maskPaths = (state.unitFileState === 'masked-runtime'
|
|
265
|
+
? maskDirectories.runtime : maskDirectories.persistent)
|
|
266
|
+
.map(directory => plugins.path.join(directory, this.name));
|
|
234
267
|
requireValue(
|
|
235
268
|
!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
236
269
|
(masked(state)
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import * as plugins from './smartdaemon.plugins.js';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* The calling process's user-manager environment, captured once at construction so a unit file
|
|
5
|
+
* and the unit it drives read the same values. Nothing here is validated at capture: each value
|
|
6
|
+
* is checked by the operation that reads it, so a malformed variable that an operation never
|
|
7
|
+
* reads cannot stop that operation.
|
|
8
|
+
*/
|
|
9
|
+
export interface ISystemdUserEnvironment {
|
|
10
|
+
/** The account's home directory; absent when the calling uid has no passwd entry. */
|
|
11
|
+
readonly homeDirectory?: string;
|
|
12
|
+
/** A non-empty XDG_CONFIG_HOME. */
|
|
13
|
+
readonly configDirectory?: string;
|
|
14
|
+
/** A non-empty XDG_DATA_HOME. */
|
|
15
|
+
readonly dataDirectory?: string;
|
|
16
|
+
/** The explicit option, otherwise a non-empty XDG_RUNTIME_DIR. */
|
|
17
|
+
readonly runtimeDirectory?: string;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/** The environment every user-manager call passes to systemctl, once it has been admitted. */
|
|
21
|
+
export type TSystemdUserManagerEnvironment = ISystemdUserEnvironment & {
|
|
22
|
+
readonly homeDirectory: string;
|
|
23
|
+
readonly runtimeDirectory: string;
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
/** Absolute, normalized, bounded and printable; never the root itself or a trailing slash. */
|
|
27
|
+
export const isSafeDirectory = (value: unknown): value is string =>
|
|
28
|
+
typeof value === 'string' && value !== '/' && plugins.path.isAbsolute(value) &&
|
|
29
|
+
plugins.path.normalize(value) === value && !value.endsWith('/') &&
|
|
30
|
+
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* An empty XDG variable counts as unset, as the XDG base directory specification defines. An
|
|
34
|
+
* explicit runtime directory option is never reinterpreted, so an empty option stays malformed.
|
|
35
|
+
*/
|
|
36
|
+
export const captureUserEnvironment = (
|
|
37
|
+
runtimeDirectoryOption: string | undefined,
|
|
38
|
+
): ISystemdUserEnvironment => {
|
|
39
|
+
let homeDirectory: string | undefined;
|
|
40
|
+
try {
|
|
41
|
+
homeDirectory = plugins.os.userInfo().homedir;
|
|
42
|
+
} catch {
|
|
43
|
+
// os.userInfo() throws for a uid without a passwd entry. The home directory is then absent,
|
|
44
|
+
// and every operation that reads it refuses with its own invalid_options code.
|
|
45
|
+
}
|
|
46
|
+
return Object.freeze({
|
|
47
|
+
homeDirectory,
|
|
48
|
+
configDirectory: process.env.XDG_CONFIG_HOME || undefined,
|
|
49
|
+
dataDirectory: process.env.XDG_DATA_HOME || undefined,
|
|
50
|
+
runtimeDirectory: runtimeDirectoryOption ?? (process.env.XDG_RUNTIME_DIR || undefined),
|
|
51
|
+
});
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Every call that reaches the user manager passes the runtime and home directories and any set
|
|
56
|
+
* XDG config/data roots to systemctl, so all of them must be well formed before the first call.
|
|
57
|
+
*/
|
|
58
|
+
export const isUserManagerEnvironment = (
|
|
59
|
+
environment: ISystemdUserEnvironment,
|
|
60
|
+
): environment is TSystemdUserManagerEnvironment =>
|
|
61
|
+
isSafeDirectory(environment.runtimeDirectory) && isSafeDirectory(environment.homeDirectory) &&
|
|
62
|
+
(environment.configDirectory === undefined || isSafeDirectory(environment.configDirectory)) &&
|
|
63
|
+
(environment.dataDirectory === undefined || isSafeDirectory(environment.dataDirectory));
|