@push.rocks/smartdaemon 2.22.0 → 3.0.0
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 +2 -2
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/smartdaemon.classes.commanderror.d.ts +25 -0
- package/dist_ts/smartdaemon.classes.commanderror.js +27 -0
- package/dist_ts/smartdaemon.classes.systemdmanager.d.ts +12 -0
- package/dist_ts/smartdaemon.classes.systemdmanager.js +63 -30
- package/dist_ts/smartdaemon.plugins.d.ts +1 -3
- package/dist_ts/smartdaemon.plugins.js +2 -4
- package/package.json +3 -4
- package/readme.md +17 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +1 -0
- package/ts/smartdaemon.classes.commanderror.ts +23 -0
- package/ts/smartdaemon.classes.systemdmanager.ts +78 -34
- package/ts/smartdaemon.plugins.ts +0 -4
- package/dist_ts/smartdamon.logging.d.ts +0 -2
- package/dist_ts/smartdamon.logging.js +0 -14
- package/ts/smartdamon.logging.ts +0 -15
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdaemon',
|
|
6
|
-
version: '
|
|
6
|
+
version: '3.0.0',
|
|
7
7
|
description: 'Start scripts as long running daemons and manage them.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
|
package/dist_ts/index.d.ts
CHANGED
package/dist_ts/index.js
CHANGED
|
@@ -4,4 +4,5 @@ export * from './classes.systemdunit.js';
|
|
|
4
4
|
export * from './classes.systemdservicedefinition.js';
|
|
5
5
|
export * from './classes.systemdunitfile.js';
|
|
6
6
|
export * from './classes.systemdtransientscope.js';
|
|
7
|
-
|
|
7
|
+
export * from './smartdaemon.classes.commanderror.js';
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLHVDQUF1QyxDQUFDO0FBQ3RELGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxvQ0FBb0MsQ0FBQztBQUNuRCxjQUFjLHVDQUF1QyxDQUFDIn0=
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A privileged command run by `SmartDaemon` (through `systemdManager.execute()`) did not exit 0.
|
|
3
|
+
* The exit status alone decides failure; `stderr` carries what the command or sudo reported.
|
|
4
|
+
*/
|
|
5
|
+
export declare class SmartDaemonCommandError extends Error {
|
|
6
|
+
/** The command as run, including any `sudo` prefix. It never contains the sudo password. */
|
|
7
|
+
readonly command: string;
|
|
8
|
+
/** The exit code; `1` when a signal ended the command. */
|
|
9
|
+
readonly exitCode: number;
|
|
10
|
+
/** The signal that ended the command, if one did. */
|
|
11
|
+
readonly signal: NodeJS.Signals | undefined;
|
|
12
|
+
/** The command's standard error, as captured. */
|
|
13
|
+
readonly stderr: string;
|
|
14
|
+
constructor(
|
|
15
|
+
/** The command as run, including any `sudo` prefix. It never contains the sudo password. */
|
|
16
|
+
command: string,
|
|
17
|
+
/** The exit code; `1` when a signal ended the command. */
|
|
18
|
+
exitCode: number,
|
|
19
|
+
/** The signal that ended the command, if one did. */
|
|
20
|
+
signal: NodeJS.Signals | undefined,
|
|
21
|
+
/** The command's standard error, as captured. */
|
|
22
|
+
stderr: string,
|
|
23
|
+
/** `cause`: the stdin write error when sudo exited before reading the password. */
|
|
24
|
+
options?: ErrorOptions);
|
|
25
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A privileged command run by `SmartDaemon` (through `systemdManager.execute()`) did not exit 0.
|
|
3
|
+
* The exit status alone decides failure; `stderr` carries what the command or sudo reported.
|
|
4
|
+
*/
|
|
5
|
+
export class SmartDaemonCommandError extends Error {
|
|
6
|
+
constructor(
|
|
7
|
+
/** The command as run, including any `sudo` prefix. It never contains the sudo password. */
|
|
8
|
+
command,
|
|
9
|
+
/** The exit code; `1` when a signal ended the command. */
|
|
10
|
+
exitCode,
|
|
11
|
+
/** The signal that ended the command, if one did. */
|
|
12
|
+
signal,
|
|
13
|
+
/** The command's standard error, as captured. */
|
|
14
|
+
stderr,
|
|
15
|
+
/** `cause`: the stdin write error when sudo exited before reading the password. */
|
|
16
|
+
options) {
|
|
17
|
+
const reason = signal ? `was terminated by signal ${signal}` : `exited with code ${exitCode}`;
|
|
18
|
+
const detail = stderr.trim();
|
|
19
|
+
super(`Command "${command}" ${reason}${detail ? `: ${detail}` : '.'}`, options);
|
|
20
|
+
this.command = command;
|
|
21
|
+
this.exitCode = exitCode;
|
|
22
|
+
this.signal = signal;
|
|
23
|
+
this.stderr = stderr;
|
|
24
|
+
this.name = 'SmartDaemonCommandError';
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24uY2xhc3Nlcy5jb21tYW5kZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhZW1vbi5jbGFzc2VzLmNvbW1hbmRlcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sdUJBQXdCLFNBQVEsS0FBSztJQUNoRDtJQUNFLDRGQUE0RjtJQUM1RSxPQUFlO0lBQy9CLDBEQUEwRDtJQUMxQyxRQUFnQjtJQUNoQyxxREFBcUQ7SUFDckMsTUFBa0M7SUFDbEQsaURBQWlEO0lBQ2pDLE1BQWM7SUFDOUIsbUZBQW1GO0lBQ25GLE9BQXNCO1FBRXRCLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsNEJBQTRCLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxvQkFBb0IsUUFBUSxFQUFFLENBQUM7UUFDOUYsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQzdCLEtBQUssQ0FBQyxZQUFZLE9BQU8sS0FBSyxNQUFNLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQzt1QkFaaEUsT0FBTzt3QkFFUCxRQUFRO3NCQUVSLE1BQU07c0JBRU4sTUFBTTtRQU90QixJQUFJLENBQUMsSUFBSSxHQUFHLHlCQUF5QixDQUFDO0lBQ3hDLENBQUM7Q0FDRiJ9
|
|
@@ -10,12 +10,24 @@ export declare class SmartDaemonSystemdManager {
|
|
|
10
10
|
smartshellInstance: plugins.smartshell.Smartshell;
|
|
11
11
|
smartFs: plugins.smartfs.SmartFs;
|
|
12
12
|
shouldExecute: boolean;
|
|
13
|
+
/** Whether this process runs as root; set by the first privileged operation's check. */
|
|
13
14
|
isRoot: boolean;
|
|
14
15
|
sudoPassword?: string;
|
|
16
|
+
private rootStatus?;
|
|
15
17
|
constructor(smartdaemonRefArg: SmartDaemon, sudoPasswordArg?: string);
|
|
16
18
|
private checkIsRoot;
|
|
19
|
+
/** Checks once whether this process runs as root and sets `isRoot`; later calls reuse that check. */
|
|
20
|
+
private ensureRootStatus;
|
|
17
21
|
checkElegibility(): Promise<boolean>;
|
|
22
|
+
/**
|
|
23
|
+
* Runs a command, through sudo when this process is not root and the command does not start with
|
|
24
|
+
* `sudo` already. With a `sudoPassword`, sudo reads it from standard input (`sudo -k -S -p ''`):
|
|
25
|
+
* it never reaches argv, the environment or a terminal. Rejects with `SmartDaemonCommandError`
|
|
26
|
+
* when the command does not exit 0.
|
|
27
|
+
*/
|
|
18
28
|
execute(commandArg: string): Promise<plugins.smartshell.IExecResult | undefined>;
|
|
29
|
+
private runChecked;
|
|
30
|
+
private assertSucceeded;
|
|
19
31
|
/**
|
|
20
32
|
* gets all services that are already present
|
|
21
33
|
*/
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from './smartdaemon.plugins.js';
|
|
2
2
|
import * as paths from './smartdaemon.paths.js';
|
|
3
3
|
import { SmartDaemon } from './smartdaemon.classes.smartdaemon.js';
|
|
4
|
+
import { SmartDaemonCommandError } from './smartdaemon.classes.commanderror.js';
|
|
4
5
|
import { SmartDaemonService, } from './smartdaemon.classes.service.js';
|
|
5
6
|
export class SmartDaemonSystemdManager {
|
|
6
7
|
// STATIC
|
|
@@ -16,6 +17,7 @@ export class SmartDaemonSystemdManager {
|
|
|
16
17
|
}
|
|
17
18
|
constructor(smartdaemonRefArg, sudoPasswordArg) {
|
|
18
19
|
this.shouldExecute = false;
|
|
20
|
+
/** Whether this process runs as root; set by the first privileged operation's check. */
|
|
19
21
|
this.isRoot = false;
|
|
20
22
|
this.smartdaemonRef = smartdaemonRefArg;
|
|
21
23
|
this.smartshellInstance = new plugins.smartshell.Smartshell({
|
|
@@ -23,18 +25,27 @@ export class SmartDaemonSystemdManager {
|
|
|
23
25
|
});
|
|
24
26
|
this.smartFs = new plugins.smartfs.SmartFs(new plugins.smartfs.SmartFsProviderNode());
|
|
25
27
|
this.sudoPassword = sudoPasswordArg;
|
|
26
|
-
// Check if we're running as root
|
|
27
|
-
this.checkIsRoot().then(isRoot => {
|
|
28
|
-
this.isRoot = isRoot;
|
|
29
|
-
if (!isRoot) {
|
|
30
|
-
console.log('Not running as root. Sudo will be used for privileged operations.');
|
|
31
|
-
}
|
|
32
|
-
});
|
|
33
28
|
}
|
|
34
29
|
async checkIsRoot() {
|
|
35
30
|
const result = await this.smartshellInstance.exec('id -u');
|
|
36
31
|
return result.stdout.trim() === '0';
|
|
37
32
|
}
|
|
33
|
+
/** Checks once whether this process runs as root and sets `isRoot`; later calls reuse that check. */
|
|
34
|
+
ensureRootStatus() {
|
|
35
|
+
if (!this.rootStatus) {
|
|
36
|
+
this.rootStatus = this.checkIsRoot().then((isRoot) => {
|
|
37
|
+
this.isRoot = isRoot;
|
|
38
|
+
if (!isRoot) {
|
|
39
|
+
console.log('Not running as root. Sudo will be used for privileged operations.');
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
// A failed check is not memoized, so the next privileged operation asks again.
|
|
43
|
+
this.rootStatus.catch(() => {
|
|
44
|
+
this.rootStatus = undefined;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
return this.rootStatus;
|
|
48
|
+
}
|
|
38
49
|
async checkElegibility() {
|
|
39
50
|
if (plugins.os.platform() === 'linux') {
|
|
40
51
|
this.shouldExecute = true;
|
|
@@ -45,30 +56,50 @@ export class SmartDaemonSystemdManager {
|
|
|
45
56
|
}
|
|
46
57
|
return this.shouldExecute;
|
|
47
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Runs a command, through sudo when this process is not root and the command does not start with
|
|
61
|
+
* `sudo` already. With a `sudoPassword`, sudo reads it from standard input (`sudo -k -S -p ''`):
|
|
62
|
+
* it never reaches argv, the environment or a terminal. Rejects with `SmartDaemonCommandError`
|
|
63
|
+
* when the command does not exit 0.
|
|
64
|
+
*/
|
|
48
65
|
async execute(commandArg) {
|
|
49
|
-
if (await this.checkElegibility()) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
66
|
+
if (!(await this.checkElegibility())) {
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
await this.ensureRootStatus();
|
|
70
|
+
if (this.isRoot || commandArg.startsWith('sudo')) {
|
|
71
|
+
return await this.runChecked(commandArg);
|
|
72
|
+
}
|
|
73
|
+
if (!this.sudoPassword) {
|
|
74
|
+
return await this.runChecked(`sudo ${commandArg}`);
|
|
75
|
+
}
|
|
76
|
+
// -k ignores cached credentials, so sudo reads the password line whenever its policy asks for
|
|
77
|
+
// one; ending stdin right after it makes a rejected password fail instead of waiting for a retry.
|
|
78
|
+
const sudoCommand = `sudo -k -S -p '' -- ${commandArg}`;
|
|
79
|
+
const interactiveExec = await this.smartshellInstance.execInteractiveControl(sudoCommand);
|
|
80
|
+
let writeError;
|
|
81
|
+
try {
|
|
82
|
+
await interactiveExec.sendLine(this.sudoPassword);
|
|
83
|
+
}
|
|
84
|
+
catch (error) {
|
|
85
|
+
// sudo can exit before reading stdin (EPIPE); its exit status below decides the outcome.
|
|
86
|
+
writeError = error;
|
|
87
|
+
}
|
|
88
|
+
interactiveExec.endInput();
|
|
89
|
+
const result = await interactiveExec.finalPromise;
|
|
90
|
+
this.assertSucceeded(sudoCommand, result, writeError);
|
|
91
|
+
return result;
|
|
92
|
+
}
|
|
93
|
+
async runChecked(commandArg) {
|
|
94
|
+
const result = await this.smartshellInstance.exec(commandArg);
|
|
95
|
+
this.assertSucceeded(commandArg, result);
|
|
96
|
+
return result;
|
|
97
|
+
}
|
|
98
|
+
assertSucceeded(commandArg, resultArg, causeArg) {
|
|
99
|
+
if (resultArg.exitCode === 0 && !resultArg.signal) {
|
|
100
|
+
return;
|
|
71
101
|
}
|
|
102
|
+
throw new SmartDaemonCommandError(commandArg, resultArg.exitCode, resultArg.signal, resultArg.stderr, causeArg === undefined ? undefined : { cause: causeArg });
|
|
72
103
|
}
|
|
73
104
|
/**
|
|
74
105
|
* gets all services that are already present
|
|
@@ -101,6 +132,7 @@ export class SmartDaemonSystemdManager {
|
|
|
101
132
|
if (await this.checkElegibility()) {
|
|
102
133
|
const content = this.smartdaemonRef.templateManager.generateUnitFileForService(serviceArg);
|
|
103
134
|
const targetPath = SmartDaemonSystemdManager.createFilePathFromServiceName(serviceArg.name);
|
|
135
|
+
await this.ensureRootStatus();
|
|
104
136
|
if (this.isRoot) {
|
|
105
137
|
// Direct write when running as root
|
|
106
138
|
await this.smartFs.file(targetPath).encoding('utf8').mode(0o644).write(content);
|
|
@@ -117,6 +149,7 @@ export class SmartDaemonSystemdManager {
|
|
|
117
149
|
async deleteService(serviceArg) {
|
|
118
150
|
if (await this.checkElegibility()) {
|
|
119
151
|
const filePath = SmartDaemonSystemdManager.createFilePathFromServiceName(serviceArg.name);
|
|
152
|
+
await this.ensureRootStatus();
|
|
120
153
|
if (this.isRoot) {
|
|
121
154
|
await this.smartFs.file(filePath).delete();
|
|
122
155
|
}
|
|
@@ -145,4 +178,4 @@ export class SmartDaemonSystemdManager {
|
|
|
145
178
|
}
|
|
146
179
|
}
|
|
147
180
|
}
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartdaemon.classes.systemdmanager.js","sourceRoot":"","sources":["../ts/smartdaemon.classes.systemdmanager.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,7 @@ export type { Stats } from 'node:fs';
|
|
|
9
9
|
export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
10
10
|
import * as lik from '@push.rocks/lik';
|
|
11
11
|
import * as smartfs from '@push.rocks/smartfs';
|
|
12
|
-
import * as smartlog from '@push.rocks/smartlog';
|
|
13
|
-
import * as smartlogDestinationLocal from '@push.rocks/smartlog/destination-local';
|
|
14
12
|
import * as smartmarkdown from '@push.rocks/smartmarkdown/iso';
|
|
15
13
|
import * as smartpath from '@push.rocks/smartpath';
|
|
16
14
|
import * as smartshell from '@push.rocks/smartshell';
|
|
17
|
-
export { lik, smartfs,
|
|
15
|
+
export { lik, smartfs, smartmarkdown, smartpath, smartshell, };
|
|
@@ -10,11 +10,9 @@ export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
|
10
10
|
// @pushrocks scope
|
|
11
11
|
import * as lik from '@push.rocks/lik';
|
|
12
12
|
import * as smartfs from '@push.rocks/smartfs';
|
|
13
|
-
import * as smartlog from '@push.rocks/smartlog';
|
|
14
|
-
import * as smartlogDestinationLocal from '@push.rocks/smartlog/destination-local';
|
|
15
13
|
import * as smartmarkdown from '@push.rocks/smartmarkdown/iso';
|
|
16
14
|
import * as smartpath from '@push.rocks/smartpath';
|
|
17
15
|
import * as smartshell from '@push.rocks/smartshell';
|
|
18
|
-
export { lik, smartfs,
|
|
16
|
+
export { lik, smartfs, smartmarkdown, smartpath, smartshell, };
|
|
19
17
|
// third party
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUNsQyxPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUc5QixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7QUFFakUsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssYUFBYSxNQUFNLCtCQUErQixDQUFDO0FBQy9ELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEVBQ0wsR0FBRyxFQUNILE9BQU8sRUFDUCxhQUFhLEVBQ2IsU0FBUyxFQUNULFVBQVUsR0FDWCxDQUFDO0FBRUYsY0FBYyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartdaemon",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Start scripts as long running daemons and manage them.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -39,16 +39,15 @@
|
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@git.zone/tsbuild": "^6.0.2",
|
|
41
41
|
"@git.zone/tsrun": "^3.0.3",
|
|
42
|
-
"@git.zone/tstest": "^
|
|
42
|
+
"@git.zone/tstest": "^8.0.0",
|
|
43
43
|
"@types/node": "^26.6.4"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@push.rocks/lik": "^6.4.4",
|
|
47
47
|
"@push.rocks/smartfs": "^1.5.1",
|
|
48
|
-
"@push.rocks/smartlog": "^4.0.4",
|
|
49
48
|
"@push.rocks/smartmarkdown": "^3.3.0",
|
|
50
49
|
"@push.rocks/smartpath": "^6.0.0",
|
|
51
|
-
"@push.rocks/smartshell": "^
|
|
50
|
+
"@push.rocks/smartshell": "^5.0.0"
|
|
52
51
|
},
|
|
53
52
|
"files": [
|
|
54
53
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -21,7 +21,7 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community
|
|
|
21
21
|
- 🔄 **Systemd Integration**: Full Linux systemd support for production-grade service management
|
|
22
22
|
- 🛡️ **Auto-Recovery**: Built-in service restart on failure
|
|
23
23
|
- 📝 **Declarative Service Definitions**: Simple, clear service configuration
|
|
24
|
-
- 🔌 **
|
|
24
|
+
- 🔌 **Passwordless or Password-Based Sudo**: Works with passwordless sudo, or hands a configured sudo password to sudo on standard input (no terminal or PTY needed)
|
|
25
25
|
- 🎛️ **Complete Lifecycle Management**: Start, stop, enable, disable, and reload services with ease
|
|
26
26
|
|
|
27
27
|
## 📦 Installation
|
|
@@ -115,6 +115,20 @@ const service = await daemon.addService({
|
|
|
115
115
|
await service.enable(); // Automatically uses sudo with password
|
|
116
116
|
```
|
|
117
117
|
|
|
118
|
+
Each privileged command runs as `sudo -k -S -p '' -- <command>`: sudo reads the password from
|
|
119
|
+
standard input, which is closed right after the password line, so a rejected password fails at
|
|
120
|
+
once instead of waiting for a retry. The password is never placed in argv, the environment or the
|
|
121
|
+
output, and no PTY (`node-pty`) is involved. `-k` makes sudo ask for the password every time and
|
|
122
|
+
leaves no cached credentials behind. If a sudoers rule lets the command run without a password
|
|
123
|
+
(`NOPASSWD`), sudo does not read standard input and the password line reaches the command's
|
|
124
|
+
standard input instead (`systemctl`, `mv`, `chmod` and `rm` never read it); leave `sudoPassword`
|
|
125
|
+
unset when sudo is passwordless.
|
|
126
|
+
|
|
127
|
+
A command that does not exit 0 rejects with `SmartDaemonCommandError` (`command`, `exitCode`,
|
|
128
|
+
`signal`, `stderr`), with or without a sudo password: a rejected password, a missing `sudo`
|
|
129
|
+
(exit code 127) or a failing `systemctl` call all surface this way. Besides `systemctl`, saving
|
|
130
|
+
and deleting a unit file as a non-root user runs `mv`, `chmod` and `rm` through sudo.
|
|
131
|
+
|
|
118
132
|
### Passwordless Sudo (Recommended for Production)
|
|
119
133
|
|
|
120
134
|
For production environments, configure passwordless sudo for specific systemctl commands:
|
|
@@ -1398,7 +1412,8 @@ WantedBy=multi-user.target
|
|
|
1398
1412
|
|
|
1399
1413
|
### Permission Denied Errors
|
|
1400
1414
|
|
|
1401
|
-
If
|
|
1415
|
+
If an operation rejects with a `SmartDaemonCommandError` whose `stderr` reports that sudo needs a
|
|
1416
|
+
password or a terminal (for example "a terminal is required to read the password"):
|
|
1402
1417
|
|
|
1403
1418
|
1. **Option 1**: Run your application with sudo
|
|
1404
1419
|
```bash
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/index.ts
CHANGED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A privileged command run by `SmartDaemon` (through `systemdManager.execute()`) did not exit 0.
|
|
3
|
+
* The exit status alone decides failure; `stderr` carries what the command or sudo reported.
|
|
4
|
+
*/
|
|
5
|
+
export class SmartDaemonCommandError extends Error {
|
|
6
|
+
constructor(
|
|
7
|
+
/** The command as run, including any `sudo` prefix. It never contains the sudo password. */
|
|
8
|
+
public readonly command: string,
|
|
9
|
+
/** The exit code; `1` when a signal ended the command. */
|
|
10
|
+
public readonly exitCode: number,
|
|
11
|
+
/** The signal that ended the command, if one did. */
|
|
12
|
+
public readonly signal: NodeJS.Signals | undefined,
|
|
13
|
+
/** The command's standard error, as captured. */
|
|
14
|
+
public readonly stderr: string,
|
|
15
|
+
/** `cause`: the stdin write error when sudo exited before reading the password. */
|
|
16
|
+
options?: ErrorOptions,
|
|
17
|
+
) {
|
|
18
|
+
const reason = signal ? `was terminated by signal ${signal}` : `exited with code ${exitCode}`;
|
|
19
|
+
const detail = stderr.trim();
|
|
20
|
+
super(`Command "${command}" ${reason}${detail ? `: ${detail}` : '.'}`, options);
|
|
21
|
+
this.name = 'SmartDaemonCommandError';
|
|
22
|
+
}
|
|
23
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from './smartdaemon.plugins.js';
|
|
2
2
|
import * as paths from './smartdaemon.paths.js';
|
|
3
3
|
import { SmartDaemon } from './smartdaemon.classes.smartdaemon.js';
|
|
4
|
+
import { SmartDaemonCommandError } from './smartdaemon.classes.commanderror.js';
|
|
4
5
|
import {
|
|
5
6
|
type ISmartDaemonServiceConstructorOptions,
|
|
6
7
|
SmartDaemonService,
|
|
@@ -31,8 +32,10 @@ export class SmartDaemonSystemdManager {
|
|
|
31
32
|
public smartFs: plugins.smartfs.SmartFs;
|
|
32
33
|
|
|
33
34
|
public shouldExecute: boolean = false;
|
|
35
|
+
/** Whether this process runs as root; set by the first privileged operation's check. */
|
|
34
36
|
public isRoot: boolean = false;
|
|
35
37
|
public sudoPassword?: string;
|
|
38
|
+
private rootStatus?: Promise<void>;
|
|
36
39
|
|
|
37
40
|
constructor(smartdaemonRefArg: SmartDaemon, sudoPasswordArg?: string) {
|
|
38
41
|
this.smartdaemonRef = smartdaemonRefArg;
|
|
@@ -41,14 +44,6 @@ export class SmartDaemonSystemdManager {
|
|
|
41
44
|
});
|
|
42
45
|
this.smartFs = new plugins.smartfs.SmartFs(new plugins.smartfs.SmartFsProviderNode());
|
|
43
46
|
this.sudoPassword = sudoPasswordArg;
|
|
44
|
-
|
|
45
|
-
// Check if we're running as root
|
|
46
|
-
this.checkIsRoot().then(isRoot => {
|
|
47
|
-
this.isRoot = isRoot;
|
|
48
|
-
if (!isRoot) {
|
|
49
|
-
console.log('Not running as root. Sudo will be used for privileged operations.');
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
47
|
}
|
|
53
48
|
|
|
54
49
|
private async checkIsRoot(): Promise<boolean> {
|
|
@@ -56,6 +51,23 @@ export class SmartDaemonSystemdManager {
|
|
|
56
51
|
return result.stdout.trim() === '0';
|
|
57
52
|
}
|
|
58
53
|
|
|
54
|
+
/** Checks once whether this process runs as root and sets `isRoot`; later calls reuse that check. */
|
|
55
|
+
private ensureRootStatus(): Promise<void> {
|
|
56
|
+
if (!this.rootStatus) {
|
|
57
|
+
this.rootStatus = this.checkIsRoot().then((isRoot) => {
|
|
58
|
+
this.isRoot = isRoot;
|
|
59
|
+
if (!isRoot) {
|
|
60
|
+
console.log('Not running as root. Sudo will be used for privileged operations.');
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
// A failed check is not memoized, so the next privileged operation asks again.
|
|
64
|
+
this.rootStatus.catch(() => {
|
|
65
|
+
this.rootStatus = undefined;
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
return this.rootStatus;
|
|
69
|
+
}
|
|
70
|
+
|
|
59
71
|
public async checkElegibility() {
|
|
60
72
|
if (plugins.os.platform() === 'linux') {
|
|
61
73
|
this.shouldExecute = true;
|
|
@@ -66,31 +78,61 @@ export class SmartDaemonSystemdManager {
|
|
|
66
78
|
return this.shouldExecute;
|
|
67
79
|
}
|
|
68
80
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
81
|
+
/**
|
|
82
|
+
* Runs a command, through sudo when this process is not root and the command does not start with
|
|
83
|
+
* `sudo` already. With a `sudoPassword`, sudo reads it from standard input (`sudo -k -S -p ''`):
|
|
84
|
+
* it never reaches argv, the environment or a terminal. Rejects with `SmartDaemonCommandError`
|
|
85
|
+
* when the command does not exit 0.
|
|
86
|
+
*/
|
|
87
|
+
public async execute(commandArg: string): Promise<plugins.smartshell.IExecResult | undefined> {
|
|
88
|
+
if (!(await this.checkElegibility())) {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
await this.ensureRootStatus();
|
|
92
|
+
if (this.isRoot || commandArg.startsWith('sudo')) {
|
|
93
|
+
return await this.runChecked(commandArg);
|
|
94
|
+
}
|
|
95
|
+
if (!this.sudoPassword) {
|
|
96
|
+
return await this.runChecked(`sudo ${commandArg}`);
|
|
97
|
+
}
|
|
98
|
+
// -k ignores cached credentials, so sudo reads the password line whenever its policy asks for
|
|
99
|
+
// one; ending stdin right after it makes a rejected password fail instead of waiting for a retry.
|
|
100
|
+
const sudoCommand = `sudo -k -S -p '' -- ${commandArg}`;
|
|
101
|
+
const interactiveExec = await this.smartshellInstance.execInteractiveControl(sudoCommand);
|
|
102
|
+
let writeError: unknown;
|
|
103
|
+
try {
|
|
104
|
+
await interactiveExec.sendLine(this.sudoPassword);
|
|
105
|
+
} catch (error) {
|
|
106
|
+
// sudo can exit before reading stdin (EPIPE); its exit status below decides the outcome.
|
|
107
|
+
writeError = error;
|
|
108
|
+
}
|
|
109
|
+
interactiveExec.endInput();
|
|
110
|
+
const result = await interactiveExec.finalPromise;
|
|
111
|
+
this.assertSucceeded(sudoCommand, result, writeError);
|
|
112
|
+
return result;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
private async runChecked(commandArg: string): Promise<plugins.smartshell.IExecResult> {
|
|
116
|
+
const result = await this.smartshellInstance.exec(commandArg);
|
|
117
|
+
this.assertSucceeded(commandArg, result);
|
|
118
|
+
return result;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
private assertSucceeded(
|
|
122
|
+
commandArg: string,
|
|
123
|
+
resultArg: plugins.smartshell.IExecResult,
|
|
124
|
+
causeArg?: unknown,
|
|
125
|
+
): void {
|
|
126
|
+
if (resultArg.exitCode === 0 && !resultArg.signal) {
|
|
127
|
+
return;
|
|
93
128
|
}
|
|
129
|
+
throw new SmartDaemonCommandError(
|
|
130
|
+
commandArg,
|
|
131
|
+
resultArg.exitCode,
|
|
132
|
+
resultArg.signal,
|
|
133
|
+
resultArg.stderr,
|
|
134
|
+
causeArg === undefined ? undefined : { cause: causeArg },
|
|
135
|
+
);
|
|
94
136
|
}
|
|
95
137
|
|
|
96
138
|
/**
|
|
@@ -136,7 +178,8 @@ export class SmartDaemonSystemdManager {
|
|
|
136
178
|
if (await this.checkElegibility()) {
|
|
137
179
|
const content = this.smartdaemonRef.templateManager.generateUnitFileForService(serviceArg);
|
|
138
180
|
const targetPath = SmartDaemonSystemdManager.createFilePathFromServiceName(serviceArg.name);
|
|
139
|
-
|
|
181
|
+
|
|
182
|
+
await this.ensureRootStatus();
|
|
140
183
|
if (this.isRoot) {
|
|
141
184
|
// Direct write when running as root
|
|
142
185
|
await this.smartFs.file(targetPath).encoding('utf8').mode(0o644).write(content);
|
|
@@ -153,7 +196,8 @@ export class SmartDaemonSystemdManager {
|
|
|
153
196
|
public async deleteService(serviceArg: SmartDaemonService) {
|
|
154
197
|
if (await this.checkElegibility()) {
|
|
155
198
|
const filePath = SmartDaemonSystemdManager.createFilePathFromServiceName(serviceArg.name);
|
|
156
|
-
|
|
199
|
+
|
|
200
|
+
await this.ensureRootStatus();
|
|
157
201
|
if (this.isRoot) {
|
|
158
202
|
await this.smartFs.file(filePath).delete();
|
|
159
203
|
} else {
|
|
@@ -13,8 +13,6 @@ export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
|
13
13
|
// @pushrocks scope
|
|
14
14
|
import * as lik from '@push.rocks/lik';
|
|
15
15
|
import * as smartfs from '@push.rocks/smartfs';
|
|
16
|
-
import * as smartlog from '@push.rocks/smartlog';
|
|
17
|
-
import * as smartlogDestinationLocal from '@push.rocks/smartlog/destination-local';
|
|
18
16
|
import * as smartmarkdown from '@push.rocks/smartmarkdown/iso';
|
|
19
17
|
import * as smartpath from '@push.rocks/smartpath';
|
|
20
18
|
import * as smartshell from '@push.rocks/smartshell';
|
|
@@ -22,8 +20,6 @@ import * as smartshell from '@push.rocks/smartshell';
|
|
|
22
20
|
export {
|
|
23
21
|
lik,
|
|
24
22
|
smartfs,
|
|
25
|
-
smartlog,
|
|
26
|
-
smartlogDestinationLocal,
|
|
27
23
|
smartmarkdown,
|
|
28
24
|
smartpath,
|
|
29
25
|
smartshell,
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import * as plugins from './smartdaemon.plugins.js';
|
|
2
|
-
export const logger = new plugins.smartlog.Smartlog({
|
|
3
|
-
logContext: {
|
|
4
|
-
company: 'Some Company',
|
|
5
|
-
companyunit: 'Some CompanyUnit',
|
|
6
|
-
containerName: 'Some Containername',
|
|
7
|
-
environment: 'local',
|
|
8
|
-
runtime: 'node',
|
|
9
|
-
zone: 'gitzone',
|
|
10
|
-
},
|
|
11
|
-
minimumLogLevel: 'silly',
|
|
12
|
-
});
|
|
13
|
-
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYW1vbi5sb2dnaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRkYW1vbi5sb2dnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUFFcEQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUM7SUFDbEQsVUFBVSxFQUFFO1FBQ1YsT0FBTyxFQUFFLGNBQWM7UUFDdkIsV0FBVyxFQUFFLGtCQUFrQjtRQUMvQixhQUFhLEVBQUUsb0JBQW9CO1FBQ25DLFdBQVcsRUFBRSxPQUFPO1FBQ3BCLE9BQU8sRUFBRSxNQUFNO1FBQ2YsSUFBSSxFQUFFLFNBQVM7S0FDaEI7SUFDRCxlQUFlLEVBQUUsT0FBTztDQUN6QixDQUFDLENBQUM7QUFFSCxNQUFNLENBQUMsaUJBQWlCLENBQUMsSUFBSSxPQUFPLENBQUMsd0JBQXdCLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDIn0=
|
package/ts/smartdamon.logging.ts
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import * as plugins from './smartdaemon.plugins.js';
|
|
2
|
-
|
|
3
|
-
export const logger = new plugins.smartlog.Smartlog({
|
|
4
|
-
logContext: {
|
|
5
|
-
company: 'Some Company',
|
|
6
|
-
companyunit: 'Some CompanyUnit',
|
|
7
|
-
containerName: 'Some Containername',
|
|
8
|
-
environment: 'local',
|
|
9
|
-
runtime: 'node',
|
|
10
|
-
zone: 'gitzone',
|
|
11
|
-
},
|
|
12
|
-
minimumLogLevel: 'silly',
|
|
13
|
-
});
|
|
14
|
-
|
|
15
|
-
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
|