ymp sandbox improvement (not completed yet)

turkman-linux · Oct 2, 2023 · 145f205 · 145f205
1 parent f14dc16
commit 145f205
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/ccode/sandbox.c b/src/ccode/sandbox.c
@@ -118,7 +118,7 @@ int sandbox(char** args){
                 unshare(CLONE_VM);
                 unshare(CLONE_NEWPID| CLONE_VFORK | SIGCHLD);
                 char *envp[] = {"TERM=linux", "PATH=/usr/bin:/bin:/usr/sbin:/sbin", NULL};
-                exit(execvpe("/proc/self/exe",args,envp));
+                exit(operation_main_raw("exec",args));
             }
         }
         exit(127);

diff --git a/src/operations/utility/run-sandbox.vala b/src/operations/utility/run-sandbox.vala
@@ -12,13 +12,7 @@ public int run_sandbox_main (string[] args) {
     sandbox_uid = int.parse (get_value ("uid"));
     sandbox_gid = int.parse (get_value ("gid"));
     info (_ ("Execute sandbox :%s").printf (join (" ", args)));
-    string[] argv = {};
-    argv += "ymp";
-    argv += "exec";
-    foreach (string i in args) {
-        argv += i;
-    }
-    int status = sandbox (argv);
+    int status = sandbox (args);
     return status / 256;
 }
 

diff --git a/src/ymp.vala b/src/ymp.vala
@@ -42,6 +42,21 @@ private void unlock_operation () {
     unblock_sigint ();
 }
 
+public int operation_main_raw(string type, string[] args){
+    info (_ ("RUN (RAW):") + type + ":" + join (" ", args));
+    foreach (operation op in ops) {
+        foreach (string name in op.names) {
+            if (type == name) {
+                set_value_readonly ("OPERATION", op.help.name);
+                return op.callback (args);
+            }
+        }
+    }
+    warning (_ ("Invalid operation name: %s").printf (type));
+    return 0;
+
+}
+
 public int operation_main (string type, string[] args) {
     info (_ ("RUN:") + type + ":" + join (" ", args));
     foreach (operation op in ops) {