[JENKINS-72028] deprecated URL instantiation applied

cli/src/main/java/hudson/cli/CLI.java

@@ -39,7 +39,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
-import java.net.URL;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -306,7 +306,7 @@ public boolean verify(String s, SSLSession sslSession) {
         }
 
         CLIConnectionFactory factory = new CLIConnectionFactory();
-        String userInfo = new URL(url).getUserInfo();
+        String userInfo = new URI(url).getUserInfo();
         if (userInfo != null) {
             factory = factory.basicAuth(userInfo);
         } else if (auth != null) {
@@ -386,9 +386,9 @@ public void close() throws IOException {
         }
     }
 
-    private static int plainHttpConnection(String url, List<String> args, CLIConnectionFactory factory) throws IOException, InterruptedException {
+    private static int plainHttpConnection(String url, List<String> args, CLIConnectionFactory factory) throws IOException, InterruptedException, URISyntaxException {
         LOGGER.log(FINE, "Trying to connect to {0} via plain protocol over HTTP", url);
-        FullDuplexHttpStream streams = new FullDuplexHttpStream(new URL(url), "cli?remoting=false", factory.authorization);
+        FullDuplexHttpStream streams = new FullDuplexHttpStream(new URI(url).toURL(), "cli?remoting=false", factory.authorization);
         try (ClientSideImpl connection = new ClientSideImpl(new PlainCLIProtocol.FramedOutput(streams.getOutputStream()))) {
             connection.start(args);
             InputStream is = streams.getInputStream();

cli/src/main/java/hudson/cli/SSHCLI.java

@@ -29,12 +29,12 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.util.QuotedStringTokenizer;
 import java.io.IOException;
-import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.KeyPair;
-import java.security.PublicKey;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
@@ -45,7 +45,6 @@
 import org.apache.sshd.client.future.ConnectFuture;
 import org.apache.sshd.client.keyverifier.DefaultKnownHostsServerKeyVerifier;
 import org.apache.sshd.client.keyverifier.KnownHostsServerKeyVerifier;
-import org.apache.sshd.client.keyverifier.ServerKeyVerifier;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.common.future.WaitableFuture;
 import org.apache.sshd.common.util.io.input.NoCloseInputStream;
@@ -60,9 +59,14 @@
  */
 class SSHCLI {
 
-    static int sshConnection(String jenkinsUrl, String user, List<String> args, PrivateKeyProvider provider, final boolean strictHostKey) throws IOException {
+    static int sshConnection(String jenkinsUrl, String user, List<String> args, PrivateKeyProvider provider, final boolean strictHostKey) throws IOException, URISyntaxException {
         Logger.getLogger(SecurityUtils.class.getName()).setLevel(Level.WARNING); // suppress: BouncyCastle not registered, using the default JCE provider
-        URL url = new URL(jenkinsUrl + "login");
+        URL url = null;
+        try {
+            url = new URI(jenkinsUrl + "login").toURL();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
         URLConnection conn = openConnection(url);
         CLI.verifyJenkinsConnection(conn);
         String endpointDescription = conn.getHeaderField("X-SSH-Endpoint");
@@ -86,12 +90,9 @@ static int sshConnection(String jenkinsUrl, String user, List<String> args, Priv
 
         try (SshClient client = SshClient.setUpDefaultClient()) {
 
-            KnownHostsServerKeyVerifier verifier = new DefaultKnownHostsServerKeyVerifier(new ServerKeyVerifier() {
-                @Override
-                public boolean verifyServerKey(ClientSession clientSession, SocketAddress remoteAddress, PublicKey serverKey) {
-                    CLI.LOGGER.log(Level.WARNING, "Unknown host key for {0}", remoteAddress.toString());
-                    return !strictHostKey;
-                }
+            KnownHostsServerKeyVerifier verifier = new DefaultKnownHostsServerKeyVerifier((clientSession, remoteAddress, serverKey) -> {
+                CLI.LOGGER.log(Level.WARNING, "Unknown host key for {0}", remoteAddress.toString());
+                return !strictHostKey;
             }, true);
 
             client.setServerKeyVerifier(verifier);

core/src/main/java/hudson/FilePath.java

@@ -83,6 +83,7 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.Charset;
@@ -1065,6 +1066,8 @@
             return true;
         } catch (IOException e) {
             throw new IOException("Failed to install " + archive + " to " + remote, e);
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -3337,8 +3340,8 @@
 
     @Restricted(NoExternalUse.class)
     static class UrlFactory {
-        public URL newURL(String location) throws MalformedURLException {
-            return new URL(location);
+        public URL newURL(String location) throws MalformedURLException, URISyntaxException {
+            return new URI(location).toURL();
         }
     }
 

core/src/main/java/hudson/Functions.java

@@ -110,7 +110,6 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -1933,18 +1932,21 @@
      * @deprecated use {@link JNLPLauncher#getInboundAgentUrl}
      */
     @Deprecated
-    public String getServerName() {
+    public String getServerName() throws URISyntaxException, MalformedURLException {
         // Try to infer this from the configured root URL.
         // This makes it work correctly when Hudson runs behind a reverse proxy.
         String url = Jenkins.get().getRootUrl();
         try {
             if (url != null) {
-                String host = new URL(url).getHost();
+                String host = new URI(url).toURL().getHost();
                 if (host != null)
                     return host;
             }
         } catch (MalformedURLException e) {
             // fall back to HTTP request
+            throw new MalformedURLException();
+        } catch (URISyntaxException e) {
+            throw new URISyntaxException(e.getReason(), e.getInput());
         }
         return Stapler.getCurrentRequest().getServerName();
     }

core/src/main/java/hudson/Main.java

@@ -37,6 +37,7 @@
 import java.io.Writer;
 import java.net.HttpRetryException;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -99,11 +100,11 @@
         if (!home.endsWith("/"))     home = home + '/';  // make sure it ends with '/'
 
         // check for authentication info
-        String auth = new URL(home).getUserInfo();
+        String auth = new URI(home).getUserInfo();
         if (auth != null) auth = "Basic " + new Base64Encoder().encode(auth.getBytes(StandardCharsets.UTF_8));
 
         { // check if the home is set correctly
-            HttpURLConnection con = open(new URL(home));
+            HttpURLConnection con = open(new URI(home).toURL());
             if (auth != null) con.setRequestProperty("Authorization", auth);
             con.connect();
             if (con.getResponseCode() != 200
@@ -113,7 +114,7 @@
             }
         }
 
-        URL jobURL = new URL(home + "job/" + Util.encode(projectName).replace("/", "/job/") + "/");
+        URL jobURL = new URI(home + "job/" + Util.encode(projectName).replace("/", "/job/") + "/").toURL();
 
         { // check if the job name is correct
             HttpURLConnection con = open(new URL(jobURL, "acceptBuildResult"));
@@ -193,7 +194,7 @@
                 } catch (HttpRetryException e) {
                     if (e.getLocation() != null) {
                         // retry with the new location
-                        location = new URL(e.getLocation());
+                        location = new URI(e.getLocation()).toURL();
                         continue;
                     }
                     // otherwise failed for reasons beyond us.

core/src/main/java/hudson/PluginManager.java

@@ -1843,7 +1843,7 @@
 
         @Override
         public void copy(File target) throws Exception {
-            try (InputStream input =  ProxyConfiguration.getInputStream(new URL(url))) {
+            try (InputStream input =  ProxyConfiguration.getInputStream(new URI(url).toURL())) {
                 Files.copy(input, target.toPath());
             }
         }
@@ -1942,10 +1942,10 @@
     }
 
     @Restricted(NoExternalUse.class)
-    @RequirePOST public FormValidation doCheckPluginUrl(StaplerRequest request, @QueryParameter String value) throws IOException {
+    @RequirePOST public FormValidation doCheckPluginUrl(StaplerRequest request, @QueryParameter String value) throws IOException, URISyntaxException {
         if (StringUtils.isNotBlank(value)) {
             try {
-                URL url = new URL(value);
+                URL url = new URI(value).toURL();
                 if (!url.getProtocol().startsWith("http")) {
                     return FormValidation.error(Messages.PluginManager_invalidUrl());
                 }
@@ -1955,6 +1955,8 @@
                 }
             } catch (MalformedURLException e) {
                 return FormValidation.error(e.getMessage());
+            } catch (URISyntaxException e) {
+                throw new URISyntaxException(e.getReason(), e.getInput());
             }
         }
         return FormValidation.ok();

core/src/main/java/hudson/TcpSlaveAgentListener.java

@@ -41,7 +41,8 @@
 import java.net.MalformedURLException;
 import java.net.Socket;
 import java.net.SocketAddress;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.charset.StandardCharsets;
 import java.security.interfaces.RSAPublicKey;
@@ -130,14 +131,16 @@
      * Gets the host name that we advertise protocol clients to connect to.
      * @since 2.198
      */
-    public String getAdvertisedHost() {
+    public String getAdvertisedHost() throws URISyntaxException {
         if (CLI_HOST_NAME != null) {
           return CLI_HOST_NAME;
         }
         try {
-            return new URL(Jenkins.get().getRootUrl()).getHost();
+            return new URI(Jenkins.get().getRootUrl()).toURL().getHost();
         } catch (MalformedURLException e) {
             throw new IllegalStateException("Could not get TcpSlaveAgentListener host name", e);
+        } catch (URISyntaxException e) {
+            throw new URISyntaxException(e.getReason(), e.getInput());
         }
     }
 

core/src/main/java/hudson/cli/InstallPluginCommand.java

@@ -33,6 +33,7 @@
 import hudson.util.VersionNumber;
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -104,7 +105,7 @@
 
             // is this an URL?
             try {
-                URL u = new URL(source);
+                URL u = new URI(source).toURL();
                 stdout.println(Messages.InstallPluginCommand_InstallingPluginFromUrl(u));
                 File f = getTmpFile();
                 FileUtils.copyURLToFile(u, f); // TODO JENKINS-58248 proxy

core/src/main/java/hudson/model/DownloadService.java

@@ -44,6 +44,7 @@
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
@@ -388,7 +389,7 @@ public FormValidation updateNow() throws IOException {
                 }
                 String jsonString;
                 try {
-                    jsonString = loadJSONHTML(new URL(site + ".html?id=" + URLEncoder.encode(getId(), StandardCharsets.UTF_8) + "&version=" + URLEncoder.encode(Jenkins.VERSION, StandardCharsets.UTF_8)));
+                    jsonString = loadJSONHTML(new URI(site + ".html?id=" + URLEncoder.encode(getId(), StandardCharsets.UTF_8) + "&version=" + URLEncoder.encode(Jenkins.VERSION, StandardCharsets.UTF_8)).toURL());
                     toolInstallerMetadataExists = true;
                 } catch (Exception e) {
                     LOGGER.log(Level.FINE, "Could not load json from " + site, e);

core/src/main/java/hudson/model/UpdateCenter.java

@@ -66,6 +66,8 @@
 import java.net.HttpRetryException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.UnknownHostException;
@@ -1206,8 +1208,8 @@
          *          that is assumed to be always available.
          * @throws IOException if a connection can't be established
          */
-        public void checkConnection(ConnectionCheckJob job, String connectionCheckUrl) throws IOException {
-            testConnection(new URL(connectionCheckUrl));
+        public void checkConnection(ConnectionCheckJob job, String connectionCheckUrl) throws IOException, URISyntaxException {
+            testConnection(new URI(connectionCheckUrl).toURL());
         }
 
         /**
@@ -1217,7 +1219,7 @@
          * @param updateCenterUrl A sting containing the URL of the update center host.
          * @throws IOException if a connection to the update center server can't be established.
          */
-        public void checkUpdateCenter(ConnectionCheckJob job, String updateCenterUrl) throws IOException {
+        public void checkUpdateCenter(ConnectionCheckJob job, String updateCenterUrl) throws IOException, URISyntaxException {
             testConnection(toUpdateCenterCheckUrl(updateCenterUrl));
         }
 
@@ -1227,12 +1229,12 @@
          * @return the converted URL.
          * @throws MalformedURLException if the supplied URL is malformed.
          */
-        static URL toUpdateCenterCheckUrl(String updateCenterUrl) throws MalformedURLException {
+        static URL toUpdateCenterCheckUrl(String updateCenterUrl) throws MalformedURLException, URISyntaxException {
             URL url;
             if (updateCenterUrl.startsWith("http://") || updateCenterUrl.startsWith("https://")) {
-                url = new URL(updateCenterUrl + (updateCenterUrl.indexOf('?') == -1 ? "?uctest" : "&uctest"));
+                url = new URI(updateCenterUrl + (updateCenterUrl.indexOf('?') == -1 ? "?uctest" : "&uctest")).toURL();
             } else {
-                url = new URL(updateCenterUrl);
+                url = new URI(updateCenterUrl).toURL();
             }
             return url;
         }
@@ -2193,7 +2195,11 @@
 
         @Override
         protected URL getURL() throws MalformedURLException {
-            return new URL(plugin.url);
+            try {
+                return new URI(plugin.url).toURL();
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         @Override
@@ -2422,7 +2428,11 @@
 
         @Override
         protected URL getURL() throws MalformedURLException {
-            return new URL(plugin.url);
+            try {
+                return new URI(plugin.url).toURL();
+            } catch (MalformedURLException | URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         @Override
@@ -2517,7 +2527,11 @@
             if (site == null) {
                 throw new MalformedURLException("no update site defined");
             }
-            return new URL(site.getData().core.url);
+            try {
+                return new URI(site.getData().core.url).toURL();
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         @Override
@@ -2564,7 +2578,11 @@
             if (site == null) {
                 throw new MalformedURLException("no update site defined");
             }
-            return new URL(site.getData().core.url);
+            try {
+                return new URI(site.getData().core.url).toURL();
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         @Override

core/src/main/java/hudson/model/UpdateSite.java

@@ -47,7 +47,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
+import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
@@ -215,7 +215,11 @@
 
     @Restricted(NoExternalUse.class)
     public @NonNull FormValidation updateDirectlyNow(boolean signatureCheck) throws IOException {
-        return updateData(DownloadService.loadJSON(new URL(getUrl() + "?id=" + URLEncoder.encode(getId(), StandardCharsets.UTF_8) + "&version=" + URLEncoder.encode(Jenkins.VERSION, StandardCharsets.UTF_8))), signatureCheck);
+        try {
+            return updateData(DownloadService.loadJSON(new URI(getUrl() + "?id=" + URLEncoder.encode(getId(), StandardCharsets.UTF_8) + "&version=" + URLEncoder.encode(Jenkins.VERSION, StandardCharsets.UTF_8)).toURL()), signatureCheck);
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private FormValidation updateData(String json, boolean signatureCheck)