Refactor interface to use URI for lookup of proxy configuration.

iterate-ch · Dec 10, 2020 · f88e7ac · f88e7ac
1 parent aea4dba
commit f88e7ac
Show file tree

Hide file tree

Showing 22 changed files with 80 additions and 61 deletions.
diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickUnauthorizedRetryStrategy.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickUnauthorizedRetryStrategy.java
@@ -26,6 +26,7 @@
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.http.DisabledServiceUnavailableRetryStrategy;
 import ch.cyberduck.core.proxy.ProxyFactory;
+import ch.cyberduck.core.proxy.ProxyHostUrlProvider;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -57,7 +58,7 @@ public boolean retryRequest(final HttpResponse response, final int executionCoun
                         final Host bookmark = session.getHost();
                         final Credentials credentials = bookmark.getCredentials();
                         credentials.reset();
-                        session.login(ProxyFactory.get().find(bookmark), prompt, new DisabledCancelCallback());
+                        session.login(ProxyFactory.get().find(new ProxyHostUrlProvider().get(bookmark)), prompt, new DisabledCancelCallback());
                         if(credentials.isSaved()) {
                             store.save(bookmark);
                         }

diff --git a/core/dylib/src/main/java/ch/cyberduck/core/proxy/SystemConfigurationProxy.java b/core/dylib/src/main/java/ch/cyberduck/core/proxy/SystemConfigurationProxy.java
@@ -18,8 +18,6 @@
  *  dkocher@cyberduck.ch
  */
 
-import ch.cyberduck.core.Host;
-import ch.cyberduck.core.HostUrlProvider;
 import ch.cyberduck.core.library.Native;
 import ch.cyberduck.core.preferences.Preferences;
 import ch.cyberduck.core.preferences.PreferencesFactory;
@@ -37,18 +35,15 @@ public final class SystemConfigurationProxy extends AbstractProxyFinder implemen
         Native.load("core");
     }
 
-    private final HostUrlProvider provider
-        = new ProxyHostUrlProvider();
-
     private final Preferences preferences
         = PreferencesFactory.get();
 
     @Override
-    public Proxy find(final Host target) {
+    public Proxy find(final String target) {
         if(!preferences.getBoolean("connection.proxy.enable")) {
             return Proxy.DIRECT;
         }
-        final String route = this.findNative(provider.get(target));
+        final String route = this.findNative(target);
         if(null == route) {
             if(log.isInfoEnabled()) {
                 log.info(String.format("No proxy configuration found for target %s", target));

diff --git a/core/dylib/src/test/java/ch/cyberduck/core/ProxySocketFactoryTest.java b/core/dylib/src/test/java/ch/cyberduck/core/ProxySocketFactoryTest.java
@@ -55,7 +55,7 @@ public void testCreateSocketWithProxy() throws Exception {
         final Socket socket = new ProxySocketFactory(new Host(new TestProtocol(), "localhost"), new DefaultSocketConfigurator(),
                 new ProxyFinder() {
                     @Override
-                    public Proxy find(final Host target) {
+                    public Proxy find(final String target) {
                         return new Proxy(Proxy.Type.SOCKS, "localhost", 7000);
                     }
                 }).createSocket();

diff --git a/core/dylib/src/test/java/ch/cyberduck/core/proxy/SystemConfigurationProxyTest.java b/core/dylib/src/test/java/ch/cyberduck/core/proxy/SystemConfigurationProxyTest.java
@@ -1,8 +1,5 @@
 package ch.cyberduck.core.proxy;
 
-import ch.cyberduck.core.Host;
-import ch.cyberduck.core.TestProtocol;
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -12,18 +9,21 @@ public class SystemConfigurationProxyTest {
     @Test
     public void testFind() {
         final SystemConfigurationProxy proxy = new SystemConfigurationProxy();
-        assertEquals(Proxy.Type.DIRECT, proxy.find(new Host(new TestProtocol(), "cyberduck.io")).getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("http://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("sftp://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("ftp://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("ftps://cyberduck.io").getType());
     }
 
     @Test
     public void testExcludedLocalHost() {
         final SystemConfigurationProxy proxy = new SystemConfigurationProxy();
-        assertEquals(Proxy.Type.DIRECT, proxy.find(new Host(new TestProtocol(), "cyberduck.local")).getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("http://cyberduck.local").getType());
     }
 
     @Test
     public void testSimpleExcluded() {
         final SystemConfigurationProxy proxy = new SystemConfigurationProxy();
-        assertEquals(Proxy.Type.DIRECT, proxy.find(new Host(new TestProtocol(), "simple")).getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("http://simple").getType());
     }
 }
diff --git a/core/src/main/java/ch/cyberduck/core/LoginConnectionService.java b/core/src/main/java/ch/cyberduck/core/LoginConnectionService.java
@@ -23,6 +23,7 @@
 import ch.cyberduck.core.proxy.Proxy;
 import ch.cyberduck.core.proxy.ProxyFactory;
 import ch.cyberduck.core.proxy.ProxyFinder;
+import ch.cyberduck.core.proxy.ProxyHostUrlProvider;
 import ch.cyberduck.core.threading.CancelCallback;
 
 import org.apache.commons.lang3.StringUtils;
@@ -131,7 +132,7 @@ public void connect(final Session<?> session, final CancelCallback callback) thr
         // Try to resolve the hostname first
         final String hostname = HostnameConfiguratorFactory.get(bookmark.getProtocol()).getHostname(bookmark.getHostname());
         listener.message(MessageFormat.format(LocaleFactory.localizedString("Resolving {0}", "Status"), hostname));
-        final Proxy proxy = this.proxy.find(bookmark);
+        final Proxy proxy = this.proxy.find(new ProxyHostUrlProvider().get(bookmark));
         if(proxy == Proxy.DIRECT) {
             // Only try to resolve target hostname if direct connection
             if(null == JumpHostConfiguratorFactory.get(bookmark.getProtocol()).getJumphost(bookmark.getHostname())) {

diff --git a/core/src/main/java/ch/cyberduck/core/proxy/DefaultProxyFinder.java b/core/src/main/java/ch/cyberduck/core/proxy/DefaultProxyFinder.java
@@ -17,8 +17,6 @@
  * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch
  */
 
-import ch.cyberduck.core.Host;
-import ch.cyberduck.core.HostUrlProvider;
 import ch.cyberduck.core.preferences.Preferences;
 import ch.cyberduck.core.preferences.PreferencesFactory;
 
@@ -29,20 +27,17 @@
 public class DefaultProxyFinder implements ProxyFinder {
 
     private final ProxySelector selector
-            = ProxySelector.getDefault();
+        = ProxySelector.getDefault();
 
     private final Preferences preferences
-            = PreferencesFactory.get();
-
-    private final HostUrlProvider provider
-            = new ProxyHostUrlProvider();
+        = PreferencesFactory.get();
 
     @Override
-    public Proxy find(final Host target) {
+    public Proxy find(final String target) {
         if(!preferences.getBoolean("connection.proxy.enable")) {
             return Proxy.DIRECT;
         }
-        for(java.net.Proxy proxy : selector.select(URI.create(provider.get(target)))) {
+        for(java.net.Proxy proxy : selector.select(URI.create(target))) {
             switch(proxy.type()) {
                 case DIRECT: {
                     return Proxy.DIRECT;

diff --git a/core/src/main/java/ch/cyberduck/core/proxy/DisabledProxyFinder.java b/core/src/main/java/ch/cyberduck/core/proxy/DisabledProxyFinder.java
@@ -18,11 +18,9 @@
  * feedback@cyberduck.io
  */
 
-import ch.cyberduck.core.Host;
-
 public class DisabledProxyFinder implements ProxyFinder {
     @Override
-    public Proxy find(final Host target) {
+    public Proxy find(final String target) {
         return Proxy.DIRECT;
     }
 }
diff --git a/core/src/main/java/ch/cyberduck/core/proxy/EnvironmentVariableProxyFinder.java b/core/src/main/java/ch/cyberduck/core/proxy/EnvironmentVariableProxyFinder.java
@@ -1,6 +1,6 @@
 package ch.cyberduck.core.proxy;
 
-import ch.cyberduck.core.Host;
+import ch.cyberduck.core.Scheme;
 import ch.cyberduck.core.preferences.Preferences;
 import ch.cyberduck.core.preferences.PreferencesFactory;
 
@@ -17,11 +17,11 @@ public class EnvironmentVariableProxyFinder implements ProxyFinder {
             = PreferencesFactory.get();
 
     @Override
-    public Proxy find(final Host target) {
+    public Proxy find(final String target) {
         if(!preferences.getBoolean("connection.proxy.enable")) {
             return Proxy.DIRECT;
         }
-        switch(target.getProtocol().getScheme()) {
+        switch(Scheme.valueOf(URI.create(target).getScheme())) {
             case ftp:
             case ftps:
             case sftp:

diff --git a/core/src/main/java/ch/cyberduck/core/proxy/ProxyFinder.java b/core/src/main/java/ch/cyberduck/core/proxy/ProxyFinder.java
@@ -19,8 +19,6 @@
  * dkocher@cyberduck.ch
  */
 
-import ch.cyberduck.core.Host;
-
 public interface ProxyFinder {
-    Proxy find(Host target);
+    Proxy find(String target);
 }
diff --git a/core/src/main/java/ch/cyberduck/core/proxy/ProxySocketFactory.java b/core/src/main/java/ch/cyberduck/core/proxy/ProxySocketFactory.java
@@ -85,7 +85,7 @@ public ProxySocketFactory withBlacklistedNetworkInterfaces(final List<String> na
      * direct connection socket factory.
      */
     protected SocketFactory factory(final String target) {
-        final Proxy proxy = proxyFinder.find(host);
+        final Proxy proxy = proxyFinder.find(target);
         if(!types.contains(proxy.getType())) {
             log.warn(String.format("Use of %s proxy is disabled for socket factory %s", proxy.getType(), this));
             return new DefaultSocketFactory();

diff --git a/core/src/main/java/ch/cyberduck/core/threading/SessionBackgroundAction.java b/core/src/main/java/ch/cyberduck/core/threading/SessionBackgroundAction.java
@@ -35,6 +35,7 @@
 import ch.cyberduck.core.pool.SessionPool;
 import ch.cyberduck.core.preferences.PreferencesFactory;
 import ch.cyberduck.core.proxy.ProxyFactory;
+import ch.cyberduck.core.proxy.ProxyHostUrlProvider;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
@@ -170,7 +171,7 @@ protected boolean login(final Session<?> session, final LoginFailureException e)
                     log.debug(String.format("Re-authenticate with credentials %s", bookmark.getCredentials()));
                 }
                 // Try to authenticate again
-                service.authenticate(ProxyFactory.get().find(bookmark), session, progress, login, new CancelCallback() {
+                service.authenticate(ProxyFactory.get().find(new ProxyHostUrlProvider().get(bookmark)), session, progress, login, new CancelCallback() {
                     @Override
                     public void verify() throws ConnectionCanceledException {
                         if(SessionBackgroundAction.this.isCanceled()) {

diff --git a/core/src/test/java/ch/cyberduck/core/LoginConnectionServiceTest.java b/core/src/test/java/ch/cyberduck/core/LoginConnectionServiceTest.java
@@ -30,7 +30,7 @@ public boolean isConnected() {
         final LoginConnectionService s = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), new DisabledPasswordStore(), new DisabledProgressListener(),
             new DisabledProxyFinder() {
                 @Override
-                public Proxy find(final Host target) {
+                public Proxy find(final String target) {
                     return new Proxy(Proxy.Type.HTTP, "proxy.local", 6666);
                 }
             });

diff --git a/core/src/test/java/ch/cyberduck/core/proxy/DefaultProxyFinderTest.java b/core/src/test/java/ch/cyberduck/core/proxy/DefaultProxyFinderTest.java
@@ -17,9 +17,6 @@
  * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch
  */
 
-import ch.cyberduck.core.Host;
-import ch.cyberduck.core.TestProtocol;
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -29,19 +26,23 @@ public class DefaultProxyFinderTest {
     @Test
     public void testFind() {
         final DefaultProxyFinder proxy = new DefaultProxyFinder();
-        assertEquals(Proxy.Type.DIRECT, proxy.find(new Host(new TestProtocol(), "cyberduck.io")).getType());
-//        assertEquals(Proxy.Type.HTTP, proxy.find(new Host(ProtocolFactory.WEBDAV, "cyberduck.io")).getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("http://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("sftp://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("ftp://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("ftps://cyberduck.io").getType());
     }
 
     @Test
     public void testExcludedLocalHost() {
         final DefaultProxyFinder proxy = new DefaultProxyFinder();
-        assertEquals(Proxy.Type.DIRECT, proxy.find(new Host(new TestProtocol(), "cyberduck.local")).getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("http://cyberduck.local").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("sftp://cyberduck.local").getType());
     }
 
     @Test
     public void testSimpleExcluded() {
         final DefaultProxyFinder proxy = new DefaultProxyFinder();
-        assertEquals(Proxy.Type.DIRECT, proxy.find(new Host(new TestProtocol(), "simple")).getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("http://simple").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("sftp://simple").getType());
     }
-}
+}
diff --git a/core/src/test/java/ch/cyberduck/core/proxy/EnvironmentVariableProxyFinderTest.java b/core/src/test/java/ch/cyberduck/core/proxy/EnvironmentVariableProxyFinderTest.java
@@ -0,0 +1,32 @@
+package ch.cyberduck.core.proxy;
+
+/*
+ * Copyright (c) 2002-2020 iterate GmbH. All rights reserved.
+ * https://cyberduck.io/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class EnvironmentVariableProxyFinderTest {
+
+    @Test
+    public void testFind() {
+        final DefaultProxyFinder proxy = new DefaultProxyFinder();
+        assertEquals(Proxy.Type.DIRECT, proxy.find("http://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("sftp://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("ftp://cyberduck.io").getType());
+        assertEquals(Proxy.Type.DIRECT, proxy.find("ftps://cyberduck.io").getType());
+    }
+}
diff --git a/core/src/test/java/ch/cyberduck/core/proxy/ProxyFinderTest.java b/core/src/test/java/ch/cyberduck/core/proxy/ProxyFinderTest.java
@@ -19,8 +19,6 @@
  * dkocher@cyberduck.ch
  */
 
-import ch.cyberduck.core.Host;
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;
@@ -32,7 +30,7 @@ public class ProxyFinderTest {
     public void testWildcard() {
         AbstractProxyFinder p = new AbstractProxyFinder() {
             @Override
-            public Proxy find(final Host target) {
+            public Proxy find(final String target) {
                 throw new UnsupportedOperationException();
             }
         };

diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSessionTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSessionTest.java
@@ -160,7 +160,7 @@ public void testProxyNoConnect() throws Exception {
             new DisabledProgressListener(),
             new ProxyFinder() {
                 @Override
-                public Proxy find(final Host target) {
+                public Proxy find(final String target) {
                     return new Proxy(Proxy.Type.HTTP, "localhost", 3128);
                 }
             }
@@ -189,7 +189,7 @@ public Credentials prompt(final Host bookmark, final String username, final Stri
             new DisabledProgressListener(),
             new ProxyFinder() {
                 @Override
-                public Proxy find(final Host target) {
+                public Proxy find(final String target) {
                     return new Proxy(Proxy.Type.HTTP, "localhost", 3128);
                 }
             }

diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPSessionTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPSessionTest.java
@@ -62,7 +62,7 @@ public void testConnectHttpProxyForbiddenHttpResponse() throws Exception {
             new DisabledProgressListener(),
             new ProxyFinder() {
                 @Override
-                public Proxy find(final Host target) {
+                public Proxy find(final String target) {
                     return new Proxy(Proxy.Type.HTTP, "localhost", 3128);
                 }
             });

diff --git a/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveSession.java b/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveSession.java
@@ -19,7 +19,6 @@
 import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostKeyCallback;
-import ch.cyberduck.core.HostParser;
 import ch.cyberduck.core.ListService;
 import ch.cyberduck.core.LoginCallback;
 import ch.cyberduck.core.PreferencesUseragentProvider;
@@ -69,7 +68,7 @@ public DriveSession(final Host host, final X509TrustManager trust, final X509Key
 
     @Override
     protected Drive connect(final Proxy proxy, final HostKeyCallback callback, final LoginCallback prompt) throws HostParserException {
-        final HttpClientBuilder configuration = builder.build(ProxyFactory.get().find(HostParser.parse(host.getProtocol().getOAuthAuthorizationUrl())), this, prompt);
+        final HttpClientBuilder configuration = builder.build(ProxyFactory.get().find(host.getProtocol().getOAuthAuthorizationUrl()), this, prompt);
         authorizationService = new OAuth2RequestInterceptor(configuration.build(), host.getProtocol())
             .withRedirectUri(host.getProtocol().getOAuthRedirectUrl());
         configuration.addInterceptorLast(authorizationService);

diff --git a/onedrive/src/main/java/ch/cyberduck/core/onedrive/GraphSession.java b/onedrive/src/main/java/ch/cyberduck/core/onedrive/GraphSession.java
@@ -18,7 +18,6 @@
 import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostKeyCallback;
-import ch.cyberduck.core.HostParser;
 import ch.cyberduck.core.LoginCallback;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
@@ -131,7 +130,7 @@ public OneDriveFolder toFolder(final Path file, final boolean resolveLastItem) t
 
     @Override
     protected OneDriveAPI connect(final Proxy proxy, final HostKeyCallback key, final LoginCallback prompt) throws HostParserException {
-        final HttpClientBuilder configuration = builder.build(ProxyFactory.get().find(HostParser.parse(host.getProtocol().getOAuthAuthorizationUrl())), this, prompt);
+        final HttpClientBuilder configuration = builder.build(ProxyFactory.get().find(host.getProtocol().getOAuthAuthorizationUrl()), this, prompt);
         authorizationService = new OAuth2RequestInterceptor(configuration.build(), host.getProtocol()) {
             @Override
             public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {

diff --git a/s3/src/main/java/ch/cyberduck/core/auth/AWSSessionCredentialsRetriever.java b/s3/src/main/java/ch/cyberduck/core/auth/AWSSessionCredentialsRetriever.java
@@ -71,7 +71,7 @@ public Credentials get() throws BackgroundException {
         final Path access = new Path(PathNormalizer.normalize(address.getDefaultPath()), EnumSet.of(Path.Type.file));
         address.setDefaultPath(String.valueOf(Path.DELIMITER));
         final DAVSession connection = new DAVSession(address, trust, key);
-        connection.withListener(transcript).open(ProxyFactory.get().find(address), new DisabledHostKeyCallback(), new DisabledLoginCallback());
+        connection.withListener(transcript).open(ProxyFactory.get().find(url), new DisabledHostKeyCallback(), new DisabledLoginCallback());
         final InputStream in = new DAVReadFeature(connection).read(access, new TransferStatus(), new DisabledConnectionCallback());
         try {
             final Credentials credentials = this.parse(in);

diff --git a/s3/src/main/java/ch/cyberduck/core/aws/CustomClientConfiguration.java b/s3/src/main/java/ch/cyberduck/core/aws/CustomClientConfiguration.java
@@ -26,6 +26,7 @@
 import ch.cyberduck.core.preferences.PreferencesFactory;
 import ch.cyberduck.core.proxy.Proxy;
 import ch.cyberduck.core.proxy.ProxyFactory;
+import ch.cyberduck.core.proxy.ProxyHostUrlProvider;
 import ch.cyberduck.core.proxy.ProxySocketFactory;
 import ch.cyberduck.core.ssl.CustomTrustSSLProtocolSocketFactory;
 import ch.cyberduck.core.ssl.ThreadLocalHostnameDelegatingTrustManager;
@@ -68,7 +69,7 @@ public InetAddress[] resolve(final String host) throws UnknownHostException {
         this.setMaxErrorRetry(0);
         this.setMaxConnections(1);
         this.setUseGzip(PreferencesFactory.get().getBoolean("http.compression.enable"));
-        final Proxy proxy = ProxyFactory.get().find(host);
+        final Proxy proxy = ProxyFactory.get().find(new ProxyHostUrlProvider().get(host));
         switch(proxy.getType()) {
             case HTTP:
             case HTTPS: