Fix loading payloads from USB root

najdek · najdek · commit bfc4d096c5ec · 2026-05-28T13:03:29.000+02:00
- Allow /mnt/usb paths in is_allowed_payload_path - Expose pldmgr_read_config_bool globally Closes #18
diff --git a/include/pldmgr.h b/include/pldmgr.h
@@ -42,6 +42,7 @@
 /* Logging */
 void pldmgr_log(const char *fmt, ...);
 int pldmgr_server_is_active();
+int pldmgr_read_config_bool(const char *key, int default_val);
 
 #include "autoload.h"
 #include "notification.h"
diff --git a/src/main.c b/src/main.c
@@ -240,6 +240,16 @@ static int is_allowed_payload_path(const char *path) {
       return 1;
     }
   }
+
+  /* Allow USB root payloads if SCAN_USB_PAYLOADS is enabled in config */
+  if (strncmp(path, "/mnt/usb", 8) == 0 &&
+      path[8] >= '0' && path[8] <= '7' &&
+      path[9] == '/') {
+    if (pldmgr_read_config_bool("SCAN_USB_PAYLOADS", 0)) {
+      return 1;
+    }
+  }
+
   return 0;
 }
 
diff --git a/src/payload_mgr.c b/src/payload_mgr.c
@@ -831,7 +831,7 @@ static int is_allowed_usb_path(const char *path) {
         return -1;
     }
 
-    static int read_config_bool(const char *key, int default_val) {
+    int pldmgr_read_config_bool(const char *key, int default_val) {
         FILE *f = fopen(PLDMGR_CONFIG_PATH, "r");
         if (!f) return default_val;
         char line[256];
@@ -866,7 +866,7 @@ static int is_allowed_usb_path(const char *path) {
             scan_payloads_recursive(scan_dirs[i], 0, 5, &jb);
         }
 
-        if (read_config_bool("SCAN_USB_PAYLOADS", 0)) {
+        if (pldmgr_read_config_bool("SCAN_USB_PAYLOADS", 0)) {
             for (int i = 0; i < 8; i++) {
                 char usb_root[32];
                 snprintf(usb_root, sizeof(usb_root), "/mnt/usb%d", i);

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,16 @@ static int is_allowed_payload_path(const char *path) {`
`240`	`240`	`return 1;`
`241`	`241`	`}`
`242`	`242`	`}`
	`243`	`+`
	`244`	`+ /* Allow USB root payloads if SCAN_USB_PAYLOADS is enabled in config */`
	`245`	`+ if (strncmp(path, "/mnt/usb", 8) == 0 &&`
	`246`	`+ path[8] >= '0' && path[8] <= '7' &&`
	`247`	`+ path[9] == '/') {`
	`248`	`+ if (pldmgr_read_config_bool("SCAN_USB_PAYLOADS", 0)) {`
	`249`	`+ return 1;`
	`250`	`+ }`
	`251`	`+ }`
	`252`	`+`
`243`	`253`	`return 0;`
`244`	`254`	`}`
`245`	`255`