micrOSDevToolKit 3.6.4__tar.gz → 3.7.0__tar.gz

{microsdevtoolkit-3.6.4/micrOSDevToolKit.egg-info → microsdevtoolkit-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.6.4
+Version: 3.7.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.0}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -259,7 +259,7 @@
     },
     "summary": {
         "core": [
-            5485,
+            5488,
             27
         ],
         "load": [
@@ -272,7 +272,7 @@
             25
         ],
         "web": [
-            215999,
+            216082,
             20
         ],
         "core_dep": [
@@ -285,6 +285,6 @@
         ],
         "core_score": 9.26,
         "load_score": 8.37,
-        "version": "3.6.4-0"
+        "version": "3.7.0-0"
     }
 }

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.0}/micrOS/source/Shell.py

@@ -28,7 +28,7 @@ IMAGE_MODE = 'rel' if 'micrOS' in uname()[-1] else 'dev'
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '3.6.4-0'
+    MICROS_VERSION = '3.7.0-0'
 
     def __init__(self):
         """

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.0}/micrOS/source/Tasks.py

@@ -605,6 +605,7 @@ def _exec_lm_core(cmd_list, jsonify):
     :param jsonify: request json output
     Return Bool(OK/NOK), Str(Command output)
     """
+    hint = "Shell: for hints type help.\nShell: for LM exec: [1](LM)module [2]function [3...]optional params"
 
     # LoadModule execution
     if len(cmd_list) >= 2:
@@ -615,18 +616,19 @@ def _exec_lm_core(cmd_list, jsonify):
             # [1] LOAD MODULE - OPTIMIZED by sys.modules
             if lm_mod not in modules:
                 exec(f"import {lm_mod}")
-            try:
-                # [2] EXECUTE FUNCTION FROM MODULE
-                lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
-            except Exception as e:
-                # Handle not proper module load (simulator), note: module in sys.modules BUT not available
-                if lm_mod in str(e):
-                    # [2.1] LOAD MODULE - FORCED
-                    exec(f"import {lm_mod}")
-                    # [2.2] EXECUTE FUNCTION FROM MODULE
-                    lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
-                else:
-                    raise e
+            # [2] IMPORT GUARD: Allow local functions and explicitly advertised commands.
+            module = modules[lm_mod]
+            func = getattr(module, lm_func)
+            if not callable(func):
+                return False, hint
+            if getattr(func, '__globals__', {}).get('__name__') != lm_mod:
+                help_func = getattr(module, 'help', None)
+                if help_func is None or not any(entry.split(' ', 1)[0] == lm_func
+                                                for entry in help_func()):
+                    return False, hint
+            # [3] Execute the checked callable, keeping its decorator active.
+            # Explicit locals also work in MicroPython and the CPython simulator.
+            lm_output = eval(f"_func({lm_params})", globals(), {'_func': func, lm_mod: module})
             # ------------ LM output format: dict(jsonify) / str(raw) ------------- #
             # Handle LM output data
             if isinstance(lm_output, dict):
@@ -635,7 +637,7 @@ def _exec_lm_core(cmd_list, jsonify):
                     [f" {key}: {value}" for key, value in lm_output.items()])
             if lm_func == 'help':
                 # Special case:
-                #   jsonify (True) json output, (False) default, "human readable" formatted output)
+                #   jsonify (True) json output, (False) default, "human-readable" formatted output
                 lm_output = dumps(lm_output) if jsonify else '\n'.join([f" {out}," for out in lm_output])
             # Return LM exec result
             return True, str(lm_output)
@@ -648,7 +650,7 @@ def _exec_lm_core(cmd_list, jsonify):
                 gcollect()
             # LM EXECUTION ERROR
             return False, f"Core error: {lm_mod}->{lm_func}: {e}"
-    return False, "Shell: for hints type help.\nShell: for LM exec: [1](LM)module [2]function [3...]optional params"
+    return False, hint
 
 
 def lm_is_loaded(lm_name):

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.0/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.6.4
+Version: 3.7.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.0}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -36,10 +36,10 @@ micrOS/micropython/esp32s2-LOLIN_MINI-20251209-v1.27.0.bin
 micrOS/micropython/esp32s3-4MBflash-20241129-v1.24.1.bin
 micrOS/micropython/esp32s3-8MBflash-20251209-v1.27.0.bin
 micrOS/micropython/esp32s3_spiram_oct-20251209-v1.27.0.bin
-micrOS/micropython/micrOS-esp32-1.28.0-3.6.4-0.bin
-micrOS/micropython/micrOS-esp32c3-1.28.0-3.6.4-0.bin
-micrOS/micropython/micrOS-esp32c6-1.28.0-3.6.4-0.bin
-micrOS/micropython/micrOS-esp32s3-1.28.0-3.6.4-0.bin
+micrOS/micropython/micrOS-esp32-1.28.0-3.7.0-0.bin
+micrOS/micropython/micrOS-esp32c3-1.28.0-3.7.0-0.bin
+micrOS/micropython/micrOS-esp32c6-1.28.0-3.7.0-0.bin
+micrOS/micropython/micrOS-esp32s3-1.28.0-3.7.0-0.bin
 micrOS/micropython/rpi-pico-w-20251209-v1.27.0.uf2
 micrOS/micropython/tinypico-20251209-v1.27.0.bin
 micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.0}/setup.py

@@ -17,7 +17,7 @@ dependencies = ['adafruit-ampy', 'mpremote', 'esptool', 'ipaddress', 'netaddr',
 
 setuptools.setup(
     name='micrOSDevToolKit',
-    version='3.6.4',
+    version='3.7.0',
     author='Marcell Ban',
     author_email='miros.framework@gmail.com',
     description='Development and deployment environment for micrOS, the diy micropython automation OS (IoT)',

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.0}/toolkit/dashboard_apps/SystemTest.py

@@ -496,6 +496,26 @@ def check_robustness_exception():
         return False, f'{info_msg}: {output}'
 
 
+def check_lm_import_guard():
+    info_msg = '[ST] Check LM import guard [robustness memory_usage]'
+    print(info_msg)
+
+    output = CLIENT.execute(['system memory_usage >json'])
+    try:
+        memory = json.loads(output[1]) if output[0] else None
+    except (ValueError, TypeError):
+        memory = None
+    if not isinstance(memory, dict) or not {'percent', 'mem_used'}.issubset(memory):
+        return False, f'{info_msg}: system memory_usage failed: {output}'
+
+    output = CLIENT.execute(['robustness memory_usage'])
+    blocked = ('Shell: for hints type help.\n'
+                'Shell: for LM exec: [1](LM)module [2]function [3...]optional params')
+    if output[0] and output[1].strip() == blocked:
+        return True, f'{info_msg}: module internal imports blocked'
+    return False, f'{info_msg}: module internal imports NOT blocked! ({output})'
+
+
 def check_robustness_memory():
     info_msg = '[ST] Check robustness - memory_leak [robustness memory_leak 12]'
     print(info_msg)
@@ -774,6 +794,7 @@ def app(devfid=None, pwd=None):
                'negative_api': negative_interface_check(),
                'dhcp_hostname': check_device_by_hostname(CLIENT.get_device()),
                'lm_exception': check_robustness_exception(),
+               'import_guard': check_lm_import_guard(),
                'mem_usage': memory_usage(),
                'disk_usage': disk_usage(),
                'webui_conn': webcli_test(),