@push.rocks/smartdaemon 2.6.0 → 2.7.1
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.systemdservicedefinition.d.ts +11 -3
- package/dist_ts/classes.systemdservicedefinition.js +20 -10
- package/dist_ts/classes.systemdunit.d.ts +13 -0
- package/dist_ts/classes.systemdunit.js +54 -5
- package/dist_ts/classes.systemdunitfile.d.ts +8 -2
- package/dist_ts/classes.systemdunitfile.js +39 -12
- package/dist_ts/smartdaemon.plugins.d.ts +2 -1
- package/dist_ts/smartdaemon.plugins.js +3 -2
- package/dist_ts/systemd.definition.d.ts +2 -2
- package/dist_ts/systemd.definition.js +8 -4
- package/package.json +5 -5
- package/readme.md +70 -7
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.systemdservicedefinition.ts +29 -15
- package/ts/classes.systemdunit.ts +63 -4
- package/ts/classes.systemdunitfile.ts +46 -15
- package/ts/smartdaemon.plugins.ts +2 -1
- package/ts/systemd.definition.ts +8 -4
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdaemon',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.7.1',
|
|
7
7
|
description: 'Start scripts as long running daemons and manage them.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import { type ISystemdServiceStartup, type ISystemdServiceDependencies, type ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
2
2
|
export type { ISystemdServiceStartup, ISystemdServiceDependencies, ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
3
|
-
|
|
3
|
+
interface ISystemdServiceDefinitionBaseOptions {
|
|
4
4
|
unitName: string;
|
|
5
5
|
description: string;
|
|
6
6
|
executable: string;
|
|
7
7
|
args: readonly string[];
|
|
8
8
|
workingDirectory: string;
|
|
9
|
-
user: string;
|
|
10
|
-
group: string;
|
|
11
9
|
restart: 'no' | 'on-failure' | 'always';
|
|
12
10
|
killMode: 'mixed' | 'control-group';
|
|
13
11
|
timeoutStopSeconds: number;
|
|
@@ -15,12 +13,22 @@ export interface ISystemdServiceDefinitionOptions {
|
|
|
15
13
|
dependencies?: ISystemdServiceDependencies;
|
|
16
14
|
install?: ISystemdServiceInstallTargets;
|
|
17
15
|
}
|
|
16
|
+
export type ISystemdServiceDefinitionOptions = ISystemdServiceDefinitionBaseOptions & ({
|
|
17
|
+
scope?: 'system';
|
|
18
|
+
user: string;
|
|
19
|
+
group: string;
|
|
20
|
+
} | {
|
|
21
|
+
scope: 'user';
|
|
22
|
+
user?: never;
|
|
23
|
+
group?: never;
|
|
24
|
+
});
|
|
18
25
|
export declare class SystemdServiceDefinitionError extends Error {
|
|
19
26
|
constructor();
|
|
20
27
|
}
|
|
21
28
|
/** Literal direct-execution definition; never introduces a shell or environment expansion. */
|
|
22
29
|
export declare class SystemdServiceDefinition {
|
|
23
30
|
readonly unitName: string;
|
|
31
|
+
readonly scope: 'system' | 'user';
|
|
24
32
|
readonly content: string;
|
|
25
33
|
readonly sha256: string;
|
|
26
34
|
constructor(options: ISystemdServiceDefinitionOptions);
|
|
@@ -13,6 +13,16 @@ export class SystemdServiceDefinition {
|
|
|
13
13
|
if (!value)
|
|
14
14
|
throw new SystemdServiceDefinitionError();
|
|
15
15
|
};
|
|
16
|
+
requireValue(options && !plugins.util.types.isProxy(options) &&
|
|
17
|
+
Object.getPrototypeOf(options) === Object.prototype);
|
|
18
|
+
const scopeDescriptor = Object.getOwnPropertyDescriptor(options, 'scope');
|
|
19
|
+
requireValue(scopeDescriptor === undefined ||
|
|
20
|
+
scopeDescriptor.enumerable && 'value' in scopeDescriptor);
|
|
21
|
+
const scopeValue = scopeDescriptor?.value ?? 'system';
|
|
22
|
+
if (scopeValue !== 'system' && scopeValue !== 'user') {
|
|
23
|
+
throw new SystemdServiceDefinitionError();
|
|
24
|
+
}
|
|
25
|
+
const scope = scopeValue;
|
|
16
26
|
const text = (value, maximum = 4096) => typeof value === 'string' && value.length <= maximum && !/[\x00-\x1f\x7f]/.test(value) &&
|
|
17
27
|
!/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/u.test(value);
|
|
18
28
|
const absolute = (value) => text(value) && plugins.path.isAbsolute(value) &&
|
|
@@ -23,15 +33,13 @@ export class SystemdServiceDefinition {
|
|
|
23
33
|
'executable',
|
|
24
34
|
'args',
|
|
25
35
|
'workingDirectory',
|
|
26
|
-
'user',
|
|
27
|
-
'group',
|
|
28
36
|
'restart',
|
|
29
37
|
'killMode',
|
|
30
38
|
'timeoutStopSeconds',
|
|
39
|
+
...(scope === 'system' ? ['user', 'group'] : []),
|
|
31
40
|
];
|
|
32
|
-
requireValue(
|
|
33
|
-
|
|
34
|
-
&& Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)) && keys.every((key) => {
|
|
41
|
+
requireValue(Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'scope', 'startup', 'dependencies', 'install'].includes(key)
|
|
42
|
+
&& Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)) && keys.every((key) => {
|
|
35
43
|
const descriptor = Object.getOwnPropertyDescriptor(options, key);
|
|
36
44
|
return descriptor && 'value' in descriptor;
|
|
37
45
|
}));
|
|
@@ -49,7 +57,9 @@ export class SystemdServiceDefinition {
|
|
|
49
57
|
Reflect.ownKeys(options.args).length === options.args.length + 1 &&
|
|
50
58
|
Array.from({ length: options.args.length }, (_, index) => Object.getOwnPropertyDescriptor(options.args, String(index)))
|
|
51
59
|
.every((descriptor) => descriptor && 'value' in descriptor && text(descriptor.value)));
|
|
52
|
-
|
|
60
|
+
if (scope === 'system') {
|
|
61
|
+
requireValue([options.user, options.group].every((value) => typeof value === 'string' && /^[a-zA-Z_][a-zA-Z0-9_-]{0,63}$/.test(value)));
|
|
62
|
+
}
|
|
53
63
|
requireValue(['no', 'on-failure', 'always'].includes(options.restart) &&
|
|
54
64
|
['mixed', 'control-group'].includes(options.killMode) &&
|
|
55
65
|
Number.isSafeInteger(options.timeoutStopSeconds) &&
|
|
@@ -59,8 +69,9 @@ export class SystemdServiceDefinition {
|
|
|
59
69
|
.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('%', '%%')
|
|
60
70
|
.replaceAll('$', () => command ? '$$' : '$') +
|
|
61
71
|
'"';
|
|
62
|
-
const relations = renderServiceRelations(options, options.unitName, options.restart, () => { throw new SystemdServiceDefinitionError(); });
|
|
72
|
+
const relations = renderServiceRelations(options, options.unitName, options.restart, scope, () => { throw new SystemdServiceDefinitionError(); });
|
|
63
73
|
this.unitName = options.unitName;
|
|
74
|
+
this.scope = scope;
|
|
64
75
|
this.content = [
|
|
65
76
|
'[Unit]',
|
|
66
77
|
`Description=${options.description.replaceAll('%', '%%')}`,
|
|
@@ -68,8 +79,7 @@ export class SystemdServiceDefinition {
|
|
|
68
79
|
'',
|
|
69
80
|
'[Service]',
|
|
70
81
|
...relations.service,
|
|
71
|
-
`User=${options.user}`,
|
|
72
|
-
`Group=${options.group}`,
|
|
82
|
+
...(scope === 'system' ? [`User=${options.user}`, `Group=${options.group}`] : []),
|
|
73
83
|
`ExecStart=${[quote(options.executable), ...options.args.map((value) => quote(value, true))].join(' ')}`,
|
|
74
84
|
// WorkingDirectory is a raw path value, not an ExecStart word list.
|
|
75
85
|
`WorkingDirectory=${options.workingDirectory.replaceAll('%', '%%')}`,
|
|
@@ -93,4 +103,4 @@ export class SystemdServiceDefinition {
|
|
|
93
103
|
Object.freeze(this);
|
|
94
104
|
}
|
|
95
105
|
}
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zeXN0ZW1kc2VydmljZWRlZmluaXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnN5c3RlbWRzZXJ2aWNlZGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxzQkFBc0IsRUFDTyxNQUFNLHlCQUF5QixDQUFDO0FBc0J0RSxNQUFNLE9BQU8sNkJBQThCLFNBQVEsS0FBSztJQUN0RDtRQUNFLEtBQUssQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxJQUFJLEdBQUcsK0JBQStCLENBQUM7SUFDOUMsQ0FBQztDQUNGO0FBRUQsOEZBQThGO0FBQzlGLE1BQU0sT0FBTyx3QkFBd0I7SUFNbkMsWUFBWSxPQUF5QztRQUNuRCxNQUFNLFlBQVksR0FBRyxDQUFDLEtBQWMsRUFBUSxFQUFFO1lBQzVDLElBQUksQ0FBQyxLQUFLO2dCQUFFLE1BQU0sSUFBSSw2QkFBNkIsRUFBRSxDQUFDO1FBQ3hELENBQUMsQ0FBQztRQUNGLFlBQVksQ0FBQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO1lBQzFELE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLEtBQUssTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3ZELE1BQU0sZUFBZSxHQUFHLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDMUUsWUFBWSxDQUFDLGVBQWUsS0FBSyxTQUFTO1lBQ3hDLGVBQWUsQ0FBQyxVQUFVLElBQUksT0FBTyxJQUFJLGVBQWUsQ0FBQyxDQUFDO1FBQzVELE1BQU0sVUFBVSxHQUFZLGVBQWUsRUFBRSxLQUFLLElBQUksUUFBUSxDQUFDO1FBQy9ELElBQUksVUFBVSxLQUFLLFFBQVEsSUFB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
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
export interface ISystemdUnitOptions {
|
|
2
2
|
unitName: string;
|
|
3
|
+
/** Defaults to the system manager. User scope addresses the calling user's manager only. */
|
|
4
|
+
scope?: 'system' | 'user';
|
|
5
|
+
/**
|
|
6
|
+
* User-manager socket directory. Defaults to a non-empty XDG_RUNTIME_DIR. May be absent at
|
|
7
|
+
* construction; every call that contacts the user manager then refuses with `invalid_options`.
|
|
8
|
+
*/
|
|
9
|
+
runtimeDirectory?: string;
|
|
3
10
|
/** Absolute executable path supplied by trusted owning code. */
|
|
4
11
|
systemctlPath?: string;
|
|
5
12
|
/** Bounds the systemctl client, not the server-side job. Defaults to 120 seconds. */
|
|
@@ -44,6 +51,11 @@ export declare class SystemdUnit {
|
|
|
44
51
|
private readonly unitName;
|
|
45
52
|
private readonly executable;
|
|
46
53
|
private readonly timeout;
|
|
54
|
+
private readonly scope;
|
|
55
|
+
private readonly runtimeDirectory?;
|
|
56
|
+
private readonly homeDirectory?;
|
|
57
|
+
private readonly configDirectory?;
|
|
58
|
+
private readonly dataDirectory?;
|
|
47
59
|
constructor(optionsArg: ISystemdUnitOptions);
|
|
48
60
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
49
61
|
inspect(): Promise<ISystemdUnitState>;
|
|
@@ -60,5 +72,6 @@ export declare class SystemdUnit {
|
|
|
60
72
|
inspectConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
61
73
|
/** Reloads unit definitions globally; does not enable, unmask, start or stop a unit. */
|
|
62
74
|
reloadConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
75
|
+
private validateUserRuntime;
|
|
63
76
|
private command;
|
|
64
77
|
}
|
|
@@ -24,11 +24,32 @@ export class SystemdUnit {
|
|
|
24
24
|
this.unitName = optionsArg?.unitName;
|
|
25
25
|
this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
|
|
26
26
|
this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
|
|
27
|
+
this.scope = optionsArg?.scope ?? 'system';
|
|
28
|
+
// An empty XDG_RUNTIME_DIR counts as unset, like the sibling XDG variables below. An explicit
|
|
29
|
+
// option is never reinterpreted, so an empty or relative option stays malformed.
|
|
30
|
+
this.runtimeDirectory = this.scope === 'user'
|
|
31
|
+
? optionsArg?.runtimeDirectory ?? (process.env.XDG_RUNTIME_DIR || undefined) : undefined;
|
|
32
|
+
this.homeDirectory = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
33
|
+
this.configDirectory = this.scope === 'user' ? process.env.XDG_CONFIG_HOME || undefined : undefined;
|
|
34
|
+
this.dataDirectory = this.scope === 'user' ? process.env.XDG_DATA_HOME || undefined : undefined;
|
|
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).
|
|
27
41
|
if (typeof this.unitName !== 'string' ||
|
|
28
42
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
29
43
|
typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
|
|
30
44
|
this.executable.includes('\0') || !Number.isSafeInteger(this.timeout) ||
|
|
31
|
-
this.timeout < 1 || this.timeout > 600000
|
|
45
|
+
this.timeout < 1 || this.timeout > 600000 ||
|
|
46
|
+
!['system', 'user'].includes(this.scope) ||
|
|
47
|
+
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
48
|
+
(this.scope === 'user' &&
|
|
49
|
+
(this.runtimeDirectory !== undefined && !safeDirectory(this.runtimeDirectory) ||
|
|
50
|
+
!safeDirectory(this.homeDirectory) ||
|
|
51
|
+
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
52
|
+
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory))))
|
|
32
53
|
throw new SystemdUnitError('invalid_options');
|
|
33
54
|
}
|
|
34
55
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
@@ -137,15 +158,43 @@ export class SystemdUnit {
|
|
|
137
158
|
await this.command(['daemon-reload']);
|
|
138
159
|
return this.inspectConfiguration();
|
|
139
160
|
}
|
|
140
|
-
|
|
161
|
+
async validateUserRuntime() {
|
|
162
|
+
if (this.scope !== 'user')
|
|
163
|
+
return;
|
|
164
|
+
// Runs before every systemctl invocation, so a missing directory refuses without side effects.
|
|
165
|
+
const runtimeDirectory = this.runtimeDirectory;
|
|
166
|
+
if (runtimeDirectory === undefined)
|
|
167
|
+
throw new SystemdUnitError('invalid_options');
|
|
168
|
+
try {
|
|
169
|
+
const uid = process.getuid?.();
|
|
170
|
+
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
171
|
+
await plugins.fs.realpath(runtimeDirectory) !== runtimeDirectory) {
|
|
172
|
+
throw new SystemdUnitError('invalid_options');
|
|
173
|
+
}
|
|
174
|
+
const info = await plugins.fs.lstat(runtimeDirectory);
|
|
175
|
+
if (!info.isDirectory() || info.isSymbolicLink() || info.uid !== uid ||
|
|
176
|
+
(info.mode & 0o077) !== 0)
|
|
177
|
+
throw new SystemdUnitError('invalid_options');
|
|
178
|
+
}
|
|
179
|
+
catch {
|
|
180
|
+
throw new SystemdUnitError('invalid_options');
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
async command(argsArg) {
|
|
184
|
+
await this.validateUserRuntime();
|
|
141
185
|
return new Promise((resolve, reject) => {
|
|
142
|
-
plugins.childProcess.execFile(this.executable, ['--system', '--no-ask-password', '--no-pager', ...argsArg], {
|
|
186
|
+
plugins.childProcess.execFile(this.executable, [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg], {
|
|
143
187
|
encoding: 'utf8',
|
|
144
188
|
timeout: this.timeout,
|
|
145
189
|
killSignal: 'SIGKILL',
|
|
146
190
|
maxBuffer: 16384,
|
|
147
191
|
windowsHide: true,
|
|
148
|
-
env:
|
|
192
|
+
env: this.scope === 'user'
|
|
193
|
+
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
194
|
+
HOME: this.homeDirectory, XDG_RUNTIME_DIR: this.runtimeDirectory,
|
|
195
|
+
...(this.configDirectory ? { XDG_CONFIG_HOME: this.configDirectory } : {}),
|
|
196
|
+
...(this.dataDirectory ? { XDG_DATA_HOME: this.dataDirectory } : {}) }
|
|
197
|
+
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
149
198
|
}, (error, stdout) => {
|
|
150
199
|
// execFile settles after the client closes. A timed-out client's remote job may continue.
|
|
151
200
|
if (error)
|
|
@@ -156,4 +205,4 @@ export class SystemdUnit {
|
|
|
156
205
|
});
|
|
157
206
|
}
|
|
158
207
|
}
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunit.js","sourceRoot":"","sources":["../ts/classes.systemdunit.ts"],"names":[],"mappings":"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"}
|
|
208
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunit.js","sourceRoot":"","sources":["../ts/classes.systemdunit.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { type ISystemdUnitOptions } from './classes.systemdunit.js';
|
|
|
3
3
|
export interface ISystemdUnitFileOptions extends ISystemdUnitOptions {
|
|
4
4
|
/** Local vendor definitions can be installed without removing an administrator's mask. */
|
|
5
5
|
unitDirectory?: string;
|
|
6
|
-
/** Trusted owning-code qualification only. Defaults to root. */
|
|
6
|
+
/** Trusted owning-code qualification only. Defaults to root for system, current uid for user. */
|
|
7
7
|
expectedUid?: number;
|
|
8
8
|
}
|
|
9
9
|
export interface ISystemdUnitFileRecord {
|
|
@@ -22,11 +22,17 @@ export declare class SystemdUnitFile {
|
|
|
22
22
|
readonly path: string;
|
|
23
23
|
private readonly directory;
|
|
24
24
|
private readonly uid;
|
|
25
|
+
private readonly scope;
|
|
26
|
+
private readonly configDirectory?;
|
|
27
|
+
private readonly runtimeDirectory?;
|
|
25
28
|
private readonly unit;
|
|
26
29
|
private readonly name;
|
|
27
30
|
private busy;
|
|
28
31
|
constructor(options: ISystemdUnitFileOptions);
|
|
29
|
-
/**
|
|
32
|
+
/**
|
|
33
|
+
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
34
|
+
* Needs no user-manager runtime directory.
|
|
35
|
+
*/
|
|
30
36
|
inspect(): Promise<ISystemdUnitFileRecord | null>;
|
|
31
37
|
/**
|
|
32
38
|
* Expected previous digest is mandatory; null admits an absent file. Exact desired bytes are idempotent.
|
|
@@ -29,16 +29,34 @@ export class SystemdUnitFile {
|
|
|
29
29
|
this.busy = false;
|
|
30
30
|
this.unit = new SystemdUnit(options);
|
|
31
31
|
this.name = options.unitName;
|
|
32
|
-
this.
|
|
33
|
-
this.
|
|
34
|
-
|
|
35
|
-
plugins.path.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
32
|
+
this.scope = options.scope ?? 'system';
|
|
33
|
+
const home = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
34
|
+
const dataDirectory = this.scope === 'user'
|
|
35
|
+
? process.env.XDG_DATA_HOME || plugins.path.join(home, '.local/share') : undefined;
|
|
36
|
+
this.configDirectory = this.scope === 'user'
|
|
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');
|
|
43
|
+
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
44
|
+
const validDirectory = (directory) => typeof directory === 'string' && directory !== '/' &&
|
|
45
|
+
plugins.path.isAbsolute(directory) && plugins.path.normalize(directory) === directory &&
|
|
46
|
+
!directory.endsWith('/') && !/[\x00-\x1f\x7f]/.test(directory) &&
|
|
47
|
+
directory.length <= 4000;
|
|
48
|
+
requireValue(validDirectory(this.directory) && Number.isSafeInteger(this.uid) && this.uid >= 0 &&
|
|
49
|
+
(this.scope === 'system' ||
|
|
50
|
+
this.uid === process.getuid?.() && validDirectory(this.configDirectory) &&
|
|
51
|
+
// inspect() reads only the unit directory, so an absent runtime directory is refused
|
|
52
|
+
// later, by install(); a supplied one must still be well formed.
|
|
53
|
+
(this.runtimeDirectory === undefined || validDirectory(this.runtimeDirectory))), 'invalid_options');
|
|
39
54
|
this.path = plugins.path.join(this.directory, this.name);
|
|
40
55
|
}
|
|
41
|
-
/**
|
|
56
|
+
/**
|
|
57
|
+
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
58
|
+
* Needs no user-manager runtime directory.
|
|
59
|
+
*/
|
|
42
60
|
async inspect() {
|
|
43
61
|
if (!await this.directories(false))
|
|
44
62
|
return null;
|
|
@@ -51,8 +69,13 @@ export class SystemdUnitFile {
|
|
|
51
69
|
*/
|
|
52
70
|
async install(definition, expectedSha256) {
|
|
53
71
|
requireValue(definition instanceof SystemdServiceDefinition && definition.unitName === this.name &&
|
|
72
|
+
definition.scope === this.scope &&
|
|
54
73
|
(expectedSha256 === null ||
|
|
55
|
-
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256))
|
|
74
|
+
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256)) &&
|
|
75
|
+
// Installation admits, reloads and verifies through the user manager and recognizes its
|
|
76
|
+
// runtime mask path. Refusing here, before the busy latch and any directory or systemctl
|
|
77
|
+
// effect, keeps the local error code instead of a wrapped write_failed.
|
|
78
|
+
(this.scope === 'system' || this.runtimeDirectory !== undefined), 'invalid_options');
|
|
56
79
|
requireValue(!this.busy, 'busy');
|
|
57
80
|
this.busy = true;
|
|
58
81
|
let temporary;
|
|
@@ -138,11 +161,15 @@ export class SystemdUnitFile {
|
|
|
138
161
|
['enabled', 'enabled-runtime', 'disabled'].includes(state.unitFileState) ||
|
|
139
162
|
state.loadState === 'not-found' && state.unitFileState === ''), 'unsafe_unit');
|
|
140
163
|
const configuration = await this.unit.inspectConfiguration();
|
|
141
|
-
const
|
|
164
|
+
const maskPaths = this.scope === 'system'
|
|
165
|
+
? [plugins.path.join(state.unitFileState === 'masked-runtime' ? '/run/systemd/system' : '/etc/systemd/system', this.name)]
|
|
166
|
+
: (state.unitFileState === 'masked-runtime'
|
|
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)));
|
|
142
169
|
requireValue(!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
143
170
|
(masked(state)
|
|
144
171
|
? configuration.fragmentPath !== this.path &&
|
|
145
|
-
['/dev/null',
|
|
172
|
+
['/dev/null', ...maskPaths].includes(configuration.fragmentPath)
|
|
146
173
|
: configuration.fragmentPath === (state.loadState === 'not-found' ? '' : this.path)), 'unsafe_unit');
|
|
147
174
|
return configuration;
|
|
148
175
|
}
|
|
@@ -246,4 +273,4 @@ export class SystemdUnitFile {
|
|
|
246
273
|
}
|
|
247
274
|
}
|
|
248
275
|
}
|
|
249
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
|
|
276
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,9 @@ import * as fs from 'node:fs/promises';
|
|
|
4
4
|
import { constants as fsConstants } from 'node:fs';
|
|
5
5
|
import * as crypto from 'node:crypto';
|
|
6
6
|
import * as util from 'node:util';
|
|
7
|
+
import * as os from 'node:os';
|
|
7
8
|
export type { Stats } from 'node:fs';
|
|
8
|
-
export { path, childProcess, fs, fsConstants, crypto, util };
|
|
9
|
+
export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
9
10
|
import * as lik from '@push.rocks/lik';
|
|
10
11
|
import * as smartfm from '@push.rocks/smartfm';
|
|
11
12
|
import * as smartfs from '@push.rocks/smartfs';
|
|
@@ -5,7 +5,8 @@ import * as fs from 'node:fs/promises';
|
|
|
5
5
|
import { constants as fsConstants } from 'node:fs';
|
|
6
6
|
import * as crypto from 'node:crypto';
|
|
7
7
|
import * as util from 'node:util';
|
|
8
|
-
|
|
8
|
+
import * as os from 'node:os';
|
|
9
|
+
export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
9
10
|
// @pushrocks scope
|
|
10
11
|
import * as lik from '@push.rocks/lik';
|
|
11
12
|
import * as smartfm from '@push.rocks/smartfm';
|
|
@@ -17,4 +18,4 @@ import * as smartshell from '@push.rocks/smartshell';
|
|
|
17
18
|
import * as smartsystem from '@push.rocks/smartsystem';
|
|
18
19
|
export { lik, smartfm, smartfs, smartlog, smartlogDestinationLocal, smartpath, smartshell, smartsystem, };
|
|
19
20
|
// third party
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUNsQyxPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUc5QixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7QUFFakUsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssT0FBTyxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLHdCQUF3QixNQUFNLHdDQUF3QyxDQUFDO0FBQ25GLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFDTCxHQUFHLEVBQ0gsT0FBTyxFQUNQLE9BQU8sRUFDUCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxHQUNaLENBQUM7QUFFRixjQUFjIn0=
|
|
@@ -3,7 +3,7 @@ export interface ISystemdServiceStartup {
|
|
|
3
3
|
remainAfterExit: boolean;
|
|
4
4
|
timeoutStartSeconds: number;
|
|
5
5
|
}
|
|
6
|
-
/** Complete literal relations. After=local-fs.target
|
|
6
|
+
/** Complete literal relations. System services always retain After=local-fs.target. */
|
|
7
7
|
export interface ISystemdServiceDependencies {
|
|
8
8
|
defaultDependencies: boolean;
|
|
9
9
|
after: readonly string[];
|
|
@@ -22,7 +22,7 @@ export declare const renderServiceRelations: (options: {
|
|
|
22
22
|
startup?: ISystemdServiceStartup;
|
|
23
23
|
dependencies?: ISystemdServiceDependencies;
|
|
24
24
|
install?: ISystemdServiceInstallTargets;
|
|
25
|
-
}, unitName: string, restart: string, fail: () => never) => {
|
|
25
|
+
}, unitName: string, restart: string, scope: "system" | "user", fail: () => never) => {
|
|
26
26
|
unit: string[];
|
|
27
27
|
service: string[];
|
|
28
28
|
install: string[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './smartdaemon.plugins.js';
|
|
2
2
|
/** Internal validated renderer; no systemd/process/filesystem effects. */
|
|
3
|
-
export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
3
|
+
export const renderServiceRelations = (options, unitName, restart, scope, fail) => {
|
|
4
4
|
const requireValue = (value) => { if (!value)
|
|
5
5
|
fail(); };
|
|
6
6
|
const record = (value, keys) => {
|
|
@@ -27,7 +27,11 @@ export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
|
27
27
|
return result.sort();
|
|
28
28
|
};
|
|
29
29
|
const line = (key, value) => value.length ? [`${key}=${value.join(' ')}`] : [];
|
|
30
|
-
const result = {
|
|
30
|
+
const result = {
|
|
31
|
+
unit: scope === 'system' ? ['After=local-fs.target'] : [],
|
|
32
|
+
service: ['Type=exec'],
|
|
33
|
+
install: [scope === 'system' ? 'WantedBy=multi-user.target' : 'WantedBy=default.target'],
|
|
34
|
+
};
|
|
31
35
|
if (options.startup !== undefined) {
|
|
32
36
|
const value = options.startup;
|
|
33
37
|
record(value, ['type', 'remainAfterExit', 'timeoutStartSeconds']);
|
|
@@ -39,7 +43,7 @@ export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
|
39
43
|
const value = options.dependencies;
|
|
40
44
|
record(value, ['defaultDependencies', 'after', 'before', 'requires', 'wants', 'conflicts']);
|
|
41
45
|
requireValue(typeof value.defaultDependencies === 'boolean');
|
|
42
|
-
const after = [...new Set(['local-fs.target', ...units(value.after)])].sort();
|
|
46
|
+
const after = [...new Set([...(scope === 'system' ? ['local-fs.target'] : []), ...units(value.after)])].sort();
|
|
43
47
|
const before = units(value.before), requires = units(value.requires), wants = units(value.wants), conflicts = units(value.conflicts);
|
|
44
48
|
requireValue(before.every(item => !after.includes(item)) && conflicts.every(item => !requires.includes(item) && !wants.includes(item)));
|
|
45
49
|
result.unit = [`DefaultDependencies=${value.defaultDependencies ? 'yes' : 'no'}`, ...line('After', after),
|
|
@@ -54,4 +58,4 @@ export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
|
54
58
|
}
|
|
55
59
|
return result;
|
|
56
60
|
};
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3lzdGVtZC5kZWZpbml0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc3lzdGVtZC5kZWZpbml0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUF3QnBELDBFQUEwRTtBQUMxRSxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLE9BSXRDLEVBQUUsUUFBZ0IsRUFBRSxPQUFlLEVBQUUsS0FBd0IsRUFBRSxJQUFpQixFQUUvRSxFQUFFO0lBQ0YsTUFBTSxZQUFZLEdBQUcsQ0FBQyxLQUFjLEVBQVEsRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLO1FBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkUsTUFBTSxNQUFNLEdBQUcsQ0FBQyxLQUFjLEVBQUUsSUFBdUIsRUFBUSxFQUFFO1FBQy9ELFlBQVksQ0FBQyxLQUFLLEtBQUssSUFBSSxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7ZUFDekYsTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsS0FBSyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDeEQsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFlLENBQUMsQ0FBQztRQUNoRCxZQUFZLENBQUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxJQUFJLENBQUMsTUFBTSxJQUFJLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEdBQUcsS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUM7ZUFDMUcsTUFBTSxDQUFDLHdCQUF3QixDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRSxVQUFVLElBQUksT0FBTyxJQUFJLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzVILENBQUMsQ0FBQztJQUNGLE1BQU0sS0FBSyxHQUFHLENBQUMsS0FBd0IsRUFBWSxFQUFFO1FBQ25ELFlBQVksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztlQUNsRSxNQUFNLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxLQUFLLEtBQUssQ0FBQyxTQUFTLElBQUksS0FBSyxDQUFDLE1BQU0sSUFBSSxFQUFFO2VBQ3RFLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxLQUFLLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDekQsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO1FBQzVCLEtBQUssSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEtBQUssR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUM7WUFDbEQsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLHdCQUF3QixDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUN6RSxZQUFZLENBQUMsVUFBVSxFQUFFLFVBQVUsSUFBSSxPQUFPLElBQUksVUFBVSxDQUFDLENBQUM7WUFDOUQsTUFBTSxJQUFJLEdBQUcsVUFBVyxDQUFDLEtBQUssQ0FBQztZQUMvQixZQUFZLENBQUMsT0FBTyxJQUFJLEtBQUssUUFBUSxJQUFJLElBQUksS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLE1BQU0sSUFBSSxHQUFHO21CQUMzRSxnSEFBZ0gsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUNsSSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BCLENBQUM7UUFDRCxZQUFZLENBQUMsSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNyRCxPQUFPLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN2QixDQUFDLENBQUM7SUFDRixNQUFNLElBQUksR0FBRyxDQUFDLEdBQVcsRUFBRSxLQUF3QixFQUFZLEVBQUUsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsR0FBRyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFDcEgsTUFBTSxNQUFNLEdBQUc7UUFDYixJQUFJLEVBQUUsS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFjO1FBQ3JFLE9BQU8sRUFBRSxDQUFDLFdBQVcsQ0FBQztRQUN0QixPQUFPLEVBQUUsQ0FBQyxLQUFLLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDLENBQUMseUJBQXlCLENBQUM7S0FDekYsQ0FBQztJQUNGLElBQUksT0FBTyxDQUFDLE9BQU8sS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUNsQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDO1FBQzlCLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEVBQUUscUJBQXFCLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLFlBQVksQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLFNBQVMsSUFBSSxPQUFPLEtBQUssQ0FBQyxlQUFlLEtBQUssU0FBUyxJQUFJLE9BQU8sS0FBSyxRQUFRO2VBQ3RHLE1BQU0sQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLElBQUksS0FBSyxDQUFDLG1CQUFtQixJQUFJLENBQUMsSUFBSSxLQUFLLENBQUMsbUJBQW1CLElBQUksR0FBRyxDQUFDLENBQUM7UUFDNUgsTUFBTSxDQUFDLE9BQU8sR0FBRyxDQUFDLGNBQWMsRUFBRSxtQkFBbUIsS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxtQkFBbUIsS0FBSyxDQUFDLG1CQUFtQixHQUFHLENBQUMsQ0FBQztJQUNoSixDQUFDO0lBQ0QsSUFBSSxPQUFPLENBQUMsWUFBWSxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ3ZDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUM7UUFDbkMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDO1FBQzVGLFlBQVksQ0FBQyxPQUFPLEtBQUssQ0FBQyxtQkFBbUIsS0FBSyxTQUFTLENBQUMsQ0FBQztRQUM3RCxNQUFNLEtBQUssR0FBRyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDL0csTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxRQUFRLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsRUFBRSxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNySSxZQUFZLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN4SSxNQUFNLENBQUMsSUFBSSxHQUFHLENBQUMsdUJBQXVCLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDO1lBQ3ZHLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQ3hILENBQUM7SUFDRCxJQUFJLE9BQU8sQ0FBQyxPQUFPLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDbEMsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQztRQUM5QixNQUFNLENBQUMsS0FBSyxFQUFFLENBQUMsVUFBVSxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7UUFDMUMsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsRUFBRSxRQUFRLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN6RSxZQUFZLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxRQUFRLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNwRyxNQUFNLENBQUMsT0FBTyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartdaemon",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.1",
|
|
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
|
@@ -164,6 +164,10 @@ const unit = new SystemdUnit({ unitName: 'smartdaemon_my-api-server.service' });
|
|
|
164
164
|
const state = await unit.inspect();
|
|
165
165
|
console.log(state.loadState, state.activeState, state.unitFileState);
|
|
166
166
|
|
|
167
|
+
// Address the calling user's manager when running as that user.
|
|
168
|
+
const userUnit = new SystemdUnit({ unitName: 'authswitch.service', scope: 'user' });
|
|
169
|
+
const userState = await userUnit.inspect();
|
|
170
|
+
|
|
167
171
|
// Application code decides whether stopping or restarting is appropriate.
|
|
168
172
|
// await unit.stop();
|
|
169
173
|
// await unit.start();
|
|
@@ -185,6 +189,17 @@ Calls use an absolute `systemctlPath` (default `/usr/bin/systemctl`), a clean
|
|
|
185
189
|
environment, no shell or password prompt, and bounded output. Trusted owning code
|
|
186
190
|
can choose another absolute executable path and `commandTimeoutMs` (default
|
|
187
191
|
120000, maximum 600000). This timeout bounds the client process only.
|
|
192
|
+
The default `scope: 'system'` retains system-manager behavior. `scope: 'user'`
|
|
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
|
|
196
|
+
valid XDG config/data roots to the command. The directory is checked again before
|
|
197
|
+
each call; a missing, replaced, linked or group-accessible runtime directory fails
|
|
198
|
+
with `invalid_options` before contacting systemd. Construction itself does not
|
|
199
|
+
require one, so a unit can be constructed without a login session (cron, a plain
|
|
200
|
+
ssh command); an empty `XDG_RUNTIME_DIR` counts as unset. A supplied directory, from
|
|
201
|
+
the option or a non-empty `XDG_RUNTIME_DIR`, that is not an absolute, normalized path
|
|
202
|
+
without a trailing slash is still rejected at construction.
|
|
188
203
|
|
|
189
204
|
`inspectConfiguration()` reports the selected `fragmentPath`, opaque `dropInPaths`
|
|
190
205
|
list and `needsReload` flag. `reloadConfiguration()` explicitly reloads the manager's
|
|
@@ -211,7 +226,9 @@ drop-ins and `needsReload === false` before permitting dependent activation.
|
|
|
211
226
|
### Installing a direct systemd service definition
|
|
212
227
|
|
|
213
228
|
`SystemdServiceDefinition` encodes a literal executable and argument list, with
|
|
214
|
-
explicit
|
|
229
|
+
explicit restart policy, kill mode and stop timeout. System-scope definitions require
|
|
230
|
+
`user` and `group`; user-scope definitions reject both directives because the user
|
|
231
|
+
manager already runs under the calling identity. It defaults to `Type=exec`,
|
|
215
232
|
journal output and null stdin. It introduces no shell; percent specifiers and
|
|
216
233
|
argument environment expansion are escaped. Paths must be absolute and normalized;
|
|
217
234
|
control characters are rejected. Descriptions and working directories cannot have
|
|
@@ -240,6 +257,45 @@ const installed = await file.install(definition, previous?.sha256 ?? null);
|
|
|
240
257
|
console.log(installed.changed, installed.masked, installed.record.sha256);
|
|
241
258
|
```
|
|
242
259
|
|
|
260
|
+
For a user service, give the definition and installer the same scope:
|
|
261
|
+
|
|
262
|
+
```typescript
|
|
263
|
+
const userDefinition = new SystemdServiceDefinition({
|
|
264
|
+
scope: 'user',
|
|
265
|
+
unitName: 'authswitch.service',
|
|
266
|
+
description: 'Account authority',
|
|
267
|
+
executable: '/opt/authswitch/bin/authswitch',
|
|
268
|
+
args: ['daemon'],
|
|
269
|
+
workingDirectory: '/opt/authswitch',
|
|
270
|
+
restart: 'on-failure',
|
|
271
|
+
killMode: 'mixed',
|
|
272
|
+
timeoutStopSeconds: 60,
|
|
273
|
+
});
|
|
274
|
+
const userFile = new SystemdUnitFile({ scope: 'user', unitName: userDefinition.unitName });
|
|
275
|
+
const previousUserFile = await userFile.inspect();
|
|
276
|
+
await userFile.install(userDefinition, previousUserFile?.sha256 ?? null);
|
|
277
|
+
```
|
|
278
|
+
|
|
279
|
+
User definitions default to `WantedBy=default.target` and have no system-only
|
|
280
|
+
`After=local-fs.target` edge. User unit files default to
|
|
281
|
+
`$XDG_DATA_HOME/systemd/user` (or `~/.local/share/systemd/user`), below the user's
|
|
282
|
+
config directory in the unit load path. Installation and enablement use the
|
|
283
|
+
current user manager and do not escalate privileges. The installer rejects unsafe
|
|
284
|
+
ownership or group-writable path components; prepare those directories explicitly
|
|
285
|
+
before installation. It never changes the permissions of existing directories.
|
|
286
|
+
|
|
287
|
+
A user-scope `SystemdUnitFile` needs the user manager's runtime directory only for
|
|
288
|
+
`install()`, which admits, reloads and verifies through the manager. Without one,
|
|
289
|
+
`install()` rejects with `invalid_options` before touching any directory or running
|
|
290
|
+
`systemctl`. Construction and `inspect()` read only the unit directory and work
|
|
291
|
+
without it, so an owner can ask whether its definition is installed from a context
|
|
292
|
+
without a login session:
|
|
293
|
+
|
|
294
|
+
```typescript
|
|
295
|
+
// Resolves to null when the file is absent, or { path, sha256 } for a protected definition.
|
|
296
|
+
const installed = await new SystemdUnitFile({ scope: 'user', unitName: 'authswitch.service' }).inspect();
|
|
297
|
+
```
|
|
298
|
+
|
|
243
299
|
For a boot prerequisite that must finish before dependent services start, supply
|
|
244
300
|
`startup: { type: 'oneshot', remainAfterExit: true, timeoutStartSeconds: 120 }`.
|
|
245
301
|
Systemd waits for successful process exit; `RemainAfterExit` keeps the completed
|
|
@@ -260,7 +316,7 @@ dependencies: {
|
|
|
260
316
|
install: { wantedBy: [], requiredBy: ['network-pre.target', 'systemd-networkd.service'] },
|
|
261
317
|
```
|
|
262
318
|
|
|
263
|
-
`After=local-fs.target
|
|
319
|
+
System definitions always retain `After=local-fs.target`. Disable default dependencies only for
|
|
264
320
|
an intentionally early boot or late shutdown service. Every list is bounded to
|
|
265
321
|
32 distinct literal unit names, sorted deterministically; templates, specifiers,
|
|
266
322
|
self references and contradictory direct relationships are rejected. These local
|
|
@@ -305,17 +361,21 @@ read-only ISO. The API fixture checks enablement without implicit start, oneshot
|
|
|
305
361
|
readiness, unchanged definition/configuration, detection of a missing provider
|
|
306
362
|
link despite enabled state, exact enable retry and preservation of a mask.
|
|
307
363
|
|
|
308
|
-
Installation requires Linux,
|
|
364
|
+
Installation requires Linux, the relevant manager's user identity and a quiescent
|
|
365
|
+
exact unit with no process,
|
|
309
366
|
cgroup or job. It rejects effective drop-ins and shadowing fragments. Definitions
|
|
310
|
-
default to `/usr/local/lib/systemd/system
|
|
311
|
-
|
|
367
|
+
default to `/usr/local/lib/systemd/system` for system scope and the user's data
|
|
368
|
+
unit directory for user scope, below administrator or user configuration in the
|
|
369
|
+
load path, so existing persistent/runtime masks remain intact. Existing
|
|
312
370
|
enablement is preserved; an absent unit becomes disabled. It never enables,
|
|
313
371
|
unmasks, starts or stops a service, or invokes sudo.
|
|
314
372
|
|
|
315
|
-
Masked units may report `/dev/null` or their exact administrator mask path:
|
|
373
|
+
Masked system units may report `/dev/null` or their exact administrator mask path:
|
|
316
374
|
`/etc/systemd/system/<unit>` for a persistent mask, `/run/systemd/system/<unit>`
|
|
317
375
|
for a runtime mask. Installation preserves that exact manager-selected fragment
|
|
318
376
|
through the write and reload, and never replaces the masking fragment itself.
|
|
377
|
+
For user scope, the exact user config or runtime mask path and the global user-unit
|
|
378
|
+
mask paths are also recognized.
|
|
319
379
|
Pending manager reloads are rejected before writing; inspect and explicitly
|
|
320
380
|
reload an existing changed configuration before retrying installation.
|
|
321
381
|
|
|
@@ -329,7 +389,10 @@ the manager and checks its selected fragment and final bytes. A reload failure
|
|
|
329
389
|
leaves the new file and retained previous definition in place; recovery requires
|
|
330
390
|
inspection, never an automatic rollback. Filesystem and definition errors use
|
|
331
391
|
`SystemdUnitFileError` with a local code. Trusted qualification code can set
|
|
332
|
-
`unitDirectory`, `expectedUid` and the inherited `SystemdUnit` command options
|
|
392
|
+
`unitDirectory`, `expectedUid` and the inherited `SystemdUnit` command options;
|
|
393
|
+
user scope requires `expectedUid` to match the caller's actual uid. The manager's
|
|
394
|
+
selected fragment must match the installed file after reload, so an unrecognized
|
|
395
|
+
custom user unit path fails closed.
|
|
333
396
|
|
|
334
397
|
With `killMode: 'mixed'`, the main process owns graceful child shutdown and must
|
|
335
398
|
remain alive until its children have joined. Systemd sends SIGTERM to the main
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,14 +3,12 @@ import { renderServiceRelations, type ISystemdServiceStartup, type ISystemdServi
|
|
|
3
3
|
type ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
4
4
|
export type { ISystemdServiceStartup, ISystemdServiceDependencies, ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
interface ISystemdServiceDefinitionBaseOptions {
|
|
7
7
|
unitName: string;
|
|
8
8
|
description: string;
|
|
9
9
|
executable: string;
|
|
10
10
|
args: readonly string[];
|
|
11
11
|
workingDirectory: string;
|
|
12
|
-
user: string;
|
|
13
|
-
group: string;
|
|
14
12
|
restart: 'no' | 'on-failure' | 'always';
|
|
15
13
|
killMode: 'mixed' | 'control-group';
|
|
16
14
|
timeoutStopSeconds: number;
|
|
@@ -19,6 +17,11 @@ export interface ISystemdServiceDefinitionOptions {
|
|
|
19
17
|
install?: ISystemdServiceInstallTargets;
|
|
20
18
|
}
|
|
21
19
|
|
|
20
|
+
export type ISystemdServiceDefinitionOptions = ISystemdServiceDefinitionBaseOptions & (
|
|
21
|
+
{ scope?: 'system'; user: string; group: string } |
|
|
22
|
+
{ scope: 'user'; user?: never; group?: never }
|
|
23
|
+
);
|
|
24
|
+
|
|
22
25
|
export class SystemdServiceDefinitionError extends Error {
|
|
23
26
|
constructor() {
|
|
24
27
|
super('Invalid direct systemd service definition.');
|
|
@@ -29,6 +32,7 @@ export class SystemdServiceDefinitionError extends Error {
|
|
|
29
32
|
/** Literal direct-execution definition; never introduces a shell or environment expansion. */
|
|
30
33
|
export class SystemdServiceDefinition {
|
|
31
34
|
public readonly unitName: string;
|
|
35
|
+
public readonly scope: 'system' | 'user';
|
|
32
36
|
public readonly content: string;
|
|
33
37
|
public readonly sha256: string;
|
|
34
38
|
|
|
@@ -36,6 +40,16 @@ export class SystemdServiceDefinition {
|
|
|
36
40
|
const requireValue = (value: unknown): void => {
|
|
37
41
|
if (!value) throw new SystemdServiceDefinitionError();
|
|
38
42
|
};
|
|
43
|
+
requireValue(options && !plugins.util.types.isProxy(options) &&
|
|
44
|
+
Object.getPrototypeOf(options) === Object.prototype);
|
|
45
|
+
const scopeDescriptor = Object.getOwnPropertyDescriptor(options, 'scope');
|
|
46
|
+
requireValue(scopeDescriptor === undefined ||
|
|
47
|
+
scopeDescriptor.enumerable && 'value' in scopeDescriptor);
|
|
48
|
+
const scopeValue: unknown = scopeDescriptor?.value ?? 'system';
|
|
49
|
+
if (scopeValue !== 'system' && scopeValue !== 'user') {
|
|
50
|
+
throw new SystemdServiceDefinitionError();
|
|
51
|
+
}
|
|
52
|
+
const scope = scopeValue;
|
|
39
53
|
const text = (value: unknown, maximum = 4096): value is string =>
|
|
40
54
|
typeof value === 'string' && value.length <= maximum && !/[\x00-\x1f\x7f]/.test(value) &&
|
|
41
55
|
!/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/u.test(value);
|
|
@@ -48,15 +62,13 @@ export class SystemdServiceDefinition {
|
|
|
48
62
|
'executable',
|
|
49
63
|
'args',
|
|
50
64
|
'workingDirectory',
|
|
51
|
-
'user',
|
|
52
|
-
'group',
|
|
53
65
|
'restart',
|
|
54
66
|
'killMode',
|
|
55
67
|
'timeoutStopSeconds',
|
|
68
|
+
...(scope === 'system' ? ['user', 'group'] : []),
|
|
56
69
|
];
|
|
57
70
|
requireValue(
|
|
58
|
-
|
|
59
|
-
Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'startup', 'dependencies', 'install'].includes(key)
|
|
71
|
+
Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'scope', 'startup', 'dependencies', 'install'].includes(key)
|
|
60
72
|
&& Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)!) && keys.every((key) => {
|
|
61
73
|
const descriptor = Object.getOwnPropertyDescriptor(options, key);
|
|
62
74
|
return descriptor && 'value' in descriptor;
|
|
@@ -87,11 +99,13 @@ export class SystemdServiceDefinition {
|
|
|
87
99
|
)
|
|
88
100
|
.every((descriptor) => descriptor && 'value' in descriptor && text(descriptor.value)),
|
|
89
101
|
);
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
102
|
+
if (scope === 'system') {
|
|
103
|
+
requireValue(
|
|
104
|
+
[options.user, options.group].every((value) =>
|
|
105
|
+
typeof value === 'string' && /^[a-zA-Z_][a-zA-Z0-9_-]{0,63}$/.test(value)
|
|
106
|
+
),
|
|
107
|
+
);
|
|
108
|
+
}
|
|
95
109
|
requireValue(
|
|
96
110
|
['no', 'on-failure', 'always'].includes(options.restart) &&
|
|
97
111
|
['mixed', 'control-group'].includes(options.killMode) &&
|
|
@@ -104,8 +118,9 @@ export class SystemdServiceDefinition {
|
|
|
104
118
|
.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('%', '%%')
|
|
105
119
|
.replaceAll('$', () => command ? '$$' : '$') +
|
|
106
120
|
'"';
|
|
107
|
-
const relations = renderServiceRelations(options, options.unitName, options.restart, () => { throw new SystemdServiceDefinitionError(); });
|
|
121
|
+
const relations = renderServiceRelations(options, options.unitName, options.restart, scope, () => { throw new SystemdServiceDefinitionError(); });
|
|
108
122
|
this.unitName = options.unitName;
|
|
123
|
+
this.scope = scope;
|
|
109
124
|
this.content = [
|
|
110
125
|
'[Unit]',
|
|
111
126
|
`Description=${options.description.replaceAll('%', '%%')}`,
|
|
@@ -113,8 +128,7 @@ export class SystemdServiceDefinition {
|
|
|
113
128
|
'',
|
|
114
129
|
'[Service]',
|
|
115
130
|
...relations.service,
|
|
116
|
-
`User=${options.user}`,
|
|
117
|
-
`Group=${options.group}`,
|
|
131
|
+
...(scope === 'system' ? [`User=${options.user}`, `Group=${options.group}`] : []),
|
|
118
132
|
`ExecStart=${
|
|
119
133
|
[quote(options.executable), ...options.args.map((value) => quote(value, true))].join(' ')
|
|
120
134
|
}`,
|
|
@@ -2,6 +2,13 @@ import * as plugins from './smartdaemon.plugins.js';
|
|
|
2
2
|
|
|
3
3
|
export interface ISystemdUnitOptions {
|
|
4
4
|
unitName: string;
|
|
5
|
+
/** Defaults to the system manager. User scope addresses the calling user's manager only. */
|
|
6
|
+
scope?: 'system' | 'user';
|
|
7
|
+
/**
|
|
8
|
+
* User-manager socket directory. Defaults to a non-empty XDG_RUNTIME_DIR. May be absent at
|
|
9
|
+
* construction; every call that contacts the user manager then refuses with `invalid_options`.
|
|
10
|
+
*/
|
|
11
|
+
runtimeDirectory?: string;
|
|
5
12
|
/** Absolute executable path supplied by trusted owning code. */
|
|
6
13
|
systemctlPath?: string;
|
|
7
14
|
/** Bounds the systemctl client, not the server-side job. Defaults to 120 seconds. */
|
|
@@ -66,17 +73,44 @@ export class SystemdUnit {
|
|
|
66
73
|
private readonly unitName: string;
|
|
67
74
|
private readonly executable: string;
|
|
68
75
|
private readonly timeout: number;
|
|
76
|
+
private readonly scope: 'system' | 'user';
|
|
77
|
+
private readonly runtimeDirectory?: string;
|
|
78
|
+
private readonly homeDirectory?: string;
|
|
79
|
+
private readonly configDirectory?: string;
|
|
80
|
+
private readonly dataDirectory?: string;
|
|
69
81
|
|
|
70
82
|
constructor(optionsArg: ISystemdUnitOptions) {
|
|
71
83
|
this.unitName = optionsArg?.unitName;
|
|
72
84
|
this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
|
|
73
85
|
this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
|
|
86
|
+
this.scope = optionsArg?.scope ?? 'system';
|
|
87
|
+
// An empty XDG_RUNTIME_DIR counts as unset, like the sibling XDG variables below. An explicit
|
|
88
|
+
// option is never reinterpreted, so an empty or relative option stays malformed.
|
|
89
|
+
this.runtimeDirectory = this.scope === 'user'
|
|
90
|
+
? optionsArg?.runtimeDirectory ?? (process.env.XDG_RUNTIME_DIR || undefined) : undefined;
|
|
91
|
+
this.homeDirectory = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
92
|
+
this.configDirectory = this.scope === 'user' ? process.env.XDG_CONFIG_HOME || undefined : undefined;
|
|
93
|
+
this.dataDirectory = this.scope === 'user' ? process.env.XDG_DATA_HOME || undefined : undefined;
|
|
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).
|
|
74
101
|
if (
|
|
75
102
|
typeof this.unitName !== 'string' ||
|
|
76
103
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
77
104
|
typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
|
|
78
105
|
this.executable.includes('\0') || !Number.isSafeInteger(this.timeout) ||
|
|
79
|
-
this.timeout < 1 || this.timeout > 600000
|
|
106
|
+
this.timeout < 1 || this.timeout > 600000 ||
|
|
107
|
+
!['system', 'user'].includes(this.scope) ||
|
|
108
|
+
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
109
|
+
(this.scope === 'user' &&
|
|
110
|
+
(this.runtimeDirectory !== undefined && !safeDirectory(this.runtimeDirectory) ||
|
|
111
|
+
!safeDirectory(this.homeDirectory) ||
|
|
112
|
+
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
113
|
+
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory)))
|
|
80
114
|
) throw new SystemdUnitError('invalid_options');
|
|
81
115
|
}
|
|
82
116
|
|
|
@@ -193,18 +227,43 @@ export class SystemdUnit {
|
|
|
193
227
|
return this.inspectConfiguration();
|
|
194
228
|
}
|
|
195
229
|
|
|
196
|
-
private
|
|
230
|
+
private async validateUserRuntime(): Promise<void> {
|
|
231
|
+
if (this.scope !== 'user') return;
|
|
232
|
+
// Runs before every systemctl invocation, so a missing directory refuses without side effects.
|
|
233
|
+
const runtimeDirectory = this.runtimeDirectory;
|
|
234
|
+
if (runtimeDirectory === undefined) throw new SystemdUnitError('invalid_options');
|
|
235
|
+
try {
|
|
236
|
+
const uid = process.getuid?.();
|
|
237
|
+
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
238
|
+
await plugins.fs.realpath(runtimeDirectory) !== runtimeDirectory) {
|
|
239
|
+
throw new SystemdUnitError('invalid_options');
|
|
240
|
+
}
|
|
241
|
+
const info = await plugins.fs.lstat(runtimeDirectory);
|
|
242
|
+
if (!info.isDirectory() || info.isSymbolicLink() || info.uid !== uid ||
|
|
243
|
+
(info.mode & 0o077) !== 0) throw new SystemdUnitError('invalid_options');
|
|
244
|
+
} catch {
|
|
245
|
+
throw new SystemdUnitError('invalid_options');
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
private async command(argsArg: string[]): Promise<string> {
|
|
250
|
+
await this.validateUserRuntime();
|
|
197
251
|
return new Promise((resolve, reject) => {
|
|
198
252
|
plugins.childProcess.execFile(
|
|
199
253
|
this.executable,
|
|
200
|
-
['--system', '--no-ask-password', '--no-pager', ...argsArg],
|
|
254
|
+
[this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg],
|
|
201
255
|
{
|
|
202
256
|
encoding: 'utf8',
|
|
203
257
|
timeout: this.timeout,
|
|
204
258
|
killSignal: 'SIGKILL',
|
|
205
259
|
maxBuffer: 16384,
|
|
206
260
|
windowsHide: true,
|
|
207
|
-
env:
|
|
261
|
+
env: this.scope === 'user'
|
|
262
|
+
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
263
|
+
HOME: this.homeDirectory!, XDG_RUNTIME_DIR: this.runtimeDirectory!,
|
|
264
|
+
...(this.configDirectory ? { XDG_CONFIG_HOME: this.configDirectory } : {}),
|
|
265
|
+
...(this.dataDirectory ? { XDG_DATA_HOME: this.dataDirectory } : {}) }
|
|
266
|
+
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
208
267
|
},
|
|
209
268
|
(error, stdout) => {
|
|
210
269
|
// execFile settles after the client closes. A timed-out client's remote job may continue.
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
export interface ISystemdUnitFileOptions extends ISystemdUnitOptions {
|
|
11
11
|
/** Local vendor definitions can be installed without removing an administrator's mask. */
|
|
12
12
|
unitDirectory?: string;
|
|
13
|
-
/** Trusted owning-code qualification only. Defaults to root. */
|
|
13
|
+
/** Trusted owning-code qualification only. Defaults to root for system, current uid for user. */
|
|
14
14
|
expectedUid?: number;
|
|
15
15
|
}
|
|
16
16
|
export interface ISystemdUnitFileRecord {
|
|
@@ -56,6 +56,9 @@ export class SystemdUnitFile {
|
|
|
56
56
|
public readonly path: string;
|
|
57
57
|
private readonly directory: string;
|
|
58
58
|
private readonly uid: number;
|
|
59
|
+
private readonly scope: 'system' | 'user';
|
|
60
|
+
private readonly configDirectory?: string;
|
|
61
|
+
private readonly runtimeDirectory?: string;
|
|
59
62
|
private readonly unit: SystemdUnit;
|
|
60
63
|
private readonly name: string;
|
|
61
64
|
private busy = false;
|
|
@@ -63,20 +66,39 @@ export class SystemdUnitFile {
|
|
|
63
66
|
constructor(options: ISystemdUnitFileOptions) {
|
|
64
67
|
this.unit = new SystemdUnit(options);
|
|
65
68
|
this.name = options.unitName;
|
|
66
|
-
this.
|
|
67
|
-
this.
|
|
69
|
+
this.scope = options.scope ?? 'system';
|
|
70
|
+
const home = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
71
|
+
const dataDirectory = this.scope === 'user'
|
|
72
|
+
? process.env.XDG_DATA_HOME || plugins.path.join(home!, '.local/share') : undefined;
|
|
73
|
+
this.configDirectory = this.scope === 'user'
|
|
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');
|
|
80
|
+
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
81
|
+
const validDirectory = (directory: unknown): directory is string =>
|
|
82
|
+
typeof directory === 'string' && directory !== '/' &&
|
|
83
|
+
plugins.path.isAbsolute(directory) && plugins.path.normalize(directory) === directory &&
|
|
84
|
+
!directory.endsWith('/') && !/[\x00-\x1f\x7f]/.test(directory) &&
|
|
85
|
+
directory.length <= 4000;
|
|
68
86
|
requireValue(
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
87
|
+
validDirectory(this.directory) && Number.isSafeInteger(this.uid) && this.uid >= 0 &&
|
|
88
|
+
(this.scope === 'system' ||
|
|
89
|
+
this.uid === process.getuid?.() && validDirectory(this.configDirectory) &&
|
|
90
|
+
// inspect() reads only the unit directory, so an absent runtime directory is refused
|
|
91
|
+
// later, by install(); a supplied one must still be well formed.
|
|
92
|
+
(this.runtimeDirectory === undefined || validDirectory(this.runtimeDirectory))),
|
|
74
93
|
'invalid_options',
|
|
75
94
|
);
|
|
76
95
|
this.path = plugins.path.join(this.directory, this.name);
|
|
77
96
|
}
|
|
78
97
|
|
|
79
|
-
/**
|
|
98
|
+
/**
|
|
99
|
+
* Reads only the exact protected definition; no systemd or filesystem mutation.
|
|
100
|
+
* Needs no user-manager runtime directory.
|
|
101
|
+
*/
|
|
80
102
|
public async inspect(): Promise<ISystemdUnitFileRecord | null> {
|
|
81
103
|
if (!await this.directories(false)) return null;
|
|
82
104
|
const file = await this.read(this.path);
|
|
@@ -93,8 +115,13 @@ export class SystemdUnitFile {
|
|
|
93
115
|
): Promise<Readonly<{ changed: boolean; record: ISystemdUnitFileRecord; masked: boolean }>> {
|
|
94
116
|
requireValue(
|
|
95
117
|
definition instanceof SystemdServiceDefinition && definition.unitName === this.name &&
|
|
118
|
+
definition.scope === this.scope &&
|
|
96
119
|
(expectedSha256 === null ||
|
|
97
|
-
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256))
|
|
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),
|
|
98
125
|
'invalid_options',
|
|
99
126
|
);
|
|
100
127
|
requireValue(!this.busy, 'busy');
|
|
@@ -196,15 +223,19 @@ export class SystemdUnitFile {
|
|
|
196
223
|
'unsafe_unit',
|
|
197
224
|
);
|
|
198
225
|
const configuration = await this.unit.inspectConfiguration();
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
226
|
+
const maskPaths = this.scope === 'system'
|
|
227
|
+
? [plugins.path.join(
|
|
228
|
+
state.unitFileState === 'masked-runtime' ? '/run/systemd/system' : '/etc/systemd/system',
|
|
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)));
|
|
203
234
|
requireValue(
|
|
204
235
|
!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
205
236
|
(masked(state)
|
|
206
237
|
? configuration.fragmentPath !== this.path &&
|
|
207
|
-
['/dev/null',
|
|
238
|
+
['/dev/null', ...maskPaths].includes(configuration.fragmentPath)
|
|
208
239
|
: configuration.fragmentPath === (state.loadState === 'not-found' ? '' : this.path)),
|
|
209
240
|
'unsafe_unit',
|
|
210
241
|
);
|
|
@@ -5,9 +5,10 @@ import * as fs from 'node:fs/promises';
|
|
|
5
5
|
import { constants as fsConstants } from 'node:fs';
|
|
6
6
|
import * as crypto from 'node:crypto';
|
|
7
7
|
import * as util from 'node:util';
|
|
8
|
+
import * as os from 'node:os';
|
|
8
9
|
export type { Stats } from 'node:fs';
|
|
9
10
|
|
|
10
|
-
export { path, childProcess, fs, fsConstants, crypto, util };
|
|
11
|
+
export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
11
12
|
|
|
12
13
|
// @pushrocks scope
|
|
13
14
|
import * as lik from '@push.rocks/lik';
|
package/ts/systemd.definition.ts
CHANGED
|
@@ -6,7 +6,7 @@ export interface ISystemdServiceStartup {
|
|
|
6
6
|
timeoutStartSeconds: number;
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
-
/** Complete literal relations. After=local-fs.target
|
|
9
|
+
/** Complete literal relations. System services always retain After=local-fs.target. */
|
|
10
10
|
export interface ISystemdServiceDependencies {
|
|
11
11
|
defaultDependencies: boolean;
|
|
12
12
|
after: readonly string[];
|
|
@@ -27,7 +27,7 @@ export const renderServiceRelations = (options: {
|
|
|
27
27
|
startup?: ISystemdServiceStartup;
|
|
28
28
|
dependencies?: ISystemdServiceDependencies;
|
|
29
29
|
install?: ISystemdServiceInstallTargets;
|
|
30
|
-
}, unitName: string, restart: string, fail: () => never): {
|
|
30
|
+
}, unitName: string, restart: string, scope: 'system' | 'user', fail: () => never): {
|
|
31
31
|
unit: string[]; service: string[]; install: string[];
|
|
32
32
|
} => {
|
|
33
33
|
const requireValue = (value: unknown): void => { if (!value) fail(); };
|
|
@@ -55,7 +55,11 @@ export const renderServiceRelations = (options: {
|
|
|
55
55
|
return result.sort();
|
|
56
56
|
};
|
|
57
57
|
const line = (key: string, value: readonly string[]): string[] => value.length ? [`${key}=${value.join(' ')}`] : [];
|
|
58
|
-
const result = {
|
|
58
|
+
const result = {
|
|
59
|
+
unit: scope === 'system' ? ['After=local-fs.target'] : [] as string[],
|
|
60
|
+
service: ['Type=exec'],
|
|
61
|
+
install: [scope === 'system' ? 'WantedBy=multi-user.target' : 'WantedBy=default.target'],
|
|
62
|
+
};
|
|
59
63
|
if (options.startup !== undefined) {
|
|
60
64
|
const value = options.startup;
|
|
61
65
|
record(value, ['type', 'remainAfterExit', 'timeoutStartSeconds']);
|
|
@@ -67,7 +71,7 @@ export const renderServiceRelations = (options: {
|
|
|
67
71
|
const value = options.dependencies;
|
|
68
72
|
record(value, ['defaultDependencies', 'after', 'before', 'requires', 'wants', 'conflicts']);
|
|
69
73
|
requireValue(typeof value.defaultDependencies === 'boolean');
|
|
70
|
-
const after = [...new Set(['local-fs.target', ...units(value.after)])].sort();
|
|
74
|
+
const after = [...new Set([...(scope === 'system' ? ['local-fs.target'] : []), ...units(value.after)])].sort();
|
|
71
75
|
const before = units(value.before), requires = units(value.requires), wants = units(value.wants), conflicts = units(value.conflicts);
|
|
72
76
|
requireValue(before.every(item => !after.includes(item)) && conflicts.every(item => !requires.includes(item) && !wants.includes(item)));
|
|
73
77
|
result.unit = [`DefaultDependencies=${value.defaultDependencies ? 'yes' : 'no'}`, ...line('After', after),
|