3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: use default password for validation 

For legacy Raspberry Pi installations attempt to automate
the update using the default password.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-10-03 11:08:00 -04:00 committed by Eric Callahan
parent be9aff8b5e
commit 9021fbea48
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moonraker/components/machine.py
View File

@ -352,6 +352,10 @@ class Machine:
def sudo_password(self) -> Optional[str]: def sudo_password(self) -> Optional[str]:
return self._sudo_password return self._sudo_password
@sudo_password.setter
def sudo_password(self, pwd: Optional[str]) -> None:
self._sudo_password = pwd
@property @property
def sudo_requested(self) -> bool: def sudo_requested(self) -> bool:
return len(self.sudo_requests) > 0 return len(self.sudo_requests) > 0
@ -1292,9 +1296,15 @@ class InstallValidator:
# A non-default datapath requires successful update of the # A non-default datapath requires successful update of the
# service # service
self.data_path_valid = False self.data_path_valid = False
user: str = props["User"]
has_sudo = False
if await machine.check_sudo_access(): if await machine.check_sudo_access():
has_sudo = True
logging.info("Moonraker has sudo access") logging.info("Moonraker has sudo access")
else: elif user == "pi" and machine.sudo_password is None:
machine.sudo_password = "raspberry"
has_sudo = await machine.check_sudo_access()
if not has_sudo:
self._request_sudo_access() self._request_sudo_access()
raise ValidationError( raise ValidationError(
"Moonraker requires sudo permission to update the system " "Moonraker requires sudo permission to update the system "
@ -1303,7 +1313,6 @@ class InstallValidator:
) )
self._sudo_requested = False self._sudo_requested = False
svc_dest = pathlib.Path(props["FragmentPath"]) svc_dest = pathlib.Path(props["FragmentPath"])
user: str = props["User"]
tmp_svc = pathlib.Path( tmp_svc = pathlib.Path(
tempfile.gettempdir() tempfile.gettempdir()
).joinpath(f"{unit}-tmp.svc") ).joinpath(f"{unit}-tmp.svc")