author | dfuchs |
Thu, 12 Sep 2019 15:46:11 +0100 | |
changeset 58108 | 5302477c8285 |
parent 54811 | 9db7c0f561a6 |
permissions | -rw-r--r-- |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
1 |
/* |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
2 |
* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved. |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
4 |
* |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
8 |
* |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
13 |
* accompanied this code). |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
14 |
* |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
18 |
* |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
21 |
* questions. |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
22 |
*/ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
23 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
24 |
/* |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
25 |
* @test |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
26 |
* @bug 6370908 8220663 |
54770
62b6e7587b1f
8220673: Add test library support for determining platform IP support
aeubanks
parents:
54188
diff
changeset
|
27 |
* @library /test/lib |
54809
351da897f409
8223465: Replace wildcard address with loopback or local host in tests - part 3
aefimov
parents:
54770
diff
changeset
|
28 |
* @summary Add support for HTTP_CONNECT proxy in Socket class. |
351da897f409
8223465: Replace wildcard address with loopback or local host in tests - part 3
aefimov
parents:
54770
diff
changeset
|
29 |
* This test uses the wildcard address and is susceptible to fail intermittently. |
351da897f409
8223465: Replace wildcard address with loopback or local host in tests - part 3
aefimov
parents:
54770
diff
changeset
|
30 |
* @key intermittent |
30820 | 31 |
* @modules java.base/sun.net.www |
49431
5812849b5027
8198358: Align organization of TwoStacksPlainSocketImp with DualStackPlainSocketImpl [win]
igerasim
parents:
47216
diff
changeset
|
32 |
* @run main HttpProxy |
5812849b5027
8198358: Align organization of TwoStacksPlainSocketImp with DualStackPlainSocketImpl [win]
igerasim
parents:
47216
diff
changeset
|
33 |
* @run main/othervm -Djava.net.preferIPv4Stack=true HttpProxy |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
34 |
* @run main/othervm -Djava.net.preferIPv6Addresses=true HttpProxy |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
35 |
*/ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
36 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
37 |
import java.io.IOException; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
38 |
import java.io.InputStream; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
39 |
import java.io.OutputStream; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
40 |
import java.io.PrintWriter; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
41 |
import static java.lang.System.out; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
42 |
import java.net.InetAddress; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
43 |
import java.net.InetSocketAddress; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
44 |
import java.net.Proxy; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
45 |
import java.net.ServerSocket; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
46 |
import java.net.Socket; |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
47 |
import java.net.SocketAddress; |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
48 |
import java.util.ArrayList; |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
49 |
import java.util.List; |
54770
62b6e7587b1f
8220673: Add test library support for determining platform IP support
aeubanks
parents:
54188
diff
changeset
|
50 |
import jdk.test.lib.net.IPSupport; |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
51 |
import sun.net.www.MessageHeader; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
52 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
53 |
public class HttpProxy { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
54 |
final String proxyHost; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
55 |
final int proxyPort; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
56 |
static final int SO_TIMEOUT = 15000; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
57 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
58 |
public static void main(String[] args) throws Exception { |
54811
9db7c0f561a6
8223652: Rename IPSupport.skipIfCurrentConfigurationIsInvalid() to IPSupport.throwSkippedExceptionIfNonOperational()
aeubanks
parents:
54809
diff
changeset
|
59 |
IPSupport.throwSkippedExceptionIfNonOperational(); |
54770
62b6e7587b1f
8220673: Add test library support for determining platform IP support
aeubanks
parents:
54188
diff
changeset
|
60 |
|
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
61 |
String host; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
62 |
int port; |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
63 |
ConnectProxyTunnelServer proxy = null; |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
64 |
if (args.length == 0) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
65 |
// Start internal proxy |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
66 |
proxy = new ConnectProxyTunnelServer(); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
67 |
proxy.start(); |
54809
351da897f409
8223465: Replace wildcard address with loopback or local host in tests - part 3
aefimov
parents:
54770
diff
changeset
|
68 |
host = InetAddress.getLoopbackAddress().getHostAddress(); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
69 |
port = proxy.getLocalPort(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
70 |
out.println("Running with internal proxy: " + host + ":" + port); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
71 |
} else if (args.length == 2) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
72 |
host = args[0]; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
73 |
port = Integer.valueOf(args[1]); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
74 |
out.println("Running against specified proxy server: " + host + ":" + port); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
75 |
} else { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
76 |
System.err.println("Usage: java HttpProxy [<proxy host> <proxy port>]"); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
77 |
return; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
78 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
79 |
|
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
80 |
try { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
81 |
HttpProxy p = new HttpProxy(host, port); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
82 |
p.test(); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
83 |
} finally { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
84 |
if (proxy != null) |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
85 |
proxy.close(); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
86 |
} |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
87 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
88 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
89 |
public HttpProxy(String proxyHost, int proxyPort) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
90 |
this.proxyHost = proxyHost; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
91 |
this.proxyPort = proxyPort; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
92 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
93 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
94 |
void test() throws Exception { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
95 |
InetSocketAddress proxyAddress = new InetSocketAddress(proxyHost, proxyPort); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
96 |
Proxy httpProxy = new Proxy(Proxy.Type.HTTP, proxyAddress); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
97 |
|
54809
351da897f409
8223465: Replace wildcard address with loopback or local host in tests - part 3
aefimov
parents:
54770
diff
changeset
|
98 |
// Wildcard address is needed here |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
99 |
try (ServerSocket ss = new ServerSocket(0)) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
100 |
List<InetSocketAddress> externalAddresses = new ArrayList<>(); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
101 |
externalAddresses.add( |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
102 |
new InetSocketAddress(InetAddress.getLocalHost(), ss.getLocalPort())); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
103 |
|
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
104 |
if (!"true".equals(System.getProperty("java.net.preferIPv4Stack"))) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
105 |
byte[] bytes = new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
106 |
var address = InetAddress.getByAddress(bytes); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
107 |
externalAddresses.add( |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
108 |
new InetSocketAddress(address, ss.getLocalPort())); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
109 |
} |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
110 |
|
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
111 |
for (SocketAddress externalAddress : externalAddresses) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
112 |
try (Socket sock = new Socket(httpProxy)) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
113 |
sock.setSoTimeout(SO_TIMEOUT); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
114 |
sock.setTcpNoDelay(false); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
115 |
|
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
116 |
out.println("Trying to connect to server socket on " + externalAddress); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
117 |
sock.connect(externalAddress); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
118 |
try (Socket externalSock = ss.accept()) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
119 |
// perform some simple checks |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
120 |
check(sock.isBound(), "Socket is not bound"); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
121 |
check(sock.isConnected(), "Socket is not connected"); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
122 |
check(!sock.isClosed(), "Socket should not be closed"); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
123 |
check(sock.getSoTimeout() == SO_TIMEOUT, |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
124 |
"Socket should have a previously set timeout"); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
125 |
check(sock.getTcpNoDelay() == false, "NODELAY should be false"); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
126 |
|
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
127 |
simpleDataExchange(sock, externalSock); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
128 |
} |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
129 |
} |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
130 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
131 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
132 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
133 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
134 |
static void check(boolean condition, String message) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
135 |
if (!condition) out.println(message); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
136 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
137 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
138 |
static Exception unexpected(Exception e) { |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
139 |
out.println("Unexpected Exception: " + e); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
140 |
e.printStackTrace(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
141 |
return e; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
142 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
143 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
144 |
// performs a simple exchange of data between the two sockets |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
145 |
// and throws an exception if there is any problem. |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
146 |
void simpleDataExchange(Socket s1, Socket s2) throws Exception { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
147 |
try (final InputStream i1 = s1.getInputStream(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
148 |
final InputStream i2 = s2.getInputStream(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
149 |
final OutputStream o1 = s1.getOutputStream(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
150 |
final OutputStream o2 = s2.getOutputStream()) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
151 |
startSimpleWriter("simpleWriter1", o1, 100); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
152 |
startSimpleWriter("simpleWriter2", o2, 200); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
153 |
simpleRead(i2, 100); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
154 |
simpleRead(i1, 200); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
155 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
156 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
157 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
158 |
void startSimpleWriter(String threadName, final OutputStream os, final int start) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
159 |
(new Thread(new Runnable() { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
160 |
public void run() { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
161 |
try { simpleWrite(os, start); } |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
162 |
catch (Exception e) {unexpected(e); } |
58108
5302477c8285
8230858: Replace wildcard address with loopback or local host in tests - part 23
dfuchs
parents:
54811
diff
changeset
|
163 |
finally { out.println(threadName + ": done"); } |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
164 |
}}, threadName)).start(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
165 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
166 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
167 |
void simpleWrite(OutputStream os, int start) throws Exception { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
168 |
byte b[] = new byte[2]; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
169 |
for (int i=start; i<start+100; i++) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
170 |
b[0] = (byte) (i / 256); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
171 |
b[1] = (byte) (i % 256); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
172 |
os.write(b); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
173 |
} |
58108
5302477c8285
8230858: Replace wildcard address with loopback or local host in tests - part 23
dfuchs
parents:
54811
diff
changeset
|
174 |
out.println("Wrote " + start + " -> " + (start + 100)); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
175 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
176 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
177 |
void simpleRead(InputStream is, int start) throws Exception { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
178 |
byte b[] = new byte [2]; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
179 |
for (int i=start; i<start+100; i++) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
180 |
int x = is.read(b); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
181 |
if (x == 1) |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
182 |
x += is.read(b,1,1); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
183 |
if (x!=2) |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
184 |
throw new Exception("read error"); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
185 |
int r = bytes(b[0], b[1]); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
186 |
if (r != i) |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
187 |
throw new Exception("read " + r + " expected " +i); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
188 |
} |
58108
5302477c8285
8230858: Replace wildcard address with loopback or local host in tests - part 23
dfuchs
parents:
54811
diff
changeset
|
189 |
out.println("Read " + start + " -> " + (start + 100)); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
190 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
191 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
192 |
int bytes(byte b1, byte b2) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
193 |
int i1 = (int)b1 & 0xFF; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
194 |
int i2 = (int)b2 & 0xFF; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
195 |
return i1 * 256 + i2; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
196 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
197 |
|
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
198 |
static class ConnectProxyTunnelServer extends Thread implements AutoCloseable { |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
199 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
200 |
private final ServerSocket ss; |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
201 |
private volatile boolean closed; |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
202 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
203 |
public ConnectProxyTunnelServer() throws IOException { |
54809
351da897f409
8223465: Replace wildcard address with loopback or local host in tests - part 3
aefimov
parents:
54770
diff
changeset
|
204 |
ss = new ServerSocket(0, 0, InetAddress.getLoopbackAddress()); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
205 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
206 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
207 |
@Override |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
208 |
public void run() { |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
209 |
try { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
210 |
while (!closed) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
211 |
try (Socket clientSocket = ss.accept()) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
212 |
processRequest(clientSocket); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
213 |
} |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
214 |
} |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
215 |
} catch (Exception e) { |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
216 |
if (!closed) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
217 |
out.println("Proxy Failed: " + e); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
218 |
e.printStackTrace(); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
219 |
} |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
220 |
} finally { |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
221 |
if (!closed) |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
222 |
try { ss.close(); } catch (IOException x) { unexpected(x); } |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
223 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
224 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
225 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
226 |
/** |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
227 |
* Returns the port on which the proxy is accepting connections. |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
228 |
*/ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
229 |
public int getLocalPort() { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
230 |
return ss.getLocalPort(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
231 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
232 |
|
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
233 |
@Override |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
234 |
public void close() throws Exception { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
235 |
closed = true; |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
236 |
ss.close(); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
237 |
} |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
238 |
|
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
239 |
/* |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
240 |
* Processes the CONNECT request |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
241 |
*/ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
242 |
private void processRequest(Socket clientSocket) throws Exception { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
243 |
MessageHeader mheader = new MessageHeader(clientSocket.getInputStream()); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
244 |
String statusLine = mheader.getValue(0); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
245 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
246 |
if (!statusLine.startsWith("CONNECT")) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
247 |
out.println("proxy server: processes only " |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
248 |
+ "CONNECT method requests, received: " |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
249 |
+ statusLine); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
250 |
return; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
251 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
252 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
253 |
// retrieve the host and port info from the status-line |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
254 |
InetSocketAddress serverAddr = getConnectInfo(statusLine); |
58108
5302477c8285
8230858: Replace wildcard address with loopback or local host in tests - part 23
dfuchs
parents:
54811
diff
changeset
|
255 |
out.println("Proxy serving CONNECT request to " + serverAddr); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
256 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
257 |
//open socket to the server |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
258 |
try (Socket serverSocket = new Socket(serverAddr.getAddress(), |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
259 |
serverAddr.getPort())) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
260 |
Forwarder clientFW = new Forwarder(clientSocket.getInputStream(), |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
261 |
serverSocket.getOutputStream()); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
262 |
Thread clientForwarderThread = new Thread(clientFW, "ClientForwarder"); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
263 |
clientForwarderThread.start(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
264 |
send200(clientSocket); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
265 |
Forwarder serverFW = new Forwarder(serverSocket.getInputStream(), |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
266 |
clientSocket.getOutputStream()); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
267 |
serverFW.run(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
268 |
clientForwarderThread.join(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
269 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
270 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
271 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
272 |
private void send200(Socket clientSocket) throws IOException { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
273 |
OutputStream out = clientSocket.getOutputStream(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
274 |
PrintWriter pout = new PrintWriter(out); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
275 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
276 |
pout.println("HTTP/1.1 200 OK"); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
277 |
pout.println(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
278 |
pout.flush(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
279 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
280 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
281 |
/* |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
282 |
* This method retrieves the hostname and port of the tunnel destination |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
283 |
* from the request line. |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
284 |
* @param connectStr |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
285 |
* of the form: <i>CONNECT server-name:server-port HTTP/1.x</i> |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
286 |
*/ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
287 |
static InetSocketAddress getConnectInfo(String connectStr) |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
288 |
throws Exception |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
289 |
{ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
290 |
try { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
291 |
int starti = connectStr.indexOf(' '); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
292 |
int endi = connectStr.lastIndexOf(' '); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
293 |
String connectInfo = connectStr.substring(starti+1, endi).trim(); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
294 |
// retrieve server name and port |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
295 |
endi = connectInfo.lastIndexOf(':'); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
296 |
String name = connectInfo.substring(0, endi); |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
297 |
|
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
298 |
if (name.contains(":")) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
299 |
if (!(name.startsWith("[") && name.endsWith("]"))) { |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
300 |
throw new IOException("Invalid host:" + name); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
301 |
} |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
302 |
name = name.substring(1, name.length() - 1); |
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
303 |
} |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
304 |
int port = Integer.parseInt(connectInfo.substring(endi+1)); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
305 |
return new InetSocketAddress(name, port); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
306 |
} catch (Exception e) { |
54188
791052cc88db
8220663: Incorrect handling of IPv6 addresses in Socket(Proxy.HTTP)
chegar
parents:
49431
diff
changeset
|
307 |
out.println("Proxy received a request: " + connectStr); |
16061
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
308 |
throw unexpected(e); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
309 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
310 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
311 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
312 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
313 |
/* Reads from the given InputStream and writes to the given OutputStream */ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
314 |
static class Forwarder implements Runnable |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
315 |
{ |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
316 |
private final InputStream in; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
317 |
private final OutputStream os; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
318 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
319 |
Forwarder(InputStream in, OutputStream os) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
320 |
this.in = in; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
321 |
this.os = os; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
322 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
323 |
|
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
324 |
@Override |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
325 |
public void run() { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
326 |
try { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
327 |
byte[] ba = new byte[1024]; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
328 |
int count; |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
329 |
while ((count = in.read(ba)) != -1) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
330 |
os.write(ba, 0, count); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
331 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
332 |
} catch (IOException e) { |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
333 |
unexpected(e); |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
334 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
335 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
336 |
} |
c80133bafef0
6370908: Add support for HTTP_CONNECT proxy in Socket class
chegar
parents:
diff
changeset
|
337 |
} |