Rollback #747 with comments (#1510)

cstamas · web-flow · commit ce051b4443fb · 2025-06-26T15:11:00.000+02:00
Also the added UTs made no sense from retrospective, as they used HTTP remote repo with HTTPS proxy, something Maven would never do. Rolls back #747 but leaves traces and some context. Ref apache/maven#2519
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
@@ -382,7 +382,11 @@ private InetAddress getBindAddress(RepositorySystemSession session, RemoteReposi
     private static HttpHost toHost(Proxy proxy) {
         HttpHost host = null;
         if (proxy != null) {
-            host = new HttpHost(proxy.getHost(), proxy.getPort(), proxy.getType());
+            // in Maven, the proxy.protocol is used for proxy matching against remote repository protocol; no TLS proxy
+            // support
+            // https://github.com/apache/maven/issues/2519
+            // https://github.com/apache/maven-resolver/issues/745
+            host = new HttpHost(proxy.getHost(), proxy.getPort());
         }
         return host;
     }
diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
@@ -391,27 +391,6 @@ public void testGetProxyAuthenticated() throws Exception {
         assertEquals(task.getDataString(), new String(listener.baos.toByteArray(), StandardCharsets.UTF_8));
     }
 
-    @Test
-    public void testGetProxyAuthenticatedHttps() throws Exception {
-        httpServer.addSslConnector();
-        httpServer.setProxyAuthentication("testuser", "testpass");
-        Authentication auth = new AuthenticationBuilder()
-                .addUsername("testuser")
-                .addPassword("testpass")
-                .build();
-        proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(), httpServer.getHttpsPort(), auth);
-        newTransporter("http://bad.localhost:1/");
-        RecordingTransportListener listener = new RecordingTransportListener();
-        GetTask task = new GetTask(URI.create("repo/file.txt")).setListener(listener);
-        transporter.get(task);
-        assertEquals("test", task.getDataString());
-        assertEquals(0L, listener.dataOffset);
-        assertEquals(4L, listener.dataLength);
-        assertEquals(1, listener.startedCount);
-        assertTrue("Count: " + listener.progressedCount, listener.progressedCount > 0);
-        assertEquals(task.getDataString(), new String(listener.baos.toByteArray(), StandardCharsets.UTF_8));
-    }
-
     @Test
     public void testGetProxyUnauthenticated() throws Exception {
         httpServer.setProxyAuthentication("testuser", "testpass");
@@ -1159,21 +1138,6 @@ public void testProxyAuthScopeNotUsedForServer() throws Exception {
         }
     }
 
-    @Test
-    public void testProxyType() throws Exception {
-        httpServer.addSslConnector();
-        proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(), httpServer.getHttpsPort(), null);
-        newTransporter("http://bad.localhost:1/");
-        try {
-            transporter.get(new GetTask(URI.create("foo/file.txt")));
-        } catch (HttpResponseException e) {
-            assertEquals(404, e.getStatusCode());
-            assertEquals(
-                    "http://bad.localhost:1/foo/file.txt",
-                    httpServer.getLogEntries().get(0).path);
-        }
-    }
-
     @Test
     public void testAuthSchemeReuse() throws Exception {
         httpServer.setAuthentication("testuser", "testpass");

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,11 @@ private InetAddress getBindAddress(RepositorySystemSession session, RemoteReposi`
`382`	`382`	`private static HttpHost toHost(Proxy proxy) {`
`383`	`383`	`HttpHost host = null;`
`384`	`384`	`if (proxy != null) {`
`385`		`- host = new HttpHost(proxy.getHost(), proxy.getPort(), proxy.getType());`
	`385`	`+ // in Maven, the proxy.protocol is used for proxy matching against remote repository protocol; no TLS proxy`
	`386`	`+ // support`
	`387`	`+ // https://github.com/apache/maven/issues/2519`
	`388`	`+ // https://github.com/apache/maven-resolver/issues/745`
	`389`	`+ host = new HttpHost(proxy.getHost(), proxy.getPort());`
`386`	`390`	`}`
`387`	`391`	`return host;`
`388`	`392`	`}`