#252646129

Committed 07 May 2025 04:36PM UTC coverage: 71.43% (-0.2%) from 71.616%

Build Type

push

Committed by

Commit Message

fixed error handling in transfer; fixed test expectations

Run Details

1808 of 3468 branches covered (52.13%)

Branch coverage included in aggregate %.

28 of 28 new or added lines in 4 files covered. (100.0%)

63 existing lines in 8 files now uncovered.

8130 of 10445 relevant lines covered (77.84%)

8.07 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

76.83

/lib/thinx/git.js

// Git Shell Manager

const Globals = require("./globals.js");
const app_config = Globals.app_config();
const fs = require("fs-extra");
const exec = require("child_process");

const valid_responses = [
        "already exists and is not an empty",
        "FETCH_HEAD",
        "up-to-date",
        "Checking out files: 100%",
        "done.",
        "Cloning into"
];
module.exports = class Git {

        responseWhiteBlacklist(rstring) {
                let success;
                for (let index in valid_responses) {
                        if (rstring.indexOf(valid_responses[index]) != -1) {
                                success = true;
                                console.log("Success expected with valid response ", valid_responses[index]);
                                break;
                        }
                }

                // blacklist
                let invalid_responses = [ "fatal" ];
                for (let index in invalid_responses) {
                        if (rstring.indexOf(invalid_responses[index]) != -1) {
                                success = false;
                                console.log("Failure override due to invalid response ", invalid_responses[index]);
                                break;
                        }
                }
                return success;
        }

        checkResponse(rstring, local_path) {

                // whitelist (default response is '')
                let success = this.responseWhiteBlacklist(rstring);

                // the basefile must exist; local_path must be valid
                if ((success == false) && (typeof(local_path) !== "undefined")) {
                        if (!fs.existsSync(local_path)) return false;
                        let basename_path = local_path + "/basename.json";
                        success = fs.existsSync(basename_path); // may throw! but does not work.
                        if (success) console.log(basename_path, "exists, success...");
                }

                console.log("[TODO TEST] Git response result", success);

                return success;
        }

        tryShellOp(cmd, local_path) {
                let result;
                try {
                        result = exec.execSync(cmd).toString().trim(); // lgtm [js/command-line-injection]
                        console.log("[git] exec result: '", result, "'");
                } catch (e) {
                        result = e.stdout.toString();
                        console.log("[ERROR] [git] exec result: '", result, "'");
                }
                return this.checkResponse(result, local_path);
        }

        askpath(keypath) {
                return keypath + ".sh";
        }

        create_askfile(keypath, password) {
                let path = this.askpath(keypath);
                let contents = `#!/usr/bin/env sh\necho "${password}"`;
                fs.writeFileSync(path, contents);
                fs.chmodSync(path, 0o700);
        }

        delete_askfile(keypath) {
                fs.removeSync(this.askpath(keypath));
        }

    fetch(owner, command, local_path) {
                // TODO: Fetch owner's key password (defaults to thinx now) and create askfile (should be per-user to allow parallelism, and deleted at the end)
                let success = false;
                let RSAKey = require("./rsakey"); let rsa = new RSAKey();
                let key_paths = rsa.getKeyPathsForOwner(owner);
                if ((typeof(key_paths) === "undefined") || (key_paths.length < 1)) {
                        console.log("ℹ️ [info] [git] no_rsa_keys_found");
                        return this.tryShellOp(command, local_path);
                } 
                
                // tries all keys until successful... may use last_successful_key first
                for (var kindex in key_paths) {
                        let keypath = app_config.ssh_keys + "/" + key_paths[kindex];
                        let askpath = this.askpath(keypath);
                        var gfpfx = `ssh-agent sh -c 'DISPLAY=: SSH_ASKPASS=${askpath} GIT_ASKPASS=${askpath} ssh-add ${keypath} >/dev/null 2>&1; `;
                        let prefixed_command = gfpfx + command + "' 2>&1";
                        this.create_askfile(keypath, "thinx"); // TODO: per-owner/per-key keypass stored in Vault
                        success = this.tryShellOp(prefixed_command, local_path);
                        this.delete_askfile(keypath);
                        if (success) return success;
                }
                
                return success;
        }

        // WHY IS THIS HERE? WHY IS THIS NOT FETCH? TO TRY WITHOUT KEY? FETCH WILL SUCCEED ANYWAY (IF ANY KEY EXISTS)
        prefetch(GIT_PREFETCH) {
                console.log(`🔨 [debug] git prefetch command:\n ${GIT_PREFETCH}`);
                var result = "";
                try {
                        result = exec.execSync(GIT_PREFETCH).toString().replace("\n", "");
                        if (result !== "Already up to date.") {
                                console.log(`ℹ️ [info] [builder] git prefetch result: ${result}`);
                        }
                } catch (e) { console.log("⚠️ [warning] git prefetch not successful..."); }
                return result;
        }
};

1	// Git Shell Manager
2
3	const Globals = require("./globals.js");	1✔
4	const app_config = Globals.app_config();	1✔
5	const fs = require("fs-extra");	1✔
6	const exec = require("child_process");	1✔
7
8	const valid_responses = [	1✔
9	"already exists and is not an empty",
10	"FETCH_HEAD",
11	"up-to-date",
12	"Checking out files: 100%",
13	"done.",
14	"Cloning into"
15	];
16	module.exports = class Git {	1✔
17
18	responseWhiteBlacklist(rstring) {
19	let success;
20	for (let index in valid_responses) {	17✔
21	if (rstring.indexOf(valid_responses[index]) != -1) {	94✔
22	success = true;	16✔
23	console.log("Success expected with valid response ", valid_responses[index]);	16✔
24	break;	16✔
25	}
26	}
27
28	// blacklist
29	let invalid_responses = [ "fatal" ];	17✔
30	for (let index in invalid_responses) {	17✔
31	if (rstring.indexOf(invalid_responses[index]) != -1) {	17✔
32	success = false;	2✔
33	console.log("Failure override due to invalid response ", invalid_responses[index]);	2✔
34	break;	2✔
35	}
36	}
37	return success;	17✔
38	}
39
40	checkResponse(rstring, local_path) {
41
42	// whitelist (default response is '')
43	let success = this.responseWhiteBlacklist(rstring);	17✔
44
45	// the basefile must exist; local_path must be valid
46	if ((success == false) && (typeof(local_path) !== "undefined")) {	17✔
47	if (!fs.existsSync(local_path)) return false;	2!
48	let basename_path = local_path + "/basename.json";	×
49	success = fs.existsSync(basename_path); // may throw! but does not work.	×
50	if (success) console.log(basename_path, "exists, success...");	×
51	}
52
53	console.log("[TODO TEST] Git response result", success);	15✔
54
55	return success;	15✔
56	}
57
58	tryShellOp(cmd, local_path) {
59	let result;
60	try {	17✔
61	result = exec.execSync(cmd).toString().trim(); // lgtm [js/command-line-injection]	17✔
62	console.log("[git] exec result: '", result, "'");	15✔
63	} catch (e) {
64	result = e.stdout.toString();	2✔
65	console.log("[ERROR] [git] exec result: '", result, "'");	2✔
66	}
67	return this.checkResponse(result, local_path);	17✔
68	}
69
70	askpath(keypath) {
71	return keypath + ".sh";	48✔
72	}
73
74	create_askfile(keypath, password) {
75	let path = this.askpath(keypath);	16✔
76	let contents = `#!/usr/bin/env sh\necho "${password}"`;	16✔
77	fs.writeFileSync(path, contents);	16✔
78	fs.chmodSync(path, 0o700);	16✔
79	}
80
81	delete_askfile(keypath) {
82	fs.removeSync(this.askpath(keypath));	16✔
83	}
84
85	fetch(owner, command, local_path) {
86	// TODO: Fetch owner's key password (defaults to thinx now) and create askfile (should be per-user to allow parallelism, and deleted at the end)
87	let success = false;	15✔
88	let RSAKey = require("./rsakey"); let rsa = new RSAKey();	15✔
89	let key_paths = rsa.getKeyPathsForOwner(owner);	15✔
90	if ((typeof(key_paths) === "undefined") \|\| (key_paths.length < 1)) {	15!
UNCOV 91	console.log("ℹ️ [info] [git] no_rsa_keys_found");	×
UNCOV 92	return this.tryShellOp(command, local_path);	×
93	}
94
95	// tries all keys until successful... may use last_successful_key first
96	for (var kindex in key_paths) {	15✔
97	let keypath = app_config.ssh_keys + "/" + key_paths[kindex];	16✔
98	let askpath = this.askpath(keypath);	16✔
99	var gfpfx = `ssh-agent sh -c 'DISPLAY=: SSH_ASKPASS=${askpath} GIT_ASKPASS=${askpath} ssh-add ${keypath} >/dev/null 2>&1; `;	16✔
100	let prefixed_command = gfpfx + command + "' 2>&1";	16✔
101	this.create_askfile(keypath, "thinx"); // TODO: per-owner/per-key keypass stored in Vault	16✔
102	success = this.tryShellOp(prefixed_command, local_path);	16✔
103	this.delete_askfile(keypath);	16✔
104	if (success) return success;	16✔
105	}
106
107	return success;	1✔
108	}
109
110	// WHY IS THIS HERE? WHY IS THIS NOT FETCH? TO TRY WITHOUT KEY? FETCH WILL SUCCEED ANYWAY (IF ANY KEY EXISTS)
111	prefetch(GIT_PREFETCH) {
112	console.log(`🔨 [debug] git prefetch command:\n ${GIT_PREFETCH}`);	×
113	var result = "";	×
114	try {	×
115	result = exec.execSync(GIT_PREFETCH).toString().replace("\n", "");	×
116	if (result !== "Already up to date.") {	×
117	console.log(`ℹ️ [info] [builder] git prefetch result: ${result}`);	×
118	}
119	} catch (e) { console.log("⚠️ [warning] git prefetch not successful..."); }	×
120	return result;	×
121	}
122	};

suculent / thinx-device-api / #252646129

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous