From d5d7fd3248053ebc1e834cb960b7c18a3e68bcea Mon Sep 17 00:00:00 2001
From: Fried Hoeben <github@hsac.nl>
Date: Tue, 17 Dec 2019 11:09:09 +0100
Subject: [PATCH] Support importing https pages, fixes #1086

---
 .../FitNesse/ReleaseNotes/content.txt         |  1 +
 src/fitnesse/responders/WikiImporter.java     | 36 +++++++++++++------
 .../fitnesse/responders/WikiImporterTest.java | 31 +++++++++++-----
 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/FitNesseRoot/FitNesse/ReleaseNotes/content.txt b/FitNesseRoot/FitNesse/ReleaseNotes/content.txt
index afa9b7700d..70a4080d24 100644
--- a/FitNesseRoot/FitNesse/ReleaseNotes/content.txt
+++ b/FitNesseRoot/FitNesse/ReleaseNotes/content.txt
@@ -1,4 +1,5 @@
 !2 ${FITNESSE_VERSION}
+ * Support importing remote wiki pages over https (not just http) ([[1086][https://github.com/unclebob/fitnesse/issues/1086]])
 
 !2 20191110
  * Improved failure navigator at top-right after running tests: some tests were missed, others were counted twice. #1246
diff --git a/src/fitnesse/responders/WikiImporter.java b/src/fitnesse/responders/WikiImporter.java
index 6c91c57c05..ab6ad8b995 100644
--- a/src/fitnesse/responders/WikiImporter.java
+++ b/src/fitnesse/responders/WikiImporter.java
@@ -30,6 +30,7 @@ public class WikiImporter implements XmlizerPageHandler, TraversalListener<WikiP
   private String remoteUsername;
   private String remotePassword;
 
+  private String remoteProtocol;
   private String remoteHostname;
   private int remotePort;
   private WikiPagePath localPath;
@@ -179,7 +180,7 @@ protected void importRemotePageContent(WikiPage localPage) throws IOException {
 
   public String remoteUrl() {
     String remotePathName = PathParser.render(remotePath);
-    return "http://" + remoteHostname + ":" + remotePort + "/" + remotePathName;
+    return remoteProtocol + "://" + remoteHostname + ":" + remotePort + "/" + remotePathName;
   }
 
   @Override
@@ -233,6 +234,10 @@ public WikiPagePath getLocalPath() {
     return localPath;
   }
 
+  public String getRemoteProtocol() {
+    return remoteProtocol;
+  }
+
   public String getRemoteHostname() {
     return remoteHostname;
   }
@@ -259,20 +264,15 @@ public void parseUrl(String urlString) throws MalformedURLException {
     URL url;
     try {
       url = new URL(urlString);
-    }
-    catch (MalformedURLException e) {
+    } catch (MalformedURLException e) {
       throw new MalformedURLException(urlString + " is not a valid URL.");
     }
 
+    remoteProtocol = url.getProtocol();
     remoteHostname = url.getHost();
-    remotePort = url.getPort();
-    if (remotePort == -1)
-      remotePort = 80;
-
-    String path = url.getPath();
-    while (path.startsWith("/"))
-      path = path.substring(1);
+    remotePort = extractPort(url);
 
+    String path = extractPath(url);
     remotePath = PathParser.parse(path);
 
     if (remotePath == null) {
@@ -280,6 +280,22 @@ public void parseUrl(String urlString) throws MalformedURLException {
     }
   }
 
+  private int extractPort(URL url) {
+    int port = url.getPort();
+    if (port == -1) {
+      port = url.getDefaultPort();
+    }
+    return port;
+  }
+
+  private String extractPath(URL url) {
+    String path = url.getPath();
+    while (path.startsWith("/")) {
+      path = path.substring(1);
+    }
+    return path;
+  }
+
   public void setWikiImporterClient(WikiImporterClient client) {
     importerClient = client;
   }
diff --git a/test/fitnesse/responders/WikiImporterTest.java b/test/fitnesse/responders/WikiImporterTest.java
index f9689a2e0a..12f8db0183 100644
--- a/test/fitnesse/responders/WikiImporterTest.java
+++ b/test/fitnesse/responders/WikiImporterTest.java
@@ -139,18 +139,31 @@ public void testGetPageTree() throws Exception {
   }
 
   @Test
-  public void testUrlParsing() throws Exception {
-    testUrlParsing("http://mysite.com", "mysite.com", 80, "");
-    testUrlParsing("http://mysite.com/", "mysite.com", 80, "");
-    testUrlParsing("http://mysite.com:8080/", "mysite.com", 8080, "");
-    testUrlParsing("http://mysite.com:8080", "mysite.com", 8080, "");
-    testUrlParsing("http://mysite.com:80/", "mysite.com", 80, "");
-    testUrlParsing("http://mysite.com/PageOne", "mysite.com", 80, "PageOne");
-    testUrlParsing("http://mysite.com/PageOne.ChildOne", "mysite.com", 80, "PageOne.ChildOne");
+  public void testUrlParsingHttp() throws Exception {
+    testUrlParsing("http://mysite.com", "http", "mysite.com", 80, "");
+    testUrlParsing("http://mysite.com/", "http", "mysite.com", 80, "");
+    testUrlParsing("http://mysite.com:8080/", "http", "mysite.com", 8080, "");
+    testUrlParsing("http://mysite.com:8080", "http", "mysite.com", 8080, "");
+    testUrlParsing("http://mysite.com:80/", "http", "mysite.com", 80, "");
+    testUrlParsing("http://mysite.com/PageOne", "http", "mysite.com", 80, "PageOne");
+    testUrlParsing("http://mysite.com/PageOne.ChildOne", "http", "mysite.com", 80, "PageOne.ChildOne");
   }
 
-  private void testUrlParsing(String url, String host, int port, String path) throws Exception {
+  @Test
+  public void testUrlParsingHttps() throws Exception {
+    testUrlParsing("https://mysite.com", "https", "mysite.com", 443, "");
+    testUrlParsing("https://mysite.com/", "https", "mysite.com", 443, "");
+    testUrlParsing("https://mysite.com:8080/", "https", "mysite.com", 8080, "");
+    testUrlParsing("https://mysite.com:8080", "https", "mysite.com", 8080, "");
+    testUrlParsing("https://mysite.com:80/", "https", "mysite.com", 80, "");
+    testUrlParsing("https://mysite.com/PageOne", "https", "mysite.com", 443, "PageOne");
+    testUrlParsing("https://mysite.com/PageOne.ChildOne", "https", "mysite.com", 443, "PageOne.ChildOne");
+    testUrlParsing("https://mysite.com:377/PageOne.ChildOne", "https", "mysite.com", 377, "PageOne.ChildOne");
+  }
+
+  private void testUrlParsing(String url, String protocol, String host, int port, String path) throws Exception {
     importer.parseUrl(url);
+    assertEquals(protocol, importer.getRemoteProtocol());
     assertEquals(host, importer.getRemoteHostname());
     assertEquals(port, importer.getRemotePort());
     assertEquals(path, PathParser.render(importer.getRemotePath()));