flyshell 1.1.0__tar.gz → 1.1.2__tar.gz

{flyshell-1.1.0/src/flyshell.egg-info → flyshell-1.1.2}/PKG-INFO

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

{flyshell-1.1.0 → flyshell-1.1.2}/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.0 → flyshell-1.1.2}/src/flyshell/constants.py

@@ -1,14 +1,12 @@
 # src\flyshell\constants.py
 
-from flyshell.core.directory import COMMAND_REGISTRY
-
 from pathlib import Path
 import os
 import platform
 import time
 
-BUILD = 113
-VERSION = "1.1.0"
+BUILD = 115
+VERSION = "1.1.2"
 
 
 def _resolve_app_dir() -> Path:
@@ -36,7 +34,6 @@ SESSION_START_TIME = time.time()
 SESSION_CMD_COUNT = 0
 
 PLUGINS = {}
-RESERVED_NAMES = set(COMMAND_REGISTRY.keys())
 
 BLOCKED_COMMANDS = frozenset({"format", "diskpart", "dd"})
 DANGER_COMMANDS = frozenset({"del", "rmdir", "rd", "rm", "taskkill", "killall"})

{flyshell-1.1.0 → flyshell-1.1.2}/src/flyshell/core/directory.py

@@ -71,12 +71,15 @@ INSTALLED_COMMANDS: list[BaseCmd] = [
     system.SysExe(),
     diskops.Touch(),
 ]
+
 COMMAND_REGISTRY: dict[str, BaseCmd] = {}
 for cmd_obj in INSTALLED_COMMANDS:
     COMMAND_REGISTRY[cmd_obj.name] = cmd_obj
     for alias_name in cmd_obj.aliases:
         COMMAND_REGISTRY[alias_name] = cmd_obj
 
+RESERVED_NAMES = set(COMMAND_REGISTRY.keys())
+
 
 def log(cmd):
     utc_now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")

{flyshell-1.1.0 → flyshell-1.1.2}/src/flyshell/core/loader.py

@@ -3,6 +3,7 @@
 from flyshell import constants as c
 from flyshell.abstract.base_plugin import BasePlugin
 from flyshell.core import data
+from flyshell.core.directory import RESERVED_NAMES
 
 from pathlib import Path
 import importlib.util
@@ -51,7 +52,7 @@ def scan_plugins(plugin_folder=None):
     first_print = True
     for name, entries in candidates.items():
         failed = False
-        if name in c.RESERVED_NAMES:
+        if name in RESERVED_NAMES:
             print(
                 f"\n⚠️ Collision Error - Plugin '{name}' conflicts with a built-in Flyshell command and will not be loaded."
             )

{flyshell-1.1.0 → flyshell-1.1.2/src/flyshell.egg-info}/PKG-INFO

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

{flyshell-1.1.0 → flyshell-1.1.2}/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