Fix some details in the ReferenceParser.

Author: gesellix

client/src/main/groovy/de/gesellix/docker/client/distribution/ReferenceParser.groovy

@@ -35,7 +35,7 @@ class ReferenceParser {
 
     String DomainRegexp = "${domainComponentRegexp}(?:(?:\\.${domainComponentRegexp})+)?(?::[0-9]+)?"
 
-    String NameRegexp = "(?:${DomainRegexp})?/${nameComponentRegexp}(?:(?:/)+)?${nameComponentRegexp}"
+    String NameRegexp = "(?:${DomainRegexp}/)?${nameComponentRegexp}(?:(?:/${nameComponentRegexp})+)?"
 
     String TagRegexp = "[\\w][\\w.-]{0,127}"
 
@@ -82,10 +82,9 @@ class ReferenceParser {
         log.debug "anchoredNameMatcher.groupCount(): ${anchoredNameMatcher.groupCount()}"
 
         if (anchoredNameMatcher.matches()
-                && anchoredNameMatcher.groupCount() == 3
-                && anchoredNameMatcher.group(1) != null
+                && anchoredNameMatcher.groupCount() >= 2
                 && anchoredNameMatcher.group(2) != null) {
-            repo.domain = anchoredNameMatcher.group(1)
+            repo.domain = anchoredNameMatcher.group(1) ?: ""
             repo.path = anchoredNameMatcher.group(2)
         }
         else {
@@ -158,13 +157,13 @@ class ReferenceParser {
             throw new IllegalArgumentException("invalid checksum digest format")
         }
 
-        def algorithm = s.substring(0, i)
+        def algorithm = s.substring(0, i).toUpperCase()
         if (!knownAlgorithms.contains(algorithm)) {
             throw new IllegalArgumentException("unsupported digest algorithm")
         }
 
         // Digests much always be hex-encoded, ensuring that their hex portion will always be size*2
-        if (algorithmDigestSizes[algorithm] * 2 != s.substring(i + 1)) {
+        if (algorithmDigestSizes[algorithm] * 2 != s.substring(i + 1).length()) {
             throw new IllegalArgumentException("invalid checksum digest length")
         }
     }

client/src/test/groovy/de/gesellix/docker/client/distribution/ReferenceParserTest.groovy

@@ -1,4 +1,40 @@
 package de.gesellix.docker.client.distribution
 
-class ReferenceParserTest {
+import spock.lang.Specification
+
+class ReferenceParserTest extends Specification {
+
+    ReferenceParser parser
+
+    def setup() {
+        parser = new ReferenceParser()
+    }
+
+    def "parse reference"() {
+        when:
+        def reference = parser.parse(s)
+        then:
+        reference == r
+        where:
+        s                                                                                                                                                                           || r
+        "docker.io/library/alpine:edge"                                                                                                                                             || [repo: [domain: "docker.io", path: "library/alpine"], tag: "edge"]
+        "test_com"                                                                                                                                                                  || [domain: "", path: "test_com"]
+        "test.com:tag"                                                                                                                                                              || [repo: [domain: "", path: "test.com"], tag: "tag"]
+        "test.com:5000"                                                                                                                                                             || [repo: [domain: "", path: "test.com"], tag: "5000"]
+        "test.com/repo:tag"                                                                                                                                                         || [repo: [domain: "test.com", path: "repo"], tag: "tag"]
+        "test:5000/repo"                                                                                                                                                            || [domain: "test:5000", path: "repo"]
+        "test:5000/repo:tag"                                                                                                                                                        || [repo: [domain: "test:5000", path: "repo"], tag: "tag"]
+        "lowercase:Uppercase"                                                                                                                                                       || [repo: [domain: "", path: "lowercase"], tag: "Uppercase"]
+        "foo_bar.com:8080"                                                                                                                                                          || [repo: [domain: "", path: "foo_bar.com"], tag: "8080"]
+        "foo/foo_bar.com:8080"                                                                                                                                                      || [repo: [domain: "foo", path: "foo_bar.com"], tag: "8080"]
+        "sub-dom1.foo.com/bar/baz/quux"                                                                                                                                             || [domain: "sub-dom1.foo.com", path: "bar/baz/quux"]
+        "sub-dom1.foo.com/bar/baz/quux:some-long-tag"                                                                                                                               || [repo: [domain: "sub-dom1.foo.com", path: "bar/baz/quux"], tag: "some-long-tag"]
+        "b.gcr.io/test.example.com/my-app:test.example.com"                                                                                                                         || [repo: [domain: "b.gcr.io", path: "test.example.com/my-app"], tag: "test.example.com"]
+        // ☃.com in punycode
+        "xn--n3h.com/myimage:xn--n3h.com"                                                                                                                                           || [repo: [domain: "xn--n3h.com", path: "myimage"], tag: "xn--n3h.com"]
+        // 🐳.com in punycode
+        "xn--7o8h.com/myimage:xn--7o8h.com@sha512:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" || [repo: [domain: "xn--7o8h.com", path: "myimage"], tag: "xn--7o8h.com", digest: "sha512:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"]
+        "test:5000/repo@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"                                                                                    || [repo: [domain: "test:5000", path: "repo"], digest: "sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"]
+        "test:5000/repo:tag@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"                                                                                || [repo: [domain: "test:5000", path: "repo"], tag: "tag", digest: "sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"]
+    }
 }