JENKINS-3133 - Allowing custom port on CVS Root (plus improving

validation of CVS Root value)
jenkinsci · Jan 2, 2012 · 4945e9a · 4945e9a
1 parent ce115fb
commit 4945e9a
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/main/java/hudson/scm/CVSSCM.java b/src/main/java/hudson/scm/CVSSCM.java
@@ -907,8 +907,8 @@ private class RepositoryBrowser {
         private transient Map<String, RepositoryBrowser> browsers;
         // end legacy fields
 
-        private static final Pattern CVSROOT_PSERVER_PATTERN =
-            Pattern.compile(":(ext|extssh|pserver)(;[^:]+)?:[^@^:]+(:[^@]*)?@[^:]+:(\\d+:)?.+");
+        //private static final Pattern CVSROOT_PSERVER_PATTERN =
+        //    Pattern.compile("^:(ext|extssh|pserver)(;[^:]+)?:([^@^:]+(:[^@^:]*)?@)?[^:]+:([0-9]+:)?(\\d+:)?.+$");
 
         /**
          * CVS compression level if individual repositories don't specifically
@@ -1063,16 +1063,10 @@ public FormValidation doCheckCvsRoot(@QueryParameter String value) throws IOExce
                 return FormValidation.error(Messages.CVSSCM_MissingCvsroot());
             }
 
-            Matcher m = CVSROOT_PSERVER_PATTERN.matcher(v);
-
-            // CVSROOT format isn't really that well defined. So it's hard to check this rigorously.
-            if(v.startsWith(":pserver") || v.startsWith(":ext")) {
-                if(!m.matches()) {
-                    return FormValidation.error(Messages.CVSSCM_InvalidCvsroot());
-                }
-                // I can't really test if the machine name exists, either.
-                // some cvs, such as SOCKS-enabled cvs can resolve host names that Jenkins might not
-                // be able to. If :ext is used, all bets are off anyway.
+            try {
+                CVSRoot.parse(v);
+            } catch(IllegalArgumentException ex) {
+                return FormValidation.error(Messages.CVSSCM_InvalidCvsroot());
             }