netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-10-26 21:36:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Reformat files with black

Browse source
This commit is contained in:
deajan 2025-01-22 20:04:06 +01:00
parent b5bebbf198
commit df8434df10
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
npbackup/restic_wrapper/__init__.py
View file

@ -859,7 +859,9 @@ class ResticRunner:
result, output = self.executor(cmd, method="monitor") result, output = self.executor(cmd, method="monitor")
if result: if result:
if build_type in ["gui", "viewer"]: if build_type in ["gui", "viewer"]:
msg = f"Successfully listed snapshot {snapshot} content (not showed here)" msg = (
f"Successfully listed snapshot {snapshot} content (not showed here)"
)
else: else:
msg = f"Successfully listed snapshot {snapshot} content:\n{output}" msg = f"Successfully listed snapshot {snapshot} content:\n{output}"
else: else:

20
upgrade_server/upgrade_server/api.py
View file

@ -65,13 +65,12 @@ def get_current_username(credentials: HTTPBasicCredentials = Depends(security)):
for user in config_dict["http_server"]["users"]: for user in config_dict["http_server"]["users"]:
try: try:
if secrets.compare_digest( if secrets.compare_digest(
credentials.username.encode("utf-8"), user.get("username").encode("utf-8") credentials.username.encode("utf-8"),
user.get("username").encode("utf-8"),
): ):
if secrets.compare_digest( if secrets.compare_digest(
credentials.password.encode("utf-8"), credentials.password.encode("utf-8"),
user.get("password").encode( user.get("password").encode("utf-8"),
"utf-8"
),
): ):
authenticated_user = user authenticated_user = user
break break
@ -101,7 +100,6 @@ def get_user_permissions(username: str):
return [] return []
@app.get("/") @app.get("/")
async def api_root(auth=Depends(get_current_username)): async def api_root(auth=Depends(get_current_username)):
if crud.is_enabled(): if crud.is_enabled():
@ -165,7 +163,9 @@ async def current_version(
try: try:
has_permission = ( has_permission = (
True if audience.value in get_user_permissions(auth).get("audience") else False True
if audience.value in get_user_permissions(auth).get("audience")
else False
) )
except Exception as exc: except Exception as exc:
logger.error(f"Failed to get user permissions (1): {exc}") logger.error(f"Failed to get user permissions (1): {exc}")
@ -265,7 +265,9 @@ async def upgrades(
try: try:
has_permission = ( has_permission = (
True if audience.value in get_user_permissions(auth).get("audience") else False True
if audience.value in get_user_permissions(auth).get("audience")
else False
) )
except Exception as exc: except Exception as exc:
logger.error(f"Failed to get user permissions (2): {exc}") logger.error(f"Failed to get user permissions (2): {exc}")
@ -367,7 +369,9 @@ async def download(
try: try:
has_permission = ( has_permission = (
True if audience.value in get_user_permissions(auth).get("audience") else False True
if audience.value in get_user_permissions(auth).get("audience")
else False
) )
except Exception as exc: except Exception as exc:
logger.error(f"Failed to get user permissions (3): {exc}") logger.error(f"Failed to get user permissions (3): {exc}")