Fixed regexp in database connection (#821)

contao · Jul 22, 2024 · e36a140 · e36a140
1 parent 7ef9d8d
commit e36a140
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/api/Controller/Server/DatabaseController.php b/api/Controller/Server/DatabaseController.php
@@ -27,7 +27,8 @@
  */
 class DatabaseController
 {
-    private const URL_PATTERN = '^([^:]+)://(([^:@]+)(:([^@]+))?@)?([^:/]+(:[0-9]+)?)/([^?]+)(\?.+)?$';
+    // double escaping is necessary for JavaScript validation
+    private const URL_PATTERN = '^([^:]+)://(([^:@]+)(:([^@]+))?@)?([^:\/]+(:[0-9]+)?)/([^?]+)(\\?.+)?$';
 
     /**
      * @var ContaoApi

diff --git a/src/components/setup/DatabaseConnection.vue b/src/components/setup/DatabaseConnection.vue
@@ -138,7 +138,7 @@ export default {
         ...mapState('contao/backup', { backupRestored: 'restored', backupRestore: 'restore' }),
         ...mapState('server/database', { currentUrl: 'url', urlPattern: 'pattern', status: 'status' }),
         ...mapState('contao/backup', ['files']),
-        ...mapGetters('contao/database', { hasDatabaseError: 'hasError' }),
+        ...mapGetters('server/database', { hasDatabaseError: 'hasError' }),
         ...mapGetters('contao/backup', ['hasBackups']),
 
         fileOptions () {