Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72f8b7f6 authored by Israel Yago Pereira's avatar Israel Yago Pereira
Browse files

Using escapeshellarg on command arguments

parent 1fc85226
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -111,16 +111,16 @@ function deleteMailAccount()
            exit('Login Failed');
        }

        $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox delete "' . $user2delete . '"');
        $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox delete "' . escapeshellarg($user2delete) . '"');

        $ssh->exec('sudo /usr/local/bin/postfixadmin-mailbox-postdeletion.sh ' . $userOnly . " " . $domain);
        $ssh->exec('sudo /usr/local/bin/postfixadmin-mailbox-postdeletion.sh ' . escapeshellarg($userOnly) . " " . escapeshellarg($domain));

        // verify it's done
        $delDbConfirm = $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox view "' . $user2delete . '" 2>&1 |grep "not valid"');
        $delDbConfirm = $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox view "' . escapeshellarg($user2delete) . '" 2>&1 |grep "not valid"');

        // build path to check deletion
        $fullPath = $baseDir . $domain . "/" . $userOnly;
        $delDirConfirm = $ssh->exec('[ ! -d "' . $fullPath . '" ] && echo "DELETED"');
        $delDirConfirm = $ssh->exec('[ ! -d "' . escapeshellarg($fullPath) . '" ] && echo "DELETED"');

        if (($delDbConfirm == "Error: The EMAIL is not valid!") && ($delDirConfirm == "DELETED")) {
            return true;