better path detection for CABs inside MSIs

binref · Nov 20, 2024 · 064c110 · 064c110
1 parent 203ed1a
commit 064c110
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/refinery/units/formats/msi.py b/refinery/units/formats/msi.py
@@ -373,9 +373,13 @@ def _iscab(path):
                     dst_name = file_info['FileName']
                 except KeyError:
                     continue
-                short, pipe, long = dst_name.partition('|')
-                if pipe == '|' and short and long:
-                    file_names[src_name] = long
+                _, _, long = dst_name.partition('|')
+                dst_name = long or dst_name
+                if not re.fullmatch(R'[-\w,.]+', dst_name):
+                    continue
+                if any(dst_name.count(odd) > 10 for odd in '-,.'):
+                    continue
+                file_names[src_name] = dst_name
 
             for path, cab in cabs.items():
                 try: