author | chegar |
Tue, 17 Apr 2018 08:54:17 -0700 | |
changeset 49765 | ee6f7a61f3a5 |
parent 48083 | b1c1b4ef4be2 |
child 52121 | 934969c63223 |
child 56451 | 9585061fdb04 |
permissions | -rw-r--r-- |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
1 |
/* |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
2 |
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
4 |
* |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
8 |
* |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
13 |
* accompanied this code). |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
14 |
* |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
18 |
* |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
21 |
* questions. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
22 |
*/ |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
23 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
24 |
import com.sun.net.httpserver.HttpContext; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
25 |
import com.sun.net.httpserver.HttpExchange; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
26 |
import com.sun.net.httpserver.HttpHandler; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
27 |
import com.sun.net.httpserver.HttpServer; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
28 |
import com.sun.net.httpserver.HttpsConfigurator; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
29 |
import com.sun.net.httpserver.HttpsParameters; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
30 |
import com.sun.net.httpserver.HttpsServer; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
31 |
import java.io.IOException; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
32 |
import java.io.InputStream; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
33 |
import java.io.OutputStream; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
34 |
import java.io.OutputStreamWriter; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
35 |
import java.io.PrintWriter; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
36 |
import java.io.Writer; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
37 |
import java.net.HttpURLConnection; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
38 |
import java.net.InetAddress; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
39 |
import java.net.InetSocketAddress; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
40 |
import java.net.Proxy; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
41 |
import java.net.ProxySelector; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
42 |
import java.net.ServerSocket; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
43 |
import java.net.Socket; |
48083 | 44 |
import java.net.SocketAddress; |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
45 |
import java.net.URI; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
46 |
import java.net.URISyntaxException; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
47 |
import java.nio.charset.StandardCharsets; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
48 |
import java.security.NoSuchAlgorithmException; |
48083 | 49 |
import java.util.List; |
49765 | 50 |
import java.util.concurrent.CompletableFuture; |
51 |
import java.util.concurrent.CopyOnWriteArrayList; |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
52 |
import javax.net.ssl.HostnameVerifier; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
53 |
import javax.net.ssl.HttpsURLConnection; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
54 |
import javax.net.ssl.SSLContext; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
55 |
import javax.net.ssl.SSLSession; |
49765 | 56 |
import java.net.http.HttpClient; |
57 |
import java.net.http.HttpRequest; |
|
58 |
import java.net.http.HttpResponse; |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
59 |
import jdk.testlibrary.SimpleSSLContext; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
60 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
61 |
/** |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
62 |
* @test |
46157 | 63 |
* @bug 8185852 8181422 |
64 |
* @summary Verifies that passing a proxy with an unresolved address does |
|
65 |
* not cause java.nio.channels.UnresolvedAddressException. |
|
66 |
* Verifies that downgrading from HTTP/2 to HTTP/1.1 works through |
|
67 |
* an SSL Tunnel connection when the client is HTTP/2 and the server |
|
68 |
* and proxy are HTTP/1.1 |
|
49765 | 69 |
* @modules java.net.http |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
70 |
* @library /lib/testlibrary/ |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
71 |
* @build jdk.testlibrary.SimpleSSLContext ProxyTest |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
72 |
* @run main/othervm ProxyTest |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
73 |
* @author danielfuchs |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
74 |
*/ |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
75 |
public class ProxyTest { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
76 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
77 |
static { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
78 |
try { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
79 |
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
80 |
public boolean verify(String hostname, SSLSession session) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
81 |
return true; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
82 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
83 |
}); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
84 |
SSLContext.setDefault(new SimpleSSLContext().get()); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
85 |
} catch (IOException ex) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
86 |
throw new ExceptionInInitializerError(ex); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
87 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
88 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
89 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
90 |
static final String RESPONSE = "<html><body><p>Hello World!</body></html>"; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
91 |
static final String PATH = "/foo/"; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
92 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
93 |
static HttpServer createHttpsServer() throws IOException, NoSuchAlgorithmException { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
94 |
HttpsServer server = com.sun.net.httpserver.HttpsServer.create(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
95 |
HttpContext context = server.createContext(PATH); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
96 |
context.setHandler(new HttpHandler() { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
97 |
@Override |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
98 |
public void handle(HttpExchange he) throws IOException { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
99 |
he.getResponseHeaders().add("encoding", "UTF-8"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
100 |
he.sendResponseHeaders(200, RESPONSE.length()); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
101 |
he.getResponseBody().write(RESPONSE.getBytes(StandardCharsets.UTF_8)); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
102 |
he.close(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
103 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
104 |
}); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
105 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
106 |
server.setHttpsConfigurator(new Configurator(SSLContext.getDefault())); |
49765 | 107 |
InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); |
108 |
server.bind(addr, 0); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
109 |
return server; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
110 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
111 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
112 |
public static void main(String[] args) |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
113 |
throws IOException, |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
114 |
URISyntaxException, |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
115 |
NoSuchAlgorithmException, |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
116 |
InterruptedException |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
117 |
{ |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
118 |
HttpServer server = createHttpsServer(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
119 |
server.start(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
120 |
try { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
121 |
test(server, HttpClient.Version.HTTP_1_1); |
46157 | 122 |
test(server, HttpClient.Version.HTTP_2); |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
123 |
} finally { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
124 |
server.stop(0); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
125 |
System.out.println("Server stopped"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
126 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
127 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
128 |
|
48083 | 129 |
/** |
130 |
* A Proxy Selector that wraps a ProxySelector.of(), and counts the number |
|
131 |
* of times its select method has been invoked. This can be used to ensure |
|
132 |
* that the Proxy Selector is invoked only once per HttpClient.sendXXX |
|
133 |
* invocation. |
|
134 |
*/ |
|
135 |
static class CountingProxySelector extends ProxySelector { |
|
136 |
private final ProxySelector proxySelector; |
|
137 |
private volatile int count; // 0 |
|
138 |
private CountingProxySelector(InetSocketAddress proxyAddress) { |
|
139 |
proxySelector = ProxySelector.of(proxyAddress); |
|
140 |
} |
|
141 |
||
142 |
public static CountingProxySelector of(InetSocketAddress proxyAddress) { |
|
143 |
return new CountingProxySelector(proxyAddress); |
|
144 |
} |
|
145 |
||
146 |
int count() { return count; } |
|
147 |
||
148 |
@Override |
|
149 |
public List<Proxy> select(URI uri) { |
|
150 |
count++; |
|
151 |
return proxySelector.select(uri); |
|
152 |
} |
|
153 |
||
154 |
@Override |
|
155 |
public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { |
|
156 |
proxySelector.connectFailed(uri, sa, ioe); |
|
157 |
} |
|
158 |
} |
|
159 |
||
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
160 |
public static void test(HttpServer server, HttpClient.Version version) |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
161 |
throws IOException, |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
162 |
URISyntaxException, |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
163 |
NoSuchAlgorithmException, |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
164 |
InterruptedException |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
165 |
{ |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
166 |
System.out.println("Server is: " + server.getAddress().toString()); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
167 |
System.out.println("Verifying communication with server"); |
49765 | 168 |
URI uri = new URI("https://localhost:" |
169 |
+ server.getAddress().getPort() + PATH + "x"); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
170 |
try (InputStream is = uri.toURL().openConnection().getInputStream()) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
171 |
String resp = new String(is.readAllBytes(), StandardCharsets.UTF_8); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
172 |
System.out.println(resp); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
173 |
if (!RESPONSE.equals(resp)) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
174 |
throw new AssertionError("Unexpected response from server"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
175 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
176 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
177 |
System.out.println("Communication with server OK"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
178 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
179 |
TunnelingProxy proxy = new TunnelingProxy(server); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
180 |
proxy.start(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
181 |
try { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
182 |
System.out.println("Proxy started"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
183 |
Proxy p = new Proxy(Proxy.Type.HTTP, |
49765 | 184 |
InetSocketAddress.createUnresolved("localhost", |
185 |
proxy.getAddress().getPort())); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
186 |
System.out.println("Verifying communication with proxy"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
187 |
HttpURLConnection conn = (HttpURLConnection)uri.toURL().openConnection(p); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
188 |
try (InputStream is = conn.getInputStream()) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
189 |
String resp = new String(is.readAllBytes(), StandardCharsets.UTF_8); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
190 |
System.out.println(resp); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
191 |
if (!RESPONSE.equals(resp)) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
192 |
throw new AssertionError("Unexpected response from proxy"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
193 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
194 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
195 |
System.out.println("Communication with proxy OK"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
196 |
System.out.println("\nReal test begins here."); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
197 |
System.out.println("Setting up request with HttpClient for version: " |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
198 |
+ version.name()); |
48083 | 199 |
CountingProxySelector ps = CountingProxySelector.of( |
49765 | 200 |
InetSocketAddress.createUnresolved("localhost", |
201 |
proxy.getAddress().getPort())); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
202 |
HttpClient client = HttpClient.newBuilder() |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
203 |
.version(version) |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
204 |
.proxy(ps) |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
205 |
.build(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
206 |
HttpRequest request = HttpRequest.newBuilder() |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
207 |
.uri(uri) |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
208 |
.GET() |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
209 |
.build(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
210 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
211 |
System.out.println("Sending request with HttpClient"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
212 |
HttpResponse<String> response |
49765 | 213 |
= client.send(request, HttpResponse.BodyHandlers.ofString()); |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
214 |
System.out.println("Got response"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
215 |
String resp = response.body(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
216 |
System.out.println("Received: " + resp); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
217 |
if (!RESPONSE.equals(resp)) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
218 |
throw new AssertionError("Unexpected response"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
219 |
} |
48083 | 220 |
if (ps.count() > 1) { |
221 |
throw new AssertionError("CountingProxySelector. Expected 1, got " + ps.count()); |
|
222 |
} |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
223 |
} finally { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
224 |
System.out.println("Stopping proxy"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
225 |
proxy.stop(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
226 |
System.out.println("Proxy stopped"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
227 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
228 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
229 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
230 |
static class TunnelingProxy { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
231 |
final Thread accept; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
232 |
final ServerSocket ss; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
233 |
final boolean DEBUG = false; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
234 |
final HttpServer serverImpl; |
49765 | 235 |
final CopyOnWriteArrayList<CompletableFuture<Void>> connectionCFs |
236 |
= new CopyOnWriteArrayList<>(); |
|
237 |
private volatile boolean stopped; |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
238 |
TunnelingProxy(HttpServer serverImpl) throws IOException { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
239 |
this.serverImpl = serverImpl; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
240 |
ss = new ServerSocket(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
241 |
accept = new Thread(this::accept); |
49765 | 242 |
accept.setDaemon(true); |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
243 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
244 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
245 |
void start() throws IOException { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
246 |
ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
247 |
accept.start(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
248 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
249 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
250 |
// Pipe the input stream to the output stream. |
49765 | 251 |
private synchronized Thread pipe(InputStream is, OutputStream os, |
252 |
char tag, CompletableFuture<Void> end) { |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
253 |
return new Thread("TunnelPipe("+tag+")") { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
254 |
@Override |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
255 |
public void run() { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
256 |
try { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
257 |
try { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
258 |
int c; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
259 |
while ((c = is.read()) != -1) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
260 |
os.write(c); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
261 |
os.flush(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
262 |
// if DEBUG prints a + or a - for each transferred |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
263 |
// character. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
264 |
if (DEBUG) System.out.print(tag); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
265 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
266 |
is.close(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
267 |
} finally { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
268 |
os.close(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
269 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
270 |
} catch (IOException ex) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
271 |
if (DEBUG) ex.printStackTrace(System.out); |
49765 | 272 |
} finally { |
273 |
end.complete(null); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
274 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
275 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
276 |
}; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
277 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
278 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
279 |
public InetSocketAddress getAddress() { |
49765 | 280 |
return new InetSocketAddress(InetAddress.getLoopbackAddress(), |
281 |
ss.getLocalPort()); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
282 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
283 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
284 |
// This is a bit shaky. It doesn't handle continuation |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
285 |
// lines, but our client shouldn't send any. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
286 |
// Read a line from the input stream, swallowing the final |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
287 |
// \r\n sequence. Stops at the first \n, doesn't complain |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
288 |
// if it wasn't preceded by '\r'. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
289 |
// |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
290 |
String readLine(InputStream r) throws IOException { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
291 |
StringBuilder b = new StringBuilder(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
292 |
int c; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
293 |
while ((c = r.read()) != -1) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
294 |
if (c == '\n') break; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
295 |
b.appendCodePoint(c); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
296 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
297 |
if (b.codePointAt(b.length() -1) == '\r') { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
298 |
b.delete(b.length() -1, b.length()); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
299 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
300 |
return b.toString(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
301 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
302 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
303 |
public void accept() { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
304 |
Socket clientConnection = null; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
305 |
try { |
49765 | 306 |
while (!stopped) { |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
307 |
System.out.println("Tunnel: Waiting for client"); |
49765 | 308 |
Socket toClose; |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
309 |
try { |
49765 | 310 |
toClose = clientConnection = ss.accept(); |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
311 |
} catch (IOException io) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
312 |
if (DEBUG) io.printStackTrace(System.out); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
313 |
break; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
314 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
315 |
System.out.println("Tunnel: Client accepted"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
316 |
Socket targetConnection = null; |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
317 |
InputStream ccis = clientConnection.getInputStream(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
318 |
OutputStream ccos = clientConnection.getOutputStream(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
319 |
Writer w = new OutputStreamWriter(ccos, "UTF-8"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
320 |
PrintWriter pw = new PrintWriter(w); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
321 |
System.out.println("Tunnel: Reading request line"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
322 |
String requestLine = readLine(ccis); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
323 |
System.out.println("Tunnel: Request status line: " + requestLine); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
324 |
if (requestLine.startsWith("CONNECT ")) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
325 |
// We should probably check that the next word following |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
326 |
// CONNECT is the host:port of our HTTPS serverImpl. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
327 |
// Some improvement for a followup! |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
328 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
329 |
// Read all headers until we find the empty line that |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
330 |
// signals the end of all headers. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
331 |
while(!requestLine.equals("")) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
332 |
System.out.println("Tunnel: Reading header: " |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
333 |
+ (requestLine = readLine(ccis))); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
334 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
335 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
336 |
// Open target connection |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
337 |
targetConnection = new Socket( |
49765 | 338 |
InetAddress.getLoopbackAddress(), |
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
339 |
serverImpl.getAddress().getPort()); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
340 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
341 |
// Then send the 200 OK response to the client |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
342 |
System.out.println("Tunnel: Sending " |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
343 |
+ "HTTP/1.1 200 OK\r\n\r\n"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
344 |
pw.print("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
345 |
pw.flush(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
346 |
} else { |
49765 | 347 |
// This should not happen. If it does then just print an |
348 |
// error - both on out and err, and close the accepted |
|
349 |
// socket |
|
350 |
System.out.println("WARNING: Tunnel: Unexpected status line: " |
|
351 |
+ requestLine + " received by " |
|
352 |
+ ss.getLocalSocketAddress() |
|
353 |
+ " from " |
|
354 |
+ toClose.getRemoteSocketAddress() |
|
355 |
+ " - closing accepted socket"); |
|
356 |
// Print on err |
|
357 |
System.err.println("WARNING: Tunnel: Unexpected status line: " |
|
358 |
+ requestLine + " received by " |
|
359 |
+ ss.getLocalSocketAddress() |
|
360 |
+ " from " |
|
361 |
+ toClose.getRemoteSocketAddress()); |
|
362 |
// close accepted socket. |
|
363 |
toClose.close(); |
|
364 |
System.err.println("Tunnel: accepted socket closed."); |
|
365 |
continue; |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
366 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
367 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
368 |
// Pipe the input stream of the client connection to the |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
369 |
// output stream of the target connection and conversely. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
370 |
// Now the client and target will just talk to each other. |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
371 |
System.out.println("Tunnel: Starting tunnel pipes"); |
49765 | 372 |
CompletableFuture<Void> end, end1, end2; |
373 |
Thread t1 = pipe(ccis, targetConnection.getOutputStream(), '+', |
|
374 |
end1 = new CompletableFuture<>()); |
|
375 |
Thread t2 = pipe(targetConnection.getInputStream(), ccos, '-', |
|
376 |
end2 = new CompletableFuture<>()); |
|
377 |
end = CompletableFuture.allOf(end1, end2); |
|
378 |
end.whenComplete( |
|
379 |
(r,t) -> { |
|
380 |
try { toClose.close(); } catch (IOException x) { } |
|
381 |
finally {connectionCFs.remove(end);} |
|
382 |
}); |
|
383 |
connectionCFs.add(end); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
384 |
t1.start(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
385 |
t2.start(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
386 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
387 |
} catch (Throwable ex) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
388 |
try { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
389 |
ss.close(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
390 |
} catch (IOException ex1) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
391 |
ex.addSuppressed(ex1); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
392 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
393 |
ex.printStackTrace(System.err); |
49765 | 394 |
} finally { |
395 |
System.out.println("Tunnel: exiting (stopped=" + stopped + ")"); |
|
396 |
connectionCFs.forEach(cf -> cf.complete(null)); |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
397 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
398 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
399 |
|
49765 | 400 |
public void stop() throws IOException { |
401 |
stopped = true; |
|
46138
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
402 |
ss.close(); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
403 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
404 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
405 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
406 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
407 |
static class Configurator extends HttpsConfigurator { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
408 |
public Configurator(SSLContext ctx) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
409 |
super(ctx); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
410 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
411 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
412 |
@Override |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
413 |
public void configure (HttpsParameters params) { |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
414 |
params.setSSLParameters (getSSLContext().getSupportedSSLParameters()); |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
415 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
416 |
} |
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
417 |
|
5982afcbf9dc
8185852: HttpConnection should resolve addresses before SocketChannel.connect() is called
dfuchs
parents:
diff
changeset
|
418 |
} |