Skip to content

Commit bde965b

Browse files
authored
Rollback #746 with comments (#1509)
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 #746 but leaves traces and some context. Ref apache/maven#2519
1 parent 0c9ada4 commit bde965b

File tree

5 files changed

+8
-58
lines changed

5 files changed

+8
-58
lines changed

maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -465,27 +465,6 @@ protected void testGet_ProxyAuthenticated() throws Exception {
465465
assertEquals(task.getDataString(), listener.getBaos().toString(StandardCharsets.UTF_8));
466466
}
467467

468-
@Test
469-
protected void testGet_ProxyAuthenticatedHttps() throws Exception {
470-
httpServer.addSslConnector();
471-
httpServer.setProxyAuthentication("testuser", "testpass");
472-
Authentication auth = new AuthenticationBuilder()
473-
.addUsername("testuser")
474-
.addPassword("testpass")
475-
.build();
476-
proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(), httpServer.getHttpsPort(), auth);
477-
newTransporter("http://bad.localhost:1/");
478-
RecordingTransportListener listener = new RecordingTransportListener();
479-
GetTask task = new GetTask(URI.create("repo/file.txt")).setListener(listener);
480-
transporter.get(task);
481-
assertEquals("test", task.getDataString());
482-
assertEquals(0L, listener.getDataOffset());
483-
assertEquals(4L, listener.getDataLength());
484-
assertEquals(1, listener.getStartedCount());
485-
assertTrue(listener.getProgressedCount() > 0, "Count: " + listener.getProgressedCount());
486-
assertEquals(task.getDataString(), listener.getBaos().toString(StandardCharsets.UTF_8));
487-
}
488-
489468
@Test
490469
protected void testGet_ProxyUnauthenticated() throws Exception {
491470
httpServer.setProxyAuthentication("testuser", "testpass");
@@ -1264,21 +1243,6 @@ protected void testProxyAuthScope_NotUsedForServer() throws Exception {
12641243
}
12651244
}
12661245

1267-
@Test
1268-
public void testProxyType() throws Exception {
1269-
httpServer.addSslConnector();
1270-
proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(), httpServer.getHttpsPort(), null);
1271-
newTransporter("http://bad.localhost:1/");
1272-
try {
1273-
transporter.get(new GetTask(URI.create("foo/file.txt")));
1274-
} catch (HttpTransporterException e) {
1275-
assertEquals(404, e.getStatusCode());
1276-
assertEquals(
1277-
"http://bad.localhost:1/foo/file.txt",
1278-
httpServer.getLogEntries().get(0).getPath());
1279-
}
1280-
}
1281-
12821246
@Test
12831247
protected void testAuthSchemeReuse() throws Exception {
12841248
httpServer.setAuthentication("testuser", "testpass");

maven-resolver-transport-apache/src/main/java/org/eclipse/aether/transport/apache/ApacheTransporter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,11 @@ private InetAddress getHttpLocalAddress(RepositorySystemSession session, RemoteR
392392
private static HttpHost toHost(Proxy proxy) {
393393
HttpHost host = null;
394394
if (proxy != null) {
395-
host = new HttpHost(proxy.getHost(), proxy.getPort(), proxy.getType());
395+
// in Maven, the proxy.protocol is used for proxy matching against remote repository protocol; no TLS proxy
396+
// support
397+
// https://github.com/apache/maven/issues/2519
398+
// https://github.com/apache/maven-resolver/issues/745
399+
host = new HttpHost(proxy.getHost(), proxy.getPort());
396400
}
397401
return host;
398402
}

maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@
104104
* <ul>
105105
* <li>Does not support {@link ConfigurationProperties#REQUEST_TIMEOUT}, see <a href="https://bugs.openjdk.org/browse/JDK-8258397">JDK-8258397</a></li>
106106
* </ul>
107+
* <p>
108+
* Related: <a href="https://dev.to/kdrakon/httpclient-can-t-connect-to-a-tls-proxy-118a">No TLS proxy supported</a>.
107109
*
108110
* @since 2.0.0
109111
*/

maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
/**
3737
* JDK Transporter UT.
38+
* Related: <a href="https://dev.to/kdrakon/httpclient-can-t-connect-to-a-tls-proxy-118a">No TLS proxy supported</a>.
3839
*/
3940
class JdkTransporterTest extends HttpTransporterTest {
4041

@@ -88,17 +89,6 @@ protected void testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfigured
8889
@Test
8990
protected void testRequestTimeout() throws Exception {}
9091

91-
// https://dev.to/kdrakon/httpclient-can-t-connect-to-a-tls-proxy-118a
92-
@Override
93-
@Disabled
94-
@Test
95-
protected void testGet_ProxyAuthenticatedHttps() {}
96-
97-
@Override
98-
@Disabled
99-
@Test
100-
public void testProxyType() {}
101-
10292
public JdkTransporterTest() {
10393
super(() -> new JdkTransporterFactory(standardChecksumExtractor(), new DefaultPathProcessor()));
10494
}

maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ protected void testRetryHandler_explicitCount_positive() {}
5858
@Test
5959
protected void testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfiguredHeader() {}
6060

61-
@Override
62-
@Disabled
63-
@Test
64-
protected void testGet_ProxyAuthenticatedHttps() {}
65-
66-
@Override
67-
@Disabled
68-
@Test
69-
public void testProxyType() {}
70-
7161
public JettyTransporterTest() {
7262
super(() -> new JettyTransporterFactory(standardChecksumExtractor(), new TestPathProcessor()));
7363
}

0 commit comments

Comments
 (0)