Amend shared folder regex

mreid-tt · Dec 9, 2023 · fddbba7 · fddbba7
1 parent 5a18a4f
commit fddbba7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/spk/owncloud/src/wizard_templates/install_uifile.sh b/spk/owncloud/src/wizard_templates/install_uifile.sh
@@ -24,7 +24,28 @@ page_append ()
 
 RESTORE_BACKUP_FILE="wizard_owncloud_restore"
 BACKUP_FILE_PATH="wizard_backup_file"
-ERROR_TEXT="{{{OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT}}}"
+BACKUP_FILE_ERROR_TEXT="{{{OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT}}}"
+DATA_DIRECTORY_ERROR_TEXT="{{{OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT}}}"
+DATA_DIRECTORY_EMPTY_TEXT="{{{OWNCLOUD_DATA_DIRECTORY_EMPTY_ERROR_TEXT}}}"
+
+getValidShare()
+{
+	VALID_SHARE=$(/bin/cat<<EOF
+{
+	var dataShare = arguments[0];
+	const pattern = /^[\w.][\w. -]{0,30}[\w.-]\$?$|^[\w]$/;
+	if (dataShare === "") {
+		return "${DATA_DIRECTORY_EMPTY_TEXT}";
+	} else if (pattern.test(dataShare)) {
+		return true;
+	} else {
+		return "${DATA_DIRECTORY_ERROR_TEXT}";
+	}
+}
+EOF
+)
+	echo "$VALID_SHARE" | quote_json
+}
 
 checkBackupFile()
 {
@@ -35,7 +56,7 @@ checkBackupFile()
 	var fileRestore = step.getComponent("${RESTORE_BACKUP_FILE}");
 	if (fileRestore.checked) {
 		if (backupFileCheck === "") {
-			return "${ERROR_TEXT}";
+			return "${BACKUP_FILE_ERROR_TEXT}";
 		}
 	}
 	return true;
@@ -191,11 +212,7 @@ PAGE_ADMIN_CONFIG=$(/bin/cat<<EOF
 			"desc": "{{{OWNCLOUD_DATA_DIRECTORY_LABEL}}}",
 			"defaultValue": "${SHAREDIR}",
 			"validator": {
-				"allowBlank": false,
-				"regex": {
-					"expr": "/^[\\w.][\\w. -]{0,30}[\\w.-]\\$?$|^[\\w]$/",
-					"errorText": "{{{OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT}}}"
-				}
+				"fn": "$(getValidShare)"
 			}
 		}]
 	}]

diff --git a/spk/owncloud/src/wizard_templates/install_uifile.yml b/spk/owncloud/src/wizard_templates/install_uifile.yml
@@ -7,6 +7,7 @@ OWNCLOUD_BACKUP_FILE_LOCATION_LABEL: "Backup file location"
 OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT: "An empty file path is not allowed when restore is enabled."
 OWNCLOUD_DATA_DIRECTORY_DESCRIPTION: "ownCloud data directory"
 OWNCLOUD_DATA_DIRECTORY_LABEL: "Share name"
+OWNCLOUD_DATA_DIRECTORY_EMPTY_ERROR_TEXT: "An empty data directory is not allowed for new deployments."
 OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT: "Subdirectories are not supported."
 
 OWNCLOUD_ADMIN_CONFIGURATION_STEP_TITLE: "ownCloud admin configuration"

diff --git a/spk/owncloud/src/wizard_templates/install_uifile_fre.yml b/spk/owncloud/src/wizard_templates/install_uifile_fre.yml
@@ -7,6 +7,7 @@ OWNCLOUD_BACKUP_FILE_LOCATION_LABEL: "Emplacement du fichier de sauvegarde"
 OWNCLOUD_BACKUP_FILE_VALIDATION_ERROR_TEXT: "Un chemin de fichier vide n'est pas autorisé lorsque la restauration est activée."
 OWNCLOUD_DATA_DIRECTORY_DESCRIPTION: "Répertoire de données ownCloud"
 OWNCLOUD_DATA_DIRECTORY_LABEL: "Partager le nom"
+OWNCLOUD_DATA_DIRECTORY_EMPTY_ERROR_TEXT: "Un répertoire de données vide n'est pas autorisé pour les nouveaux déploiements."
 OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT: "Les sous-répertoires ne sont pas pris en charge."
 
 OWNCLOUD_ADMIN_CONFIGURATION_STEP_TITLE: "Configuration de l'administrateur d'ownCloud"