webui: escape superkey in shell call

#1

Author: KOWX712

webui/index.js

@@ -40,16 +40,22 @@ async function updateStatus() {
     }
 }
 
+export function escapeShell(cmd) {
+    if (cmd === '' || cmd === null || cmd === undefined) return "''";
+    return "'" + String(cmd).replace(/'/g, "'\\''") + "'";
+}
+
 function updateSuperkey(key) {
     superkey = key;
     document.querySelectorAll('.password-field').forEach(field => {
         field.value = key;
     });
     localStorage.setItem('kp-next_superkey', key);
+    const safeKey = escapeShell(key);
     exec(`
-        key="${key}"
+        key=${safeKey}
         if [ -n "$key" ]; then
-            echo '${key}' | base64 -w0 > /data/adb/kp-next/key
+            printf "%s" "$key" | base64 -w0 > /data/adb/kp-next/key
             if [ -f "${modDir}/unresolved" ]; then
                 rm -f "${modDir}/unresolved"
                 busybox nohup sh "${modDir}/service.sh" &

webui/page/exclude.js

@@ -1,5 +1,5 @@
 import { listPackages, getPackagesInfo, exec } from 'kernelsu-alt';
-import { modDir, persistDir, superkey } from '../index.js';
+import { modDir, persistDir, superkey, escapeShell } from '../index.js';
 import { getString } from '../language.js';
 import fallbackIcon from '../icon.png';
 
@@ -217,7 +217,7 @@ async function renderAppList() {
                     saveTimeout = setTimeout(() => {
                         saveExcludedList(excludedApps);
                     }, 500);
-                    exec(`kpatch '${superkey}' exclude_set ${realUid} ${isSelected ? 1 : 0}`, { env: { PATH: `${modDir}/bin` } });
+                    exec(`kpatch ${escapeShell(superkey)} exclude_set ${realUid} ${isSelected ? 1 : 0}`, { env: { PATH: `${modDir}/bin` } });
                 });
 
                 appItemMap.set(appKey, item);

webui/page/kpm.js

@@ -1,5 +1,5 @@
 import { exec, spawn, toast } from 'kernelsu-alt';
-import { modDir, persistDir, superkey, initInfo, MAX_CHUNK_SIZE, linkRedirect } from '../index.js';
+import { modDir, persistDir, superkey, initInfo, MAX_CHUNK_SIZE, linkRedirect, escapeShell } from '../index.js';
 import { getString } from '../language.js';
 
 let allKpms = [];
@@ -46,13 +46,13 @@ async function getKpmList() {
     }
 
     const listResult = await exec(
-        `kpatch '${superkey}' kpm list && sh "${modDir}/status.sh" '${superkey}'`,
+        `kpatch ${escapeShell(superkey)} kpm list && sh "${modDir}/status.sh" ${escapeShell(superkey)}`,
         { env: { PATH: `${modDir}/bin:$PATH` } }
     );
     const modules = listResult.stdout.trim().split('\n').filter(line => line.trim());
 
     const modulePromises = modules.map(async (moduleName) => {
-        const infoResult = await exec(`kpatch '${superkey}' kpm info "${moduleName}"`, { env: { PATH: `${modDir}/bin` } });
+        const infoResult = await exec(`kpatch ${escapeShell(superkey)} kpm info "${moduleName}"`, { env: { PATH: `${modDir}/bin` } });
         const infoLines = infoResult.stdout.trim().split('\n');
 
         const moduleInfo = {};
@@ -69,7 +69,7 @@ async function getKpmList() {
 }
 
 async function controlModule(moduleName, action) {
-    const result = await exec(`kpatch '${superkey}' kpm ctl0 "${moduleName}" ${action}`, { env: { PATH: `${modDir}/bin` } });
+    const result = await exec(`kpatch ${escapeShell(superkey)} kpm ctl0 "${moduleName}" ${action}`, { env: { PATH: `${modDir}/bin` } });
     toast(result.errno === 0 ? result.stdout : result.stderr);
 }
 
@@ -79,12 +79,12 @@ function forgetModule(moduleName) {
 
 async function unloadModule(moduleName) {
     forgetModule(moduleName);
-    const result = await exec(`kpatch '${superkey}' kpm unload "${moduleName}"`, { env: { PATH: `${modDir}/bin` } });
+    const result = await exec(`kpatch ${escapeShell(superkey)} kpm unload "${moduleName}"`, { env: { PATH: `${modDir}/bin` } });
     return result.errno === 0;
 }
 
 async function loadModule(modulePath) {
-    const result = await exec(`kpatch '${superkey}' kpm load "${modulePath}"`, { env: { PATH: `${modDir}/bin` } });
+    const result = await exec(`kpatch ${escapeShell(superkey)} kpm load "${modulePath}"`, { env: { PATH: `${modDir}/bin` } });
     return result.errno === 0;
 }
 

webui/page/patch.js

@@ -1,5 +1,5 @@
 import { exec, spawn, toast } from 'kernelsu-alt';
-import { modDir, superkey } from '../index.js';
+import { modDir, superkey, escapeShell } from '../index.js';
 import { handleFileUpload, uploadFile } from './kpm.js';
 import { getString } from '../language.js';
 
@@ -39,9 +39,9 @@ function parseIni(str) {
 async function getInstalledVersion() {
     if (superkey === '') return null;
     if (import.meta.env.DEV) return uInt2String('c06');
-    const working = await exec(`kpatch '${superkey}' hello`, { env: { PATH: `${modDir}/bin` } });
+    const working = await exec(`kpatch ${escapeShell(superkey)} hello`, { env: { PATH: `${modDir}/bin` } });
     if (working.stdout.trim() === '') return null;
-    const version = await exec(`kpatch '${superkey}' kpver`, { env: { PATH: `${modDir}/bin` } });
+    const version = await exec(`kpatch ${escapeShell(superkey)} kpver`, { env: { PATH: `${modDir}/bin` } });
     return uInt2String(version.stdout.trim());
 }
 
@@ -337,23 +337,23 @@ function patch(type) {
     if (type === "patch") {
         args.push(
             `${modDir}/boot_patch.sh`,
-            `'${superkeyVal}'`,
+            escapeShell(superkeyVal),
             bootDev,
             'true'
         );
 
         // New kpm
         newExtras.forEach(extra => {
             args.push('-M', `${modDir}/tmp/${extra.fileName}`);
-            if (extra.args) args.push('-A', extra.args);
+            if (extra.args) args.push('-A', escapeShell(extra.args));
             if (extra.event) args.push('-V', extra.event);
             args.push('-T', 'kpm');
         });
 
         // Embeded kpm
         existedExtras.forEach(extra => {
             args.push('-E', extra.name);
-            if (extra.args) args.push('-A', extra.args);
+            if (extra.args) args.push('-A', escapeShell(extra.args));
             if (extra.event) args.push('-V', extra.event);
             args.push('-T', 'kpm');
         });