From c131841168432401056ec585202e6e65a7ee4443 Mon Sep 17 00:00:00 2001
From: Allan Burdajewicz <allan.burdajewicz@gmail.com>
Date: Thu, 30 Jul 2020 10:19:34 +1000
Subject: [PATCH 1/2] [JENKINS-63243] DockerRegistryEndpoint Pattern should
 accept registry v2 references

---
 .../commons/credentials/DockerRegistryEndpoint.java      | 9 +++++----
 .../commons/credentials/DockerRegistryEndpointTest.java  | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java b/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java
index 19b925fa..529fdcce 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java
@@ -84,12 +84,13 @@ public class DockerRegistryEndpoint extends AbstractDescribableImpl<DockerRegist
      * Some regex magic to parse docker registry:port/namespace/name:tag into parts, using the same constraints as
      * docker push.
      * 
-     * registry must not contain / and must contain a .
+     * registry must not contain /, may contain dashes and must contain a .
      * 
      * everything but name is optional
      */
     private static final Pattern DOCKER_REGISTRY_PATTERN = Pattern
-            .compile("(([^/]+\\.[^/]+)/)?(([a-z0-9_]+)/)?([a-zA-Z0-9-_\\.]+)(:([a-z0-9-_\\.]+))?");
+        .compile("^(?:([a-zA-Z0-9]+(?:(?:[-.][a-zA-Z0-9]+)+)(?::([0-9]+))?)/)?([a-z0-9-_.]+)(?:/([a-z0-9-_.]+))*(:[a-zA-Z0-9-_.]+)?$");
+    
 
     private static final Logger LOGGER = Logger.getLogger(DockerRegistryEndpoint.class.getName());
 
@@ -119,13 +120,13 @@ public DockerRegistryEndpoint(String url, String credentialsId) {
      */
     public static DockerRegistryEndpoint fromImageName(String s, @CheckForNull String credentialsId) {
         Matcher matcher = DOCKER_REGISTRY_PATTERN.matcher(s);
-        if (!matcher.matches() || matcher.groupCount() < 7) {
+        if (!matcher.matches() || matcher.groupCount() < 5) {
             throw new IllegalArgumentException(s + " does not match regex " + DOCKER_REGISTRY_PATTERN);
         }
         String url;
         try {
             // docker push always uses https
-            url = matcher.group(2) == null ? null : new URL("https://" + matcher.group(2)).toString();
+            url = matcher.group(1) == null ? null : new URL("https://" + matcher.group(1)).toString();
         } catch (MalformedURLException e) {
             throw new IllegalArgumentException(s + " can not be parsed as URL: " + e.getMessage());
         }
diff --git a/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java b/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java
index ad9099d1..36b0fd05 100644
--- a/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java
+++ b/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java
@@ -71,6 +71,9 @@ public void testParse() throws Exception {
         assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/acme/test");
         assertRegistry("https://docker.acme.com", "docker.acme.com/acme/test");
         assertRegistry("https://docker.acme.com", "docker.acme.com/busybox");
+        // Registry v2
+        assertRegistry("https://docker.acme.com", "docker.acme.com/path/to/busybox");
+        assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/path/to/busybox");
     }
 
     @Test
@@ -81,6 +84,9 @@ public void testParseWithTags() throws Exception {
         assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/acme/test:tag");
         assertRegistry("https://docker.acme.com", "docker.acme.com/acme/test:tag");
         assertRegistry("https://docker.acme.com", "docker.acme.com/busybox:tag");
+        // Registry v2
+        assertRegistry("https://docker.acme.com", "docker.acme.com/path/to/busybox:tag");
+        assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/path/to/busybox:tag");
     }
 
     @Issue("JENKINS-39181")

From 6ae336f87a1d7f68961b6b38dc6460904de1eb43 Mon Sep 17 00:00:00 2001
From: Allan Burdajewicz <allan.burdajewicz@gmail.com>
Date: Thu, 30 Jul 2020 11:42:44 +1000
Subject: [PATCH 2/2] [JENKINS-63243] Support digest and hostnames

---
 .../credentials/DockerRegistryEndpoint.java     | 17 +++++++++++++++--
 .../credentials/DockerRegistryEndpointTest.java |  5 +++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java b/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java
index 529fdcce..a29f0662 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java
@@ -87,9 +87,19 @@ public class DockerRegistryEndpoint extends AbstractDescribableImpl<DockerRegist
      * registry must not contain /, may contain dashes and must contain a .
      * 
      * everything but name is optional
+     * 
+     * See also https://github.com/docker/distribution/blob/release/2.7/reference/regexp.go
      */
     private static final Pattern DOCKER_REGISTRY_PATTERN = Pattern
-        .compile("^(?:([a-zA-Z0-9]+(?:(?:[-.][a-zA-Z0-9]+)+)(?::([0-9]+))?)/)?([a-z0-9-_.]+)(?:/([a-z0-9-_.]+))*(:[a-zA-Z0-9-_.]+)?$");
+        .compile("^" +
+            // Domain
+            "(?:([a-zA-Z0-9]+(?:(?:[-.][a-zA-Z0-9]+)+)?(?::([0-9]+))?)/)?" +
+            // Repo
+            "([a-z0-9-_.]+)(?:/([a-z0-9-_.]+))*" +
+            // Tag
+            "(:[a-zA-Z0-9-_.]+)?" +
+            // Digest
+            "(@[A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][A-Za-z0-9]*)?$");
     
 
     private static final Logger LOGGER = Logger.getLogger(DockerRegistryEndpoint.class.getName());
@@ -126,7 +136,10 @@ public static DockerRegistryEndpoint fromImageName(String s, @CheckForNull Strin
         String url;
         try {
             // docker push always uses https
-            url = matcher.group(1) == null ? null : new URL("https://" + matcher.group(1)).toString();
+            String domain = matcher.group(1);
+            url = (domain == null || !(domain.contains(".") || domain.contains(":") || "localhost".equalsIgnoreCase(domain))) 
+                ? null
+                : new URL("https://" + matcher.group(1)).toString();
         } catch (MalformedURLException e) {
             throw new IllegalArgumentException(s + " can not be parsed as URL: " + e.getMessage());
         }
diff --git a/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java b/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java
index 36b0fd05..b618d3d1 100644
--- a/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java
+++ b/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java
@@ -73,6 +73,8 @@ public void testParse() throws Exception {
         assertRegistry("https://docker.acme.com", "docker.acme.com/busybox");
         // Registry v2
         assertRegistry("https://docker.acme.com", "docker.acme.com/path/to/busybox");
+        assertRegistry("https://localhost:8080", "localhost:8080/path/to/busybox");
+        assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/path/to/busybox");
         assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/path/to/busybox");
     }
 
@@ -84,9 +86,12 @@ public void testParseWithTags() throws Exception {
         assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/acme/test:tag");
         assertRegistry("https://docker.acme.com", "docker.acme.com/acme/test:tag");
         assertRegistry("https://docker.acme.com", "docker.acme.com/busybox:tag");
+        assertRegistry("https://docker.acme.com", "docker.acme.com/busybox@sha256:sha256");
         // Registry v2
         assertRegistry("https://docker.acme.com", "docker.acme.com/path/to/busybox:tag");
+        assertRegistry("https://localhost:8080", "localhost:8080/path/to/busybox:tag");
         assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/path/to/busybox:tag");
+        assertRegistry("https://docker.acme.com:8080", "docker.acme.com:8080/path/to/busybox@sha256:sha256");
     }
 
     @Issue("JENKINS-39181")