From 9a583fe82867df80e201075c46e4aa4b20118c6a Mon Sep 17 00:00:00 2001 From: Volker Theile Date: Sat, 6 Jan 2018 13:46:45 +0100 Subject: [PATCH] Improve regular expression to validate NFS extra options. Signed-off-by: Volker Theile --- .../usr/share/openmediavault/datamodels/conf.service.nfs.json | 2 +- .../share/openmediavault/datamodels/conf.service.nfs.share.json | 2 +- 2 files changed, 2 insertions(+), 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 index 6172f4fc181..be30b0a5d9b 100644 --- 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 index c0873c4d726..f87b8f407ae 100644 --- 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@:\\/]+))?$/" } } }