From df6e300d92ef1b471db8bea55bed08817eaca1d8 Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <t.wieczorek@yieldlab.de>
Date: Fri, 5 Apr 2019 12:05:06 +0200
Subject: [PATCH] Don't fail SCMName detection on non-IDN host names

Previously, when passing an URL with a host name that is not a valid IDN to SCMName::from, it failed with an IllegalArgumentException. This especially affects the case when the host name is an IP address. Make this method a bit more graceful by returning null instead.
---
 src/main/java/jenkins/scm/api/SCMName.java    | 30 ++++++++++++++-----
 .../java/jenkins/scm/api/SCMNameTest.java     |  5 ++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/java/jenkins/scm/api/SCMName.java b/src/main/java/jenkins/scm/api/SCMName.java
index 199e1f93..0989ec2e 100644
--- a/src/main/java/jenkins/scm/api/SCMName.java
+++ b/src/main/java/jenkins/scm/api/SCMName.java
@@ -105,15 +105,13 @@ private static String innerFromUrl(@NonNull String url, @CheckForNull List<Strin
         if (StringUtils.isBlank(hostName)) {
             return null;
         }
-        // let's see if we can make this more "friendly"
-        InternetDomainName host = InternetDomainName.from(IDN.toASCII(hostName));
-        if (host.hasPublicSuffix()) {
-            String publicName = host.publicSuffix().name();
-            hostName = StringUtils.removeEnd(StringUtils.removeEnd(host.name(), publicName), ".")
-                    .toLowerCase(Locale.ENGLISH);
-        } else {
-            hostName = StringUtils.removeEnd(host.name(), ".").toLowerCase(Locale.ENGLISH);
+
+        hostName = resolveInternetDomainName(hostName);
+        if (hostName == null) {
+            return null;
         }
+
+        // let's see if we can make this more "friendly"
         if (ignoredPrefixes != null) {
             for (String prefix : ignoredPrefixes) {
                 if (prefix.endsWith(".")) {
@@ -134,4 +132,20 @@ private static String innerFromUrl(@NonNull String url, @CheckForNull List<Strin
         }
         return hostName;
     }
+
+    private static String resolveInternetDomainName(String hostName) {
+        final InternetDomainName host;
+        try {
+            host = InternetDomainName.from(IDN.toASCII(hostName));
+        } catch (IllegalArgumentException notADomainName) {
+            return null;
+        }
+
+        if (host.hasPublicSuffix()) {
+            final String publicName = host.publicSuffix().name();
+            return StringUtils.removeEnd(StringUtils.removeEnd(host.name(), publicName), ".").toLowerCase(Locale.ENGLISH);
+        }
+
+        return StringUtils.removeEnd(host.name(), ".").toLowerCase(Locale.ENGLISH);
+    }
 }
diff --git a/src/test/java/jenkins/scm/api/SCMNameTest.java b/src/test/java/jenkins/scm/api/SCMNameTest.java
index b7ce0146..cafc953f 100644
--- a/src/test/java/jenkins/scm/api/SCMNameTest.java
+++ b/src/test/java/jenkins/scm/api/SCMNameTest.java
@@ -68,4 +68,9 @@ public void given__url_with_idn__when__naming__then__punycode_is_roundtripped2()
         assertThat(SCMName.fromUrl("http://\u4F8B\u5B50.\u4E2D\u56FD/"), is("\u4F8B\u5B50"));
     }
 
+    @Test
+    public void given__url_with_ipv4address__when__naming__then__no_name_inferred() throws Exception {
+        assertThat(SCMName.fromUrl("http://127.0.0.1/scm"), is(nullValue()));
+    }
+
 }