Merge branch 'sudo_permission_check' into wheel_group_suppor

checking that the username is root
Changing the mechanism for checking that the username is root
2024-11-16 09:18:05 +04:00 · 2024-11-16 09:04:11 +04:00 · 2024-10-24 22:06:07 +04:00
1 changed files with 2 additions and 6 deletions
--- a/client/core/controllers/serverController.cpp
+++ b/client/core/controllers/serverController.cpp
@ -751,10 +751,6 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential

 ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, DockerContainer container)
 {
-    if (credentials.userName == "root") {
-        return ErrorCode::NoError;
-    }
-
    QString stdOut;
    auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
        stdOut += data + "\n";
@ -768,7 +764,7 @@ ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, D
    const QString scriptData = amnezia::scriptData(SharedScriptType::check_user_in_sudo);
    ErrorCode error = runScript(credentials, replaceVars(scriptData, genVarsForScript(credentials)), cbReadStdOut, cbReadStdErr);

-    if (!stdOut.contains("sudo"))
+    if (!stdOut.contains("root :") && !stdOut.contains(" sudo") && !stdOut.contains(" wheel"))
        return ErrorCode::ServerUserNotInSudo;

    return error;
@ -832,4 +828,4 @@ ErrorCode ServerController::getDecryptedPrivateKey(const ServerCredentials &cred
 {
    auto error = m_sshClient.getDecryptedPrivateKey(credentials, decryptedPrivateKey, callback);
    return error;
-}
+}
Author	SHA1	Message	Date
lunardunno	f1152ccad3	Merge branch 'sudo_permission_check' into wheel_group_suppor	2024-11-16 09:18:05 +04:00
lunardunno	3d95b14fc1	checking that the username is root Changing the mechanism for checking that the username is root	2024-11-16 09:04:11 +04:00
lunardunno	6d176dcc2f	wheel group check Checking if the user is included in the wheel group	2024-10-24 22:06:07 +04:00