Local Video: Widget video path does not allow Windows file path (#3461)

relates to xibosignage/xibo#3461
xibosignage · Aug 1, 2024 · 65dab62 · 65dab62
1 parent 646f67e
commit 65dab62
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/Widget/Definition/Property.php b/lib/Widget/Definition/Property.php
@@ -275,6 +275,23 @@ public function validate(array $properties, string $stage): Property
                             }
                             break;
 
+                        case 'windowsPath':
+                            // Ensure the path is a valid Windows file path ending in a file, not a directory
+                            $windowsPathRegex = '/^(?P<Root>[A-Za-z]:)(?P<Relative>(?:\\\\[^<>:"\/\\\\|?*\r\n]+)+)(?P<File>\\\\[^<>:"\/\\\\|?*\r\n]+)$/';
+
+                            // Check if the test value is not empty and does not match the regular expression
+                            if (!empty($testValue)
+                                && !preg_match($windowsPathRegex, $testValue)
+                            ) {
+                                // Throw an InvalidArgumentException if the test value is not a valid Windows path
+                                throw new InvalidArgumentException(
+                                    $message ?? sprintf(__('%s must be a valid Windows path'), $this->title),
+                                    $this->id
+                                );
+                            }
+
+                            break;
+
                         case 'interval':
                             if (!empty($testValue)) {
                                 // Try to create a date interval from it

diff --git a/modules/localvideo.xml b/modules/localvideo.xml
@@ -46,7 +46,10 @@
             <rule>
                 <test type="and">
                     <condition type="required"></condition>
+                </test>
+                <test type="or">
                     <condition type="uri"></condition>
+                    <condition type="windowsPath"></condition>
                 </test>
             </rule>
         </property>