[JENKINS-31462] GitHub Enterprise Servers validation

jenkinsci · Nov 15, 2015 · b05cadb · b05cadb
1 parent 8aefbc7
commit b05cadb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,10 +36,11 @@
             <artifactId>git</artifactId>
             <version>2.3</version>
         </dependency>
+        <!-- TODO: Update when org.jenkins-ci.plugins:github-api is released -->
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>github-api</artifactId>
-            <version>1.69</version>
+            <version>1.71-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/Endpoint.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/Endpoint.java
@@ -29,7 +29,12 @@
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
 import hudson.util.FormValidation;
-import java.util.regex.Pattern;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.kohsuke.github.GitHub;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
@@ -94,24 +99,27 @@ public String getDisplayName() {
             return "";
         }
 
-        public FormValidation doCheckApiUrl(@QueryParameter String value) {
-            if (Util.fixEmptyAndTrim(value) == null) {
-                return FormValidation.error("You must specify the API URI");
+        public FormValidation doCheckApiUri(@QueryParameter String apiUri) {
+            if (Util.fixEmptyAndTrim(apiUri) == null) {
+                return FormValidation.warning("You must specify the API URI");
             }
-            Pattern enterprise = Pattern.compile("^https?://(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*"
-                    + "([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])/api/v3/?$");
-            if (!enterprise.matcher(value).matches()) {
-                return FormValidation.warning(
-                        "This does not look like a GitHub Enterprise API URI. Expecting something like "
-                                + "https://[hostname or ip]/api/v3/");
+            try {
+                URL api = new URL(apiUri);
+                GitHub github = GitHub.connectToEnterpriseAnonymously(api.toString());
+                if (github.isApiUrlValid()) {
+                    return FormValidation.ok();
+                }
+                return FormValidation.warning("This does not look like a GitHub Enterprise API URI");
+            } catch (MalformedURLException mue) {
+                return FormValidation.error("This does not look like a GitHub Enterprise API URI");
+            } catch (IOException e) {
+                return FormValidation.error(e.getMessage());
             }
-            // TODO validate connection
-            return FormValidation.ok();
         }
 
-        public FormValidation doCheckApiName(@QueryParameter String value) {
-            if (Util.fixEmptyAndTrim(value) == null) {
-                return FormValidation.warning("Specifying a name is recommended");
+        public FormValidation doCheckName(@QueryParameter String name) {
+            if (Util.fixEmptyAndTrim(name) == null) {
+                return FormValidation.warning("You must specify the name");
             }
             return FormValidation.ok();
         }