Feat/add https support

pom.xml

@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.sonymobile.tools.gerrit</groupId>
             <artifactId>gerrit-events</artifactId>
-            <version>2.22.0</version>
+            <version>2.23.0</version>
             <exclusions>
                 <!-- Provided by gson-api plugin -->
                 <exclusion>

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritProjectListUpdater.java

@@ -24,6 +24,7 @@
 package com.sonyericsson.hudson.plugins.gerrit.trigger;
 
 import com.sonyericsson.hudson.plugins.gerrit.trigger.utils.StringUtil;
+import hudson.Functions;
 import com.sonymobile.tools.gerrit.gerritevents.ConnectionListener;
 import com.sonymobile.tools.gerrit.gerritevents.GerritEventListener;
 import com.sonymobile.tools.gerrit.gerritevents.dto.GerritEvent;
@@ -34,14 +35,29 @@
 import com.sonyericsson.hudson.plugins.gerrit.trigger.config.IGerritHudsonTriggerConfig;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import net.sf.json.JSONObject;
+import net.sf.json.JSONSerializer;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.Credentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -264,20 +280,22 @@
             if (isConnected()) {
                 logger.info("Trying to load project list.");
                 IGerritHudsonTriggerConfig activeConfig = getConfig();
-                SshConnection sshConnection = SshConnectionFactory.getConnection(
-                        activeConfig.getGerritHostName(),
-                        activeConfig.getGerritSshPort(),
-                        activeConfig.getGerritProxy(),
-                        activeConfig.getGerritAuthentication()
-                );
-                List<String> projects = readProjects(sshConnection.executeCommandReader(GERRIT_LS_PROJECTS));
+                if (activeConfig == null) {
+                    logger.error("Could not load project list: config is null for {}", serverName);
+                    return;
+                }
+                List<String> projects;
+                if (activeConfig.isUseHttpsPoller()) {
+                    projects = loadProjectsViaRest(activeConfig);
+                } else {
+                    projects = loadProjectsViaSsh(activeConfig);
+                }
                 if (!projects.isEmpty()) {
                     setGerritProjects(projects);
                     logger.info("Project list from {} contains {} entries", serverName, projects.size());
                 } else {
                     logger.warn("Project list from {} contains 0 projects", serverName);
                 }
-                sshConnection.disconnect();
             } else {
                 logger.warn("Could not connect to Gerrit server when updating Gerrit project list: "
                         + "Server is not connected (timeout)");
@@ -289,6 +307,95 @@
         }
     }
 
+    /**
+     * Loads the project list via the SSH {@code gerrit ls-projects} command.
+     *
+     * @param activeConfig the server configuration.
+     * @return the list of project names.
+     * @throws SshException if an SSH error occurs.
+     * @throws IOException if an I/O error occurs.
+     */
+    private List<String> loadProjectsViaSsh(IGerritHudsonTriggerConfig activeConfig)
+            throws SshException, IOException {
+        SshConnection sshConnection = SshConnectionFactory.getConnection(
+                activeConfig.getGerritHostName(),
+                activeConfig.getGerritSshPort(),
+                activeConfig.getGerritProxy(),
+                activeConfig.getGerritAuthentication()
+        );
+        try {
+            return readProjects(sshConnection.executeCommandReader(GERRIT_LS_PROJECTS));
+        } finally {
+            sshConnection.disconnect();
+        }
+    }
+
+    /**
+     * Loads the project list via the Gerrit REST API.
+     *
+     * @param activeConfig the server configuration.
+     * @return the list of project names.
+     * @throws IOException if an I/O error occurs.
+     */
+    private List<String> loadProjectsViaRest(IGerritHudsonTriggerConfig activeConfig)
+            throws IOException {
+        String frontEndUrl = activeConfig.getGerritFrontEndUrl();
+        String url = Functions.joinPath(frontEndUrl, "a/projects/?d");
+
+        Credentials httpCredentials = activeConfig.getHttpCredentials();
+        CredentialsProvider credsProvider = new BasicCredentialsProvider();
+        credsProvider.setCredentials(AuthScope.ANY, httpCredentials);
+        HttpClient httpClient = HttpClients.custom()
+                .setDefaultCredentialsProvider(credsProvider)
+                .build();
+        HttpGet httpGet = new HttpGet(url);
+        HttpResponse response = httpClient.execute(httpGet);
+        int statusCode = response.getStatusLine().getStatusCode();
+        if (statusCode != HttpURLConnection.HTTP_OK) {
+            throw new IOException("HTTP " + statusCode + " for project list query");
+        }
+
+        StringBuilder sb = new StringBuilder();
+        try (BufferedReader reader = new BufferedReader(
+                new InputStreamReader(response.getEntity().getContent(),
+                        StandardCharsets.UTF_8))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line);
+            }
+        }
+        String body = sb.toString();
+        // Strip Gerrit JSON hijacking prevention prefix
+        if (body.startsWith(")]}'")) {
+            body = body.substring(")]}'".length());
+        }
+        return readProjectsFromJson(body);
+    }
+
+    /**
+     * Reads project names from a Gerrit REST API projects JSON response.
+     * The response format is a JSON object where each key is a project name.
+     *
+     * @param jsonBody the JSON response body.
+     * @return the list of project names.
+     * @throws IOException if JSON parsing fails.
+     */
+    static List<String> readProjectsFromJson(String jsonBody) throws IOException {
+        List<String> projects = new ArrayList<String>();
+        try {
+            JSONObject json = (JSONObject)JSONSerializer.toJSON(jsonBody);
+            for (Iterator<?> it = json.keys(); it.hasNext();) {
+                String key = (String)it.next();
+                if (key != null && !key.isEmpty()) {
+                    projects.add(key);
+                }
+            }
+        } catch (Exception ex) {
+            throw new IOException("Failed to parse projects JSON response", ex);
+        }
+        return projects;
+    }
+
     /**
      * Get the the server config.
      * @return the server config or null if config not found.

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer.java

@@ -100,6 +100,9 @@
 import com.sonymobile.tools.gerrit.gerritevents.GerritHandler;
 import com.sonymobile.tools.gerrit.gerritevents.GerritQueryHandler;
 import com.sonymobile.tools.gerrit.gerritevents.GerritConnection;
+import com.sonymobile.tools.gerrit.gerritevents.GerritEventSource;
+import com.sonymobile.tools.gerrit.gerritevents.GerritRestPoller;
+import com.sonymobile.tools.gerrit.gerritevents.GerritRestQueryHandler;
 import com.sonymobile.tools.gerrit.gerritevents.dto.GerritEvent;
 import com.sonymobile.tools.gerrit.gerritevents.dto.rest.Notify;
 import com.sonymobile.tools.gerrit.gerritevents.ssh.Authentication;
@@ -152,7 +155,7 @@
     private transient boolean timeoutWakeup = false;
     private transient String connectionResponse = "";
     private transient GerritHandler gerritEventManager;
-    private transient GerritConnection gerritConnection;
+    private transient GerritEventSource gerritConnection;
     private transient GerritProjectListUpdater projectListUpdater;
     private IGerritHudsonTriggerConfig config;
     private transient GerritConnectionListener gerritConnectionListener;
@@ -252,7 +255,7 @@
     public void setConfig(IGerritHudsonTriggerConfig config) {
         checkPermission();
         this.config = config;
-        gerritQueryHnadler = new GerritQueryHandler(config);
+        gerritQueryHnadler = null;
     }
 
     /**
@@ -262,7 +265,11 @@
      */
     public GerritQueryHandler getQueryHandler() {
         if (gerritQueryHnadler == null) {
-            gerritQueryHnadler = new GerritQueryHandler(config);
+            if (config.isUseHttpsPoller()) {
+                gerritQueryHnadler = new GerritRestQueryHandler(config);
+            } else {
+                gerritQueryHnadler = new GerritQueryHandler(config);
+            }
         }
         return gerritQueryHnadler;
     }
@@ -581,9 +588,23 @@
     public synchronized void startConnection() {
         checkPermission();
         if (!config.hasDefaultValues()) {
-            if (gerritConnection == null) {
+            if (gerritConnection != null && gerritConnection.isConnected()) {
+                logger.warn("Already started!");
+            } else {
+                // If there's an existing but dead connection, stop it first
+                if (gerritConnection != null) {
+                    logger.info("{}: Stopping failed connection before restart.", name);
+                    gerritConnection.shutdown(false);
+                    gerritConnection.removeListener(gerritConnectionListener);
+                    gerritConnection.removeListener(missedEventsPlaybackManager);
+                }
                 logger.debug("Starting Gerrit connection...");
-                gerritConnection = new GerritConnection(name, config);
+                if (config.isUseHttpsPoller()) {
+                    logger.info("{}: Using HTTPS polling for Gerrit events.", name);
+                    gerritConnection = new GerritRestPoller(name, config);
+                } else {
+                    gerritConnection = new GerritConnection(name, config);
+                }
                 if (config.isTriggerOnAllComments()) {
                     logger.info("Will trigger on all comments, even from the configured user.");
                 } else {
@@ -598,8 +619,6 @@
                 gerritConnection.addListener(missedEventsPlaybackManager);
 
                 gerritConnection.start();
-            } else {
-                logger.warn("Already started!");
             }
             // Initialize project list update after connection with Gerrit server
             projectListUpdater.initProjectListUpdater();

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/PluginImpl.java

@@ -335,6 +335,23 @@ public static GerritServer getFirstServer_() {
         return plugin.getFirstServer();
     }
 
+    /**
+     * Get the server with the given name, falling back to the first server
+     * when the named server is not found.
+     *
+     * @param name the server name, or null.
+     * @return the server, or null if no server could be found.
+     */
+    @CheckForNull
+    //CS IGNORE MethodName FOR NEXT 1 LINES. REASON: Static equivalent marker.
+    public static GerritServer getServerOrFirst_(String name) {
+        GerritServer server = getServer_(name);
+        if (server == null) {
+            server = getFirstServer_();
+        }
+        return server;
+    }
+
     /**
      * Set the list of Gerrit servers.
      *