author | redestad |
Thu, 13 Dec 2018 15:31:05 +0100 | |
changeset 53018 | 8bf9268df0e2 |
parent 52725 | c470f977ade8 |
child 54116 | d21803f47416 |
permissions | -rw-r--r-- |
2 | 1 |
/* |
49435
5fd26ab491fa
8144300: http.nonProxyHosts value having wildcard * both at end and start are not honored
rpatil
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
package sun.net.spi; |
|
27 |
||
7982
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
28 |
import java.net.InetSocketAddress; |
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
29 |
import java.net.Proxy; |
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
30 |
import java.net.ProxySelector; |
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
31 |
import java.net.SocketAddress; |
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
32 |
import java.net.URI; |
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
33 |
import java.util.Collections; |
7982
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
34 |
import java.util.List; |
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
35 |
import java.io.IOException; |
2 | 36 |
import java.security.AccessController; |
37 |
import java.security.PrivilegedAction; |
|
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
38 |
import java.util.StringJoiner; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
39 |
import java.util.regex.Pattern; |
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
40 |
import java.util.stream.Stream; |
7982
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
41 |
import sun.net.NetProperties; |
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
42 |
import sun.net.SocksProxy; |
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
43 |
import static java.util.regex.Pattern.quote; |
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
44 |
import static java.util.stream.Collectors.collectingAndThen; |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
45 |
import static java.util.stream.Collectors.toList; |
2 | 46 |
|
47 |
/** |
|
48 |
* Supports proxy settings using system properties This proxy selector |
|
49 |
* provides backward compatibility with the old http protocol handler |
|
50 |
* as far as how proxy is set |
|
51 |
* |
|
52 |
* Most of the implementation copied from the old http protocol handler |
|
53 |
* |
|
54 |
* Supports http/https/ftp.proxyHost, http/https/ftp.proxyPort, |
|
55 |
* proxyHost, proxyPort, and http/https/ftp.nonProxyHost, and socks. |
|
56 |
*/ |
|
57 |
public class DefaultProxySelector extends ProxySelector { |
|
58 |
||
59 |
/** |
|
60 |
* This is where we define all the valid System Properties we have to |
|
61 |
* support for each given protocol. |
|
62 |
* The format of this 2 dimensional array is : |
|
63 |
* - 1 row per protocol (http, ftp, ...) |
|
64 |
* - 1st element of each row is the protocol name |
|
65 |
* - subsequent elements are prefixes for Host & Port properties |
|
66 |
* listed in order of priority. |
|
67 |
* Example: |
|
68 |
* {"ftp", "ftp.proxy", "ftpProxy", "proxy", "socksProxy"}, |
|
69 |
* means for FTP we try in that oder: |
|
70 |
* + ftp.proxyHost & ftp.proxyPort |
|
71 |
* + ftpProxyHost & ftpProxyPort |
|
72 |
* + proxyHost & proxyPort |
|
73 |
* + socksProxyHost & socksProxyPort |
|
74 |
* |
|
75 |
* Note that the socksProxy should *always* be the last on the list |
|
76 |
*/ |
|
32649
2ee9017c7597
8136583: Core libraries should use blessed modifier order
martin
parents:
31529
diff
changeset
|
77 |
static final String[][] props = { |
2 | 78 |
/* |
79 |
* protocol, Property prefix 1, Property prefix 2, ... |
|
80 |
*/ |
|
81 |
{"http", "http.proxy", "proxy", "socksProxy"}, |
|
82 |
{"https", "https.proxy", "proxy", "socksProxy"}, |
|
83 |
{"ftp", "ftp.proxy", "ftpProxy", "proxy", "socksProxy"}, |
|
84 |
{"socket", "socksProxy"} |
|
85 |
}; |
|
86 |
||
7982
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
87 |
private static final String SOCKS_PROXY_VERSION = "socksProxyVersion"; |
65f5328a67a2
6964547: Impossible to set useV4 in SocksSocketImpl
chegar
parents:
5506
diff
changeset
|
88 |
|
2 | 89 |
private static boolean hasSystemProxies = false; |
90 |
||
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
91 |
private static final List<Proxy> NO_PROXY_LIST = List.of(Proxy.NO_PROXY); |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
92 |
|
2 | 93 |
static { |
94 |
final String key = "java.net.useSystemProxies"; |
|
51 | 95 |
Boolean b = AccessController.doPrivileged( |
96 |
new PrivilegedAction<Boolean>() { |
|
97 |
public Boolean run() { |
|
2 | 98 |
return NetProperties.getBoolean(key); |
99 |
}}); |
|
100 |
if (b != null && b.booleanValue()) { |
|
101 |
java.security.AccessController.doPrivileged( |
|
12559
9456ceada8b1
7164376: Replace use of sun.security.action.LoadLibraryAction with System.loadLibrary
mchung
parents:
12047
diff
changeset
|
102 |
new java.security.PrivilegedAction<Void>() { |
9456ceada8b1
7164376: Replace use of sun.security.action.LoadLibraryAction with System.loadLibrary
mchung
parents:
12047
diff
changeset
|
103 |
public Void run() { |
9456ceada8b1
7164376: Replace use of sun.security.action.LoadLibraryAction with System.loadLibrary
mchung
parents:
12047
diff
changeset
|
104 |
System.loadLibrary("net"); |
9456ceada8b1
7164376: Replace use of sun.security.action.LoadLibraryAction with System.loadLibrary
mchung
parents:
12047
diff
changeset
|
105 |
return null; |
9456ceada8b1
7164376: Replace use of sun.security.action.LoadLibraryAction with System.loadLibrary
mchung
parents:
12047
diff
changeset
|
106 |
} |
9456ceada8b1
7164376: Replace use of sun.security.action.LoadLibraryAction with System.loadLibrary
mchung
parents:
12047
diff
changeset
|
107 |
}); |
2 | 108 |
hasSystemProxies = init(); |
109 |
} |
|
110 |
} |
|
111 |
||
31529
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
112 |
public static int socksProxyVersion() { |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
113 |
return AccessController.doPrivileged( |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
114 |
new PrivilegedAction<Integer>() { |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
115 |
@Override public Integer run() { |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
116 |
return NetProperties.getInteger(SOCKS_PROXY_VERSION, 5); |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
117 |
} |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
118 |
}); |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
119 |
} |
31d7d82b39ff
8129444: socksProxyVersion system property ignored for Socket(Proxy)
asmotrak
parents:
25859
diff
changeset
|
120 |
|
2 | 121 |
/** |
122 |
* How to deal with "non proxy hosts": |
|
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
123 |
* since we do have to generate a pattern we don't want to do that if |
2 | 124 |
* it's not necessary. Therefore we do cache the result, on a per-protocol |
125 |
* basis, and change it only when the "source", i.e. the system property, |
|
126 |
* did change. |
|
127 |
*/ |
|
128 |
||
129 |
static class NonProxyInfo { |
|
3855
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
130 |
// Default value for nonProxyHosts, this provides backward compatibility |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
131 |
// by excluding localhost and its litteral notations. |
12047
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
9035
diff
changeset
|
132 |
static final String defStringVal = "localhost|127.*|[::1]|0.0.0.0|[::0]"; |
3855
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
133 |
|
2 | 134 |
String hostsSource; |
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
135 |
Pattern pattern; |
3855
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
136 |
final String property; |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
137 |
final String defaultVal; |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
138 |
static NonProxyInfo ftpNonProxyInfo = new NonProxyInfo("ftp.nonProxyHosts", null, null, defStringVal); |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
139 |
static NonProxyInfo httpNonProxyInfo = new NonProxyInfo("http.nonProxyHosts", null, null, defStringVal); |
16737
8f36190e097a
5001942: Missings SOCKS support for direct connections
khazra
parents:
14342
diff
changeset
|
140 |
static NonProxyInfo socksNonProxyInfo = new NonProxyInfo("socksNonProxyHosts", null, null, defStringVal); |
2 | 141 |
|
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
142 |
NonProxyInfo(String p, String s, Pattern pattern, String d) { |
2 | 143 |
property = p; |
144 |
hostsSource = s; |
|
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
145 |
this.pattern = pattern; |
3855
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
146 |
defaultVal = d; |
2 | 147 |
} |
148 |
} |
|
149 |
||
150 |
||
151 |
/** |
|
152 |
* select() method. Where all the hard work is done. |
|
153 |
* Build a list of proxies depending on URI. |
|
154 |
* Since we're only providing compatibility with the system properties |
|
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
155 |
* from previous releases (see list above), that list will typically |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
156 |
* contain one single proxy, default being NO_PROXY. |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
157 |
* If we can get a system proxy it might contain more entries. |
2 | 158 |
*/ |
159 |
public java.util.List<Proxy> select(URI uri) { |
|
160 |
if (uri == null) { |
|
161 |
throw new IllegalArgumentException("URI can't be null."); |
|
162 |
} |
|
163 |
String protocol = uri.getScheme(); |
|
164 |
String host = uri.getHost(); |
|
165 |
||
166 |
if (host == null) { |
|
167 |
// This is a hack to ensure backward compatibility in two |
|
168 |
// cases: 1. hostnames contain non-ascii characters, |
|
169 |
// internationalized domain names. in which case, URI will |
|
170 |
// return null, see BugID 4957669; 2. Some hostnames can |
|
171 |
// contain '_' chars even though it's not supposed to be |
|
172 |
// legal, in which case URI will return null for getHost, |
|
173 |
// but not for getAuthority() See BugID 4913253 |
|
174 |
String auth = uri.getAuthority(); |
|
175 |
if (auth != null) { |
|
176 |
int i; |
|
177 |
i = auth.indexOf('@'); |
|
178 |
if (i >= 0) { |
|
179 |
auth = auth.substring(i+1); |
|
180 |
} |
|
181 |
i = auth.lastIndexOf(':'); |
|
182 |
if (i >= 0) { |
|
183 |
auth = auth.substring(0,i); |
|
184 |
} |
|
185 |
host = auth; |
|
186 |
} |
|
187 |
} |
|
188 |
||
189 |
if (protocol == null || host == null) { |
|
190 |
throw new IllegalArgumentException("protocol = "+protocol+" host = "+host); |
|
191 |
} |
|
192 |
||
193 |
NonProxyInfo pinfo = null; |
|
194 |
||
195 |
if ("http".equalsIgnoreCase(protocol)) { |
|
2429
8ea224e457c6
6819122: DefaultProxySelector should lazily initialize the Pattern object and the NonProxyInfo objects
mchung
parents:
715
diff
changeset
|
196 |
pinfo = NonProxyInfo.httpNonProxyInfo; |
2 | 197 |
} else if ("https".equalsIgnoreCase(protocol)) { |
198 |
// HTTPS uses the same property as HTTP, for backward |
|
199 |
// compatibility |
|
2429
8ea224e457c6
6819122: DefaultProxySelector should lazily initialize the Pattern object and the NonProxyInfo objects
mchung
parents:
715
diff
changeset
|
200 |
pinfo = NonProxyInfo.httpNonProxyInfo; |
2 | 201 |
} else if ("ftp".equalsIgnoreCase(protocol)) { |
2429
8ea224e457c6
6819122: DefaultProxySelector should lazily initialize the Pattern object and the NonProxyInfo objects
mchung
parents:
715
diff
changeset
|
202 |
pinfo = NonProxyInfo.ftpNonProxyInfo; |
16737
8f36190e097a
5001942: Missings SOCKS support for direct connections
khazra
parents:
14342
diff
changeset
|
203 |
} else if ("socket".equalsIgnoreCase(protocol)) { |
8f36190e097a
5001942: Missings SOCKS support for direct connections
khazra
parents:
14342
diff
changeset
|
204 |
pinfo = NonProxyInfo.socksNonProxyInfo; |
2 | 205 |
} |
206 |
||
207 |
/** |
|
208 |
* Let's check the System properties for that protocol |
|
209 |
*/ |
|
210 |
final String proto = protocol; |
|
211 |
final NonProxyInfo nprop = pinfo; |
|
212 |
final String urlhost = host.toLowerCase(); |
|
213 |
||
214 |
/** |
|
215 |
* This is one big doPrivileged call, but we're trying to optimize |
|
216 |
* the code as much as possible. Since we're checking quite a few |
|
217 |
* System properties it does help having only 1 call to doPrivileged. |
|
218 |
* Be mindful what you do in here though! |
|
219 |
*/ |
|
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
220 |
Proxy[] proxyArray = AccessController.doPrivileged( |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
221 |
new PrivilegedAction<Proxy[]>() { |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
222 |
public Proxy[] run() { |
2 | 223 |
int i, j; |
224 |
String phost = null; |
|
225 |
int pport = 0; |
|
226 |
String nphosts = null; |
|
227 |
InetSocketAddress saddr = null; |
|
228 |
||
229 |
// Then let's walk the list of protocols in our array |
|
230 |
for (i=0; i<props.length; i++) { |
|
231 |
if (props[i][0].equalsIgnoreCase(proto)) { |
|
232 |
for (j = 1; j < props[i].length; j++) { |
|
233 |
/* System.getProp() will give us an empty |
|
234 |
* String, "" for a defined but "empty" |
|
235 |
* property. |
|
236 |
*/ |
|
237 |
phost = NetProperties.get(props[i][j]+"Host"); |
|
238 |
if (phost != null && phost.length() != 0) |
|
239 |
break; |
|
240 |
} |
|
53018
8bf9268df0e2
8215281: Use String.isEmpty() when applicable in java.base
redestad
parents:
52725
diff
changeset
|
241 |
if (phost == null || phost.isEmpty()) { |
2 | 242 |
/** |
243 |
* No system property defined for that |
|
244 |
* protocol. Let's check System Proxy |
|
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
245 |
* settings (Gnome, MacOsX & Windows) if |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
246 |
* we were instructed to. |
2 | 247 |
*/ |
248 |
if (hasSystemProxies) { |
|
249 |
String sproto; |
|
250 |
if (proto.equalsIgnoreCase("socket")) |
|
251 |
sproto = "socks"; |
|
252 |
else |
|
253 |
sproto = proto; |
|
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
254 |
return getSystemProxies(sproto, urlhost); |
2 | 255 |
} |
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
256 |
return null; |
2 | 257 |
} |
258 |
// If a Proxy Host is defined for that protocol |
|
259 |
// Let's get the NonProxyHosts property |
|
260 |
if (nprop != null) { |
|
261 |
nphosts = NetProperties.get(nprop.property); |
|
262 |
synchronized (nprop) { |
|
263 |
if (nphosts == null) { |
|
3855
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
264 |
if (nprop.defaultVal != null) { |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
265 |
nphosts = nprop.defaultVal; |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
266 |
} else { |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
267 |
nprop.hostsSource = null; |
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
268 |
nprop.pattern = null; |
3855
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
269 |
} |
53018
8bf9268df0e2
8215281: Use String.isEmpty() when applicable in java.base
redestad
parents:
52725
diff
changeset
|
270 |
} else if (!nphosts.isEmpty()) { |
12047
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
9035
diff
changeset
|
271 |
// add the required default patterns |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
9035
diff
changeset
|
272 |
// but only if property no set. If it |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
9035
diff
changeset
|
273 |
// is empty, leave empty. |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
9035
diff
changeset
|
274 |
nphosts += "|" + NonProxyInfo |
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
9035
diff
changeset
|
275 |
.defStringVal; |
3855
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
276 |
} |
653df3a7256d
6737819: sun.misc.net.DefaultProxySelector doesn't use proxy setting to localhost
jccollet
parents:
2429
diff
changeset
|
277 |
if (nphosts != null) { |
2 | 278 |
if (!nphosts.equals(nprop.hostsSource)) { |
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
279 |
nprop.pattern = toPattern(nphosts); |
2 | 280 |
nprop.hostsSource = nphosts; |
281 |
} |
|
282 |
} |
|
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
283 |
if (shouldNotUseProxyFor(nprop.pattern, urlhost)) { |
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
284 |
return null; |
2 | 285 |
} |
286 |
} |
|
287 |
} |
|
288 |
// We got a host, let's check for port |
|
289 |
||
290 |
pport = NetProperties.getInteger(props[i][j]+"Port", 0).intValue(); |
|
291 |
if (pport == 0 && j < (props[i].length - 1)) { |
|
292 |
// Can't find a port with same prefix as Host |
|
293 |
// AND it's not a SOCKS proxy |
|
294 |
// Let's try the other prefixes for that proto |
|
295 |
for (int k = 1; k < (props[i].length - 1); k++) { |
|
296 |
if ((k != j) && (pport == 0)) |
|
297 |
pport = NetProperties.getInteger(props[i][k]+"Port", 0).intValue(); |
|
298 |
} |
|
299 |
} |
|
300 |
||
301 |
// Still couldn't find a port, let's use default |
|
302 |
if (pport == 0) { |
|
303 |
if (j == (props[i].length - 1)) // SOCKS |
|
304 |
pport = defaultPort("socket"); |
|
305 |
else |
|
306 |
pport = defaultPort(proto); |
|
307 |
} |
|
308 |
// We did find a proxy definition. |
|
309 |
// Let's create the address, but don't resolve it |
|
310 |
// as this will be done at connection time |
|
311 |
saddr = InetSocketAddress.createUnresolved(phost, pport); |
|
312 |
// Socks is *always* the last on the list. |
|
313 |
if (j == (props[i].length - 1)) { |
|
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
314 |
return new Proxy[] {SocksProxy.create(saddr, socksProxyVersion())}; |
2 | 315 |
} |
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
316 |
return new Proxy[] {new Proxy(Proxy.Type.HTTP, saddr)}; |
2 | 317 |
} |
318 |
} |
|
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
319 |
return null; |
2 | 320 |
}}); |
321 |
||
322 |
||
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
323 |
if (proxyArray != null) { |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
324 |
// Remove duplicate entries, while preserving order. |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
325 |
return Stream.of(proxyArray).distinct().collect( |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
326 |
collectingAndThen(toList(), Collections::unmodifiableList)); |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
327 |
} |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
328 |
|
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
329 |
// If no specific proxy was found, return a standard list containing |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
330 |
// only one NO_PROXY entry. |
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
331 |
return NO_PROXY_LIST; |
2 | 332 |
} |
333 |
||
334 |
public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { |
|
335 |
if (uri == null || sa == null || ioe == null) { |
|
336 |
throw new IllegalArgumentException("Arguments can't be null."); |
|
337 |
} |
|
338 |
// ignored |
|
339 |
} |
|
340 |
||
341 |
||
342 |
private int defaultPort(String protocol) { |
|
343 |
if ("http".equalsIgnoreCase(protocol)) { |
|
344 |
return 80; |
|
345 |
} else if ("https".equalsIgnoreCase(protocol)) { |
|
346 |
return 443; |
|
347 |
} else if ("ftp".equalsIgnoreCase(protocol)) { |
|
348 |
return 80; |
|
349 |
} else if ("socket".equalsIgnoreCase(protocol)) { |
|
350 |
return 1080; |
|
351 |
} else { |
|
352 |
return -1; |
|
353 |
} |
|
354 |
} |
|
355 |
||
32649
2ee9017c7597
8136583: Core libraries should use blessed modifier order
martin
parents:
31529
diff
changeset
|
356 |
private static native boolean init(); |
43501
243c346dc905
8170868: DefaultProxySelector should use system defaults on Windows, MacOS and Gnome
clanger
parents:
32649
diff
changeset
|
357 |
private synchronized native Proxy[] getSystemProxies(String protocol, String host); |
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
358 |
|
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
359 |
/** |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
360 |
* @return {@code true} if given this pattern for non-proxy hosts and this |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
361 |
* urlhost the proxy should NOT be used to access this urlhost |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
362 |
*/ |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
363 |
static boolean shouldNotUseProxyFor(Pattern pattern, String urlhost) { |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
364 |
if (pattern == null || urlhost.isEmpty()) |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
365 |
return false; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
366 |
boolean matches = pattern.matcher(urlhost).matches(); |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
367 |
return matches; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
368 |
} |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
369 |
|
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
370 |
/** |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
371 |
* @param mask non-null mask |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
372 |
* @return {@link java.util.regex.Pattern} corresponding to this mask |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
373 |
* or {@code null} in case mask should not match anything |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
374 |
*/ |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
375 |
static Pattern toPattern(String mask) { |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
376 |
boolean disjunctionEmpty = true; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
377 |
StringJoiner joiner = new StringJoiner("|"); |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
378 |
for (String disjunct : mask.split("\\|")) { |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
379 |
if (disjunct.isEmpty()) |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
380 |
continue; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
381 |
disjunctionEmpty = false; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
382 |
String regex = disjunctToRegex(disjunct.toLowerCase()); |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
383 |
joiner.add(regex); |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
384 |
} |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
385 |
return disjunctionEmpty ? null : Pattern.compile(joiner.toString()); |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
386 |
} |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
387 |
|
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
388 |
/** |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
389 |
* @param disjunct non-null mask disjunct |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
390 |
* @return java regex string corresponding to this mask |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
391 |
*/ |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
392 |
static String disjunctToRegex(String disjunct) { |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
393 |
String regex; |
49435
5fd26ab491fa
8144300: http.nonProxyHosts value having wildcard * both at end and start are not honored
rpatil
parents:
47216
diff
changeset
|
394 |
if (disjunct.startsWith("*") && disjunct.endsWith("*")) { |
5fd26ab491fa
8144300: http.nonProxyHosts value having wildcard * both at end and start are not honored
rpatil
parents:
47216
diff
changeset
|
395 |
regex = ".*" + quote(disjunct.substring(1, disjunct.length() - 1)) + ".*"; |
5fd26ab491fa
8144300: http.nonProxyHosts value having wildcard * both at end and start are not honored
rpatil
parents:
47216
diff
changeset
|
396 |
} else if (disjunct.startsWith("*")) { |
23583
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
397 |
regex = ".*" + quote(disjunct.substring(1)); |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
398 |
} else if (disjunct.endsWith("*")) { |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
399 |
regex = quote(disjunct.substring(0, disjunct.length() - 1)) + ".*"; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
400 |
} else { |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
401 |
regex = quote(disjunct); |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
402 |
} |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
403 |
return regex; |
1bee92aa2f1f
8035158: Remove dependency on sun.misc.RegexpPool and friends
chegar
parents:
23010
diff
changeset
|
404 |
} |
2 | 405 |
} |