flyshell 1.1.1__tar.gz → 1.1.3__tar.gz

{flyshell-1.1.1/src/flyshell.egg-info → flyshell-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.1.1
+Version: 1.1.3
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.1.1 → flyshell-1.1.3}/src/flyshell/builtin/system.py

@@ -73,32 +73,36 @@ class SysExe(BaseCmd):
     aliases = []
 
     def execute(self, args):
+        if not args:
+            return (1, "\nCommand Error: 'sys' requires at least 1 parameter(s).\n")
         if args[0] in ["-f", "--force"]:
             override = True
-            args = args[1:]
-            if not args:
+            cmd_args = args[1:]
+            if not cmd_args:
                 return (1, "\nCommand Error: 'sys' requires at least 1 parameter(s).\n")
         else:
             override = False
-        cmd = " ".join(args).strip().strip("\"'")
-        cmd_normalised = " ".join(cmd.lower().split())
-        is_blocked = any(
-            re.search(rf"\b{re.escape(b)}\b", cmd_normalised)
-            for b in c.BLOCKED_COMMANDS
-        )
-        is_dangerous = any(
-            re.search(rf"\b{re.escape(d)}\b", cmd_normalised) for d in c.DANGER_COMMANDS
-        )
-        if is_blocked:
+            cmd_args = args
+        tokens_lower = [token.lower().strip("\"'") for token in cmd_args]
+
+        def matches_pattern(target_set):
+            for token in tokens_lower:
+                base_name = os.path.splitext(os.path.basename(token))[0]
+                if token in target_set or base_name in target_set:
+                    return True
+            return False
+
+        if matches_pattern(c.BLOCKED_COMMANDS):
+            cmd_display = " ".join(cmd_args)
             return (
                 1,
                 (
                     "\nSecurity Error: Flyshell has blocked execution of this command.\n"
-                    f"This command '{cmd}' is permanently restricted by Flyshell safety policy.\n"
+                    f"This command '{cmd_display}' is permanently restricted by Flyshell safety policy.\n"
                     "Flyshell has blocked your command to prevent damage to your computer.\n"
                 ),
             )
-        elif is_dangerous and not override:
+        if not override and matches_pattern(c.DANGER_COMMANDS):
             password = getpass.getpass(
                 "\nThis command is restricted. To execute, enter your password: "
             )
@@ -109,7 +113,8 @@ class SysExe(BaseCmd):
                 return (1, "\nAccount Error: Password does not match.\n")
         try:
             print()
-            result = subprocess.run(cmd, shell=True)
+            raw_cmd = " ".join(cmd_args)
+            result = subprocess.run(raw_cmd, shell=True)
             print()
             return (result.returncode, "")
         except KeyboardInterrupt:

{flyshell-1.1.1 → flyshell-1.1.3}/src/flyshell/constants.py

@@ -5,8 +5,8 @@ import os
 import platform
 import time
 
-BUILD = 114
-VERSION = "1.1.1"
+BUILD = 116
+VERSION = "1.1.3"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.1.1 → flyshell-1.1.3}/src/flyshell/core/directory.py

@@ -80,6 +80,7 @@ for cmd_obj in INSTALLED_COMMANDS:
 
 RESERVED_NAMES = set(COMMAND_REGISTRY.keys())
 
+
 def log(cmd):
     utc_now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
     data.append_history(cmd, utc_now)

{flyshell-1.1.1 → flyshell-1.1.3}/src/flyshell/core/loader.py

@@ -1,4 +1,4 @@
-# src\flyshell\core\loader.py
+# src/flyshell/core/loader.py
 
 from flyshell import constants as c
 from flyshell.abstract.base_plugin import BasePlugin
@@ -33,10 +33,17 @@ def scan_plugins(plugin_folder=None):
             if entry.exists():
                 file_path = entry
                 plugin_name = item.name
-        if not file_path:
+        if not file_path or not plugin_name:
+            continue
+        if plugin_name in RESERVED_NAMES:
+            print(
+                f"\n⚠️ Collision Error - Plugin '{plugin_name}' conflicts with a built-in Flyshell command and will not be loaded."
+            )
             continue
         try:
             spec = importlib.util.spec_from_file_location(plugin_name, file_path)
+            if spec is None or spec.loader is None:
+                continue
             module = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(module)
             for _, obj in inspect.getmembers(module, inspect.isclass):
@@ -51,12 +58,6 @@ def scan_plugins(plugin_folder=None):
     loaded_count = 0
     first_print = True
     for name, entries in candidates.items():
-        failed = False
-        if name in RESERVED_NAMES:
-            print(
-                f"\n⚠️ Collision Error - Plugin '{name}' conflicts with a built-in Flyshell command and will not be loaded."
-            )
-            failed = True
         if len(entries) > 1:
             paths = "\n    - ".join(str(path) for _, path in entries)
             print(
@@ -65,8 +66,6 @@ def scan_plugins(plugin_folder=None):
             print(
                 "The above plugins will not be loaded. Please rename them to unique names."
             )
-            failed = True
-        if failed:
             continue
         instance, _ = entries[0]
         c.PLUGINS[name] = instance

{flyshell-1.1.1 → flyshell-1.1.3/src/flyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.1.1
+Version: 1.1.3
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.1.1 → flyshell-1.1.3}/tests/test_loader.py

@@ -41,3 +41,15 @@ def test_loader_handles_broken_plugin_gracefully(tmp_path, monkeypatch):
     monkeypatch.setattr(c, "USER_PLUGIN_DIR", tmp_path)
     loader.scan_plugins(plugin_folder=tmp_path)
     assert "broken" not in c.PLUGINS
+
+
+def test_loader_does_not_execute_code_in_reserved_plugin(tmp_path, monkeypatch):
+    sentinel = tmp_path / "sentinel.txt"
+    bad_plugin = tmp_path / "cd.py"
+    bad_plugin.write_text(
+        f"from pathlib import Path\nPath('{sentinel.as_posix()}').write_text('executed')\n"
+    )
+    monkeypatch.setattr(c, "USER_PLUGIN_DIR", tmp_path)
+    loader.scan_plugins(plugin_folder=tmp_path)
+    assert "cd" not in c.PLUGINS
+    assert not sentinel.exists()

{flyshell-1.1.1 → flyshell-1.1.3}/tests/test_security.py

@@ -31,3 +31,11 @@ def test_sysexe_force_flag_without_arguments_returns_error():
     code, message = system.SysExe().execute(["-f"])
     assert code == 1
     assert "requires at least 1 parameter" in message
+
+
+def test_sysexe_blocks_command_with_path_or_extension():
+    for cmd in ["/bin/dd if=/dev/zero", "diskpart.exe", "format.com"]:
+        tokens = cmd.split()
+        code, message = system.SysExe().execute(tokens)
+        assert code == 1
+        assert "Security Error" in message