@push.rocks/smartdaemon 2.7.0 → 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 +12 -6
- package/dist_ts/classes.systemdunit.js +32 -23
- package/dist_ts/classes.systemdunitfile.d.ts +17 -3
- package/dist_ts/classes.systemdunitfile.js +65 -28
- package/dist_ts/systemd.userenvironment.d.ts +33 -0
- package/dist_ts/systemd.userenvironment.js +33 -0
- package/package.json +5 -5
- package/readme.md +41 -5
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.systemdunit.ts +42 -27
- package/ts/classes.systemdunitfile.ts +79 -36
- 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=
|
|
@@ -2,7 +2,11 @@ export interface ISystemdUnitOptions {
|
|
|
2
2
|
unitName: string;
|
|
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. 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`.
|
|
9
|
+
*/
|
|
6
10
|
runtimeDirectory?: string;
|
|
7
11
|
/** Absolute executable path supplied by trusted owning code. */
|
|
8
12
|
systemctlPath?: string;
|
|
@@ -49,10 +53,8 @@ export declare class SystemdUnit {
|
|
|
49
53
|
private readonly executable;
|
|
50
54
|
private readonly timeout;
|
|
51
55
|
private readonly scope;
|
|
52
|
-
|
|
53
|
-
private readonly
|
|
54
|
-
private readonly configDirectory?;
|
|
55
|
-
private readonly dataDirectory?;
|
|
56
|
+
/** Present exactly for user scope. */
|
|
57
|
+
private readonly userEnvironment?;
|
|
56
58
|
constructor(optionsArg: ISystemdUnitOptions);
|
|
57
59
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
58
60
|
inspect(): Promise<ISystemdUnitState>;
|
|
@@ -69,6 +71,10 @@ export declare class SystemdUnit {
|
|
|
69
71
|
inspectConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
70
72
|
/** Reloads unit definitions globally; does not enable, unmask, start or stop a unit. */
|
|
71
73
|
reloadConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
72
|
-
|
|
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;
|
|
73
79
|
private command;
|
|
74
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,14 +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
|
-
this.
|
|
29
|
-
? optionsArg?.runtimeDirectory
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
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.
|
|
36
36
|
if (typeof this.unitName !== 'string' ||
|
|
37
37
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
38
38
|
typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
|
|
@@ -40,10 +40,8 @@ export class SystemdUnit {
|
|
|
40
40
|
this.timeout < 1 || this.timeout > 600000 ||
|
|
41
41
|
!['system', 'user'].includes(this.scope) ||
|
|
42
42
|
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
43
|
-
(this.scope === 'user' &&
|
|
44
|
-
|
|
45
|
-
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
46
|
-
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory))))
|
|
43
|
+
(this.scope === 'user' && optionsArg?.runtimeDirectory !== undefined &&
|
|
44
|
+
!isSafeDirectory(optionsArg.runtimeDirectory)))
|
|
47
45
|
throw new SystemdUnitError('invalid_options');
|
|
48
46
|
}
|
|
49
47
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
@@ -152,16 +150,24 @@ export class SystemdUnit {
|
|
|
152
150
|
await this.command(['daemon-reload']);
|
|
153
151
|
return this.inspectConfiguration();
|
|
154
152
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
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))
|
|
162
|
+
throw new SystemdUnitError('invalid_options');
|
|
163
|
+
const runtimeDirectory = environment.runtimeDirectory;
|
|
158
164
|
try {
|
|
159
165
|
const uid = process.getuid?.();
|
|
160
166
|
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
161
|
-
await plugins.fs.realpath(
|
|
167
|
+
await plugins.fs.realpath(runtimeDirectory) !== runtimeDirectory) {
|
|
162
168
|
throw new SystemdUnitError('invalid_options');
|
|
163
169
|
}
|
|
164
|
-
const info = await plugins.fs.lstat(
|
|
170
|
+
const info = await plugins.fs.lstat(runtimeDirectory);
|
|
165
171
|
if (!info.isDirectory() || info.isSymbolicLink() || info.uid !== uid ||
|
|
166
172
|
(info.mode & 0o077) !== 0)
|
|
167
173
|
throw new SystemdUnitError('invalid_options');
|
|
@@ -169,9 +175,10 @@ export class SystemdUnit {
|
|
|
169
175
|
catch {
|
|
170
176
|
throw new SystemdUnitError('invalid_options');
|
|
171
177
|
}
|
|
178
|
+
return environment;
|
|
172
179
|
}
|
|
173
180
|
async command(argsArg) {
|
|
174
|
-
await this.
|
|
181
|
+
const userEnvironment = await this.userManagerEnvironment();
|
|
175
182
|
return new Promise((resolve, reject) => {
|
|
176
183
|
plugins.childProcess.execFile(this.executable, [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg], {
|
|
177
184
|
encoding: 'utf8',
|
|
@@ -179,11 +186,13 @@ export class SystemdUnit {
|
|
|
179
186
|
killSignal: 'SIGKILL',
|
|
180
187
|
maxBuffer: 16384,
|
|
181
188
|
windowsHide: true,
|
|
182
|
-
env:
|
|
189
|
+
env: userEnvironment
|
|
183
190
|
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
184
|
-
HOME:
|
|
185
|
-
...(
|
|
186
|
-
|
|
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 } : {}) }
|
|
187
196
|
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
188
197
|
}, (error, stdout) => {
|
|
189
198
|
// execFile settles after the client closes. A timed-out client's remote job may continue.
|
|
@@ -195,4 +204,4 @@ export class SystemdUnit {
|
|
|
195
204
|
});
|
|
196
205
|
}
|
|
197
206
|
}
|
|
198
|
-
//# 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,13 +23,27 @@ 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
|
-
/**
|
|
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;
|
|
43
|
+
/**
|
|
44
|
+
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
45
|
+
* Needs no user-manager runtime directory.
|
|
46
|
+
*/
|
|
33
47
|
inspect(): Promise<ISystemdUnitFileRecord | null>;
|
|
34
48
|
/**
|
|
35
49
|
* Expected previous digest is mandatory; null admits an absent file. Exact desired bytes are idempotent.
|
|
@@ -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,30 +28,61 @@ 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
|
-
this.runtimeDirectory = this.scope === 'user'
|
|
39
|
-
? options.runtimeDirectory ?? process.env.XDG_RUNTIME_DIR : undefined;
|
|
40
|
-
this.directory = options.unitDirectory ?? (this.scope === 'user'
|
|
41
|
-
? 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();
|
|
42
40
|
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
validDirectory(this.runtimeDirectory)), 'invalid_options');
|
|
51
|
-
this.path = plugins.path.join(this.directory, this.name);
|
|
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);
|
|
52
48
|
}
|
|
53
|
-
/**
|
|
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
|
+
};
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
84
|
+
* Needs no user-manager runtime directory.
|
|
85
|
+
*/
|
|
54
86
|
async inspect() {
|
|
55
87
|
if (!await this.directories(false))
|
|
56
88
|
return null;
|
|
@@ -66,13 +98,20 @@ export class SystemdUnitFile {
|
|
|
66
98
|
definition.scope === this.scope &&
|
|
67
99
|
(expectedSha256 === null ||
|
|
68
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');
|
|
69
108
|
requireValue(!this.busy, 'busy');
|
|
70
109
|
this.busy = true;
|
|
71
110
|
let temporary;
|
|
72
111
|
let temporaryInfo;
|
|
73
112
|
try {
|
|
74
113
|
const before = await this.unit.inspect();
|
|
75
|
-
const beforeConfiguration = await this.admit(before);
|
|
114
|
+
const beforeConfiguration = await this.admit(before, maskDirectories);
|
|
76
115
|
await this.directories(true);
|
|
77
116
|
const parent = await plugins.fs.lstat(this.directory);
|
|
78
117
|
const previous = await this.read(this.path);
|
|
@@ -101,7 +140,7 @@ export class SystemdUnitFile {
|
|
|
101
140
|
requireValue(sameFile(parent, await plugins.fs.lstat(this.directory)), 'unsafe_path');
|
|
102
141
|
const rechecked = await this.unit.inspect();
|
|
103
142
|
requireValue(JSON.stringify(rechecked) === JSON.stringify(before), 'changed');
|
|
104
|
-
const recheckedConfiguration = await this.admit(rechecked);
|
|
143
|
+
const recheckedConfiguration = await this.admit(rechecked, maskDirectories);
|
|
105
144
|
requireValue(recheckedConfiguration.fragmentPath === beforeConfiguration.fragmentPath, 'changed');
|
|
106
145
|
await plugins.fs.rename(temporary, this.path);
|
|
107
146
|
temporary = undefined;
|
|
@@ -145,17 +184,15 @@ export class SystemdUnitFile {
|
|
|
145
184
|
}
|
|
146
185
|
}
|
|
147
186
|
}
|
|
148
|
-
async admit(state) {
|
|
187
|
+
async admit(state, maskDirectories) {
|
|
149
188
|
requireValue(quiet(state) && (masked(state) ||
|
|
150
189
|
state.loadState === 'loaded' &&
|
|
151
190
|
['enabled', 'enabled-runtime', 'disabled'].includes(state.unitFileState) ||
|
|
152
191
|
state.loadState === 'not-found' && state.unitFileState === ''), 'unsafe_unit');
|
|
153
192
|
const configuration = await this.unit.inspectConfiguration();
|
|
154
|
-
const maskPaths =
|
|
155
|
-
?
|
|
156
|
-
|
|
157
|
-
? [this.runtimeDirectory, '/run'].map(root => plugins.path.join(root, 'systemd/user', this.name))
|
|
158
|
-
: [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));
|
|
159
196
|
requireValue(!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
160
197
|
(masked(state)
|
|
161
198
|
? configuration.fragmentPath !== this.path &&
|
|
@@ -263,4 +300,4 @@ export class SystemdUnitFile {
|
|
|
263
300
|
}
|
|
264
301
|
}
|
|
265
302
|
}
|
|
266
|
-
//# 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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartdaemon",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Start scripts as long running daemons and manage them.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
},
|
|
27
27
|
"homepage": "https://code.foss.global/push.rocks/smartdaemon",
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@git.zone/tsbuild": "^
|
|
30
|
-
"@git.zone/tsrun": "^
|
|
31
|
-
"@git.zone/tstest": "^6.
|
|
32
|
-
"@types/node": "^26.
|
|
29
|
+
"@git.zone/tsbuild": "^5.0.0",
|
|
30
|
+
"@git.zone/tsrun": "^3.0.0",
|
|
31
|
+
"@git.zone/tstest": "^6.2.1",
|
|
32
|
+
"@types/node": "^26.6.1"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@push.rocks/lik": "^6.4.1",
|
package/readme.md
CHANGED
|
@@ -190,11 +190,22 @@ environment, no shell or password prompt, and bounded output. Trusted owning cod
|
|
|
190
190
|
can choose another absolute executable path and `commandTimeoutMs` (default
|
|
191
191
|
120000, maximum 600000). This timeout bounds the client process only.
|
|
192
192
|
The default `scope: 'system'` retains system-manager behavior. `scope: 'user'`
|
|
193
|
-
uses `systemctl --user` as the calling user.
|
|
194
|
-
`XDG_RUNTIME_DIR` (or an
|
|
195
|
-
with the user's home and
|
|
196
|
-
|
|
197
|
-
|
|
193
|
+
uses `systemctl --user` as the calling user. Every `SystemdUnit` operation contacts
|
|
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 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.
|
|
198
209
|
|
|
199
210
|
`inspectConfiguration()` reports the selected `fragmentPath`, opaque `dropInPaths`
|
|
200
211
|
list and `needsReload` flag. `reloadConfiguration()` explicitly reloads the manager's
|
|
@@ -279,6 +290,31 @@ current user manager and do not escalate privileges. The installer rejects unsaf
|
|
|
279
290
|
ownership or group-writable path components; prepare those directories explicitly
|
|
280
291
|
before installation. It never changes the permissions of existing directories.
|
|
281
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:
|
|
312
|
+
|
|
313
|
+
```typescript
|
|
314
|
+
// Resolves to null when the file is absent, or { path, sha256 } for a protected definition.
|
|
315
|
+
const installed = await new SystemdUnitFile({ scope: 'user', unitName: 'authswitch.service' }).inspect();
|
|
316
|
+
```
|
|
317
|
+
|
|
282
318
|
For a boot prerequisite that must finish before dependent services start, supply
|
|
283
319
|
`startup: { type: 'oneshot', remainAfterExit: true, timeoutStartSeconds: 120 }`.
|
|
284
320
|
Systemd waits for successful process exit; `RemainAfterExit` keeps the completed
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,10 +1,21 @@
|
|
|
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
|
+
/**
|
|
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`.
|
|
18
|
+
*/
|
|
8
19
|
runtimeDirectory?: string;
|
|
9
20
|
/** Absolute executable path supplied by trusted owning code. */
|
|
10
21
|
systemctlPath?: string;
|
|
@@ -71,25 +82,21 @@ export class SystemdUnit {
|
|
|
71
82
|
private readonly executable: string;
|
|
72
83
|
private readonly timeout: number;
|
|
73
84
|
private readonly scope: 'system' | 'user';
|
|
74
|
-
|
|
75
|
-
private readonly
|
|
76
|
-
private readonly configDirectory?: string;
|
|
77
|
-
private readonly dataDirectory?: string;
|
|
85
|
+
/** Present exactly for user scope. */
|
|
86
|
+
private readonly userEnvironment?: ISystemdUserEnvironment;
|
|
78
87
|
|
|
79
88
|
constructor(optionsArg: ISystemdUnitOptions) {
|
|
80
89
|
this.unitName = optionsArg?.unitName;
|
|
81
90
|
this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
|
|
82
91
|
this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
|
|
83
92
|
this.scope = optionsArg?.scope ?? 'system';
|
|
84
|
-
this.
|
|
85
|
-
? optionsArg?.runtimeDirectory
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
plugins.path.normalize(value) === value && !value.endsWith('/') &&
|
|
92
|
-
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
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.
|
|
93
100
|
if (
|
|
94
101
|
typeof this.unitName !== 'string' ||
|
|
95
102
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
@@ -98,10 +105,8 @@ export class SystemdUnit {
|
|
|
98
105
|
this.timeout < 1 || this.timeout > 600000 ||
|
|
99
106
|
!['system', 'user'].includes(this.scope) ||
|
|
100
107
|
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
101
|
-
(this.scope === 'user' &&
|
|
102
|
-
|
|
103
|
-
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
104
|
-
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory)))
|
|
108
|
+
(this.scope === 'user' && optionsArg?.runtimeDirectory !== undefined &&
|
|
109
|
+
!isSafeDirectory(optionsArg.runtimeDirectory))
|
|
105
110
|
) throw new SystemdUnitError('invalid_options');
|
|
106
111
|
}
|
|
107
112
|
|
|
@@ -218,24 +223,32 @@ export class SystemdUnit {
|
|
|
218
223
|
return this.inspectConfiguration();
|
|
219
224
|
}
|
|
220
225
|
|
|
221
|
-
|
|
222
|
-
|
|
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;
|
|
223
235
|
try {
|
|
224
236
|
const uid = process.getuid?.();
|
|
225
237
|
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
226
|
-
await plugins.fs.realpath(
|
|
238
|
+
await plugins.fs.realpath(runtimeDirectory) !== runtimeDirectory) {
|
|
227
239
|
throw new SystemdUnitError('invalid_options');
|
|
228
240
|
}
|
|
229
|
-
const info = await plugins.fs.lstat(
|
|
241
|
+
const info = await plugins.fs.lstat(runtimeDirectory);
|
|
230
242
|
if (!info.isDirectory() || info.isSymbolicLink() || info.uid !== uid ||
|
|
231
243
|
(info.mode & 0o077) !== 0) throw new SystemdUnitError('invalid_options');
|
|
232
244
|
} catch {
|
|
233
245
|
throw new SystemdUnitError('invalid_options');
|
|
234
246
|
}
|
|
247
|
+
return environment;
|
|
235
248
|
}
|
|
236
249
|
|
|
237
250
|
private async command(argsArg: string[]): Promise<string> {
|
|
238
|
-
await this.
|
|
251
|
+
const userEnvironment = await this.userManagerEnvironment();
|
|
239
252
|
return new Promise((resolve, reject) => {
|
|
240
253
|
plugins.childProcess.execFile(
|
|
241
254
|
this.executable,
|
|
@@ -246,11 +259,13 @@ export class SystemdUnit {
|
|
|
246
259
|
killSignal: 'SIGKILL',
|
|
247
260
|
maxBuffer: 16384,
|
|
248
261
|
windowsHide: true,
|
|
249
|
-
env:
|
|
262
|
+
env: userEnvironment
|
|
250
263
|
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
251
|
-
HOME:
|
|
252
|
-
...(
|
|
253
|
-
|
|
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 } : {}) }
|
|
254
269
|
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
255
270
|
},
|
|
256
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,71 @@ 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
|
-
this.runtimeDirectory = this.scope === 'user'
|
|
76
|
-
? options.runtimeDirectory ?? process.env.XDG_RUNTIME_DIR : undefined;
|
|
77
|
-
this.directory = options.unitDirectory ?? (this.scope === 'user'
|
|
78
|
-
? 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();
|
|
79
86
|
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
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
|
+
};
|
|
93
129
|
}
|
|
94
130
|
|
|
95
|
-
/**
|
|
131
|
+
/**
|
|
132
|
+
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
133
|
+
* Needs no user-manager runtime directory.
|
|
134
|
+
*/
|
|
96
135
|
public async inspect(): Promise<ISystemdUnitFileRecord | null> {
|
|
97
136
|
if (!await this.directories(false)) return null;
|
|
98
137
|
const file = await this.read(this.path);
|
|
@@ -114,13 +153,19 @@ export class SystemdUnitFile {
|
|
|
114
153
|
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256)),
|
|
115
154
|
'invalid_options',
|
|
116
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');
|
|
117
162
|
requireValue(!this.busy, 'busy');
|
|
118
163
|
this.busy = true;
|
|
119
164
|
let temporary: string | undefined;
|
|
120
165
|
let temporaryInfo: plugins.Stats | undefined;
|
|
121
166
|
try {
|
|
122
167
|
const before = await this.unit.inspect();
|
|
123
|
-
const beforeConfiguration = await this.admit(before);
|
|
168
|
+
const beforeConfiguration = await this.admit(before, maskDirectories);
|
|
124
169
|
await this.directories(true);
|
|
125
170
|
const parent = await plugins.fs.lstat(this.directory);
|
|
126
171
|
const previous = await this.read(this.path);
|
|
@@ -153,7 +198,7 @@ export class SystemdUnitFile {
|
|
|
153
198
|
requireValue(sameFile(parent, await plugins.fs.lstat(this.directory)), 'unsafe_path');
|
|
154
199
|
const rechecked = await this.unit.inspect();
|
|
155
200
|
requireValue(JSON.stringify(rechecked) === JSON.stringify(before), 'changed');
|
|
156
|
-
const recheckedConfiguration = await this.admit(rechecked);
|
|
201
|
+
const recheckedConfiguration = await this.admit(rechecked, maskDirectories);
|
|
157
202
|
requireValue(
|
|
158
203
|
recheckedConfiguration.fragmentPath === beforeConfiguration.fragmentPath,
|
|
159
204
|
'changed',
|
|
@@ -204,7 +249,10 @@ export class SystemdUnitFile {
|
|
|
204
249
|
}
|
|
205
250
|
}
|
|
206
251
|
|
|
207
|
-
private async admit(
|
|
252
|
+
private async admit(
|
|
253
|
+
state: ISystemdUnitState,
|
|
254
|
+
maskDirectories: IMaskDirectories,
|
|
255
|
+
): Promise<ISystemdUnitConfigurationState> {
|
|
208
256
|
requireValue(
|
|
209
257
|
quiet(state) && (masked(state) ||
|
|
210
258
|
state.loadState === 'loaded' &&
|
|
@@ -213,14 +261,9 @@ export class SystemdUnitFile {
|
|
|
213
261
|
'unsafe_unit',
|
|
214
262
|
);
|
|
215
263
|
const configuration = await this.unit.inspectConfiguration();
|
|
216
|
-
const maskPaths =
|
|
217
|
-
?
|
|
218
|
-
|
|
219
|
-
this.name,
|
|
220
|
-
)]
|
|
221
|
-
: (state.unitFileState === 'masked-runtime'
|
|
222
|
-
? [this.runtimeDirectory!, '/run'].map(root => plugins.path.join(root, 'systemd/user', this.name))
|
|
223
|
-
: [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));
|
|
224
267
|
requireValue(
|
|
225
268
|
!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
226
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));
|