author | michaelm |
Thu, 29 Mar 2018 17:14:17 +0100 | |
branch | http-client-branch |
changeset 56368 | c10279a27b41 |
parent 56365 | 7b2e4c363335 |
child 56427 | 7f1916397463 |
permissions | -rw-r--r-- |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
1 |
/* |
56009
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
2 |
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
4 |
* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
10 |
* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
15 |
* accompanied this code). |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
16 |
* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
20 |
* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
23 |
* questions. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
24 |
*/ |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
25 |
|
56092
fd85b2bf2b0d
http-client-branch: move implementation to jdk.internal.net.http
chegar
parents:
56089
diff
changeset
|
26 |
package jdk.internal.net.http.common; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
27 |
|
56089
42208b2f224e
http-client-branch: move to standard package and module name
chegar
parents:
56054
diff
changeset
|
28 |
import java.net.http.HttpHeaders; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
29 |
import sun.net.NetProperties; |
45713
ee3f2cbfe23a
8182589: TLS SNI in new Java 9 client is not available
michaelm
parents:
43730
diff
changeset
|
30 |
import sun.net.util.IPAddressUtil; |
56009
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
31 |
import sun.net.www.HeaderParser; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
32 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
33 |
import java.io.ByteArrayOutputStream; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
34 |
import java.io.Closeable; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
35 |
import java.io.IOException; |
48083 | 36 |
import java.io.PrintStream; |
43730 | 37 |
import java.io.UncheckedIOException; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
38 |
import java.io.UnsupportedEncodingException; |
48083 | 39 |
import java.lang.System.Logger; |
40 |
import java.lang.System.Logger.Level; |
|
45713
ee3f2cbfe23a
8182589: TLS SNI in new Java 9 client is not available
michaelm
parents:
43730
diff
changeset
|
41 |
import java.net.InetSocketAddress; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
42 |
import java.net.URI; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
43 |
import java.net.URLPermission; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
44 |
import java.nio.ByteBuffer; |
43730 | 45 |
import java.nio.charset.Charset; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
46 |
import java.nio.charset.StandardCharsets; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
47 |
import java.security.AccessController; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
48 |
import java.security.PrivilegedAction; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
49 |
import java.util.Arrays; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
50 |
import java.util.Collection; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
51 |
import java.util.Collections; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
52 |
import java.util.List; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
53 |
import java.util.Set; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
54 |
import java.util.TreeSet; |
48083 | 55 |
import java.util.concurrent.CompletionException; |
56 |
import java.util.concurrent.ExecutionException; |
|
56054
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
57 |
import java.util.function.BiPredicate; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
58 |
import java.util.function.Predicate; |
48083 | 59 |
import java.util.function.Supplier; |
56054
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
60 |
import java.util.stream.Collectors; |
48083 | 61 |
import java.util.stream.Stream; |
56126
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
62 |
import javax.net.ssl.SSLParameters; |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
63 |
import javax.net.ssl.SSLSession; |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
64 |
import javax.net.ssl.ExtendedSSLSession; |
48083 | 65 |
|
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
66 |
import static java.lang.String.format; |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
67 |
import static java.util.Objects.requireNonNull; |
48083 | 68 |
import static java.util.stream.Collectors.joining; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
69 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
70 |
/** |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
71 |
* Miscellaneous utilities |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
72 |
*/ |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
73 |
public final class Utils { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
74 |
|
48083 | 75 |
public static final boolean ASSERTIONSENABLED; |
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
76 |
|
48083 | 77 |
static { |
78 |
boolean enabled = false; |
|
79 |
assert enabled = true; |
|
80 |
ASSERTIONSENABLED = enabled; |
|
81 |
} |
|
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
82 |
|
48083 | 83 |
// public static final boolean TESTING; |
84 |
// static { |
|
85 |
// if (ASSERTIONSENABLED) { |
|
86 |
// PrivilegedAction<String> action = () -> System.getProperty("test.src"); |
|
87 |
// TESTING = AccessController.doPrivileged(action) != null; |
|
88 |
// } else TESTING = false; |
|
89 |
// } |
|
90 |
public static final boolean DEBUG = // Revisit: temporary dev flag. |
|
91 |
getBooleanProperty(DebugLogger.HTTP_NAME, false); |
|
56304
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
92 |
public static final boolean DEBUG_WS = // Revisit: temporary dev flag. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
93 |
getBooleanProperty(DebugLogger.WS_NAME, false); |
48083 | 94 |
public static final boolean DEBUG_HPACK = // Revisit: temporary dev flag. |
95 |
getBooleanProperty(DebugLogger.HPACK_NAME, false); |
|
96 |
public static final boolean TESTING = DEBUG; |
|
97 |
||
56137
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
98 |
public static final boolean isHostnameVerificationDisabled = // enabled by default |
56270
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
99 |
hostnameVerificationDisabledValue(); |
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
100 |
|
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
101 |
private static boolean hostnameVerificationDisabledValue() { |
56272
7394452786ba
http-client-branch: rename jdk.internal.httpclient.disableHostnameVerification property
chegar
parents:
56271
diff
changeset
|
102 |
String prop = getProperty("jdk.internal.httpclient.disableHostnameVerification"); |
56270
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
103 |
if (prop == null) |
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
104 |
return false; |
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
105 |
return prop.isEmpty() ? true : Boolean.parseBoolean(prop); |
56270
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
106 |
} |
56137
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
107 |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
108 |
/** |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
109 |
* Allocated buffer size. Must never be higher than 16K. But can be lower |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
110 |
* if smaller allocation units preferred. HTTP/2 mandates that all |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
111 |
* implementations support frame payloads of at least 16K. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
112 |
*/ |
48083 | 113 |
private static final int DEFAULT_BUFSIZE = 16 * 1024; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
114 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
115 |
public static final int BUFSIZE = getIntegerNetProperty( |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
116 |
"jdk.httpclient.bufsize", DEFAULT_BUFSIZE |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
117 |
); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
118 |
|
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
119 |
private static final Set<String> DISALLOWED_HEADERS_SET; |
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
120 |
|
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
121 |
static { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
122 |
// A case insensitive TreeSet of strings. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
123 |
TreeSet<String> treeSet = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
124 |
treeSet.addAll(Set.of("connection", "content-length", |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
125 |
"date", "expect", "from", "host", "origin", |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56036
diff
changeset
|
126 |
"referer", "upgrade", |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
127 |
"via", "warning")); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
128 |
DISALLOWED_HEADERS_SET = Collections.unmodifiableSet(treeSet); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
56024
diff
changeset
|
129 |
} |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56036
diff
changeset
|
130 |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
131 |
public static final Predicate<String> |
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
132 |
ALLOWED_HEADERS = header -> !DISALLOWED_HEADERS_SET.contains(header); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
133 |
|
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
134 |
public static final BiPredicate<String, List<String>> VALIDATE_USER_HEADER = |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
135 |
(name, lv) -> { |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
136 |
requireNonNull(name, "header name"); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
137 |
requireNonNull(lv, "header values"); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
138 |
if (!isValidName(name)) { |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
139 |
throw newIAE("invalid header name: \"%s\"", name); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
140 |
} |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
141 |
if (!Utils.ALLOWED_HEADERS.test(name)) { |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
142 |
throw newIAE("restricted header name: \"%s\"", name); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
143 |
} |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
144 |
for (String value : lv) { |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
145 |
requireNonNull(value, "header value"); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
146 |
if (!isValidValue(value)) { |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
147 |
throw newIAE("invalid header value for %s: \"%s\"", name, value); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
148 |
} |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
149 |
} |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
150 |
return true; |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
151 |
}; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56036
diff
changeset
|
152 |
|
56054
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
153 |
private static final Predicate<String> IS_PROXY_HEADER = (k) -> |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56036
diff
changeset
|
154 |
k != null && k.length() > 6 && "proxy-".equalsIgnoreCase(k.substring(0,6)); |
56054
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
155 |
private static final Predicate<String> NO_PROXY_HEADER = |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56036
diff
changeset
|
156 |
IS_PROXY_HEADER.negate(); |
56054
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
157 |
private static final Predicate<String> ALL_HEADERS = (s) -> true; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
158 |
|
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
159 |
private static final Set<String> PROXY_AUTH_DISABLED_SCHEMES; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
160 |
private static final Set<String> PROXY_AUTH_TUNNEL_DISABLED_SCHEMES; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
161 |
static { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
162 |
String proxyAuthDisabled = |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
163 |
getNetProperty("jdk.http.auth.proxying.disabledSchemes"); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
164 |
String proxyAuthTunnelDisabled = |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
165 |
getNetProperty("jdk.http.auth.tunneling.disabledSchemes"); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
166 |
PROXY_AUTH_DISABLED_SCHEMES = |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
167 |
proxyAuthDisabled == null ? Set.of() : |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
168 |
Stream.of(proxyAuthDisabled.split(",")) |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
169 |
.map(String::trim) |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
170 |
.filter((s) -> !s.isEmpty()) |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
171 |
.collect(Collectors.toUnmodifiableSet()); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
172 |
PROXY_AUTH_TUNNEL_DISABLED_SCHEMES = |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
173 |
proxyAuthTunnelDisabled == null ? Set.of() : |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
174 |
Stream.of(proxyAuthTunnelDisabled.split(",")) |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
175 |
.map(String::trim) |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
176 |
.filter((s) -> !s.isEmpty()) |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
177 |
.collect(Collectors.toUnmodifiableSet()); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
178 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
179 |
|
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
180 |
private static final String WSPACES = " \t\r\n"; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
181 |
private static final boolean isAllowedForProxy(String name, |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
182 |
List<String> value, |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
183 |
Set<String> disabledSchemes, |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
184 |
Predicate<String> allowedKeys) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
185 |
if (!allowedKeys.test(name)) return false; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
186 |
if (disabledSchemes.isEmpty()) return true; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
187 |
if (name.equalsIgnoreCase("proxy-authorization")) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
188 |
if (value.isEmpty()) return false; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
189 |
for (String scheme : disabledSchemes) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
190 |
int slen = scheme.length(); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
191 |
for (String v : value) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
192 |
int vlen = v.length(); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
193 |
if (vlen == slen) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
194 |
if (v.equalsIgnoreCase(scheme)) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
195 |
return false; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
196 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
197 |
} else if (vlen > slen) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
198 |
if (v.substring(0,slen).equalsIgnoreCase(scheme)) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
199 |
int c = v.codePointAt(slen); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
200 |
if (WSPACES.indexOf(c) > -1 |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
201 |
|| Character.isSpaceChar(c) |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
202 |
|| Character.isWhitespace(c)) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
203 |
return false; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
204 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
205 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
206 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
207 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
208 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
209 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
210 |
return true; |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
211 |
} |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
212 |
|
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
213 |
public static final BiPredicate<String, List<String>> PROXY_TUNNEL_FILTER = |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
214 |
(s,v) -> isAllowedForProxy(s, v, PROXY_AUTH_TUNNEL_DISABLED_SCHEMES, |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
215 |
IS_PROXY_HEADER); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
216 |
public static final BiPredicate<String, List<String>> PROXY_FILTER = |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
217 |
(s,v) -> isAllowedForProxy(s, v, PROXY_AUTH_DISABLED_SCHEMES, |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
218 |
ALL_HEADERS); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
219 |
public static final BiPredicate<String, List<String>> NO_PROXY_HEADERS_FILTER = |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
220 |
(n,v) -> Utils.NO_PROXY_HEADER.test(n); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
221 |
|
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
222 |
|
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
223 |
public static boolean proxyHasDisabledSchemes(boolean tunnel) { |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
224 |
return tunnel ? ! PROXY_AUTH_TUNNEL_DISABLED_SCHEMES.isEmpty() |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
225 |
: ! PROXY_AUTH_DISABLED_SCHEMES.isEmpty(); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
226 |
} |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
227 |
|
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
228 |
public static IllegalArgumentException newIAE(String message, Object... args) { |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
229 |
return new IllegalArgumentException(format(message, args)); |
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
230 |
} |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
231 |
public static ByteBuffer getBuffer() { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
232 |
return ByteBuffer.allocate(BUFSIZE); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
233 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
234 |
|
48083 | 235 |
public static Throwable getCompletionCause(Throwable x) { |
236 |
if (!(x instanceof CompletionException) |
|
237 |
&& !(x instanceof ExecutionException)) return x; |
|
238 |
final Throwable cause = x.getCause(); |
|
56024
de352132c7e8
http-client-branch: (WebSocket) a number of tests for exceptional completion
prappo
parents:
56009
diff
changeset
|
239 |
if (cause == null) { |
de352132c7e8
http-client-branch: (WebSocket) a number of tests for exceptional completion
prappo
parents:
56009
diff
changeset
|
240 |
throw new InternalError("Unexpected null cause", x); |
de352132c7e8
http-client-branch: (WebSocket) a number of tests for exceptional completion
prappo
parents:
56009
diff
changeset
|
241 |
} |
de352132c7e8
http-client-branch: (WebSocket) a number of tests for exceptional completion
prappo
parents:
56009
diff
changeset
|
242 |
return cause; |
48083 | 243 |
} |
244 |
||
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
245 |
public static IOException getIOException(Throwable t) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
246 |
if (t instanceof IOException) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
247 |
return (IOException) t; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
248 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
249 |
Throwable cause = t.getCause(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
250 |
if (cause != null) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
251 |
return getIOException(cause); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
252 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
253 |
return new IOException(t); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
254 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
255 |
|
48083 | 256 |
private Utils() { } |
257 |
||
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
258 |
/** |
48083 | 259 |
* Returns the security permissions required to connect to the proxy, or |
260 |
* {@code null} if none is required or applicable. |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
261 |
*/ |
48083 | 262 |
public static URLPermission permissionForProxy(InetSocketAddress proxyAddress) { |
263 |
if (proxyAddress == null) |
|
264 |
return null; |
|
265 |
||
266 |
StringBuilder sb = new StringBuilder(); |
|
267 |
sb.append("socket://") |
|
268 |
.append(proxyAddress.getHostString()).append(":") |
|
269 |
.append(proxyAddress.getPort()); |
|
270 |
String urlString = sb.toString(); |
|
271 |
return new URLPermission(urlString, "CONNECT"); |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
272 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
273 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
274 |
/** |
48083 | 275 |
* Returns the security permission required for the given details. |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
276 |
*/ |
48083 | 277 |
public static URLPermission permissionForServer(URI uri, |
278 |
String method, |
|
279 |
Stream<String> headers) { |
|
280 |
String urlString = new StringBuilder() |
|
281 |
.append(uri.getScheme()).append("://") |
|
282 |
.append(uri.getAuthority()) |
|
283 |
.append(uri.getPath()).toString(); |
|
284 |
||
285 |
StringBuilder actionStringBuilder = new StringBuilder(method); |
|
286 |
String collected = headers.collect(joining(",")); |
|
287 |
if (!collected.isEmpty()) { |
|
288 |
actionStringBuilder.append(":").append(collected); |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
289 |
} |
48083 | 290 |
return new URLPermission(urlString, actionStringBuilder.toString()); |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
291 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
292 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
293 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
294 |
// ABNF primitives defined in RFC 7230 |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
295 |
private static final boolean[] tchar = new boolean[256]; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
296 |
private static final boolean[] fieldvchar = new boolean[256]; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
297 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
298 |
static { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
299 |
char[] allowedTokenChars = |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
300 |
("!#$%&'*+-.^_`|~0123456789" + |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
301 |
"abcdefghijklmnopqrstuvwxyz" + |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
302 |
"ABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
303 |
for (char c : allowedTokenChars) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
304 |
tchar[c] = true; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
305 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
306 |
for (char c = 0x21; c < 0xFF; c++) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
307 |
fieldvchar[c] = true; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
308 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
309 |
fieldvchar[0x7F] = false; // a little hole (DEL) in the range |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
310 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
311 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
312 |
/* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
313 |
* Validates a RFC 7230 field-name. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
314 |
*/ |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
315 |
public static boolean isValidName(String token) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
316 |
for (int i = 0; i < token.length(); i++) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
317 |
char c = token.charAt(i); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
318 |
if (c > 255 || !tchar[c]) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
319 |
return false; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
320 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
321 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
322 |
return !token.isEmpty(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
323 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
324 |
|
56368
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
325 |
public static class ServerName { |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
326 |
ServerName(String name, boolean isLiteral) { |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
327 |
this.name = name; |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
328 |
this.isLiteral = isLiteral; |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
329 |
} |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
330 |
|
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
331 |
final String name; |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
332 |
final boolean isLiteral; |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
333 |
|
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
334 |
public String getName() { |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
335 |
return name; |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
336 |
} |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
337 |
|
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
338 |
public boolean isLiteral() { |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
339 |
return isLiteral; |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
340 |
} |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
341 |
} |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
342 |
|
45713
ee3f2cbfe23a
8182589: TLS SNI in new Java 9 client is not available
michaelm
parents:
43730
diff
changeset
|
343 |
/** |
56368
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
344 |
* Analyse the given address and determine if it is literal or not, |
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
345 |
* returning the address in String form. |
45713
ee3f2cbfe23a
8182589: TLS SNI in new Java 9 client is not available
michaelm
parents:
43730
diff
changeset
|
346 |
*/ |
56368
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
347 |
public static ServerName getServerName(InetSocketAddress addr) { |
45713
ee3f2cbfe23a
8182589: TLS SNI in new Java 9 client is not available
michaelm
parents:
43730
diff
changeset
|
348 |
String host = addr.getHostString(); |
56126
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
349 |
byte[] literal = IPAddressUtil.textToNumericFormatV4(host); |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
350 |
if (literal == null) { |
56368
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
351 |
// not IPv4 literal. Check IPv6 |
56126
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
352 |
literal = IPAddressUtil.textToNumericFormatV6(host); |
56368
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
353 |
return new ServerName(host, literal != null); |
56126
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
354 |
} else { |
56368
c10279a27b41
http-client-branch: Fixed 8200351: problem verifying certificate of literal IP address connection
michaelm
parents:
56365
diff
changeset
|
355 |
return new ServerName(host, true); |
56126
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
356 |
} |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
357 |
} |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
358 |
|
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
359 |
private static boolean isLoopbackLiteral(byte[] bytes) { |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
360 |
if (bytes.length == 4) { |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
361 |
return bytes[0] == 127; |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
362 |
} else if (bytes.length == 16) { |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
363 |
for (int i=0; i<14; i++) |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
364 |
if (bytes[i] != 0) |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
365 |
return false; |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
366 |
if (bytes[15] != 1) |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
367 |
return false; |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
368 |
return true; |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
369 |
} else |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
370 |
throw new InternalError(); |
45713
ee3f2cbfe23a
8182589: TLS SNI in new Java 9 client is not available
michaelm
parents:
43730
diff
changeset
|
371 |
} |
ee3f2cbfe23a
8182589: TLS SNI in new Java 9 client is not available
michaelm
parents:
43730
diff
changeset
|
372 |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
373 |
/* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
374 |
* Validates a RFC 7230 field-value. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
375 |
* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
376 |
* "Obsolete line folding" rule |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
377 |
* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
378 |
* obs-fold = CRLF 1*( SP / HTAB ) |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
379 |
* |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
380 |
* is not permitted! |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
381 |
*/ |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
382 |
public static boolean isValidValue(String token) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
383 |
for (int i = 0; i < token.length(); i++) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
384 |
char c = token.charAt(i); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
385 |
if (c > 255) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
386 |
return false; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
387 |
} |
56365
7b2e4c363335
http-client-branch: fix header field-value validation
dfuchs
parents:
56342
diff
changeset
|
388 |
if (c == ' ' || c == '\t') { |
7b2e4c363335
http-client-branch: fix header field-value validation
dfuchs
parents:
56342
diff
changeset
|
389 |
continue; |
7b2e4c363335
http-client-branch: fix header field-value validation
dfuchs
parents:
56342
diff
changeset
|
390 |
} else if (!fieldvchar[c]) { |
7b2e4c363335
http-client-branch: fix header field-value validation
dfuchs
parents:
56342
diff
changeset
|
391 |
return false; // forbidden byte |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
392 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
393 |
} |
56365
7b2e4c363335
http-client-branch: fix header field-value validation
dfuchs
parents:
56342
diff
changeset
|
394 |
return true; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
395 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
396 |
|
56342
5c2ea761455b
http-client-branch: verify that send/sendAsync will throw IAE and NPE as specified by HttpRequest.Builder
dfuchs
parents:
56304
diff
changeset
|
397 |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
398 |
public static int getIntegerNetProperty(String name, int defaultValue) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
399 |
return AccessController.doPrivileged((PrivilegedAction<Integer>) () -> |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
400 |
NetProperties.getInteger(name, defaultValue)); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
401 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
402 |
|
56263 | 403 |
public static String getNetProperty(String name) { |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
404 |
return AccessController.doPrivileged((PrivilegedAction<String>) () -> |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
405 |
NetProperties.get(name)); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
406 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
407 |
|
56137
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
408 |
public static boolean getBooleanProperty(String name, boolean def) { |
48083 | 409 |
return AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> |
410 |
Boolean.parseBoolean(System.getProperty(name, String.valueOf(def)))); |
|
411 |
} |
|
412 |
||
56270
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
413 |
public static String getProperty(String name) { |
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
414 |
return AccessController.doPrivileged((PrivilegedAction<String>) () -> |
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
415 |
System.getProperty(name)); |
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
416 |
} |
5c861402c69e
http-client-branch: test update for disableHostnameVerification
chegar
parents:
56263
diff
changeset
|
417 |
|
56271
e1eab097c6d7
http-client-branch: rename jdk.httpclient.internal.selector.timeout property
chegar
parents:
56270
diff
changeset
|
418 |
public static int getIntegerProperty(String name, int defaultValue) { |
e1eab097c6d7
http-client-branch: rename jdk.httpclient.internal.selector.timeout property
chegar
parents:
56270
diff
changeset
|
419 |
return AccessController.doPrivileged((PrivilegedAction<Integer>) () -> |
56272
7394452786ba
http-client-branch: rename jdk.internal.httpclient.disableHostnameVerification property
chegar
parents:
56271
diff
changeset
|
420 |
Integer.parseInt(System.getProperty(name, String.valueOf(defaultValue)))); |
56271
e1eab097c6d7
http-client-branch: rename jdk.httpclient.internal.selector.timeout property
chegar
parents:
56270
diff
changeset
|
421 |
} |
e1eab097c6d7
http-client-branch: rename jdk.httpclient.internal.selector.timeout property
chegar
parents:
56270
diff
changeset
|
422 |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
423 |
public static SSLParameters copySSLParameters(SSLParameters p) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
424 |
SSLParameters p1 = new SSLParameters(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
425 |
p1.setAlgorithmConstraints(p.getAlgorithmConstraints()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
426 |
p1.setCipherSuites(p.getCipherSuites()); |
43730 | 427 |
// JDK 8 EXCL START |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
428 |
p1.setEnableRetransmissions(p.getEnableRetransmissions()); |
43730 | 429 |
p1.setMaximumPacketSize(p.getMaximumPacketSize()); |
430 |
// JDK 8 EXCL END |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
431 |
p1.setEndpointIdentificationAlgorithm(p.getEndpointIdentificationAlgorithm()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
432 |
p1.setNeedClientAuth(p.getNeedClientAuth()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
433 |
String[] protocols = p.getProtocols(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
434 |
if (protocols != null) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
435 |
p1.setProtocols(protocols.clone()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
436 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
437 |
p1.setSNIMatchers(p.getSNIMatchers()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
438 |
p1.setServerNames(p.getServerNames()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
439 |
p1.setUseCipherSuitesOrder(p.getUseCipherSuitesOrder()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
440 |
p1.setWantClientAuth(p.getWantClientAuth()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
441 |
return p1; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
442 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
443 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
444 |
/** |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
445 |
* Set limit to position, and position to mark. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
446 |
*/ |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
447 |
public static void flipToMark(ByteBuffer buffer, int mark) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
448 |
buffer.limit(buffer.position()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
449 |
buffer.position(mark); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
450 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
451 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
452 |
public static String stackTrace(Throwable t) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
453 |
ByteArrayOutputStream bos = new ByteArrayOutputStream(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
454 |
String s = null; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
455 |
try { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
456 |
PrintStream p = new PrintStream(bos, true, "US-ASCII"); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
457 |
t.printStackTrace(p); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
458 |
s = bos.toString("US-ASCII"); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
459 |
} catch (UnsupportedEncodingException ex) { |
48083 | 460 |
throw new InternalError(ex); // Can't happen |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
461 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
462 |
return s; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
463 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
464 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
465 |
/** |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
466 |
* Copies as much of src to dst as possible. |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
467 |
* Return number of bytes copied |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
468 |
*/ |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
469 |
public static int copy(ByteBuffer src, ByteBuffer dst) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
470 |
int srcLen = src.remaining(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
471 |
int dstLen = dst.remaining(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
472 |
if (srcLen > dstLen) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
473 |
int diff = srcLen - dstLen; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
474 |
int limit = src.limit(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
475 |
src.limit(limit - diff); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
476 |
dst.put(src); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
477 |
src.limit(limit); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
478 |
} else { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
479 |
dst.put(src); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
480 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
481 |
return srcLen - src.remaining(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
482 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
483 |
|
48083 | 484 |
/** Threshold beyond which data is no longer copied into the current |
485 |
* buffer, if that buffer has enough unused space. */ |
|
486 |
private static final int COPY_THRESHOLD = 8192; |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
487 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
488 |
/** |
48083 | 489 |
* Adds the data from buffersToAdd to currentList. Either 1) appends the |
490 |
* data from a particular buffer to the last buffer in the list ( if |
|
491 |
* there is enough unused space ), or 2) adds it to the list. |
|
492 |
* |
|
493 |
* @return the number of bytes added |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
494 |
*/ |
48083 | 495 |
public static long accumulateBuffers(List<ByteBuffer> currentList, |
496 |
List<ByteBuffer> buffersToAdd) { |
|
497 |
long accumulatedBytes = 0; |
|
498 |
for (ByteBuffer bufferToAdd : buffersToAdd) { |
|
499 |
int remaining = bufferToAdd.remaining(); |
|
500 |
if (remaining <= 0) |
|
501 |
continue; |
|
502 |
int listSize = currentList.size(); |
|
503 |
if (listSize == 0) { |
|
504 |
currentList.add(bufferToAdd); |
|
505 |
accumulatedBytes = remaining; |
|
506 |
continue; |
|
507 |
} |
|
508 |
||
509 |
ByteBuffer lastBuffer = currentList.get(listSize - 1); |
|
510 |
int freeSpace = lastBuffer.capacity() - lastBuffer.limit(); |
|
511 |
if (remaining <= COPY_THRESHOLD && freeSpace >= remaining) { |
|
512 |
// append the new data to the unused space in the last buffer |
|
513 |
int position = lastBuffer.position(); |
|
514 |
int limit = lastBuffer.limit(); |
|
515 |
lastBuffer.position(limit); |
|
516 |
lastBuffer.limit(limit + remaining); |
|
517 |
lastBuffer.put(bufferToAdd); |
|
518 |
lastBuffer.position(position); |
|
519 |
} else { |
|
520 |
currentList.add(bufferToAdd); |
|
521 |
} |
|
522 |
accumulatedBytes += remaining; |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
523 |
} |
48083 | 524 |
return accumulatedBytes; |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
525 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
526 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
527 |
public static ByteBuffer copy(ByteBuffer src) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
528 |
ByteBuffer dst = ByteBuffer.allocate(src.remaining()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
529 |
dst.put(src); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
530 |
dst.flip(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
531 |
return dst; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
532 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
533 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
534 |
public static String dump(Object... objects) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
535 |
return Arrays.toString(objects); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
536 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
537 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
538 |
public static String stringOf(Collection<?> source) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
539 |
// We don't know anything about toString implementation of this |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
540 |
// collection, so let's create an array |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
541 |
return Arrays.toString(source.toArray()); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
542 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
543 |
|
48083 | 544 |
public static long remaining(ByteBuffer[] bufs) { |
545 |
long remain = 0; |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
546 |
for (ByteBuffer buf : bufs) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
547 |
remain += buf.remaining(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
548 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
549 |
return remain; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
550 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
551 |
|
48083 | 552 |
public static boolean hasRemaining(List<ByteBuffer> bufs) { |
553 |
synchronized (bufs) { |
|
554 |
for (ByteBuffer buf : bufs) { |
|
555 |
if (buf.hasRemaining()) |
|
556 |
return true; |
|
557 |
} |
|
558 |
} |
|
559 |
return false; |
|
560 |
} |
|
561 |
||
562 |
public static long remaining(List<ByteBuffer> bufs) { |
|
563 |
long remain = 0; |
|
564 |
synchronized (bufs) { |
|
565 |
for (ByteBuffer buf : bufs) { |
|
566 |
remain += buf.remaining(); |
|
567 |
} |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
568 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
569 |
return remain; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
570 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
571 |
|
48083 | 572 |
public static int remaining(List<ByteBuffer> bufs, int max) { |
573 |
long remain = 0; |
|
574 |
synchronized (bufs) { |
|
575 |
for (ByteBuffer buf : bufs) { |
|
576 |
remain += buf.remaining(); |
|
577 |
if (remain > max) { |
|
578 |
throw new IllegalArgumentException("too many bytes"); |
|
579 |
} |
|
580 |
} |
|
581 |
} |
|
582 |
return (int) remain; |
|
583 |
} |
|
584 |
||
585 |
public static long remaining(ByteBufferReference[] refs) { |
|
586 |
long remain = 0; |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
587 |
for (ByteBufferReference ref : refs) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
588 |
remain += ref.get().remaining(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
589 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
590 |
return remain; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
591 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
592 |
|
48083 | 593 |
public static int remaining(ByteBufferReference[] refs, int max) { |
594 |
long remain = 0; |
|
595 |
for (ByteBufferReference ref : refs) { |
|
596 |
remain += ref.get().remaining(); |
|
597 |
if (remain > max) { |
|
598 |
throw new IllegalArgumentException("too many bytes"); |
|
599 |
} |
|
600 |
} |
|
601 |
return (int) remain; |
|
602 |
} |
|
603 |
||
604 |
public static int remaining(ByteBuffer[] refs, int max) { |
|
605 |
long remain = 0; |
|
606 |
for (ByteBuffer b : refs) { |
|
607 |
remain += b.remaining(); |
|
608 |
if (remain > max) { |
|
609 |
throw new IllegalArgumentException("too many bytes"); |
|
610 |
} |
|
611 |
} |
|
612 |
return (int) remain; |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
613 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
614 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
615 |
public static void close(Closeable... closeables) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
616 |
for (Closeable c : closeables) { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
617 |
try { |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
618 |
c.close(); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
619 |
} catch (IOException ignored) { } |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
620 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
621 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
622 |
|
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
623 |
// Put all these static 'empty' singletons here |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
624 |
public static final ByteBuffer EMPTY_BYTEBUFFER = ByteBuffer.allocate(0); |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
625 |
public static final ByteBuffer[] EMPTY_BB_ARRAY = new ByteBuffer[0]; |
48083 | 626 |
public static final List<ByteBuffer> EMPTY_BB_LIST = List.of(); |
627 |
public static final ByteBufferReference[] EMPTY_BBR_ARRAY = new ByteBufferReference[0]; |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
628 |
|
56036
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
629 |
/** |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
630 |
* Returns a slice of size {@code amount} from the given buffer. If the |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
631 |
* buffer contains more data than {@code amount}, then the slice's capacity |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
632 |
* ( and, but not just, its limit ) is set to {@code amount}. If the buffer |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
633 |
* does not contain more data than {@code amount}, then the slice's capacity |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
634 |
* will be the same as the given buffer's capacity. |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
635 |
*/ |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
636 |
public static ByteBuffer sliceWithLimitedCapacity(ByteBuffer buffer, int amount) { |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
637 |
final int index = buffer.position() + amount; |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
638 |
final int limit = buffer.limit(); |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
639 |
if (index != limit) { |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
640 |
// additional data in the buffer |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
641 |
buffer.limit(index); // ensures that the slice does not go beyond |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
642 |
} else { |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
643 |
// no additional data in the buffer |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
644 |
buffer.limit(buffer.capacity()); // allows the slice full capacity |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
645 |
} |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
646 |
|
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
647 |
ByteBuffer newb = buffer.slice(); |
56036
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
648 |
buffer.position(index); |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
649 |
buffer.limit(limit); // restore the original buffer's limit |
89a688549f5d
http-client-branch: Import of 8195823: Buffers given to response body subscribers should not contain unprocessed HTTP data
chegar
parents:
56033
diff
changeset
|
650 |
newb.limit(amount); // slices limit to amount (capacity may be greater) |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
651 |
return newb; |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
652 |
} |
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
653 |
|
43730 | 654 |
/** |
655 |
* Get the Charset from the Content-encoding header. Defaults to |
|
656 |
* UTF_8 |
|
657 |
*/ |
|
658 |
public static Charset charsetFrom(HttpHeaders headers) { |
|
56009
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
659 |
String type = headers.firstValue("Content-type") |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
660 |
.orElse("text/html; charset=utf-8"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
661 |
int i = type.indexOf(";"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
662 |
if (i >= 0) type = type.substring(i+1); |
43730 | 663 |
try { |
56009
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
664 |
HeaderParser parser = new HeaderParser(type); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
665 |
String value = parser.findValue("charset"); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
666 |
if (value == null) return StandardCharsets.UTF_8; |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
667 |
return Charset.forName(value); |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
668 |
} catch (Throwable x) { |
cf8792f51dee
http-client-branch: Adds some convenience methods to parse body responses as lines
dfuchs
parents:
55973
diff
changeset
|
669 |
Log.logTrace("Can't find charset in \"{0}\" ({1})", type, x); |
43730 | 670 |
return StandardCharsets.UTF_8; |
671 |
} |
|
672 |
} |
|
673 |
||
674 |
public static UncheckedIOException unchecked(IOException e) { |
|
675 |
return new UncheckedIOException(e); |
|
676 |
} |
|
48083 | 677 |
|
678 |
/** |
|
679 |
* Get a logger for debug HTTP traces. |
|
680 |
* |
|
681 |
* The logger should only be used with levels whose severity is |
|
682 |
* {@code <= DEBUG}. By default, this logger will forward all messages |
|
683 |
* logged to an internal logger named "jdk.internal.httpclient.debug". |
|
684 |
* In addition, if the property -Djdk.internal.httpclient.debug=true is set, |
|
685 |
* it will print the messages on stderr. |
|
686 |
* The logger will add some decoration to the printed message, in the form of |
|
687 |
* {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>} |
|
688 |
* |
|
689 |
* @param dbgTag A lambda that returns a string that identifies the caller |
|
690 |
* (e.g: "SocketTube(3)", or "Http2Connection(SocketTube(3))") |
|
691 |
* |
|
692 |
* @return A logger for HTTP internal debug traces |
|
693 |
*/ |
|
694 |
public static Logger getDebugLogger(Supplier<String> dbgTag) { |
|
695 |
return getDebugLogger(dbgTag, DEBUG); |
|
696 |
} |
|
697 |
||
698 |
/** |
|
699 |
* Get a logger for debug HTTP traces.The logger should only be used |
|
700 |
* with levels whose severity is {@code <= DEBUG}. |
|
701 |
* |
|
702 |
* By default, this logger will forward all messages logged to an internal |
|
703 |
* logger named "jdk.internal.httpclient.debug". |
|
704 |
* In addition, if the message severity level is >= to |
|
705 |
* the provided {@code errLevel} it will print the messages on stderr. |
|
706 |
* The logger will add some decoration to the printed message, in the form of |
|
707 |
* {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>} |
|
708 |
* |
|
709 |
* @apiNote To obtain a logger that will always print things on stderr in |
|
710 |
* addition to forwarding to the internal logger, use |
|
711 |
* {@code getDebugLogger(this::dbgTag, Level.ALL);}. |
|
712 |
* This is also equivalent to calling |
|
713 |
* {@code getDebugLogger(this::dbgTag, true);}. |
|
714 |
* To obtain a logger that will only forward to the internal logger, |
|
715 |
* use {@code getDebugLogger(this::dbgTag, Level.OFF);}. |
|
716 |
* This is also equivalent to calling |
|
717 |
* {@code getDebugLogger(this::dbgTag, false);}. |
|
718 |
* |
|
719 |
* @param dbgTag A lambda that returns a string that identifies the caller |
|
720 |
* (e.g: "SocketTube(3)", or "Http2Connection(SocketTube(3))") |
|
721 |
* @param errLevel The level above which messages will be also printed on |
|
722 |
* stderr (in addition to be forwarded to the internal logger). |
|
723 |
* |
|
724 |
* @return A logger for HTTP internal debug traces |
|
725 |
*/ |
|
726 |
static Logger getDebugLogger(Supplier<String> dbgTag, Level errLevel) { |
|
727 |
return DebugLogger.createHttpLogger(dbgTag, Level.OFF, errLevel); |
|
728 |
} |
|
729 |
||
730 |
/** |
|
731 |
* Get a logger for debug HTTP traces.The logger should only be used |
|
732 |
* with levels whose severity is {@code <= DEBUG}. |
|
733 |
* |
|
734 |
* By default, this logger will forward all messages logged to an internal |
|
735 |
* logger named "jdk.internal.httpclient.debug". |
|
736 |
* In addition, the provided boolean {@code on==true}, it will print the |
|
737 |
* messages on stderr. |
|
738 |
* The logger will add some decoration to the printed message, in the form of |
|
739 |
* {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>} |
|
740 |
* |
|
741 |
* @apiNote To obtain a logger that will always print things on stderr in |
|
742 |
* addition to forwarding to the internal logger, use |
|
743 |
* {@code getDebugLogger(this::dbgTag, true);}. |
|
744 |
* This is also equivalent to calling |
|
745 |
* {@code getDebugLogger(this::dbgTag, Level.ALL);}. |
|
746 |
* To obtain a logger that will only forward to the internal logger, |
|
747 |
* use {@code getDebugLogger(this::dbgTag, false);}. |
|
748 |
* This is also equivalent to calling |
|
749 |
* {@code getDebugLogger(this::dbgTag, Level.OFF);}. |
|
750 |
* |
|
751 |
* @param dbgTag A lambda that returns a string that identifies the caller |
|
752 |
* (e.g: "SocketTube(3)", or "Http2Connection(SocketTube(3))") |
|
753 |
* @param on Whether messages should also be printed on |
|
754 |
* stderr (in addition to be forwarded to the internal logger). |
|
755 |
* |
|
756 |
* @return A logger for HTTP internal debug traces |
|
757 |
*/ |
|
758 |
public static Logger getDebugLogger(Supplier<String> dbgTag, boolean on) { |
|
759 |
Level errLevel = on ? Level.ALL : Level.OFF; |
|
760 |
return getDebugLogger(dbgTag, errLevel); |
|
761 |
} |
|
762 |
||
763 |
/** |
|
764 |
* Get a logger for debug HPACK traces.The logger should only be used |
|
765 |
* with levels whose severity is {@code <= DEBUG}. |
|
766 |
* |
|
767 |
* By default, this logger will forward all messages logged to an internal |
|
768 |
* logger named "jdk.internal.httpclient.hpack.debug". |
|
769 |
* In addition, if the message severity level is >= to |
|
770 |
* the provided {@code outLevel} it will print the messages on stdout. |
|
771 |
* The logger will add some decoration to the printed message, in the form of |
|
772 |
* {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>} |
|
773 |
* |
|
774 |
* @apiNote To obtain a logger that will always print things on stdout in |
|
775 |
* addition to forwarding to the internal logger, use |
|
776 |
* {@code getHpackLogger(this::dbgTag, Level.ALL);}. |
|
777 |
* This is also equivalent to calling |
|
778 |
* {@code getHpackLogger(this::dbgTag, true);}. |
|
779 |
* To obtain a logger that will only forward to the internal logger, |
|
780 |
* use {@code getHpackLogger(this::dbgTag, Level.OFF);}. |
|
781 |
* This is also equivalent to calling |
|
782 |
* {@code getHpackLogger(this::dbgTag, false);}. |
|
783 |
* |
|
784 |
* @param dbgTag A lambda that returns a string that identifies the caller |
|
785 |
* (e.g: "Http2Connection(SocketTube(3))/hpack.Decoder(3)") |
|
786 |
* @param outLevel The level above which messages will be also printed on |
|
787 |
* stdout (in addition to be forwarded to the internal logger). |
|
788 |
* |
|
789 |
* @return A logger for HPACK internal debug traces |
|
790 |
*/ |
|
791 |
public static Logger getHpackLogger(Supplier<String> dbgTag, Level outLevel) { |
|
792 |
Level errLevel = Level.OFF; |
|
793 |
return DebugLogger.createHpackLogger(dbgTag, outLevel, errLevel); |
|
794 |
} |
|
795 |
||
796 |
/** |
|
797 |
* Get a logger for debug HPACK traces.The logger should only be used |
|
798 |
* with levels whose severity is {@code <= DEBUG}. |
|
799 |
* |
|
800 |
* By default, this logger will forward all messages logged to an internal |
|
801 |
* logger named "jdk.internal.httpclient.hpack.debug". |
|
802 |
* In addition, the provided boolean {@code on==true}, it will print the |
|
803 |
* messages on stdout. |
|
804 |
* The logger will add some decoration to the printed message, in the form of |
|
805 |
* {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>} |
|
806 |
* |
|
807 |
* @apiNote To obtain a logger that will always print things on stdout in |
|
808 |
* addition to forwarding to the internal logger, use |
|
809 |
* {@code getHpackLogger(this::dbgTag, true);}. |
|
810 |
* This is also equivalent to calling |
|
811 |
* {@code getHpackLogger(this::dbgTag, Level.ALL);}. |
|
812 |
* To obtain a logger that will only forward to the internal logger, |
|
813 |
* use {@code getHpackLogger(this::dbgTag, false);}. |
|
814 |
* This is also equivalent to calling |
|
815 |
* {@code getHpackLogger(this::dbgTag, Level.OFF);}. |
|
816 |
* |
|
817 |
* @param dbgTag A lambda that returns a string that identifies the caller |
|
818 |
* (e.g: "Http2Connection(SocketTube(3))/hpack.Decoder(3)") |
|
819 |
* @param on Whether messages should also be printed on |
|
820 |
* stdout (in addition to be forwarded to the internal logger). |
|
821 |
* |
|
822 |
* @return A logger for HPACK internal debug traces |
|
823 |
*/ |
|
824 |
public static Logger getHpackLogger(Supplier<String> dbgTag, boolean on) { |
|
825 |
Level outLevel = on ? Level.ALL : Level.OFF; |
|
826 |
return getHpackLogger(dbgTag, outLevel); |
|
827 |
} |
|
56126
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
828 |
|
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
829 |
/** |
56304
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
830 |
* Get a logger for debug WebSocket traces.The logger should only be used |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
831 |
* with levels whose severity is {@code <= DEBUG}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
832 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
833 |
* By default, this logger will forward all messages logged to an internal |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
834 |
* logger named "jdk.internal.httpclient.websocket.debug". |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
835 |
* In addition, if the message severity level is >= to |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
836 |
* the provided {@code errLevel} it will print the messages on stderr. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
837 |
* The logger will add some decoration to the printed message, in the form of |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
838 |
* {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>} |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
839 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
840 |
* @apiNote To obtain a logger that will always print things on stderr in |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
841 |
* addition to forwarding to the internal logger, use |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
842 |
* {@code getWebSocketLogger(this::dbgTag, Level.ALL);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
843 |
* This is also equivalent to calling |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
844 |
* {@code getWSLogger(this::dbgTag, true);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
845 |
* To obtain a logger that will only forward to the internal logger, |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
846 |
* use {@code getWebSocketLogger(this::dbgTag, Level.OFF);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
847 |
* This is also equivalent to calling |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
848 |
* {@code getWSLogger(this::dbgTag, false);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
849 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
850 |
* @param dbgTag A lambda that returns a string that identifies the caller |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
851 |
* (e.g: "WebSocket(3)") |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
852 |
* @param errLevel The level above which messages will be also printed on |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
853 |
* stderr (in addition to be forwarded to the internal logger). |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
854 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
855 |
* @return A logger for HPACK internal debug traces |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
856 |
*/ |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
857 |
public static Logger getWebSocketLogger(Supplier<String> dbgTag, Level errLevel) { |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
858 |
Level outLevel = Level.OFF; |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
859 |
return DebugLogger.createWebSocketLogger(dbgTag, outLevel, errLevel); |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
860 |
} |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
861 |
|
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
862 |
/** |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
863 |
* Get a logger for debug WebSocket traces.The logger should only be used |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
864 |
* with levels whose severity is {@code <= DEBUG}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
865 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
866 |
* By default, this logger will forward all messages logged to an internal |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
867 |
* logger named "jdk.internal.httpclient.websocket.debug". |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
868 |
* In addition, the provided boolean {@code on==true}, it will print the |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
869 |
* messages on stderr. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
870 |
* The logger will add some decoration to the printed message, in the form of |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
871 |
* {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>} |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
872 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
873 |
* @apiNote To obtain a logger that will always print things on stderr in |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
874 |
* addition to forwarding to the internal logger, use |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
875 |
* {@code getWebSocketLogger(this::dbgTag, true);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
876 |
* This is also equivalent to calling |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
877 |
* {@code getWebSocketLogger(this::dbgTag, Level.ALL);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
878 |
* To obtain a logger that will only forward to the internal logger, |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
879 |
* use {@code getWebSocketLogger(this::dbgTag, false);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
880 |
* This is also equivalent to calling |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
881 |
* {@code getHpackLogger(this::dbgTag, Level.OFF);}. |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
882 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
883 |
* @param dbgTag A lambda that returns a string that identifies the caller |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
884 |
* (e.g: "WebSocket(3)") |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
885 |
* @param on Whether messages should also be printed on |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
886 |
* stderr (in addition to be forwarded to the internal logger). |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
887 |
* |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
888 |
* @return A logger for WebSocket internal debug traces |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
889 |
*/ |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
890 |
public static Logger getWebSocketLogger(Supplier<String> dbgTag, boolean on) { |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
891 |
Level errLevel = on ? Level.ALL : Level.OFF; |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
892 |
return getWebSocketLogger(dbgTag, errLevel); |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
893 |
} |
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
894 |
|
065641767a75
http-client-branch: change websocket to use System.Logger for debug logging
dfuchs
parents:
56272
diff
changeset
|
895 |
/** |
56126
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
896 |
* SSLSessions returned to user are wrapped in an immutable object |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
897 |
*/ |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
898 |
public static SSLSession immutableSession(SSLSession session) { |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
899 |
if (session instanceof ExtendedSSLSession) |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
900 |
return new ImmutableExtendedSSLSession((ExtendedSSLSession)session); |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
901 |
else |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
902 |
return new ImmutableSSLSession(session); |
86e628130926
http-client-branch: fixed TLS hostname checking issue, SSL session reuse, and changed HttpResponse to return SSLSession
michaelm
parents:
56092
diff
changeset
|
903 |
} |
56137
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
904 |
|
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
905 |
/** |
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
906 |
* Enabled by default. May be disabled for testing. Use with care |
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
907 |
*/ |
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
908 |
public static boolean isHostnameVerificationDisabled() { |
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
909 |
return isHostnameVerificationDisabled; |
dd867826d55b
http-client-branch: added system property to disable hostname verification for testing
michaelm
parents:
56126
diff
changeset
|
910 |
} |
56165
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
911 |
|
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
912 |
public static InetSocketAddress resolveAddress(InetSocketAddress address) { |
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
913 |
if (address != null && address.isUnresolved()) { |
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
914 |
// The default proxy selector may select a proxy whose address is |
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
915 |
// unresolved. We must resolve the address before connecting to it. |
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
916 |
address = new InetSocketAddress(address.getHostString(), address.getPort()); |
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
917 |
} |
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
918 |
return address; |
8a6065d830b9
http-client-branch: Add a test for BodySubscribers throwing in getBody() or returning exceptionally completed CFs
dfuchs
parents:
56137
diff
changeset
|
919 |
} |
42460
7133f144981a
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
diff
changeset
|
920 |
} |