Refactor

Author: mbv06

src/slicer_uri_bridge/handler.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import argparse
+import contextlib
 import ipaddress
 import json
 import logging
@@ -180,10 +181,8 @@ def read_protocol_uri(uri_file: str) -> str:
             return data.decode("utf-16").strip()
         return data.decode("utf-8-sig").strip()
     finally:
-        try:
+        with contextlib.suppress(OSError):
             path.unlink()
-        except OSError:
-            pass
 
 
 def resolve_protocol_uri(args: argparse.Namespace) -> str:
@@ -336,7 +335,7 @@ def validate_remote_url(
         if normalize_host(host) not in allowed_hosts:
             raise BridgeError(f"Download host is not allow-listed: {host}")
 
-    if not allow_local_resolved_hosts:
+    if not allow_local_resolved_hosts or not check_allowlist:
         assert_public_host(host)
 
 
@@ -490,15 +489,11 @@ def download_model(
                         output.write(chunk)
             except Exception:
                 if output_created:
-                    try:
+                    with contextlib.suppress(OSError):
                         destination.unlink()
-                    except OSError:
-                        pass
                 if download_folder is None:
-                    try:
+                    with contextlib.suppress(OSError):
                         destination.parent.rmdir()
-                    except OSError:
-                        pass
                 raise
 
             logger.info(f"Downloaded {total} bytes to {destination}")
@@ -678,16 +673,14 @@ def launch_bambu(command: list[str], model_path: Path) -> None:
 
 def show_message(message: str, kind: str) -> None:
     print(message, file=sys.stderr)
-    try:
+    with contextlib.suppress(Exception):
         import tkinter
         from tkinter import messagebox
 
         root = tkinter.Tk()
         root.withdraw()
         getattr(messagebox, kind)("Slicer URI Bridge", message)
         root.destroy()
-    except Exception:
-        pass
 
 
 def show_error(message: str) -> None:
@@ -755,15 +748,11 @@ def main(argv: list[str] | None = None) -> int:
     except Exception as exc:
         logger.error(f"Failed: {exc}")
         if local_path:
-            try:
+            with contextlib.suppress(OSError):
                 local_path.unlink()
-            except OSError:
-                pass
             if download_folder is None:
-                try:
+                with contextlib.suppress(OSError):
                     local_path.parent.rmdir()
-                except OSError:
-                    pass
         show_error(str(exc))
         return 1
 

src/slicer_uri_bridge/manager.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import argparse
+import contextlib
 import importlib.resources
 import importlib.util
 import os
@@ -378,19 +379,15 @@ def refresh_desktop_database(self) -> None:
         command = shutil.which("update-desktop-database")
         if not command:
             return
-        try:
+        with contextlib.suppress(OSError):
             subprocess.run([command, str(self.applications_dir)], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except OSError:
-            pass
 
     def apply_xdg_default(self, mime: str) -> None:
         command = shutil.which("xdg-mime")
         if not command:
             return
-        try:
+        with contextlib.suppress(OSError):
             subprocess.run([command, "default", DESKTOP_ID, mime], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except OSError:
-            pass
 
     def write_bridge_files(self, definitions: Iterable[ProtocolDef]) -> None:
         self.check_expected_runtime()
@@ -686,10 +683,8 @@ def delete_handler_registration(self, definition: ProtocolDef) -> None:
     def delete_expected_key(self, root, path: str, root_path: str) -> None:  # noqa: ANN001 - winreg root type is platform-only
         if not self.safe_delete_path(root, path, root_path):
             return
-        try:
+        with contextlib.suppress(OSError):
             self.winreg.DeleteKey(root, path)
-        except OSError:
-            pass
 
     def safe_delete_path(self, root, path: str, root_path: str) -> bool:  # noqa: ANN001 - winreg root type is platform-only
         if root != self.winreg.HKEY_CURRENT_USER:
@@ -949,19 +944,15 @@ def register_app_bundle(self) -> None:
         command = self.lsregister_command()
         if not command or not self.app_bundle.exists():
             return
-        try:
+        with contextlib.suppress(OSError):
             subprocess.run([command, "-f", str(self.app_bundle)], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except OSError:
-            pass
 
     def unregister_app_bundle(self) -> None:
         command = self.lsregister_command()
         if not command or not self.app_bundle.exists():
             return
-        try:
+        with contextlib.suppress(OSError):
             subprocess.run([command, "-u", str(self.app_bundle)], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except OSError:
-            pass
 
     class _LaunchServices:
         ENCODING_UTF8 = 0x08000100

tests/test_handler.py

@@ -266,6 +266,19 @@ def test_validate_remote_url_can_allow_local_resolved_hosts(self) -> None:
 
         assert_public_host.assert_not_called()
 
+    def test_validate_remote_url_still_checks_redirect_targets_when_local_hosts_are_allowed(self) -> None:
+        with patch("slicer_uri_bridge.handler.assert_public_host") as assert_public_host:
+            validate_remote_url(
+                "https://127.0.0.1/model.3mf",
+                allowed_hosts={"files.example"},
+                allow_any_original_host=False,
+                allow_plain_http=False,
+                check_allowlist=False,
+                allow_local_resolved_hosts=True,
+            )
+
+        assert_public_host.assert_called_once_with("127.0.0.1")
+
 
 class FileValidationTests(unittest.TestCase):
     def test_validate_downloaded_file_accepts_non_empty_model_payload(self) -> None: