author | dfuchs |
Wed, 14 Feb 2018 17:35:42 +0000 | |
branch | http-client-branch |
changeset 56128 | 249a863b0aca |
parent 56104 | 3420c1bdd254 |
child 56136 | 3b58e5bacad6 |
permissions | -rw-r--r-- |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1 |
/* |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
2 |
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
4 |
* |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
10 |
* |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
15 |
* accompanied this code). |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
16 |
* |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
20 |
* |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
23 |
* questions. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
24 |
*/ |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
25 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
26 |
import com.sun.net.httpserver.BasicAuthenticator; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
27 |
import com.sun.net.httpserver.HttpServer; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
28 |
import com.sun.net.httpserver.HttpsConfigurator; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
29 |
import com.sun.net.httpserver.HttpsParameters; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
30 |
import com.sun.net.httpserver.HttpsServer; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
31 |
import java.io.IOException; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
32 |
import java.io.InputStream; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
33 |
import java.io.OutputStream; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
34 |
import java.io.OutputStreamWriter; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
35 |
import java.io.PrintWriter; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
36 |
import java.io.Writer; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
37 |
import java.math.BigInteger; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
38 |
import java.net.Authenticator; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
39 |
import java.net.HttpURLConnection; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
40 |
import java.net.InetSocketAddress; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
41 |
import java.net.MalformedURLException; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
42 |
import java.net.PasswordAuthentication; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
43 |
import java.net.ServerSocket; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
44 |
import java.net.Socket; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
45 |
import java.net.URI; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
46 |
import java.net.URISyntaxException; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
47 |
import java.net.URL; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
48 |
import java.nio.charset.StandardCharsets; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
49 |
import java.security.MessageDigest; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
50 |
import java.security.NoSuchAlgorithmException; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
51 |
import java.time.Instant; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
52 |
import java.util.ArrayList; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
53 |
import java.util.Arrays; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
54 |
import java.util.Base64; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
55 |
import java.util.List; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
56 |
import java.util.Locale; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
57 |
import java.util.Objects; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
58 |
import java.util.Optional; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
59 |
import java.util.Random; |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
60 |
import java.util.StringTokenizer; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
61 |
import java.util.concurrent.CompletableFuture; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
62 |
import java.util.concurrent.CopyOnWriteArrayList; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
63 |
import java.util.concurrent.atomic.AtomicInteger; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
64 |
import java.util.stream.Collectors; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
65 |
import java.util.stream.Stream; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
66 |
import javax.net.ssl.SSLContext; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
67 |
import sun.net.www.HeaderParser; |
56089
42208b2f224e
http-client-branch: move to standard package and module name
chegar
parents:
56070
diff
changeset
|
68 |
import java.net.http.HttpClient.Version; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
69 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
70 |
/** |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
71 |
* A simple HTTP server that supports Basic or Digest authentication. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
72 |
* By default this server will echo back whatever is present |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
73 |
* in the request body. Note that the Digest authentication is |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
74 |
* a test implementation implemented only for tests purposes. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
75 |
* @author danielfuchs |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
76 |
*/ |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
77 |
public abstract class DigestEchoServer implements HttpServerAdapters { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
78 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
79 |
public static final boolean DEBUG = |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
80 |
Boolean.parseBoolean(System.getProperty("test.debug", "false")); |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
81 |
public enum HttpAuthType { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
82 |
SERVER, PROXY, SERVER307, PROXY305 |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
83 |
/* add PROXY_AND_SERVER and SERVER_PROXY_NONE */ |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
84 |
}; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
85 |
public enum HttpAuthSchemeType { NONE, BASICSERVER, BASIC, DIGEST }; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
86 |
public static final HttpAuthType DEFAULT_HTTP_AUTH_TYPE = HttpAuthType.SERVER; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
87 |
public static final String DEFAULT_PROTOCOL_TYPE = "https"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
88 |
public static final HttpAuthSchemeType DEFAULT_SCHEME_TYPE = HttpAuthSchemeType.DIGEST; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
89 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
90 |
public static class HttpTestAuthenticator extends Authenticator { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
91 |
private final String realm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
92 |
private final String username; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
93 |
// Used to prevent incrementation of 'count' when calling the |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
94 |
// authenticator from the server side. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
95 |
private final ThreadLocal<Boolean> skipCount = new ThreadLocal<>(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
96 |
// count will be incremented every time getPasswordAuthentication() |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
97 |
// is called from the client side. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
98 |
final AtomicInteger count = new AtomicInteger(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
99 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
100 |
public HttpTestAuthenticator(String realm, String username) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
101 |
this.realm = realm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
102 |
this.username = username; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
103 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
104 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
105 |
protected PasswordAuthentication getPasswordAuthentication() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
106 |
if (skipCount.get() == null || skipCount.get().booleanValue() == false) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
107 |
System.out.println("Authenticator called: " + count.incrementAndGet()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
108 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
109 |
return new PasswordAuthentication(getUserName(), |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
110 |
new char[] {'d','e','n', 't'}); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
111 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
112 |
// Called by the server side to get the password of the user |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
113 |
// being authentified. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
114 |
public final char[] getPassword(String user) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
115 |
if (user.equals(username)) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
116 |
skipCount.set(Boolean.TRUE); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
117 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
118 |
return getPasswordAuthentication().getPassword(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
119 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
120 |
skipCount.set(Boolean.FALSE); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
121 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
122 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
123 |
throw new SecurityException("User unknown: " + user); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
124 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
125 |
public final String getUserName() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
126 |
return username; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
127 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
128 |
public final String getRealm() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
129 |
return realm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
130 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
131 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
132 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
133 |
public static final HttpTestAuthenticator AUTHENTICATOR; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
134 |
static { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
135 |
AUTHENTICATOR = new HttpTestAuthenticator("earth", "arthur"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
136 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
137 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
138 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
139 |
final HttpTestServer serverImpl; // this server endpoint |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
140 |
final DigestEchoServer redirect; // the target server where to redirect 3xx |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
141 |
final HttpTestHandler delegate; // unused |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
142 |
final String key; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
143 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
144 |
DigestEchoServer(String key, |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
145 |
HttpTestServer server, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
146 |
DigestEchoServer target, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
147 |
HttpTestHandler delegate) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
148 |
this.key = key; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
149 |
this.serverImpl = server; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
150 |
this.redirect = target; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
151 |
this.delegate = delegate; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
152 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
153 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
154 |
public static void main(String[] args) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
155 |
throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
156 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
157 |
DigestEchoServer server = create(Version.HTTP_1_1, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
158 |
DEFAULT_PROTOCOL_TYPE, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
159 |
DEFAULT_HTTP_AUTH_TYPE, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
160 |
AUTHENTICATOR, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
161 |
DEFAULT_SCHEME_TYPE); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
162 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
163 |
System.out.println("Server created at " + server.getAddress()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
164 |
System.out.println("Strike <Return> to exit"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
165 |
System.in.read(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
166 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
167 |
System.out.println("stopping server"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
168 |
server.stop(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
169 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
170 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
171 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
172 |
private static String toString(HttpTestHeaders headers) { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
173 |
return headers.entrySet().stream() |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
174 |
.map((e) -> e.getKey() + ": " + e.getValue()) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
175 |
.collect(Collectors.joining("\n")); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
176 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
177 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
178 |
public static DigestEchoServer create(Version version, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
179 |
String protocol, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
180 |
HttpAuthType authType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
181 |
HttpAuthSchemeType schemeType) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
182 |
throws IOException { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
183 |
return create(version, protocol, authType, AUTHENTICATOR, schemeType); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
184 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
185 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
186 |
public static DigestEchoServer create(Version version, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
187 |
String protocol, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
188 |
HttpAuthType authType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
189 |
HttpTestAuthenticator auth, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
190 |
HttpAuthSchemeType schemeType) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
191 |
throws IOException { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
192 |
return create(version, protocol, authType, auth, schemeType, null); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
193 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
194 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
195 |
public static DigestEchoServer create(Version version, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
196 |
String protocol, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
197 |
HttpAuthType authType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
198 |
HttpTestAuthenticator auth, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
199 |
HttpAuthSchemeType schemeType, |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
200 |
HttpTestHandler delegate) |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
201 |
throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
202 |
Objects.requireNonNull(authType); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
203 |
Objects.requireNonNull(auth); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
204 |
switch(authType) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
205 |
// A server that performs Server Digest authentication. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
206 |
case SERVER: return createServer(version, protocol, authType, auth, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
207 |
schemeType, delegate, "/"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
208 |
// A server that pretends to be a Proxy and performs |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
209 |
// Proxy Digest authentication. If protocol is HTTPS, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
210 |
// then this will create a HttpsProxyTunnel that will |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
211 |
// handle the CONNECT request for tunneling. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
212 |
case PROXY: return createProxy(version, protocol, authType, auth, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
213 |
schemeType, delegate, "/"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
214 |
// A server that sends 307 redirect to a server that performs |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
215 |
// Digest authentication. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
216 |
// Note: 301 doesn't work here because it transforms POST into GET. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
217 |
case SERVER307: return createServerAndRedirect(version, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
218 |
protocol, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
219 |
HttpAuthType.SERVER, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
220 |
auth, schemeType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
221 |
delegate, 307); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
222 |
// A server that sends 305 redirect to a proxy that performs |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
223 |
// Digest authentication. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
224 |
// Note: this is not correctly stubbed/implemented in this test. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
225 |
case PROXY305: return createServerAndRedirect(version, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
226 |
protocol, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
227 |
HttpAuthType.PROXY, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
228 |
auth, schemeType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
229 |
delegate, 305); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
230 |
default: |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
231 |
throw new InternalError("Unknown server type: " + authType); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
232 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
233 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
234 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
235 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
236 |
/** |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
237 |
* The SocketBindableFactory ensures that the local port used by an HttpServer |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
238 |
* or a proxy ServerSocket previously created by the current test/VM will not |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
239 |
* get reused by a subsequent test in the same VM. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
240 |
* This is to avoid having the test client trying to reuse cached connections. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
241 |
*/ |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
242 |
private static abstract class SocketBindableFactory<B> { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
243 |
private static final int MAX = 10; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
244 |
private static final CopyOnWriteArrayList<String> addresses = |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
245 |
new CopyOnWriteArrayList<>(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
246 |
protected B createInternal() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
247 |
final int max = addresses.size() + MAX; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
248 |
final List<B> toClose = new ArrayList<>(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
249 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
250 |
for (int i = 1; i <= max; i++) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
251 |
B bindable = createBindable(); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
252 |
InetSocketAddress address = getAddress(bindable); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
253 |
String key = "127.0.0.1:" + address.getPort(); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
254 |
if (addresses.addIfAbsent(key)) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
255 |
System.out.println("Socket bound to: " + key |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
256 |
+ " after " + i + " attempt(s)"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
257 |
return bindable; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
258 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
259 |
System.out.println("warning: address " + key |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
260 |
+ " already used. Retrying bind."); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
261 |
// keep the port bound until we get a port that we haven't |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
262 |
// used already |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
263 |
toClose.add(bindable); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
264 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
265 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
266 |
// if we had to retry, then close the socket we're not |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
267 |
// going to use. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
268 |
for (B b : toClose) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
269 |
try { close(b); } catch (Exception x) { /* ignore */ } |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
270 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
271 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
272 |
throw new IOException("Couldn't bind socket after " + max + " attempts: " |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
273 |
+ "addresses used before: " + addresses); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
274 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
275 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
276 |
protected abstract B createBindable() throws IOException; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
277 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
278 |
protected abstract InetSocketAddress getAddress(B bindable); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
279 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
280 |
protected abstract void close(B bindable) throws IOException; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
281 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
282 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
283 |
/* |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
284 |
* Used to create ServerSocket for a proxy. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
285 |
*/ |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
286 |
private static final class ServerSocketFactory |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
287 |
extends SocketBindableFactory<ServerSocket> { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
288 |
private static final ServerSocketFactory instance = new ServerSocketFactory(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
289 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
290 |
static ServerSocket create() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
291 |
return instance.createInternal(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
292 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
293 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
294 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
295 |
protected ServerSocket createBindable() throws IOException { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
296 |
return new ServerSocket(0); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
297 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
298 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
299 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
300 |
protected InetSocketAddress getAddress(ServerSocket socket) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
301 |
return new InetSocketAddress(socket.getInetAddress(), socket.getLocalPort()); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
302 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
303 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
304 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
305 |
protected void close(ServerSocket socket) throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
306 |
socket.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
307 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
308 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
309 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
310 |
/* |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
311 |
* Used to create HttpServer |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
312 |
*/ |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
313 |
private static abstract class H1ServerFactory<S extends HttpServer> |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
314 |
extends SocketBindableFactory<S> { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
315 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
316 |
protected S createBindable() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
317 |
S server = newHttpServer(); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
318 |
server.bind(new InetSocketAddress( 0), 0); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
319 |
return server; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
320 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
321 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
322 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
323 |
protected InetSocketAddress getAddress(S server) { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
324 |
return server.getAddress(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
325 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
326 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
327 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
328 |
protected void close(S server) throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
329 |
server.stop(1); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
330 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
331 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
332 |
/* |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
333 |
* Returns a HttpServer or a HttpsServer in different subclasses. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
334 |
*/ |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
335 |
protected abstract S newHttpServer() throws IOException; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
336 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
337 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
338 |
/* |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
339 |
* Used to create Http2TestServer |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
340 |
*/ |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
341 |
private static abstract class H2ServerFactory<S extends Http2TestServer> |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
342 |
extends SocketBindableFactory<S> { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
343 |
@Override |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
344 |
protected S createBindable() throws IOException { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
345 |
final S server; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
346 |
try { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
347 |
server = newHttpServer(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
348 |
} catch (IOException io) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
349 |
throw io; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
350 |
} catch (Exception x) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
351 |
throw new IOException(x); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
352 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
353 |
return server; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
354 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
355 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
356 |
@Override |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
357 |
protected InetSocketAddress getAddress(S server) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
358 |
return server.getAddress(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
359 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
360 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
361 |
@Override |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
362 |
protected void close(S server) throws IOException { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
363 |
server.stop(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
364 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
365 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
366 |
/* |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
367 |
* Returns a HttpServer or a HttpsServer in different subclasses. |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
368 |
*/ |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
369 |
protected abstract S newHttpServer() throws Exception; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
370 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
371 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
372 |
private static final class Http2ServerFactory extends H2ServerFactory<Http2TestServer> { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
373 |
private static final Http2ServerFactory instance = new Http2ServerFactory(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
374 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
375 |
static Http2TestServer create() throws IOException { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
376 |
return instance.createInternal(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
377 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
378 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
379 |
@Override |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
380 |
protected Http2TestServer newHttpServer() throws Exception { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
381 |
return new Http2TestServer("127.0.0.1", false, 0); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
382 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
383 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
384 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
385 |
private static final class Https2ServerFactory extends H2ServerFactory<Http2TestServer> { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
386 |
private static final Https2ServerFactory instance = new Https2ServerFactory(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
387 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
388 |
static Http2TestServer create() throws IOException { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
389 |
return instance.createInternal(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
390 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
391 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
392 |
@Override |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
393 |
protected Http2TestServer newHttpServer() throws Exception { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
394 |
return new Http2TestServer("127.0.0.1", true, 0); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
395 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
396 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
397 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
398 |
private static final class Http1ServerFactory extends H1ServerFactory<HttpServer> { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
399 |
private static final Http1ServerFactory instance = new Http1ServerFactory(); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
400 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
401 |
static HttpServer create() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
402 |
return instance.createInternal(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
403 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
404 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
405 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
406 |
protected HttpServer newHttpServer() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
407 |
return HttpServer.create(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
408 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
409 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
410 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
411 |
private static final class Https1ServerFactory extends H1ServerFactory<HttpsServer> { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
412 |
private static final Https1ServerFactory instance = new Https1ServerFactory(); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
413 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
414 |
static HttpsServer create() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
415 |
return instance.createInternal(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
416 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
417 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
418 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
419 |
protected HttpsServer newHttpServer() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
420 |
return HttpsServer.create(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
421 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
422 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
423 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
424 |
static Http2TestServer createHttp2Server(String protocol) throws IOException { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
425 |
final Http2TestServer server; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
426 |
if ("http".equalsIgnoreCase(protocol)) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
427 |
server = Http2ServerFactory.create(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
428 |
} else if ("https".equalsIgnoreCase(protocol)) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
429 |
server = Https2ServerFactory.create(); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
430 |
} else { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
431 |
throw new InternalError("unsupported protocol: " + protocol); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
432 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
433 |
return server; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
434 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
435 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
436 |
static HttpTestServer createHttpServer(Version version, String protocol) |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
437 |
throws IOException |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
438 |
{ |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
439 |
switch(version) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
440 |
case HTTP_1_1: |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
441 |
return HttpTestServer.of(createHttp1Server(protocol)); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
442 |
case HTTP_2: |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
443 |
return HttpTestServer.of(createHttp2Server(protocol)); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
444 |
default: |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
445 |
throw new InternalError("Unexpected version: " + version); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
446 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
447 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
448 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
449 |
static HttpServer createHttp1Server(String protocol) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
450 |
final HttpServer server; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
451 |
if ("http".equalsIgnoreCase(protocol)) { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
452 |
server = Http1ServerFactory.create(); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
453 |
} else if ("https".equalsIgnoreCase(protocol)) { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
454 |
server = configure(Https1ServerFactory.create()); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
455 |
} else { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
456 |
throw new InternalError("unsupported protocol: " + protocol); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
457 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
458 |
return server; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
459 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
460 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
461 |
static HttpsServer configure(HttpsServer server) throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
462 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
463 |
SSLContext ctx = SSLContext.getDefault(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
464 |
server.setHttpsConfigurator(new Configurator(ctx)); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
465 |
} catch (NoSuchAlgorithmException ex) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
466 |
throw new IOException(ex); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
467 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
468 |
return server; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
469 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
470 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
471 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
472 |
static void setContextAuthenticator(HttpTestContext ctxt, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
473 |
HttpTestAuthenticator auth) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
474 |
final String realm = auth.getRealm(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
475 |
com.sun.net.httpserver.Authenticator authenticator = |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
476 |
new BasicAuthenticator(realm) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
477 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
478 |
public boolean checkCredentials(String username, String pwd) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
479 |
return auth.getUserName().equals(username) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
480 |
&& new String(auth.getPassword(username)).equals(pwd); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
481 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
482 |
}; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
483 |
ctxt.setAuthenticator(authenticator); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
484 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
485 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
486 |
public static DigestEchoServer createServer(Version version, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
487 |
String protocol, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
488 |
HttpAuthType authType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
489 |
HttpTestAuthenticator auth, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
490 |
HttpAuthSchemeType schemeType, |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
491 |
HttpTestHandler delegate, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
492 |
String path) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
493 |
throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
494 |
Objects.requireNonNull(authType); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
495 |
Objects.requireNonNull(auth); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
496 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
497 |
HttpTestServer impl = createHttpServer(version, protocol); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
498 |
String key = String.format("DigestEchoServer[PID=%s,PORT=%s]:%s:%s:%s:%s", |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
499 |
ProcessHandle.current().pid(), |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
500 |
impl.getAddress().getPort(), |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
501 |
version, protocol, authType, schemeType); |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
502 |
final DigestEchoServer server = new DigestEchoServerImpl(key, impl, null, delegate); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
503 |
final HttpTestHandler handler = |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
504 |
server.createHandler(schemeType, auth, authType, false); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
505 |
HttpTestContext context = impl.addHandler(handler, path); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
506 |
server.configureAuthentication(context, schemeType, auth, authType); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
507 |
impl.start(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
508 |
return server; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
509 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
510 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
511 |
public static DigestEchoServer createProxy(Version version, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
512 |
String protocol, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
513 |
HttpAuthType authType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
514 |
HttpTestAuthenticator auth, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
515 |
HttpAuthSchemeType schemeType, |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
516 |
HttpTestHandler delegate, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
517 |
String path) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
518 |
throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
519 |
Objects.requireNonNull(authType); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
520 |
Objects.requireNonNull(auth); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
521 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
522 |
if (version == Version.HTTP_2 && protocol.equalsIgnoreCase("http")) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
523 |
System.out.println("WARNING: can't use HTTP/1.1 proxy with unsecure HTTP/2 server"); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
524 |
version = Version.HTTP_1_1; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
525 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
526 |
HttpTestServer impl = createHttpServer(version, protocol); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
527 |
String key = String.format("DigestEchoServer[PID=%s,PORT=%s]:%s:%s:%s:%s", |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
528 |
ProcessHandle.current().pid(), |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
529 |
impl.getAddress().getPort(), |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
530 |
version, protocol, authType, schemeType); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
531 |
final DigestEchoServer server = "https".equalsIgnoreCase(protocol) |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
532 |
? new HttpsProxyTunnel(key, impl, null, delegate) |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
533 |
: new DigestEchoServerImpl(key, impl, null, delegate); |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
534 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
535 |
final HttpTestHandler hh = server.createHandler(HttpAuthSchemeType.NONE, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
536 |
null, HttpAuthType.SERVER, |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
537 |
server instanceof HttpsProxyTunnel); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
538 |
HttpTestContext ctxt = impl.addHandler(hh, path); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
539 |
server.configureAuthentication(ctxt, schemeType, auth, authType); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
540 |
impl.start(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
541 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
542 |
return server; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
543 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
544 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
545 |
public static DigestEchoServer createServerAndRedirect( |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
546 |
Version version, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
547 |
String protocol, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
548 |
HttpAuthType targetAuthType, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
549 |
HttpTestAuthenticator auth, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
550 |
HttpAuthSchemeType schemeType, |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
551 |
HttpTestHandler targetDelegate, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
552 |
int code300) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
553 |
throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
554 |
Objects.requireNonNull(targetAuthType); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
555 |
Objects.requireNonNull(auth); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
556 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
557 |
// The connection between client and proxy can only |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
558 |
// be a plain connection: SSL connection to proxy |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
559 |
// is not supported by our client connection. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
560 |
String targetProtocol = targetAuthType == HttpAuthType.PROXY |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
561 |
? "http" |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
562 |
: protocol; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
563 |
DigestEchoServer redirectTarget = |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
564 |
(targetAuthType == HttpAuthType.PROXY) |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
565 |
? createProxy(version, protocol, targetAuthType, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
566 |
auth, schemeType, targetDelegate, "/") |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
567 |
: createServer(version, targetProtocol, targetAuthType, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
568 |
auth, schemeType, targetDelegate, "/"); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
569 |
HttpTestServer impl = createHttpServer(version, protocol); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
570 |
String key = String.format("RedirectingServer[PID=%s,PORT=%s]:%s:%s:%s:%s", |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
571 |
ProcessHandle.current().pid(), |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
572 |
impl.getAddress().getPort(), |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
573 |
version, protocol, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
574 |
HttpAuthType.SERVER, code300) |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
575 |
+ "->" + redirectTarget.key; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
576 |
final DigestEchoServer redirectingServer = |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
577 |
new DigestEchoServerImpl(key, impl, redirectTarget, null); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
578 |
InetSocketAddress redirectAddr = redirectTarget.getAddress(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
579 |
URL locationURL = url(targetProtocol, redirectAddr, "/"); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
580 |
final HttpTestHandler hh = redirectingServer.create300Handler(key, locationURL, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
581 |
HttpAuthType.SERVER, code300); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
582 |
impl.addHandler(hh,"/"); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
583 |
impl.start(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
584 |
return redirectingServer; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
585 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
586 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
587 |
public abstract InetSocketAddress getServerAddress(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
588 |
public abstract InetSocketAddress getProxyAddress(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
589 |
public abstract InetSocketAddress getAddress(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
590 |
public abstract void stop(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
591 |
public abstract Version getServerVersion(); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
592 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
593 |
private static class DigestEchoServerImpl extends DigestEchoServer { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
594 |
DigestEchoServerImpl(String key, |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
595 |
HttpTestServer server, |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
596 |
DigestEchoServer target, |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
597 |
HttpTestHandler delegate) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
598 |
super(key, Objects.requireNonNull(server), target, delegate); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
599 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
600 |
|
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
601 |
public InetSocketAddress getAddress() { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
602 |
return new InetSocketAddress("127.0.0.1", |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
603 |
serverImpl.getAddress().getPort()); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
604 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
605 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
606 |
public InetSocketAddress getServerAddress() { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
607 |
return new InetSocketAddress("127.0.0.1", |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
608 |
serverImpl.getAddress().getPort()); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
609 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
610 |
|
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
611 |
public InetSocketAddress getProxyAddress() { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
612 |
return new InetSocketAddress("127.0.0.1", |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
613 |
serverImpl.getAddress().getPort()); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
614 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
615 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
616 |
public Version getServerVersion() { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
617 |
return serverImpl.getVersion(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
618 |
} |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
619 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
620 |
public void stop() { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
621 |
serverImpl.stop(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
622 |
if (redirect != null) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
623 |
redirect.stop(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
624 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
625 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
626 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
627 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
628 |
protected void writeResponse(HttpTestExchange he) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
629 |
if (delegate == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
630 |
he.sendResponseHeaders(HttpURLConnection.HTTP_OK, 0); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
631 |
he.getResponseBody().write(he.getRequestBody().readAllBytes()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
632 |
} else { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
633 |
delegate.handle(he); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
634 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
635 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
636 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
637 |
private HttpTestHandler createHandler(HttpAuthSchemeType schemeType, |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
638 |
HttpTestAuthenticator auth, |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
639 |
HttpAuthType authType, |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
640 |
boolean tunelled) { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
641 |
return new HttpNoAuthHandler(key, authType, tunelled); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
642 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
643 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
644 |
void configureAuthentication(HttpTestContext ctxt, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
645 |
HttpAuthSchemeType schemeType, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
646 |
HttpTestAuthenticator auth, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
647 |
HttpAuthType authType) { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
648 |
switch(schemeType) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
649 |
case DIGEST: |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
650 |
// DIGEST authentication is handled by the handler. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
651 |
ctxt.addFilter(new HttpDigestFilter(key, auth, authType)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
652 |
break; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
653 |
case BASIC: |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
654 |
// BASIC authentication is handled by the filter. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
655 |
ctxt.addFilter(new HttpBasicFilter(key, auth, authType)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
656 |
break; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
657 |
case BASICSERVER: |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
658 |
switch(authType) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
659 |
case PROXY: case PROXY305: |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
660 |
// HttpServer can't support Proxy-type authentication |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
661 |
// => we do as if BASIC had been specified, and we will |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
662 |
// handle authentication in the handler. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
663 |
ctxt.addFilter(new HttpBasicFilter(key, auth, authType)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
664 |
break; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
665 |
case SERVER: case SERVER307: |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
666 |
if (ctxt.getVersion() == Version.HTTP_1_1) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
667 |
// Basic authentication is handled by HttpServer |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
668 |
// directly => the filter should not perform |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
669 |
// authentication again. |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
670 |
setContextAuthenticator(ctxt, auth); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
671 |
ctxt.addFilter(new HttpNoAuthFilter(key, authType)); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
672 |
} else { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
673 |
ctxt.addFilter(new HttpBasicFilter(key, auth, authType)); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
674 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
675 |
break; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
676 |
default: |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
677 |
throw new InternalError(key + ": Invalid combination scheme=" |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
678 |
+ schemeType + " authType=" + authType); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
679 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
680 |
case NONE: |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
681 |
// No authentication at all. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
682 |
ctxt.addFilter(new HttpNoAuthFilter(key, authType)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
683 |
break; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
684 |
default: |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
685 |
throw new InternalError(key + ": No such scheme: " + schemeType); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
686 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
687 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
688 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
689 |
private HttpTestHandler create300Handler(String key, URL proxyURL, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
690 |
HttpAuthType type, int code300) |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
691 |
throws MalformedURLException |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
692 |
{ |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
693 |
return new Http3xxHandler(key, proxyURL, type, code300); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
694 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
695 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
696 |
// Abstract HTTP filter class. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
697 |
private abstract static class AbstractHttpFilter extends HttpTestFilter { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
698 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
699 |
final HttpAuthType authType; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
700 |
final String type; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
701 |
public AbstractHttpFilter(HttpAuthType authType, String type) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
702 |
this.authType = authType; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
703 |
this.type = type; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
704 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
705 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
706 |
String getLocation() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
707 |
return "Location"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
708 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
709 |
String getAuthenticate() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
710 |
return authType == HttpAuthType.PROXY |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
711 |
? "Proxy-Authenticate" : "WWW-Authenticate"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
712 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
713 |
String getAuthorization() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
714 |
return authType == HttpAuthType.PROXY |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
715 |
? "Proxy-Authorization" : "Authorization"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
716 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
717 |
int getUnauthorizedCode() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
718 |
return authType == HttpAuthType.PROXY |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
719 |
? HttpURLConnection.HTTP_PROXY_AUTH |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
720 |
: HttpURLConnection.HTTP_UNAUTHORIZED; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
721 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
722 |
String getKeepAlive() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
723 |
return "keep-alive"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
724 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
725 |
String getConnection() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
726 |
return authType == HttpAuthType.PROXY |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
727 |
? "Proxy-Connection" : "Connection"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
728 |
} |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
729 |
protected abstract boolean isAuthentified(HttpTestExchange he) throws IOException; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
730 |
protected abstract void requestAuthentication(HttpTestExchange he) throws IOException; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
731 |
protected void accept(HttpTestExchange he, HttpChain chain) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
732 |
chain.doFilter(he); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
733 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
734 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
735 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
736 |
public String description() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
737 |
return "Filter for " + type; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
738 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
739 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
740 |
public void doFilter(HttpTestExchange he, HttpChain chain) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
741 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
742 |
System.out.println(type + ": Got " + he.getRequestMethod() |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
743 |
+ ": " + he.getRequestURI() |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
744 |
+ "\n" + DigestEchoServer.toString(he.getRequestHeaders())); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
745 |
if (!isAuthentified(he)) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
746 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
747 |
requestAuthentication(he); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
748 |
he.sendResponseHeaders(getUnauthorizedCode(), 0); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
749 |
System.out.println(type |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
750 |
+ ": Sent back " + getUnauthorizedCode()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
751 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
752 |
he.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
753 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
754 |
} else { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
755 |
accept(he, chain); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
756 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
757 |
} catch (RuntimeException | Error | IOException t) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
758 |
System.err.println(type |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
759 |
+ ": Unexpected exception while handling request: " + t); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
760 |
t.printStackTrace(System.err); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
761 |
he.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
762 |
throw t; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
763 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
764 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
765 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
766 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
767 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
768 |
// WARNING: This is not a full fledged implementation of DIGEST. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
769 |
// It does contain bugs and inaccuracy. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
770 |
final static class DigestResponse { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
771 |
final String realm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
772 |
final String username; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
773 |
final String nonce; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
774 |
final String cnonce; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
775 |
final String nc; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
776 |
final String uri; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
777 |
final String algorithm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
778 |
final String response; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
779 |
final String qop; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
780 |
final String opaque; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
781 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
782 |
public DigestResponse(String realm, String username, String nonce, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
783 |
String cnonce, String nc, String uri, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
784 |
String algorithm, String qop, String opaque, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
785 |
String response) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
786 |
this.realm = realm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
787 |
this.username = username; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
788 |
this.nonce = nonce; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
789 |
this.cnonce = cnonce; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
790 |
this.nc = nc; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
791 |
this.uri = uri; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
792 |
this.algorithm = algorithm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
793 |
this.qop = qop; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
794 |
this.opaque = opaque; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
795 |
this.response = response; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
796 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
797 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
798 |
String getAlgorithm(String defval) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
799 |
return algorithm == null ? defval : algorithm; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
800 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
801 |
String getQoP(String defval) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
802 |
return qop == null ? defval : qop; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
803 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
804 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
805 |
// Code stolen from DigestAuthentication: |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
806 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
807 |
private static final char charArray[] = { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
808 |
'0', '1', '2', '3', '4', '5', '6', '7', |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
809 |
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f' |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
810 |
}; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
811 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
812 |
private static String encode(String src, char[] passwd, MessageDigest md) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
813 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
814 |
md.update(src.getBytes("ISO-8859-1")); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
815 |
} catch (java.io.UnsupportedEncodingException uee) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
816 |
assert false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
817 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
818 |
if (passwd != null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
819 |
byte[] passwdBytes = new byte[passwd.length]; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
820 |
for (int i=0; i<passwd.length; i++) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
821 |
passwdBytes[i] = (byte)passwd[i]; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
822 |
md.update(passwdBytes); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
823 |
Arrays.fill(passwdBytes, (byte)0x00); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
824 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
825 |
byte[] digest = md.digest(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
826 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
827 |
StringBuilder res = new StringBuilder(digest.length * 2); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
828 |
for (int i = 0; i < digest.length; i++) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
829 |
int hashchar = ((digest[i] >>> 4) & 0xf); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
830 |
res.append(charArray[hashchar]); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
831 |
hashchar = (digest[i] & 0xf); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
832 |
res.append(charArray[hashchar]); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
833 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
834 |
return res.toString(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
835 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
836 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
837 |
public static String computeDigest(boolean isRequest, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
838 |
String reqMethod, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
839 |
char[] password, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
840 |
DigestResponse params) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
841 |
throws NoSuchAlgorithmException |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
842 |
{ |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
843 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
844 |
String A1, HashA1; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
845 |
String algorithm = params.getAlgorithm("MD5"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
846 |
boolean md5sess = algorithm.equalsIgnoreCase ("MD5-sess"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
847 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
848 |
MessageDigest md = MessageDigest.getInstance(md5sess?"MD5":algorithm); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
849 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
850 |
if (params.username == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
851 |
throw new IllegalArgumentException("missing username"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
852 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
853 |
if (params.realm == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
854 |
throw new IllegalArgumentException("missing realm"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
855 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
856 |
if (params.uri == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
857 |
throw new IllegalArgumentException("missing uri"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
858 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
859 |
if (params.nonce == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
860 |
throw new IllegalArgumentException("missing nonce"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
861 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
862 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
863 |
A1 = params.username + ":" + params.realm + ":"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
864 |
HashA1 = encode(A1, password, md); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
865 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
866 |
String A2; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
867 |
if (isRequest) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
868 |
A2 = reqMethod + ":" + params.uri; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
869 |
} else { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
870 |
A2 = ":" + params.uri; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
871 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
872 |
String HashA2 = encode(A2, null, md); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
873 |
String combo, finalHash; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
874 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
875 |
if ("auth".equals(params.qop)) { /* RRC2617 when qop=auth */ |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
876 |
if (params.cnonce == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
877 |
throw new IllegalArgumentException("missing nonce"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
878 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
879 |
if (params.nc == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
880 |
throw new IllegalArgumentException("missing nonce"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
881 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
882 |
combo = HashA1+ ":" + params.nonce + ":" + params.nc + ":" + |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
883 |
params.cnonce + ":auth:" +HashA2; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
884 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
885 |
} else { /* for compatibility with RFC2069 */ |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
886 |
combo = HashA1 + ":" + |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
887 |
params.nonce + ":" + |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
888 |
HashA2; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
889 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
890 |
finalHash = encode(combo, null, md); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
891 |
return finalHash; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
892 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
893 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
894 |
public static DigestResponse create(String raw) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
895 |
String username, realm, nonce, nc, uri, response, cnonce, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
896 |
algorithm, qop, opaque; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
897 |
HeaderParser parser = new HeaderParser(raw); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
898 |
username = parser.findValue("username"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
899 |
realm = parser.findValue("realm"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
900 |
nonce = parser.findValue("nonce"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
901 |
nc = parser.findValue("nc"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
902 |
uri = parser.findValue("uri"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
903 |
cnonce = parser.findValue("cnonce"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
904 |
response = parser.findValue("response"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
905 |
algorithm = parser.findValue("algorithm"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
906 |
qop = parser.findValue("qop"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
907 |
opaque = parser.findValue("opaque"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
908 |
return new DigestResponse(realm, username, nonce, cnonce, nc, uri, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
909 |
algorithm, qop, opaque, response); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
910 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
911 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
912 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
913 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
914 |
private static class HttpNoAuthFilter extends AbstractHttpFilter { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
915 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
916 |
static String type(String key, HttpAuthType authType) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
917 |
String type = authType == HttpAuthType.SERVER |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
918 |
? "NoAuth Server Filter" : "NoAuth Proxy Filter"; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
919 |
return "["+type+"]:"+key; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
920 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
921 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
922 |
public HttpNoAuthFilter(String key, HttpAuthType authType) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
923 |
super(authType, type(key, authType)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
924 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
925 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
926 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
927 |
protected boolean isAuthentified(HttpTestExchange he) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
928 |
return true; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
929 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
930 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
931 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
932 |
protected void requestAuthentication(HttpTestExchange he) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
933 |
throw new InternalError("Should not com here"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
934 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
935 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
936 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
937 |
public String description() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
938 |
return "Passthrough Filter"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
939 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
940 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
941 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
942 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
943 |
// An HTTP Filter that performs Basic authentication |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
944 |
private static class HttpBasicFilter extends AbstractHttpFilter { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
945 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
946 |
static String type(String key, HttpAuthType authType) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
947 |
String type = authType == HttpAuthType.SERVER |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
948 |
? "Basic Server Filter" : "Basic Proxy Filter"; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
949 |
return "["+type+"]:"+key; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
950 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
951 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
952 |
private final HttpTestAuthenticator auth; |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
953 |
public HttpBasicFilter(String key, HttpTestAuthenticator auth, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
954 |
HttpAuthType authType) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
955 |
super(authType, type(key, authType)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
956 |
this.auth = auth; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
957 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
958 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
959 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
960 |
protected void requestAuthentication(HttpTestExchange he) |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
961 |
throws IOException { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
962 |
he.getResponseHeaders().addHeader(getAuthenticate(), |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
963 |
"Basic realm=\"" + auth.getRealm() + "\""); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
964 |
System.out.println(type + ": Requesting Basic Authentication " |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
965 |
+ he.getResponseHeaders().firstValue(getAuthenticate())); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
966 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
967 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
968 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
969 |
protected boolean isAuthentified(HttpTestExchange he) { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
970 |
if (he.getRequestHeaders().containsKey(getAuthorization())) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
971 |
List<String> authorization = |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
972 |
he.getRequestHeaders().get(getAuthorization()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
973 |
for (String a : authorization) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
974 |
System.out.println(type + ": processing " + a); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
975 |
int sp = a.indexOf(' '); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
976 |
if (sp < 0) return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
977 |
String scheme = a.substring(0, sp); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
978 |
if (!"Basic".equalsIgnoreCase(scheme)) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
979 |
System.out.println(type + ": Unsupported scheme '" |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
980 |
+ scheme +"'"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
981 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
982 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
983 |
if (a.length() <= sp+1) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
984 |
System.out.println(type + ": value too short for '" |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
985 |
+ scheme +"'"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
986 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
987 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
988 |
a = a.substring(sp+1); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
989 |
return validate(a); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
990 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
991 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
992 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
993 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
994 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
995 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
996 |
boolean validate(String a) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
997 |
byte[] b = Base64.getDecoder().decode(a); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
998 |
String userpass = new String (b); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
999 |
int colon = userpass.indexOf (':'); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1000 |
String uname = userpass.substring (0, colon); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1001 |
String pass = userpass.substring (colon+1); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1002 |
return auth.getUserName().equals(uname) && |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1003 |
new String(auth.getPassword(uname)).equals(pass); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1004 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1005 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1006 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1007 |
public String description() { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1008 |
return "Filter for BASIC authentication: " + type; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1009 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1010 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1011 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1012 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1013 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1014 |
// An HTTP Filter that performs Digest authentication |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1015 |
// WARNING: This is not a full fledged implementation of DIGEST. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1016 |
// It does contain bugs and inaccuracy. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1017 |
private static class HttpDigestFilter extends AbstractHttpFilter { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1018 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1019 |
static String type(String key, HttpAuthType authType) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1020 |
String type = authType == HttpAuthType.SERVER |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1021 |
? "Digest Server Filter" : "Digest Proxy Filter"; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1022 |
return "["+type+"]:"+key; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1023 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1024 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1025 |
// This is a very basic DIGEST - used only for the purpose of testing |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1026 |
// the client implementation. Therefore we can get away with never |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1027 |
// updating the server nonce as it makes the implementation of the |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1028 |
// server side digest simpler. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1029 |
private final HttpTestAuthenticator auth; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1030 |
private final byte[] nonce; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1031 |
private final String ns; |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1032 |
public HttpDigestFilter(String key, HttpTestAuthenticator auth, HttpAuthType authType) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1033 |
super(authType, type(key, authType)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1034 |
this.auth = auth; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1035 |
nonce = new byte[16]; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1036 |
new Random(Instant.now().toEpochMilli()).nextBytes(nonce); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1037 |
ns = new BigInteger(1, nonce).toString(16); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1038 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1039 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1040 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1041 |
protected void requestAuthentication(HttpTestExchange he) |
56104
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1042 |
throws IOException { |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1043 |
String separator; |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1044 |
Version v = he.getExchangeVersion(); |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1045 |
if (v == Version.HTTP_1_1) { |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1046 |
separator = "\r\n "; |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1047 |
} else if (v == Version.HTTP_2) { |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1048 |
separator = " "; |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1049 |
} else { |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1050 |
throw new InternalError(String.valueOf(v)); |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1051 |
} |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1052 |
he.getResponseHeaders().addHeader(getAuthenticate(), |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1053 |
"Digest realm=\"" + auth.getRealm() + "\"," |
56104
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1054 |
+ separator + "qop=\"auth\"," |
3420c1bdd254
http-client-branch: (HttpClient) JDK-fixed 8196962
prappo
parents:
56089
diff
changeset
|
1055 |
+ separator + "nonce=\"" + ns +"\""); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1056 |
System.out.println(type + ": Requesting Digest Authentication " |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1057 |
+ he.getResponseHeaders() |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1058 |
.firstValue(getAuthenticate()) |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1059 |
.orElse("null")); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1060 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1061 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1062 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1063 |
protected boolean isAuthentified(HttpTestExchange he) { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1064 |
if (he.getRequestHeaders().containsKey(getAuthorization())) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1065 |
List<String> authorization = he.getRequestHeaders().get(getAuthorization()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1066 |
for (String a : authorization) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1067 |
System.out.println(type + ": processing " + a); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1068 |
int sp = a.indexOf(' '); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1069 |
if (sp < 0) return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1070 |
String scheme = a.substring(0, sp); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1071 |
if (!"Digest".equalsIgnoreCase(scheme)) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1072 |
System.out.println(type + ": Unsupported scheme '" + scheme +"'"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1073 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1074 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1075 |
if (a.length() <= sp+1) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1076 |
System.out.println(type + ": value too short for '" + scheme +"'"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1077 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1078 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1079 |
a = a.substring(sp+1); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1080 |
DigestResponse dgr = DigestResponse.create(a); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1081 |
return validate(he.getRequestURI(), he.getRequestMethod(), dgr); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1082 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1083 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1084 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1085 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1086 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1087 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1088 |
boolean validate(URI uri, String reqMethod, DigestResponse dg) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1089 |
if (!"MD5".equalsIgnoreCase(dg.getAlgorithm("MD5"))) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1090 |
System.out.println(type + ": Unsupported algorithm " |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1091 |
+ dg.algorithm); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1092 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1093 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1094 |
if (!"auth".equalsIgnoreCase(dg.getQoP("auth"))) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1095 |
System.out.println(type + ": Unsupported qop " |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1096 |
+ dg.qop); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1097 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1098 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1099 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1100 |
if (!dg.nonce.equals(ns)) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1101 |
System.out.println(type + ": bad nonce returned by client: " |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1102 |
+ nonce + " expected " + ns); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1103 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1104 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1105 |
if (dg.response == null) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1106 |
System.out.println(type + ": missing digest response."); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1107 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1108 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1109 |
char[] pa = auth.getPassword(dg.username); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1110 |
return verify(uri, reqMethod, dg, pa); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1111 |
} catch(IllegalArgumentException | SecurityException |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1112 |
| NoSuchAlgorithmException e) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1113 |
System.out.println(type + ": " + e.getMessage()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1114 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1115 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1116 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1117 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1118 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1119 |
boolean verify(URI uri, String reqMethod, DigestResponse dg, char[] pw) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1120 |
throws NoSuchAlgorithmException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1121 |
String response = DigestResponse.computeDigest(true, reqMethod, pw, dg); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1122 |
if (!dg.response.equals(response)) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1123 |
System.out.println(type + ": bad response returned by client: " |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1124 |
+ dg.response + " expected " + response); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1125 |
return false; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1126 |
} else { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1127 |
// A real server would also verify the uri=<request-uri> |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1128 |
// parameter - but this is just a test... |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1129 |
System.out.println(type + ": verified response " + response); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1130 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1131 |
return true; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1132 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1133 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1134 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1135 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1136 |
public String description() { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1137 |
return "Filter for DIGEST authentication: " + type; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1138 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1139 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1140 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1141 |
// Abstract HTTP handler class. |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1142 |
private abstract static class AbstractHttpHandler implements HttpTestHandler { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1143 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1144 |
final HttpAuthType authType; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1145 |
final String type; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1146 |
public AbstractHttpHandler(HttpAuthType authType, String type) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1147 |
this.authType = authType; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1148 |
this.type = type; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1149 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1150 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1151 |
String getLocation() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1152 |
return "Location"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1153 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1154 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1155 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1156 |
public void handle(HttpTestExchange he) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1157 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1158 |
sendResponse(he); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1159 |
} catch (RuntimeException | Error | IOException t) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1160 |
System.err.println(type |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1161 |
+ ": Unexpected exception while handling request: " + t); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1162 |
t.printStackTrace(System.err); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1163 |
throw t; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1164 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1165 |
he.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1166 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1167 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1168 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1169 |
protected abstract void sendResponse(HttpTestExchange he) throws IOException; |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1170 |
|
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1171 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1172 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1173 |
static String stype(String type, String key, HttpAuthType authType, boolean tunnelled) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1174 |
type = type + (authType == HttpAuthType.SERVER |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1175 |
? " Server" : " Proxy") |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1176 |
+ (tunnelled ? " Tunnelled" : ""); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1177 |
return "["+type+"]:"+key; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1178 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1179 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1180 |
private class HttpNoAuthHandler extends AbstractHttpHandler { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1181 |
|
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1182 |
// true if this server is behind a proxy tunnel. |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1183 |
final boolean tunnelled; |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1184 |
public HttpNoAuthHandler(String key, HttpAuthType authType, boolean tunnelled) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1185 |
super(authType, stype("NoAuth", key, authType, tunnelled)); |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1186 |
this.tunnelled = tunnelled; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1187 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1188 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1189 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1190 |
protected void sendResponse(HttpTestExchange he) throws IOException { |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1191 |
if (DEBUG) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1192 |
System.out.println(type + ": headers are: " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1193 |
+ DigestEchoServer.toString(he.getRequestHeaders())); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1194 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1195 |
if (authType == HttpAuthType.SERVER && tunnelled) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1196 |
// Verify that the client doesn't send us proxy-* headers |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1197 |
// used to establish the proxy tunnel |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1198 |
Optional<String> proxyAuth = he.getRequestHeaders() |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1199 |
.keySet().stream() |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1200 |
.filter("proxy-authorization"::equalsIgnoreCase) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1201 |
.findAny(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1202 |
if (proxyAuth.isPresent()) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1203 |
System.out.println(type + " found " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1204 |
+ proxyAuth.get() + ": failing!"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1205 |
throw new IOException(proxyAuth.get() |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1206 |
+ " found by " + type + " for " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1207 |
+ he.getRequestURI()); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1208 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1209 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1210 |
DigestEchoServer.this.writeResponse(he); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1211 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1212 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1213 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1214 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1215 |
// A dummy HTTP Handler that redirects all incoming requests |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1216 |
// by sending a back 3xx response code (301, 305, 307 etc..) |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1217 |
private class Http3xxHandler extends AbstractHttpHandler { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1218 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1219 |
private final URL redirectTargetURL; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1220 |
private final int code3XX; |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1221 |
public Http3xxHandler(String key, URL proxyURL, HttpAuthType authType, int code300) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1222 |
super(authType, stype("Server" + code300, key, authType, false)); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1223 |
this.redirectTargetURL = proxyURL; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1224 |
this.code3XX = code300; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1225 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1226 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1227 |
int get3XX() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1228 |
return code3XX; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1229 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1230 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1231 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1232 |
public void sendResponse(HttpTestExchange he) throws IOException { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1233 |
System.out.println(type + ": Got " + he.getRequestMethod() |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1234 |
+ ": " + he.getRequestURI() |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1235 |
+ "\n" + DigestEchoServer.toString(he.getRequestHeaders())); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1236 |
System.out.println(type + ": Redirecting to " |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1237 |
+ (authType == HttpAuthType.PROXY305 |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1238 |
? "proxy" : "server")); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1239 |
he.getResponseHeaders().addHeader(getLocation(), |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1240 |
redirectTargetURL.toExternalForm().toString()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1241 |
he.sendResponseHeaders(get3XX(), 0); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1242 |
System.out.println(type + ": Sent back " + get3XX() + " " |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1243 |
+ getLocation() + ": " + redirectTargetURL.toExternalForm().toString()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1244 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1245 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1246 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1247 |
static class Configurator extends HttpsConfigurator { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1248 |
public Configurator(SSLContext ctx) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1249 |
super(ctx); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1250 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1251 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1252 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1253 |
public void configure (HttpsParameters params) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1254 |
params.setSSLParameters (getSSLContext().getSupportedSSLParameters()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1255 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1256 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1257 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1258 |
static final long start = System.nanoTime(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1259 |
public static String now() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1260 |
long now = System.nanoTime() - start; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1261 |
long secs = now / 1000_000_000; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1262 |
long mill = (now % 1000_000_000) / 1000_000; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1263 |
long nan = now % 1000_000; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1264 |
return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1265 |
} |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1266 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1267 |
static class ProxyAuthorization { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1268 |
final HttpAuthSchemeType schemeType; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1269 |
final HttpTestAuthenticator authenticator; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1270 |
private final byte[] nonce; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1271 |
private final String ns; |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1272 |
private final String key; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1273 |
|
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1274 |
ProxyAuthorization(String key, HttpAuthSchemeType schemeType, HttpTestAuthenticator auth) { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1275 |
this.key = key; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1276 |
this.schemeType = schemeType; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1277 |
this.authenticator = auth; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1278 |
nonce = new byte[16]; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1279 |
new Random(Instant.now().toEpochMilli()).nextBytes(nonce); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1280 |
ns = new BigInteger(1, nonce).toString(16); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1281 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1282 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1283 |
String doBasic(Optional<String> authorization) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1284 |
String offset = "proxy-authorization: basic "; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1285 |
String authstring = authorization.orElse(""); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1286 |
if (!authstring.toLowerCase(Locale.US).startsWith(offset)) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1287 |
return "Proxy-Authenticate: BASIC " + "realm=\"" |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1288 |
+ authenticator.getRealm() +"\""; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1289 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1290 |
authstring = authstring |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1291 |
.substring(offset.length()) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1292 |
.trim(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1293 |
byte[] base64 = Base64.getDecoder().decode(authstring); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1294 |
String up = new String(base64, StandardCharsets.UTF_8); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1295 |
int colon = up.indexOf(':'); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1296 |
if (colon < 1) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1297 |
return "Proxy-Authenticate: BASIC " + "realm=\"" |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1298 |
+ authenticator.getRealm() +"\""; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1299 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1300 |
String u = up.substring(0, colon); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1301 |
String p = up.substring(colon+1); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1302 |
char[] pw = authenticator.getPassword(u); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1303 |
if (!p.equals(new String(pw))) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1304 |
return "Proxy-Authenticate: BASIC " + "realm=\"" |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1305 |
+ authenticator.getRealm() +"\""; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1306 |
} |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1307 |
System.out.println(now() + key + " Proxy basic authentication success"); |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1308 |
return null; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1309 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1310 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1311 |
String doDigest(Optional<String> authorization) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1312 |
String offset = "proxy-authorization: digest "; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1313 |
String authstring = authorization.orElse(""); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1314 |
if (!authstring.toLowerCase(Locale.US).startsWith(offset)) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1315 |
return "Proxy-Authenticate: " + |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1316 |
"Digest realm=\"" + authenticator.getRealm() + "\"," |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1317 |
+ "\r\n qop=\"auth\"," |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1318 |
+ "\r\n nonce=\"" + ns +"\""; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1319 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1320 |
authstring = authstring |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1321 |
.substring(offset.length()) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1322 |
.trim(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1323 |
boolean validated = false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1324 |
try { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1325 |
DigestResponse dgr = DigestResponse.create(authstring); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1326 |
validated = validate("CONNECT", dgr); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1327 |
} catch (Throwable t) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1328 |
t.printStackTrace(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1329 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1330 |
if (!validated) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1331 |
return "Proxy-Authenticate: " + |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1332 |
"Digest realm=\"" + authenticator.getRealm() + "\"," |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1333 |
+ "\r\n qop=\"auth\"," |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1334 |
+ "\r\n nonce=\"" + ns +"\""; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1335 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1336 |
return null; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1337 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1338 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1339 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1340 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1341 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1342 |
boolean validate(String reqMethod, DigestResponse dg) { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1343 |
String type = now() + this.getClass().getSimpleName() + ":" + key; |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1344 |
if (!"MD5".equalsIgnoreCase(dg.getAlgorithm("MD5"))) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1345 |
System.out.println(type + ": Unsupported algorithm " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1346 |
+ dg.algorithm); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1347 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1348 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1349 |
if (!"auth".equalsIgnoreCase(dg.getQoP("auth"))) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1350 |
System.out.println(type + ": Unsupported qop " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1351 |
+ dg.qop); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1352 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1353 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1354 |
try { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1355 |
if (!dg.nonce.equals(ns)) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1356 |
System.out.println(type + ": bad nonce returned by client: " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1357 |
+ nonce + " expected " + ns); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1358 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1359 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1360 |
if (dg.response == null) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1361 |
System.out.println(type + ": missing digest response."); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1362 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1363 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1364 |
char[] pa = authenticator.getPassword(dg.username); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1365 |
return verify(type, reqMethod, dg, pa); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1366 |
} catch(IllegalArgumentException | SecurityException |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1367 |
| NoSuchAlgorithmException e) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1368 |
System.out.println(type + ": " + e.getMessage()); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1369 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1370 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1371 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1372 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1373 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1374 |
boolean verify(String type, String reqMethod, DigestResponse dg, char[] pw) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1375 |
throws NoSuchAlgorithmException { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1376 |
String response = DigestResponse.computeDigest(true, reqMethod, pw, dg); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1377 |
if (!dg.response.equals(response)) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1378 |
System.out.println(type + ": bad response returned by client: " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1379 |
+ dg.response + " expected " + response); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1380 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1381 |
} else { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1382 |
// A real server would also verify the uri=<request-uri> |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1383 |
// parameter - but this is just a test... |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1384 |
System.out.println(type + ": verified response " + response); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1385 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1386 |
return true; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1387 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1388 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1389 |
public boolean authorize(StringBuilder response, String requestLine, String headers) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1390 |
String message = "<html><body><p>Authorization Failed%s</p></body></html>\r\n"; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1391 |
if (authenticator == null && schemeType != HttpAuthSchemeType.NONE) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1392 |
message = String.format(message, " No Authenticator Set"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1393 |
response.append("HTTP/1.1 407 Proxy Authentication Failed\r\n"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1394 |
response.append("Content-Length: ") |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1395 |
.append(message.getBytes(StandardCharsets.UTF_8).length) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1396 |
.append("\r\n\r\n"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1397 |
response.append(message); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1398 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1399 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1400 |
Optional<String> authorization = Stream.of(headers.split("\r\n")) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1401 |
.filter((k) -> k.toLowerCase(Locale.US).startsWith("proxy-authorization:")) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1402 |
.findFirst(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1403 |
String authenticate = null; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1404 |
switch(schemeType) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1405 |
case BASIC: |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1406 |
case BASICSERVER: |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1407 |
authenticate = doBasic(authorization); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1408 |
break; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1409 |
case DIGEST: |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1410 |
authenticate = doDigest(authorization); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1411 |
break; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1412 |
case NONE: |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1413 |
response.append("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1414 |
return true; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1415 |
default: |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1416 |
throw new InternalError("Unknown scheme type: " + schemeType); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1417 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1418 |
if (authenticate != null) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1419 |
message = String.format(message, ""); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1420 |
response.append("HTTP/1.1 407 Proxy Authentication Required\r\n"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1421 |
response.append("Content-Length: ") |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1422 |
.append(message.getBytes(StandardCharsets.UTF_8).length) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1423 |
.append("\r\n") |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1424 |
.append(authenticate) |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1425 |
.append("\r\n\r\n"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1426 |
response.append(message); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1427 |
return false; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1428 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1429 |
response.append("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1430 |
return true; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1431 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1432 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1433 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1434 |
public interface TunnelingProxy { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1435 |
InetSocketAddress getProxyAddress(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1436 |
void stop(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1437 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1438 |
|
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1439 |
// This is a bit hacky: HttpsProxyTunnel is an HTTPTestServer hidden |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1440 |
// behind a fake proxy that only understands CONNECT requests. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1441 |
// The fake proxy is just a server socket that intercept the |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1442 |
// CONNECT and then redirect streams to the real server. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1443 |
static class HttpsProxyTunnel extends DigestEchoServer |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1444 |
implements Runnable, TunnelingProxy { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1445 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1446 |
final ServerSocket ss; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1447 |
final CopyOnWriteArrayList<CompletableFuture<Void>> connectionCFs |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1448 |
= new CopyOnWriteArrayList<>(); |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1449 |
volatile ProxyAuthorization authorization; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1450 |
volatile boolean stopped; |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1451 |
public HttpsProxyTunnel(String key, HttpTestServer server, DigestEchoServer target, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1452 |
HttpTestHandler delegate) |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1453 |
throws IOException { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1454 |
this(key, server, target, delegate, ServerSocketFactory.create()); |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1455 |
} |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1456 |
private HttpsProxyTunnel(String key, HttpTestServer server, DigestEchoServer target, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1457 |
HttpTestHandler delegate, ServerSocket ss) |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1458 |
throws IOException { |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1459 |
super("HttpsProxyTunnel:" + ss.getLocalPort() + ":" + key, |
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1460 |
server, target, delegate); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1461 |
System.out.flush(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1462 |
System.err.println("WARNING: HttpsProxyTunnel is an experimental test class"); |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1463 |
this.ss = ss; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1464 |
start(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1465 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1466 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1467 |
final void start() throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1468 |
Thread t = new Thread(this, "ProxyThread"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1469 |
t.setDaemon(true); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1470 |
t.start(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1471 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1472 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1473 |
@Override |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1474 |
public Version getServerVersion() { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1475 |
// serverImpl is not null when this proxy |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1476 |
// serves a single server. It will be null |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1477 |
// if this proxy can serve multiple servers. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1478 |
if (serverImpl != null) return serverImpl.getVersion(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1479 |
return null; |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1480 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1481 |
|
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1482 |
@Override |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1483 |
public void stop() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1484 |
stopped = true; |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1485 |
if (serverImpl != null) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1486 |
serverImpl.stop(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1487 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1488 |
if (redirect != null) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1489 |
redirect.stop(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1490 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1491 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1492 |
ss.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1493 |
} catch (IOException ex) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1494 |
if (DEBUG) ex.printStackTrace(System.out); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1495 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1496 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1497 |
|
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1498 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1499 |
@Override |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1500 |
void configureAuthentication(HttpTestContext ctxt, |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1501 |
HttpAuthSchemeType schemeType, |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1502 |
HttpTestAuthenticator auth, |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1503 |
HttpAuthType authType) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1504 |
if (authType == HttpAuthType.PROXY || authType == HttpAuthType.PROXY305) { |
56070
66a9c3185028
http-client-branch: add tests with an HTTP/2 server for custom basic and digest authentication
dfuchs
parents:
56054
diff
changeset
|
1505 |
authorization = new ProxyAuthorization(key, schemeType, auth); |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1506 |
} else { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1507 |
super.configureAuthentication(ctxt, schemeType, auth, authType); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1508 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1509 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1510 |
|
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1511 |
boolean authorize(StringBuilder response, String requestLine, String headers) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1512 |
if (authorization != null) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1513 |
return authorization.authorize(response, requestLine, headers); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1514 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1515 |
response.append("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1516 |
return true; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1517 |
} |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1518 |
|
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1519 |
// Pipe the input stream to the output stream. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1520 |
private synchronized Thread pipe(InputStream is, OutputStream os, char tag, CompletableFuture<Void> end) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1521 |
return new Thread("TunnelPipe("+tag+")") { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1522 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1523 |
public void run() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1524 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1525 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1526 |
int c; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1527 |
while ((c = is.read()) != -1) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1528 |
os.write(c); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1529 |
os.flush(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1530 |
// if DEBUG prints a + or a - for each transferred |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1531 |
// character. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1532 |
if (DEBUG) System.out.print(tag); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1533 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1534 |
is.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1535 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1536 |
os.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1537 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1538 |
} catch (IOException ex) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1539 |
if (DEBUG) ex.printStackTrace(System.out); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1540 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1541 |
end.complete(null); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1542 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1543 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1544 |
}; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1545 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1546 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1547 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1548 |
public InetSocketAddress getAddress() { |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1549 |
return new InetSocketAddress("127.0.0.1", |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1550 |
ss.getLocalPort()); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1551 |
} |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1552 |
@Override |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1553 |
public InetSocketAddress getProxyAddress() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1554 |
return getAddress(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1555 |
} |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1556 |
@Override |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1557 |
public InetSocketAddress getServerAddress() { |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1558 |
// serverImpl can be null if this proxy can serve |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1559 |
// multiple servers. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1560 |
if (serverImpl != null) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1561 |
return serverImpl.getAddress(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1562 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1563 |
return null; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1564 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1565 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1566 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1567 |
// This is a bit shaky. It doesn't handle continuation |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1568 |
// lines, but our client shouldn't send any. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1569 |
// Read a line from the input stream, swallowing the final |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1570 |
// \r\n sequence. Stops at the first \n, doesn't complain |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1571 |
// if it wasn't preceded by '\r'. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1572 |
// |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1573 |
String readLine(InputStream r) throws IOException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1574 |
StringBuilder b = new StringBuilder(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1575 |
int c; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1576 |
while ((c = r.read()) != -1) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1577 |
if (c == '\n') break; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1578 |
b.appendCodePoint(c); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1579 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1580 |
if (b.codePointAt(b.length() -1) == '\r') { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1581 |
b.delete(b.length() -1, b.length()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1582 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1583 |
return b.toString(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1584 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1585 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1586 |
@Override |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1587 |
public void run() { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1588 |
Socket clientConnection = null; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1589 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1590 |
while (!stopped) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1591 |
System.out.println(now() + "Tunnel: Waiting for client"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1592 |
Socket toClose; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1593 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1594 |
toClose = clientConnection = ss.accept(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1595 |
} catch (IOException io) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1596 |
if (DEBUG || !stopped) io.printStackTrace(System.out); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1597 |
break; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1598 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1599 |
System.out.println(now() + "Tunnel: Client accepted"); |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1600 |
StringBuilder headers = new StringBuilder(); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1601 |
Socket targetConnection = null; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1602 |
InputStream ccis = clientConnection.getInputStream(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1603 |
OutputStream ccos = clientConnection.getOutputStream(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1604 |
Writer w = new OutputStreamWriter( |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1605 |
clientConnection.getOutputStream(), "UTF-8"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1606 |
PrintWriter pw = new PrintWriter(w); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1607 |
System.out.println(now() + "Tunnel: Reading request line"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1608 |
String requestLine = readLine(ccis); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1609 |
System.out.println(now() + "Tunnel: Request line: " + requestLine); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1610 |
if (requestLine.startsWith("CONNECT ")) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1611 |
// We should probably check that the next word following |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1612 |
// CONNECT is the host:port of our HTTPS serverImpl. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1613 |
// Some improvement for a followup! |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1614 |
StringTokenizer tokenizer = new StringTokenizer(requestLine); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1615 |
String connect = tokenizer.nextToken(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1616 |
assert connect.equalsIgnoreCase("connect"); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1617 |
String hostport = tokenizer.nextToken(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1618 |
InetSocketAddress targetAddress; |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1619 |
try { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1620 |
URI uri = new URI("https", hostport, "/", null, null); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1621 |
int port = uri.getPort(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1622 |
port = port == -1 ? 443 : port; |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1623 |
targetAddress = new InetSocketAddress(uri.getHost(), port); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1624 |
if (serverImpl != null) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1625 |
assert targetAddress.getHostString() |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1626 |
.equalsIgnoreCase(serverImpl.getAddress().getHostString()); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1627 |
assert targetAddress.getPort() == serverImpl.getAddress().getPort(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1628 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1629 |
} catch (Throwable x) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1630 |
System.err.printf("Bad target address: \"%s\" in \"%s\"%n", |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1631 |
hostport, requestLine); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1632 |
toClose.close(); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1633 |
continue; |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1634 |
} |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1635 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1636 |
// Read all headers until we find the empty line that |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1637 |
// signals the end of all headers. |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1638 |
String line = requestLine; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1639 |
while(!line.equals("")) { |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1640 |
System.out.println(now() + "Tunnel: Reading header: " |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1641 |
+ (line = readLine(ccis))); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1642 |
headers.append(line).append("\r\n"); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1643 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1644 |
|
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1645 |
StringBuilder response = new StringBuilder(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1646 |
final boolean authorize = authorize(response, requestLine, headers.toString()); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1647 |
if (!authorize) { |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1648 |
System.out.println(now() + "Tunnel: Sending " |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1649 |
+ response); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1650 |
// send the 407 response |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1651 |
pw.print(response.toString()); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1652 |
pw.flush(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1653 |
toClose.close(); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1654 |
continue; |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1655 |
} |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1656 |
System.out.println(now() |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1657 |
+ "Tunnel connecting to target server at " |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1658 |
+ targetAddress.getAddress() + ":" + targetAddress.getPort()); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1659 |
targetConnection = new Socket( |
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1660 |
targetAddress.getAddress(), |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1661 |
targetAddress.getPort()); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1662 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1663 |
// Then send the 200 OK response to the client |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1664 |
System.out.println(now() + "Tunnel: Sending " |
56041
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1665 |
+ response); |
b4b5e09ef3cc
http-client-branch: make it possible to supply proxy-authorization headers
dfuchs
parents:
56033
diff
changeset
|
1666 |
pw.print(response); |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1667 |
pw.flush(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1668 |
} else { |
56054
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1669 |
// This should not happen. If it does then just print an |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1670 |
// error - both on out and err, and close the accepted |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1671 |
// socket |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1672 |
System.out.println("WARNING: Tunnel: Unexpected status line: " |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1673 |
+ requestLine + " received by " |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1674 |
+ ss.getLocalSocketAddress() |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1675 |
+ " from " |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1676 |
+ toClose.getRemoteSocketAddress() |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1677 |
+ " - closing accepted socket"); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1678 |
// Print on err |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1679 |
System.err.println("WARNING: Tunnel: Unexpected status line: " |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1680 |
+ requestLine + " received by " |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1681 |
+ ss.getLocalSocketAddress() |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1682 |
+ " from " |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1683 |
+ toClose.getRemoteSocketAddress()); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1684 |
// close accepted socket. |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1685 |
toClose.close(); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1686 |
System.err.println("Tunnel: accepted socket closed."); |
352e845ae744
http-client-branch: honor legacy jdk.http.auth.* property when handling proxy-authorization
dfuchs
parents:
56041
diff
changeset
|
1687 |
continue; |
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1688 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1689 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1690 |
// Pipe the input stream of the client connection to the |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1691 |
// output stream of the target connection and conversely. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1692 |
// Now the client and target will just talk to each other. |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1693 |
System.out.println(now() + "Tunnel: Starting tunnel pipes"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1694 |
CompletableFuture<Void> end, end1, end2; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1695 |
Thread t1 = pipe(ccis, targetConnection.getOutputStream(), '+', |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1696 |
end1 = new CompletableFuture<>()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1697 |
Thread t2 = pipe(targetConnection.getInputStream(), ccos, '-', |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1698 |
end2 = new CompletableFuture<>()); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1699 |
end = CompletableFuture.allOf(end1, end2); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1700 |
end.whenComplete( |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1701 |
(r,t) -> { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1702 |
try { toClose.close(); } catch (IOException x) { } |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1703 |
finally {connectionCFs.remove(end);} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1704 |
}); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1705 |
connectionCFs.add(end); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1706 |
t1.start(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1707 |
t2.start(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1708 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1709 |
} catch (Throwable ex) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1710 |
try { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1711 |
ss.close(); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1712 |
} catch (IOException ex1) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1713 |
ex.addSuppressed(ex1); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1714 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1715 |
ex.printStackTrace(System.err); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1716 |
} finally { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1717 |
System.out.println(now() + "Tunnel: exiting (stopped=" + stopped + ")"); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1718 |
connectionCFs.forEach(cf -> cf.complete(null)); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1719 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1720 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1721 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1722 |
|
56128
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1723 |
/** |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1724 |
* Creates a TunnelingProxy that can serve multiple servers. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1725 |
* The server address is extracted from the CONNECT request line. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1726 |
* @param authScheme The authentication scheme supported by the proxy. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1727 |
* Typically one of DIGEST, BASIC, NONE. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1728 |
* @return A new TunnelingProxy able to serve multiple servers. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1729 |
* @throws IOException If the proxy could not be created. |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1730 |
*/ |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1731 |
public static TunnelingProxy createHttpsProxyTunnel(HttpAuthSchemeType authScheme) |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1732 |
throws IOException { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1733 |
HttpsProxyTunnel result = new HttpsProxyTunnel("", null, null, null); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1734 |
if (authScheme != HttpAuthSchemeType.NONE) { |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1735 |
result.configureAuthentication(null, |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1736 |
authScheme, |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1737 |
AUTHENTICATOR, |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1738 |
HttpAuthType.PROXY); |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1739 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1740 |
return result; |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1741 |
} |
249a863b0aca
http-client-branch: 8196967: HTTP1/HTTP2 Proxy Issue
dfuchs
parents:
56104
diff
changeset
|
1742 |
|
56033
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1743 |
private static String protocol(String protocol) { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1744 |
if ("http".equalsIgnoreCase(protocol)) return "http"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1745 |
else if ("https".equalsIgnoreCase(protocol)) return "https"; |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1746 |
else throw new InternalError("Unsupported protocol: " + protocol); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1747 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1748 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1749 |
public static URL url(String protocol, InetSocketAddress address, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1750 |
String path) throws MalformedURLException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1751 |
return new URL(protocol(protocol), |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1752 |
address.getHostString(), |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1753 |
address.getPort(), path); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1754 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1755 |
|
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1756 |
public static URI uri(String protocol, InetSocketAddress address, |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1757 |
String path) throws URISyntaxException { |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1758 |
return new URI(protocol(protocol) + "://" + |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1759 |
address.getHostString() + ":" + |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1760 |
address.getPort() + path); |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1761 |
} |
db102c5ca88a
http-client-branch: 8194729: Java 9's HttpClient doesn't allow custom 'Authorization' headers
dfuchs
parents:
diff
changeset
|
1762 |
} |