From d084cfd5a2cd6cbe420c332021d2ddb0b66e22ee Mon Sep 17 00:00:00 2001 From: epheo Date: Thu, 15 Feb 2024 01:56:03 +0100 Subject: [PATCH 1/2] Only ask for sudo password when required Check nmcli permissions and only ask for password if required. Move getpass to separate func and validate password input using assert Otherwise raise AssertionError Change sudo func to return an empty string if no sudo password is provided in order to prevent formating of the nmcli commands with sudo prefix if not required. Raise condition is moved at password input. --- .../open_gopro/wifi/adapters/wireless.py | 32 +++++++++++++++---- .../open_gopro/wifi/controller.py | 5 +-- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py index 899888bf..46f073cc 100644 --- a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py +++ b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py @@ -117,15 +117,16 @@ def _detect_driver(self) -> WifiController: if which("networksetup"): return NetworksetupWireless() - # Try Linux options. Need password for sudo - if not self._password: - self._password = getpass("Need to run as sudo. Enter password: ") - # Validate password - if "VALID PASSWORD" not in cmd(f'echo "{self._password}" | sudo -S echo "VALID PASSWORD"'): - raise RuntimeError("Invalid password") - + # Try Linux options. # try nmcli (Ubuntu 14.04). Allow for use in Snap Package if which("nmcli") or which("nmcli", path="/snap/bin/"): + + ctrl_wifi = cmd("nmcli general permissions |grep enable-disable-wifi") + scan_wifi = cmd("nmcli general permissions |grep scan") + + if not "yes" in ctrl_wifi or not "yes" in scan_wifi: + self._sudo_from_stdin() + version = cmd("nmcli --version").split()[-1] return ( Nmcli0990Wireless(password=self._password) @@ -134,10 +135,27 @@ def _detect_driver(self) -> WifiController: ) # try nmcli (Ubuntu w/o network-manager) if which("wpa_supplicant"): + self._sudo_from_stdin() return WpasupplicantWireless(password=self._password) raise RuntimeError("Unable to find compatible wireless driver.") + def _sudo_from_stdin(self) -> str: + """Ask for sudo password input from stdin + + Returns: + str: password + """ + # Need password for sudo + if not self._password: + self._password = getpass("Need to run as sudo. Enter password: ") + assert self._password, 'Password is required' + # Validate password + if "VALID PASSWORD" not in cmd(f'echo "{self._password}" | sudo -S echo "VALID PASSWORD"'): + raise RuntimeError("Invalid password") + + return self._password + @pass_through_to_driver def connect(self, ssid: str, password: str, timeout: float = 15) -> bool: # type: ignore """Connect to a network. diff --git a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/controller.py b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/controller.py index 49884329..fd1ca6bb 100644 --- a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/controller.py +++ b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/controller.py @@ -143,12 +143,9 @@ def is_on(self) -> bool: def sudo(self) -> str: """Return the sudo encapsulated password - Raises: - RuntimeError: No password has been supplied - Returns: str: echo "**********" | sudo -S """ if not self._password: - raise RuntimeError("Can't use sudo with empty password.") + return "" return f'echo "{self._password}" | sudo -S' From 2c419a1cd960137ef54212f454e84a3902ca2920 Mon Sep 17 00:00:00 2001 From: epheo Date: Thu, 15 Feb 2024 12:48:26 +0100 Subject: [PATCH 2/2] Allow password arg from None type in driver class As password isn't a mandatory requirement for the follwing classes also accept None type arg for password. - Nmcli0990Wireless - NmcliWireless - WpasupplicantWireless Replace assert with if not raise RunTime error. --- .../open_gopro/wifi/adapters/wireless.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py index 46f073cc..f2ea919c 100644 --- a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py +++ b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py @@ -143,13 +143,20 @@ def _detect_driver(self) -> WifiController: def _sudo_from_stdin(self) -> str: """Ask for sudo password input from stdin + This method prompts the user to enter the sudo password from the command line. + It validates the password by running a command with sudo and checking if the password is valid. + Returns: - str: password + str: The entered sudo password. + + Raises: + RuntimeError: If the password is empty or invalid. """ # Need password for sudo if not self._password: self._password = getpass("Need to run as sudo. Enter password: ") - assert self._password, 'Password is required' + if not self._password: + raise RuntimeError("Can't use sudo with empty password.") # Validate password if "VALID PASSWORD" not in cmd(f'echo "{self._password}" | sudo -S echo "VALID PASSWORD"'): raise RuntimeError("Invalid password") @@ -248,7 +255,7 @@ def is_on(self) -> bool: class NmcliWireless(WifiController): """Linux nmcli Driver < 0.9.9.0.""" - def __init__(self, password: str, interface: Optional[str] = None) -> None: + def __init__(self, password: str | None, interface: Optional[str] = None) -> None: WifiController.__init__(self, interface=interface, password=password) def _clean(self, partial: str) -> None: @@ -409,7 +416,7 @@ def power(self, power: bool) -> bool: class Nmcli0990Wireless(WifiController): """Linux nmcli Driver >= 0.9.9.0.""" - def __init__(self, password: str, interface: Optional[str] = None) -> None: + def __init__(self, password: str | None, interface: Optional[str] = None) -> None: WifiController.__init__(self, interface=interface, password=password) def _clean(self, partial: str) -> None: @@ -568,7 +575,7 @@ class WpasupplicantWireless(WifiController): _file = "/tmp/wpa_supplicant.conf" - def __init__(self, password: str, interface: Optional[str] = None) -> None: + def __init__(self, password: str | None, interface: Optional[str] = None) -> None: WifiController.__init__(self, interface=interface, password=password) def connect(self, ssid: str, password: str, timeout: float = 15) -> bool: