Liron Aravot has uploaded a new change for review. Change subject: core: fixing nfs mountpoint FQDN regex ......................................................................
core: fixing nfs mountpoint FQDN regex *the regex now supports fqdn similar to: "foo.example.f7:/<export>" *minor structural fixes of the regex Change-Id: Iba3121b602d9e2e21bc120875cdfc4298f872841 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NfsMountPointConstraint.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/30995/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NfsMountPointConstraint.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NfsMountPointConstraint.java index bc68e68..8f62acf 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NfsMountPointConstraint.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NfsMountPointConstraint.java @@ -16,7 +16,7 @@ private static final String IP = "((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|"; - private static final String FQDN = "(([A-Za-z0-9]([A-Za-z0-9\\-\\.]{0,61}[A-Za-z0-9])?)*[A-Za-z]))"; + private static final String FQDN = "(?=^.{1,254}$)(^(((?!-)[a-zA-Z0-9-]{1,63}(?<!-))|((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\\.)+[a-zA-Z0-9]{2,63})))"; private static final String PATH = "\\:/(.*?/|.*?\\\\)?([^\\./|^\\.\\\\]+)(?:\\.([^\\\\]*)|)"; diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java index 5184193..798c383 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/validation/NFSMountPointConstraintTest.java @@ -14,6 +14,7 @@ Assert.assertTrue(new NfsMountPointConstraint().isValid("s:/tmp/kakukk", null)); Assert.assertTrue(new NfsMountPointConstraint().isValid("s.foobar:/tmp/kakukk", null)); Assert.assertTrue(new NfsMountPointConstraint().isValid("0s:/tmp/kakukk", null)); + Assert.assertTrue(new NfsMountPointConstraint().isValid("f0o.example.f4:/tmp/kakukk", null)); Assert.assertFalse(new NfsMountPointConstraint().isValid("", null)); Assert.assertFalse(new NfsMountPointConstraint().isValid("/tmp/kakukk", null)); -- To view, visit http://gerrit.ovirt.org/30995 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba3121b602d9e2e21bc120875cdfc4298f872841 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
