Fix the use of PrivilegesError

Author: javierfh03

CHANGELOG.md

@@ -3,13 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.2.0] - 2024-02-29
+## [0.2.0] - 2024-01-01
 ### Changed
 - @javierfh03 - Add Authentication and Privileges errors and changes in the command managers structure.
 ### Fixed
 - @javierfh03 - Fix error when execute complex commands.
 - @javierfh03 - Fix error when return additional line in list in the output from command.
 - @javierfh03 - Fix wait to execute command.
+- @javierfh03 - Fix the use of PrivilegesError.
 
 ## [0.1.1] - 2024-02-14
 ### Changed

src/shell_executor_lib/manager/command_manager.py

@@ -58,7 +58,9 @@ async def execute_command(self, command: str, sudo: bool = False, *stdin: str) -
             try:
                 return await executor(f"su - {self.user} -c \"sudo -S {command}\"", self.__password,
                                       self.__password, *stdin)
-            except CommandError:
-                raise PrivilegesError(self.user)
+            except CommandError as command_error:
+                if "is not in the sudoers file" in command_error.response:
+                    raise PrivilegesError(self.user)
+                raise command_error
 
         return await executor(f"su - {self.user} -c \"{command}\"", self.__password, *stdin)

tests/mock_shell_executor_lib/__init__.py

@@ -1,6 +1,7 @@
 """Exposed mock classes and methods."""
 from mock_shell_executor_lib.mock_command_executor import (mock_subprocess_error_exit_code, mock_subprocess_correct,
                                                            mock_subprocess_invalid_exit_code,
-                                                           mock_subprocess_invalid_outs, mock_output_data)
+                                                           mock_subprocess_invalid_outs, mock_output_data,
+                                                           mock_subprocess_sudo_error_exit_code)
 
 mock_asyncio_subprocess = "asyncio.create_subprocess_shell"

tests/mock_shell_executor_lib/mock_command_executor.py

@@ -11,6 +11,11 @@
 mock_subprocess_error_exit_code.stderr.read.return_value = b""
 mock_subprocess_error_exit_code.returncode = 1
 
+mock_subprocess_sudo_error_exit_code = AsyncMock()
+mock_subprocess_sudo_error_exit_code.stdout.read.return_value = b""
+mock_subprocess_sudo_error_exit_code.stderr.read.return_value = b"pepe is not in the sudoers file."
+mock_subprocess_sudo_error_exit_code.returncode = 1
+
 mock_subprocess_invalid_exit_code = AsyncMock()
 mock_subprocess_invalid_exit_code.stdout.read.return_value = b"Output data\nOutput data\nOutput data"
 mock_subprocess_invalid_exit_code.stderr.read.return_value = b""

tests/test_shell_executor_lib/test_command_manager.py

@@ -3,8 +3,8 @@
 from unittest import mock
 
 from mock_shell_executor_lib import mock_asyncio_subprocess, mock_subprocess_correct, mock_output_data, \
-    mock_subprocess_error_exit_code
-from shell_executor_lib import CommandManager, PrivilegesError, AuthenticationError
+    mock_subprocess_error_exit_code, mock_subprocess_sudo_error_exit_code
+from shell_executor_lib import CommandManager, PrivilegesError, AuthenticationError, CommandError
 
 
 class TestCommandManager(unittest.IsolatedAsyncioTestCase):
@@ -28,9 +28,16 @@ async def test_execute_command_with_privileges(self) -> None:
             self.assertEqual(await (await CommandManager.init("augusto", "augusto"))
                              .execute_command("ls", True), mock_output_data)
 
-    async def test_execute_command_with_privileges_error(self) -> None:
-        """Test error if the user does not have privileges."""
+    async def test_execute_command_with_privileges_using_no_sudo_user(self) -> None:
+        """Test error if the command return an error."""
         with mock.patch(mock_asyncio_subprocess, side_effect=(mock_subprocess_correct,
-                                                              mock_subprocess_error_exit_code)):
+                                                              mock_subprocess_sudo_error_exit_code)):
             with self.assertRaises(PrivilegesError):
                 await (await CommandManager.init("augusto", "augusto")).execute_command("ls", True)
+
+    async def test_error_when_execute_command_with_privileges(self) -> None:
+        """Test error if the command return an error."""
+        with mock.patch(mock_asyncio_subprocess, side_effect=(mock_subprocess_correct,
+                                                              mock_subprocess_error_exit_code)):
+            with self.assertRaises(CommandError):
+                await (await CommandManager.init("augusto", "augusto")).execute_command("ls", True)