micrOSDevToolKit 2.26.0__tar.gz → 2.26.2__tar.gz

{microsdevtoolkit-2.26.0/micrOSDevToolKit.egg-info → microsdevtoolkit-2.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.26.0
+Version: 2.26.2
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -628,12 +628,11 @@ Version **3.0.0-0** `micrOS-Autonomous`
 				- mount pathes write access handlig
 				- mount pathes read (+visibility) access handlig
 
-		- (11) [TODO][CONCEPT] @Common.RequireSudo decorator
-			- When node_config["auth"] == True 
+		- (11) [DONE] @Auth.sudo decorator
 			- Require pwd="<password>" parameter
 			- Two modes:
 				- Always require
-				- Require when force=True (_when_force=True)
+				- Require when force=True (_force_only=(True, 0))
 			- Apply this to:
 				- pacman rm
 				- pacman rmdir

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/README.md

@@ -590,12 +590,11 @@ Version **3.0.0-0** `micrOS-Autonomous`
 				- mount pathes write access handlig
 				- mount pathes read (+visibility) access handlig
 
-		- (11) [TODO][CONCEPT] @Common.RequireSudo decorator
-			- When node_config["auth"] == True 
+		- (11) [DONE] @Auth.sudo decorator
 			- Require pwd="<password>" parameter
 			- Two modes:
 				- Always require
-				- Require when force=True (_when_force=True)
+				- Require when force=True (_force_only=(True, 0))
 			- Apply this to:
 				- pacman rm
 				- pacman rmdir

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -1,5 +1,9 @@
 {
     "files": {
+        "Auth.py": [
+            9.5,
+            4
+        ],
         "Time.py": [
             9.34,
             5
@@ -17,7 +21,7 @@
             1
         ],
         "Hooks.py": [
-            9.62,
+            9.63,
             1
         ],
         "Server.py": [
@@ -34,10 +38,10 @@
         ],
         "Config.py": [
             9.44,
-            16
+            17
         ],
         "Shell.py": [
-            9.37,
+            9.36,
             2
         ],
         "Notify.py": [
@@ -46,7 +50,7 @@
         ],
         "Types.py": [
             9.21,
-            29
+            28
         ],
         "Logger.py": [
             8.84,
@@ -54,7 +58,7 @@
         ],
         "Common.py": [
             9.85,
-            34
+            33
         ],
         "InterConnect.py": [
             9.63,
@@ -78,7 +82,7 @@
         ],
         "microIO.py": [
             9.35,
-            44
+            43
         ],
         "micrOS.py": [
             9.3,
@@ -113,7 +117,7 @@
             0
         ],
         "modules/LM_pacman.py": [
-            7.7,
+            7.68,
             0
         ],
         "modules/LM_web.py": [
@@ -133,7 +137,7 @@
             0
         ],
         "modules/LM_robustness.py": [
-            8.33,
+            8.47,
             0
         ],
         "modules/LM_qmi8658.py": [
@@ -257,7 +261,7 @@
             0
         ],
         "modules/LM_OV2640.py": [
-            9.28,
+            9.29,
             0
         ],
         "modules/LM_rgb.py": [
@@ -311,20 +315,16 @@
         "modules/LM_fileserver.py": [
             9.41,
             0
-        ],
-        "modules/LM_neomatrix.py": [
-            8.75,
-            0
         ]
     },
     "summary": {
         "core": [
-            4700,
-            25
+            4734,
+            26
         ],
         "load": [
-            9093,
-            54
+            8777,
+            53
         ],
         "core_dep": [
             true,
@@ -334,8 +334,8 @@
             true,
             3
         ],
-        "core_score": 9.27,
-        "load_score": 8.44,
-        "version": "2.26.0-0"
+        "core_score": 9.28,
+        "load_score": 8.43,
+        "version": "2.26.1-0"
     }
 }

microsdevtoolkit-2.26.2/micrOS/source/Auth.py

@@ -0,0 +1,63 @@
+"""
+micrOS Load Module Authentication features
+    Designed by Marcell Ban aka BxNxM
+"""
+from Config import cfgget as __cfgget
+PWD_KEY = "pwd"
+
+def sudo(_f=None, *, _when_true=None):
+    """
+    Decorator for password-protected functions.
+      his decorator can be used with or without arguments:
+        @sudo
+        def fn(...): ...
+
+        @sudo(_when_true=("flag", 0))
+        def fn(flag, ...): ...
+
+    :param _f: Internal use only.
+        The decorated function when the decorator is used without parentheses.
+        If None, the decorator is being configured and will return a wrapper.
+    :param _when_true: optional pwd check
+      - _when_true=None: always require pwd
+      - _when_true=(keyword:str, position:int): require pwd only when keyword/position is True
+    Password check:
+      - pwd is checked against node_config appwd value, and is not passed to the decorated function
+    """
+
+    def deco(f):
+        wt_kw = wt_idx = None
+        if _when_true is not None:
+            wt_kw, wt_idx = _when_true
+
+        def w(*a, **k):
+            # Decide if password is required
+            require = True
+            if wt_kw is not None or wt_idx is not None:
+                require = False
+                # Keyword-based condition
+                if wt_kw is not None and k.get(wt_kw, False):
+                    require = True
+                # Positional-based condition
+                if wt_idx is not None and 0 <= wt_idx < len(a):
+                    if a[wt_idx]:
+                        require = True
+
+            # Password check
+            if require and k.get(PWD_KEY) != __cfgget("appwd"):
+                raise Exception("Access denied, wrong password ({})".format(PWD_KEY))
+            # Remove password before calling function
+            k.pop(PWD_KEY, None)
+            return f(*a, **k)
+        return w
+    return deco if _f is None else deco(_f)
+
+
+def resolve_secret(commands:str):
+    """
+    Resolve secret: $pwd in boothook
+    """
+    placeholder = f"${PWD_KEY}"
+    if placeholder in commands:
+        commands = commands.replace(placeholder, f"'{__cfgget("appwd")}'")
+    return commands

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/source/Hooks.py

@@ -21,6 +21,7 @@ from Config import cfgget, cfgput
 from microIO import detect_platform
 from Debug import console_write, syslog
 from Tasks import exec_lm_pipe
+from Auth import resolve_secret
 from micropython import mem_info
 from machine import freq
 try:
@@ -46,7 +47,7 @@ def bootup():
     bootasks = cfgget('boothook')
     if bootasks is not None and bootasks.lower() != 'n/a':
         console_write(f"|-[BOOT] TASKS: {bootasks}")
-        if exec_lm_pipe(bootasks):
+        if exec_lm_pipe(resolve_secret(bootasks)):
             console_write("|-[BOOT] DONE")
         else:
             console_write("|-[BOOT] ERROR")

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/source/Shell.py

@@ -25,7 +25,7 @@ from Debug import syslog
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '2.26.0-0'
+    MICROS_VERSION = '2.26.2-0'
 
     def __init__(self):
         """
@@ -72,8 +72,7 @@ class Shell:
         # Set user auth state
         if self.__auth_mode and not self.__auth_ok:
             # check password
-            usrpwd = cfgget('appwd')
-            if usrpwd == msg_list[0].strip():
+            if cfgget('appwd') == msg_list[0].strip():
                 self.__auth_ok = True
                 await self.a_send("AuthOk")
                 return True, []

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/source/Web.py

@@ -250,7 +250,7 @@ class WebEngine:
         resp_schema = {'result': {}, 'state': False}
         cmd = url.replace('/rest', '')
         if len(cmd) > 1:
-            # REST sub-parameter handling (rest commands)
+            # REST sub-parameter handling (rest commands) TODO: create url_decode helper for: " ' >
             cmd = (cmd.replace('/', ' ').replace('-', ' ').replace("%3E", ">")
                    .replace('%22', '"').replace('%E2%80%9C', '"').replace('%E2%80%9D', '"')
                    .strip().split())

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/source/modules/LM_OV2640.py

@@ -190,7 +190,8 @@ def photo(name='photo.jpeg'):
     # Create file name with time stamp
     photo_path = f"{path}/{ts}-{name}"
     # Take a Photo
-    buf = capture()
+    _ = capture()       # Dump current cached image
+    buf = capture()     # Create new image
     # Save the Photo
     with open(photo_path, 'wb') as f:
         if buf:
@@ -200,7 +201,8 @@ def photo(name='photo.jpeg'):
 
 
 def _snapshot_clb():
-    image = capture()
+    _ = capture()       # Dump current cached image
+    image = capture()   # Take new image
     if image is not None:
         return 'image/jpeg', image
     return 'text/plain', f'capture error: {image}'

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/source/modules/LM_fileserver.py

@@ -9,6 +9,7 @@ from uos import stat, rename, mkdir, statvfs
 from Common import web_endpoint, web_mounts, web_dir, syslog
 from Files import path_join, is_dir, remove_dir, remove_file, OSPath, abs_path, ilist_fs
 from Web import url_path_resolve
+from Auth import sudo
 
 
 class Shared:
@@ -174,13 +175,21 @@ def load(web_data_dir:str=None):
             base_dir = current_dir
 
     # Register endpoints
+    #   [GET] List shared directories
     web_endpoint('fs/dirs', lambda: ('application/json', dumps(get_shared_dirs())))
+    #   [GET] List help message
     web_endpoint('fs/list', lambda: ('text/plain', 'USE THIS AS POST Endpoint, select dir in http body'))
+    #   [POST] List selected directory content
     web_endpoint('fs/list', _list_file_paths_clb, 'POST')
-    web_endpoint('fs/files', lambda: ('text/plain', "USE THIS AS POST / DELETE Endpoint, select file in http body"))
+    #   [GET] Files - list user files
+    web_endpoint('fs/files', _list_file_paths_clb)
+    #   [DELETE] Files - delete selected file
     web_endpoint('fs/files', _delete_file_clb, 'DELETE')
+    #   [POST] Upload file to the selected path (in filename)
     web_endpoint('fs/files', _upload_file_clb, 'POST')
+    #   [GET] Show internal flash storage usage
     web_endpoint('fs/usage', _disk_usage_clb)
+    #   [GET] Fileserver homepage UI
     web_endpoint('fs', 'filesui.html')
 
     return "Fileserver was initialized, endpoints: /fs, /fs/files, /fs/dirs, /fs/usage"
@@ -220,7 +229,7 @@ def get_user_dir():
     Getter for user configured shared dir
     - used by other load modules
     """
-    return Shared.ROOT_DIR.replace(web_dir(), "")
+    return Shared.ROOT_DIR
 
 
 def extend_mounts(modules:bool=None, data:bool=None, logs:bool=None):
@@ -233,6 +242,7 @@ def extend_mounts(modules:bool=None, data:bool=None, logs:bool=None):
     return web_mounts(modules, data, logs)
 
 
+@sudo
 def mounts_write_access(modules:bool=None, data:bool=None, logs:bool=None):
     if modules is not None:
         Shared.MOUNTS_WRITE_ACCESS["$modules"] = modules

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/source/modules/LM_pacman.py

@@ -1,6 +1,7 @@
 from sys import modules
 from Common import socket_stream
 from Files import list_fs, ilist_fs, remove_file, remove_dir, OSPath, path_join, is_protected
+from Auth import sudo
 
 
 #############################################
@@ -31,6 +32,7 @@ def ls(path="/", content='*', raw=False, select='*', core=False):
     return lines
 
 
+@sudo(_when_true=("force", 1))
 def rm(path, force=False):
     """
     Linux like rm command - delete app resources and folders
@@ -40,6 +42,7 @@ def rm(path, force=False):
     return remove_file(path, force)
 
 
+@sudo(_when_true=("force", 1))
 def rmdir(path, force=False):
     """
     Linux like rmdir command for directory deletion
@@ -75,13 +78,6 @@ def cat(path):
     return content
 
 
-def download(ref=None):
-    """
-    OBSOLETED interface
-    """
-    return install(ref)
-
-
 def install(ref=None):
     """
     Unified mip-based installer for micrOS.
@@ -104,6 +100,7 @@ def install(ref=None):
     return pm_install(ref)
 
 
+@sudo
 def uninstall(name=None):
     """
     Delete package by name from /lib
@@ -267,6 +264,7 @@ def listmods(msgobj=None):
     return msg_buf if len(msg_buf) > 0 else ''
 
 
+@sudo
 def delmod(mod):
     """
     Module package manager

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOS/source/modules/LM_robustness.py

@@ -1,5 +1,6 @@
 from LM_system import memory_usage
 from Common import socket_stream, syslog, micro_task
+from Auth import sudo
 
 
 @socket_stream
@@ -105,6 +106,22 @@ async def mytask(tag, period_ms=30):
             await my_task.feed(sleep_ms=period_ms)
             # [i] feed same as "await asyncio.sleep_ms(period_ms)" with micrOS features (WDT)
 
+
+@sudo
+def func_sudo():
+    """
+    Function execution requires pwd=<...>
+    """
+    return "Access granted"
+
+
+@sudo(_when_true=("opt", 0))
+def func_sudo_opt(opt=False):
+    """
+    Function requires pwd=<...> when force=True
+    """
+    return f"Access granted, opt flag: {opt}"
+
 ##############################################################################
 
 def help(widgets=False):
@@ -116,5 +133,5 @@ def help(widgets=False):
     """
     return 'NOTE: This is a test module to validate system robustness', \
            'raise_error', 'memory_leak cnt=160', 'recursion_limit cnt=14', \
-           'create_task', 'mytask'
+           'create_task', 'mytask', "func_sudo", "func_sudo_opt opt=False"
 

{microsdevtoolkit-2.26.0/toolkit/workspace/precompiled → microsdevtoolkit-2.26.2/micrOS/source}/web/filesui.js

@@ -76,34 +76,46 @@ function loadFiles() {
   })
     .then(r => r.json())
     .then(files => {
-      list.innerHTML = '';
-      clearSelection();
-
-      files.forEach(f => {
-        const name = f.path.split('/').pop();
-        const d = document.createElement('div');
-        d.className = 'file-item';
-        d.textContent = `${name} ${f.size}B`;
-
-        d.onclick = (e) => {
-          e.stopPropagation();
-
-          if (selectedEl === d) {
-            clearSelection();
-            return;
-          }
-
-          clearSelection();
-          d.className = 'file-item sel';
-          selected = name;
-          selectedEl = d;
-        };
-
-        list.appendChild(d);
-      });
-
-      console.info("Files loaded");
-    })
+       list.innerHTML = '';
+       clearSelection();
+       // 🔹 Empty folder placeholder
+       if (!Array.isArray(files) || files.length === 0) {
+         const d = document.createElement('div');
+         d.className = 'file-item placeholder';
+         d.textContent = '.empty';
+         d.style.opacity = '0.5';
+         d.style.pointerEvents = 'none'; // 🔹 non-clickable
+         list.appendChild(d);
+
+         console.info("Files loaded (empty folder)");
+         return;
+       }
+       // 🔹 Files listing
+       files.forEach(f => {
+         const name = f.path.split('/').pop();
+         const d = document.createElement('div');
+         d.className = 'file-item';
+         d.textContent = `${name} ${f.size}B`;
+
+         d.onclick = (e) => {
+           e.stopPropagation();
+
+           if (selectedEl === d) {
+             clearSelection();
+             return;
+           }
+
+           clearSelection();
+           d.className = 'file-item sel';
+           selected = name;
+           selectedEl = d;
+         };
+
+         list.appendChild(d);
+       });
+
+       console.info("Files loaded");
+      })
     .catch(err => {
       console.error("load failed:", err);
       popUpMsg("Failed to load files: " + err.message);

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.26.0
+Version: 2.26.2
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -628,12 +628,11 @@ Version **3.0.0-0** `micrOS-Autonomous`
 				- mount pathes write access handlig
 				- mount pathes read (+visibility) access handlig
 
-		- (11) [TODO][CONCEPT] @Common.RequireSudo decorator
-			- When node_config["auth"] == True 
+		- (11) [DONE] @Auth.sudo decorator
 			- Require pwd="<password>" parameter
 			- Two modes:
 				- Always require
-				- Require when force=True (_when_force=True)
+				- Require when force=True (_force_only=(True, 0))
 			- Apply this to:
 				- pacman rm
 				- pacman rmdir

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ 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
 micrOS/source/.DS_Store
+micrOS/source/Auth.py
 micrOS/source/Common.py
 micrOS/source/Config.py
 micrOS/source/Debug.py
@@ -80,7 +81,6 @@ micrOS/source/modules/IO_esp32s3.py
 micrOS/source/modules/IO_m5stamp.py
 micrOS/source/modules/IO_qtpy.py
 micrOS/source/modules/IO_rp2.py
-micrOS/source/modules/IO_s3matrix.py
 micrOS/source/modules/IO_tinypico.py
 micrOS/source/modules/LM_L298N.py
 micrOS/source/modules/LM_L9110_DCmotor.py
@@ -109,7 +109,6 @@ micrOS/source/modules/LM_ld2410.py
 micrOS/source/modules/LM_light_sensor.py
 micrOS/source/modules/LM_mh_z19c.py
 micrOS/source/modules/LM_neoeffects.py
-micrOS/source/modules/LM_neomatrix.py
 micrOS/source/modules/LM_neopixel.py
 micrOS/source/modules/LM_oled.py
 micrOS/source/modules/LM_oled_sh1106.py
@@ -141,7 +140,6 @@ micrOS/source/web/editor.js
 micrOS/source/web/filesui.html
 micrOS/source/web/filesui.js
 micrOS/source/web/index.html
-micrOS/source/web/matrix_draw.html
 micrOS/source/web/uapi.js
 micrOS/source/web/udashboard.js
 micrOS/source/web/ustyle.css
@@ -300,6 +298,7 @@ toolkit/user_data/webhooks/macro.py
 toolkit/user_data/webhooks/template.macro
 toolkit/user_data/webhooks/template.py
 toolkit/workspace/__init__.py
+toolkit/workspace/precompiled/Auth.mpy
 toolkit/workspace/precompiled/Common.mpy
 toolkit/workspace/precompiled/Config.mpy
 toolkit/workspace/precompiled/Debug.mpy
@@ -335,7 +334,6 @@ toolkit/workspace/precompiled/modules/IO_esp32s3.mpy
 toolkit/workspace/precompiled/modules/IO_m5stamp.mpy
 toolkit/workspace/precompiled/modules/IO_qtpy.mpy
 toolkit/workspace/precompiled/modules/IO_rp2.mpy
-toolkit/workspace/precompiled/modules/IO_s3matrix.mpy
 toolkit/workspace/precompiled/modules/IO_tinypico.mpy
 toolkit/workspace/precompiled/modules/LM_L298N.mpy
 toolkit/workspace/precompiled/modules/LM_L9110_DCmotor.py
@@ -364,7 +362,6 @@ toolkit/workspace/precompiled/modules/LM_ld2410.mpy
 toolkit/workspace/precompiled/modules/LM_light_sensor.mpy
 toolkit/workspace/precompiled/modules/LM_mh_z19c.py
 toolkit/workspace/precompiled/modules/LM_neoeffects.mpy
-toolkit/workspace/precompiled/modules/LM_neomatrix.mpy
 toolkit/workspace/precompiled/modules/LM_neopixel.mpy
 toolkit/workspace/precompiled/modules/LM_oled.mpy
 toolkit/workspace/precompiled/modules/LM_oled_sh1106.mpy
@@ -396,7 +393,6 @@ toolkit/workspace/precompiled/web/editor.js
 toolkit/workspace/precompiled/web/filesui.html
 toolkit/workspace/precompiled/web/filesui.js
 toolkit/workspace/precompiled/web/index.html
-toolkit/workspace/precompiled/web/matrix_draw.html
 toolkit/workspace/precompiled/web/uapi.js
 toolkit/workspace/precompiled/web/udashboard.js
 toolkit/workspace/precompiled/web/ustyle.css

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/setup.py

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

{microsdevtoolkit-2.26.0 → microsdevtoolkit-2.26.2}/toolkit/micrOSlint.py

@@ -18,7 +18,7 @@ MICROS_SOURCE_DIR = os.path.join(MYPATH, '../micrOS/source')
 RELEASE_INFO_PATH = os.path.join(MYPATH, '../micrOS/release_info/micrOS_ReleaseInfo')
 
 # MICROS LINTER CONFIG
-ALLOWED_LM_DEP_WARNS = 5        # ALLOWED NUMBER OF LM CORE DEPENDENCY (less is better)
+ALLOWED_LM_DEP_WARNS = 3        # ALLOWED NUMBER OF LM CORE DEPENDENCY (less is better)
 
 def parse_micros_file_categories(verbose=True):
     """
@@ -178,7 +178,7 @@ def core_dep_checker(categories, verbose=True):
 def load_module_checker(categories, verbose=True):
 
     def _is_allowed(_relation):
-        _allowed_whitelist = ['Common', 'microIO', 'Types', 'urequests']
+        _allowed_whitelist = ['Common', 'microIO', 'Types', 'urequests', 'Auth']
         _allowed = []
         for _allow in _relation:
             if _allow in _allowed_whitelist:

microsdevtoolkit-2.26.2/toolkit/simulator_lib/node_config.json

@@ -0,0 +1,6 @@
+{"auth": false,
+  "devfid": "simulator",
+  "appwd": "ADmin123",
+  "webui": true,
+  "boothook": "web load dashboard=True fileserver=True fs_explore=True; fileserver mounts_write_access modules=True logs=True pwd=$pwd; neopixel load; #telegram load '6185435843:AAH71wEyoOil8bRKecQHp4zazTQ_MmE7bvE' &; #telegram receiver_loop &2000",
+  "aioqueue": 4}