Workspace: Add python-dojo-suid

pwncollege · Sep 7, 2024 · d27986e · d27986e
1 parent 0bfdb54
commit d27986e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/workspace/core/sudo.nix b/workspace/core/sudo.nix
@@ -13,7 +13,7 @@ pkgs.stdenv.mkDerivation {
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin
-    echo "#!/usr/bin/env python-suid" > $out/bin/sudo
+    echo "#!/usr/bin/env python-dojo-suid" > $out/bin/sudo
     cat ${./sudo.py} >> $out/bin/sudo
     chmod +x $out/bin/sudo
     runHook postInstall

diff --git a/workspace/core/suid-interpreter.nix b/workspace/core/suid-interpreter.nix
@@ -31,6 +31,7 @@ let
 in pkgs.symlinkJoin {
   name = "suid-interpreter";
   paths = with pkgs; [
+    (buildSuid "python-dojo-suid" "SUID_PYTHON_DOJO")
     (buildSuid "python-suid" "SUID_PYTHON")
     (buildSuid "bash-suid" "SUID_BASH")
     (buildSuid "sh-suid" "SUID_SH")

diff --git a/workspace/core/suid_interpreter.c b/workspace/core/suid_interpreter.c
@@ -58,6 +58,12 @@ int main(int argc, char **argv, char **envp)
     fgets(first_line, PATH_MAX, file);
     fclose(file);
 
+#ifdef SUID_PYTHON_DOJO
+    char *child_argv_prefix[] = { "/run/dojo/bin/python", "-I", "--", NULL };
+    if (strcmp(first_line, "#!/usr/bin/env python-suid\n"))
+        return ERROR_BAD_SHEBANG;
+#endif
+
 #ifdef SUID_PYTHON
     char *child_argv_prefix[] = { "/usr/bin/python", "-I", "--", NULL };
     if (strcmp(first_line, "#!/opt/pwn.college/python\n") &&
@@ -105,7 +111,7 @@ int main(int argc, char **argv, char **envp)
     int child_argc = 0;
     for (int i = 0; child_argv_prefix[i]; i++)
         child_argv[child_argc++] = child_argv_prefix[i];
-#ifdef SUID_PYTHON
+#ifdef SUID_PYTHON || SUID_PYTHON_DOJO
     child_argv[child_argc++] = path;
 #endif
     for (int i = 2; i < argc; i++)