Improve regular expression to validate NFS extra options.

Signed-off-by: Volker Theile <votdev@gmx.de>
openmediavault · Jan 6, 2018 · 9a583fe · 9a583fe
1 parent 7fcf7dd
commit 9a583fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deb/openmediavault/usr/share/openmediavault/datamodels/conf.service.nfs.json b/deb/openmediavault/usr/share/openmediavault/datamodels/conf.service.nfs.json
@@ -46,7 +46,7 @@
 							},
 							"extraoptions": {
 								"type": "string",
-								"pattern": "/^(\\w+[,])*\\w+$/"
+								"pattern": "/^(([a-zA-Z_]+)(=([\\w@:\\/]+))?[,])*([a-zA-Z_]+)(=([\\w@:\\/]+))?$/"
 							}
 						}
 					}

diff --git a/deb/openmediavault/usr/share/openmediavault/datamodels/conf.service.nfs.share.json b/deb/openmediavault/usr/share/openmediavault/datamodels/conf.service.nfs.share.json
@@ -31,7 +31,7 @@
 		},
 		"extraoptions": {
 			"type": "string",
-			"pattern": "/^(\\w+[,])*\\w+$/"
+			"pattern": "/^(([a-zA-Z_]+)(=([\\w@:\\/]+))?[,])*([a-zA-Z_]+)(=([\\w@:\\/]+))?$/"
 		}
 	}
 }