Use "Subprocess" for mount and init

This removed the need of storing the password in a temporary file. Instead we just pass it via stdin. Signed-off-by: moson-mo <[email protected]>
moson-mo · Jan 26, 2024 · c4c945c · c4c945c
1 parent 29a0734
commit c4c945c
Showing 1 changed file with 20 additions and 73 deletions.
diff --git a/src/Gocrypt.vala b/src/Gocrypt.vala
@@ -1,60 +1,39 @@
 namespace Cryptor {
     public class Gocrypt {
         public static void init_vault (string path, string password, bool reverse) throws Error {
-            string standard_error;
-            int status;
-
-            var pfile = write_password_file (password);
-            try {
-                string cmd = "gocryptfs -init -q ";
-                if (reverse) {
-                    cmd += "-reverse ";
-                }
-                cmd += " -passfile " + pfile.get_path () + " -- " + path;
-                Process.spawn_command_line_sync (cmd, null, out standard_error, out status);
-            } catch (Error e) {
-                throw e;
-            } finally {
-                if (pfile != null) {
-                    try {
-                        pfile.delete ();
-                    } catch (Error e) {
-                    }
-                }
+            string ? standard_error;
+            string cmd = "gocryptfs -init -q";
+            if (reverse) {
+                cmd += "-reverse";
             }
+            cmd += " -- " + path;
+
+            var sp = new Subprocess.newv (cmd.split (" "), SubprocessFlags.STDIN_PIPE | SubprocessFlags.STDERR_PIPE | SubprocessFlags.STDOUT_PIPE);
+            sp.communicate_utf8 (password + "\n" + password + "\n", null, null, out standard_error);
+            var status = sp.get_exit_status ();
+
             if (standard_error != null && standard_error != "") {
                 throw new Error (Quark.from_string ("Cryptor"), status, remove_color (standard_error));
             }
         }
 
         public static void mount_vault (string path, string mountpoint, string password, bool ro, bool reverse, string custom_options) throws Error {
-            string standard_error;
-            int status;
-
-            var pfile = write_password_file (password);
-            var cmd = "gocryptfs -q ";
+            string ? standard_error;
+            var cmd = "gocryptfs -q";
             if (ro) {
-                cmd += "-ro ";
+                cmd += "-ro";
             }
             if (reverse) {
-                cmd += "-reverse ";
+                cmd += "-reverse";
             }
             if (custom_options != "") {
-                cmd += custom_options + " ";
-            }
-            cmd += " -passfile " + pfile.get_path () + " -- " + path + " " + mountpoint;
-            try {
-                Process.spawn_command_line_sync (cmd, null, out standard_error, out status);
-            } catch (Error e) {
-                throw e;
-            } finally {
-                if (pfile != null) {
-                    try {
-                        pfile.delete ();
-                    } catch (Error e) {
-                    }
-                }
+                cmd += custom_options;
             }
+            cmd += " -- " + path + " " + mountpoint;
+            var sp = new Subprocess.newv (cmd.split (" "), SubprocessFlags.STDIN_PIPE | SubprocessFlags.STDERR_PIPE | SubprocessFlags.STDOUT_PIPE);
+            sp.communicate_utf8 (password + "\n", null, null, out standard_error);
+            var status = sp.get_exit_status ();
+
             if (standard_error != null && standard_error != "") {
                 throw new Error (Quark.from_string ("Cryptor"), status, remove_color (standard_error));
             }
@@ -88,40 +67,8 @@ namespace Cryptor {
             return standard_output;
         }
 
-        private static File write_password_file (string password) throws Error {
-            FileIOStream ps;
-            var temp_file = File.new_tmp (null, out ps);
-            var dos = new DataOutputStream (ps.output_stream);
-            dos.put_string (password);
-            dos.close ();
-            return temp_file;
-        }
-
         private static string remove_color (string str) {
             return str.replace ("\033[31m", "").replace ("\033[33m", "").replace ("\033[0m", "");
         }
-
-        /*
-           public static void init_vault_stdin (string path, string password) throws Error {
-
-            string[] com = { "gocryptfs", "-init", path };
-            Pid pid;
-            int sin, sout, serr;
-
-            Process.spawn_async_with_pipes (Environment.get_current_dir (), com, Environ.get (), SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD, null, out pid, out sin, out sout, out serr);
-
-            var output = FileStream.fdopen (sout, "r");
-            string ? o;
-            while ((o = output.read_line ()) != null) {
-                print ("%s\n", o);
-                if (o == "Reading Password from stdin") {
-                    var input = FileStream.fdopen (sin, "w");
-                    input.write (password.data);
-                    input.write ({ '\n' });
-                    input.write (password.data);
-                }
-            }
-           }
-         */
     }
 }