Merge
This commit is contained in:
commit
f1e72f0012
jdk
src/share
classes
com/sun/security/auth/login
java
javax/net/ssl
sun/net/www/protocol/http
native/java/net
test
com/sun/security/auth/login/ConfigFile
java
javax/security/auth/login/Configuration
@ -620,9 +620,35 @@ public class ConfigFile extends javax.security.auth.login.Configuration {
|
||||
* start up time noticeably for the new launcher. -- DAC
|
||||
*/
|
||||
private InputStream getInputStream(URL url) throws IOException {
|
||||
if ("file".equals(url.getProtocol())) {
|
||||
String path = url.getFile().replace('/', File.separatorChar);
|
||||
return new FileInputStream(path);
|
||||
if ("file".equalsIgnoreCase(url.getProtocol())) {
|
||||
// Compatibility notes:
|
||||
//
|
||||
// Code changed from
|
||||
// String path = url.getFile().replace('/', File.separatorChar);
|
||||
// return new FileInputStream(path);
|
||||
//
|
||||
// The original implementation would search for "/tmp/a%20b"
|
||||
// when url is "file:///tmp/a%20b". This is incorrect. The
|
||||
// current codes fix this bug and searches for "/tmp/a b".
|
||||
// For compatibility reasons, when the file "/tmp/a b" does
|
||||
// not exist, the file named "/tmp/a%20b" will be tried.
|
||||
//
|
||||
// This also means that if both file exists, the behavior of
|
||||
// this method is changed, and the current codes choose the
|
||||
// correct one.
|
||||
try {
|
||||
return url.openStream();
|
||||
} catch (Exception e) {
|
||||
String file = url.getPath();
|
||||
if (url.getHost().length() > 0) { // For Windows UNC
|
||||
file = "//" + url.getHost() + file;
|
||||
}
|
||||
if (debugConfig != null) {
|
||||
debugConfig.println("cannot read " + url +
|
||||
", try " + file);
|
||||
}
|
||||
return new FileInputStream(file);
|
||||
}
|
||||
} else {
|
||||
return url.openStream();
|
||||
}
|
||||
|
@ -205,11 +205,31 @@ public class CookieManager extends CookieHandler
|
||||
if (cookieJar == null)
|
||||
return Collections.unmodifiableMap(cookieMap);
|
||||
|
||||
boolean secureLink = "https".equalsIgnoreCase(uri.getScheme());
|
||||
List<HttpCookie> cookies = new java.util.ArrayList<HttpCookie>();
|
||||
String path = uri.getPath();
|
||||
if (path == null || path.isEmpty()) {
|
||||
path = "/";
|
||||
}
|
||||
for (HttpCookie cookie : cookieJar.get(uri)) {
|
||||
// apply path-matches rule (RFC 2965 sec. 3.3.4)
|
||||
if (pathMatches(uri.getPath(), cookie.getPath())) {
|
||||
cookies.add(cookie);
|
||||
// and check for the possible "secure" tag (i.e. don't send
|
||||
// 'secure' cookies over unsecure links)
|
||||
if (pathMatches(path, cookie.getPath()) &&
|
||||
(secureLink || !cookie.getSecure())) {
|
||||
// Let's check the authorize port list if it exists
|
||||
String ports = cookie.getPortlist();
|
||||
if (ports != null && !ports.isEmpty()) {
|
||||
int port = uri.getPort();
|
||||
if (port == -1) {
|
||||
port = "https".equals(uri.getScheme()) ? 443 : 80;
|
||||
}
|
||||
if (isInPortList(ports, port)) {
|
||||
cookies.add(cookie);
|
||||
}
|
||||
} else {
|
||||
cookies.add(cookie);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -251,8 +271,46 @@ public class CookieManager extends CookieHandler
|
||||
try {
|
||||
List<HttpCookie> cookies = HttpCookie.parse(headerValue);
|
||||
for (HttpCookie cookie : cookies) {
|
||||
if (shouldAcceptInternal(uri, cookie)) {
|
||||
cookieJar.add(uri, cookie);
|
||||
if (cookie.getPath() == null) {
|
||||
// If no path is specified, then by default
|
||||
// the path is the directory of the page/doc
|
||||
String path = uri.getPath();
|
||||
if (!path.endsWith("/")) {
|
||||
int i = path.lastIndexOf("/");
|
||||
if (i > 0) {
|
||||
path = path.substring(0, i + 1);
|
||||
} else {
|
||||
path = "/";
|
||||
}
|
||||
}
|
||||
cookie.setPath(path);
|
||||
}
|
||||
String ports = cookie.getPortlist();
|
||||
if (ports != null) {
|
||||
int port = uri.getPort();
|
||||
if (port == -1) {
|
||||
port = "https".equals(uri.getScheme()) ? 443 : 80;
|
||||
}
|
||||
if (ports.isEmpty()) {
|
||||
// Empty port list means this should be restricted
|
||||
// to the incoming URI port
|
||||
cookie.setPortlist("" + port );
|
||||
if (shouldAcceptInternal(uri, cookie)) {
|
||||
cookieJar.add(uri, cookie);
|
||||
}
|
||||
} else {
|
||||
// Only store cookies with a port list
|
||||
// IF the URI port is in that list, as per
|
||||
// RFC 2965 section 3.3.2
|
||||
if (isInPortList(ports, port) &&
|
||||
shouldAcceptInternal(uri, cookie)) {
|
||||
cookieJar.add(uri, cookie);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (shouldAcceptInternal(uri, cookie)) {
|
||||
cookieJar.add(uri, cookie);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
@ -276,6 +334,32 @@ public class CookieManager extends CookieHandler
|
||||
}
|
||||
|
||||
|
||||
static private boolean isInPortList(String lst, int port) {
|
||||
int i = lst.indexOf(",");
|
||||
int val = -1;
|
||||
while (i > 0) {
|
||||
try {
|
||||
val = Integer.parseInt(lst.substring(0, i));
|
||||
if (val == port) {
|
||||
return true;
|
||||
}
|
||||
} catch (NumberFormatException numberFormatException) {
|
||||
}
|
||||
lst = lst.substring(i+1);
|
||||
i = lst.indexOf(",");
|
||||
}
|
||||
if (!lst.isEmpty()) {
|
||||
try {
|
||||
val = Integer.parseInt(lst);
|
||||
if (val == port) {
|
||||
return true;
|
||||
}
|
||||
} catch (NumberFormatException numberFormatException) {
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* path-matches algorithm, as defined by RFC 2965
|
||||
*/
|
||||
|
@ -92,9 +92,14 @@ public final class HttpCookie implements Cloneable {
|
||||
|
||||
|
||||
//
|
||||
// date format used by Netscape's cookie draft
|
||||
// date formats used by Netscape's cookie draft
|
||||
// as well as formats seen on various sites
|
||||
//
|
||||
private final static String NETSCAPE_COOKIE_DATE_FORMAT = "EEE',' dd-MMM-yyyy HH:mm:ss 'GMT'";
|
||||
private final static String[] COOKIE_DATE_FORMATS = {
|
||||
"EEE',' dd-MMM-yyyy HH:mm:ss 'GMT'",
|
||||
"EEE',' dd MMM yyyy HH:mm:ss 'GMT'",
|
||||
"EEE MMM dd yyyy HH:mm:ss 'GMT'Z"
|
||||
};
|
||||
|
||||
//
|
||||
// constant strings represent set-cookie header token
|
||||
@ -148,6 +153,7 @@ public final class HttpCookie implements Cloneable {
|
||||
secure = false;
|
||||
|
||||
whenCreated = System.currentTimeMillis();
|
||||
portlist = null;
|
||||
}
|
||||
|
||||
|
||||
@ -505,14 +511,14 @@ public final class HttpCookie implements Cloneable {
|
||||
|
||||
|
||||
/**
|
||||
* Indicates to the browser whether the cookie should only be sent
|
||||
* using a secure protocol, such as HTTPS or SSL.
|
||||
* Indicates whether the cookie should only be sent using a secure protocol,
|
||||
* such as HTTPS or SSL.
|
||||
*
|
||||
* <p>The default value is <code>false</code>.
|
||||
*
|
||||
* @param flag if <code>true</code>, sends the cookie from the browser
|
||||
* to the server using only when using a secure protocol;
|
||||
* if <code>false</code>, sent on any protocol
|
||||
* @param flag If <code>true</code>, the cookie can only be sent over
|
||||
* a secure protocol like https.
|
||||
* If <code>false</code>, it can be sent over any protocol.
|
||||
*
|
||||
* @see #getSecure
|
||||
*
|
||||
@ -526,12 +532,12 @@ public final class HttpCookie implements Cloneable {
|
||||
|
||||
|
||||
/**
|
||||
* Returns <code>true</code> if the browser is sending cookies
|
||||
* only over a secure protocol, or <code>false</code> if the
|
||||
* browser can send cookies using any protocol.
|
||||
* Returns <code>true</code> if sending this cookie should be
|
||||
* restricted to a secure protocol, or <code>false</code> if the
|
||||
* it can be sent using any protocol.
|
||||
*
|
||||
* @return <code>true</code> if the browser can use
|
||||
* any standard protocol; otherwise, <code>false</code>
|
||||
* @return <code>false</code> if the cookie can be sent over
|
||||
* any standard protocol; otherwise, <code>true</code>
|
||||
*
|
||||
* @see #setSecure
|
||||
*
|
||||
@ -748,6 +754,7 @@ public final class HttpCookie implements Cloneable {
|
||||
*
|
||||
* @return a string form of the cookie. The string has the defined format
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
if (getVersion() > 0) {
|
||||
return toRFC2965HeaderString();
|
||||
@ -768,6 +775,7 @@ public final class HttpCookie implements Cloneable {
|
||||
* @return <tt>true</tt> if 2 http cookies equal to each other;
|
||||
* otherwise, <tt>false</tt>
|
||||
*/
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (obj == this)
|
||||
return true;
|
||||
@ -798,6 +806,7 @@ public final class HttpCookie implements Cloneable {
|
||||
*
|
||||
* @return this http cookie's hash code
|
||||
*/
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int h1 = name.toLowerCase().hashCode();
|
||||
int h2 = (domain!=null) ? domain.toLowerCase().hashCode() : 0;
|
||||
@ -811,6 +820,7 @@ public final class HttpCookie implements Cloneable {
|
||||
*
|
||||
* @return a clone of this http cookie
|
||||
*/
|
||||
@Override
|
||||
public Object clone() {
|
||||
try {
|
||||
return super.clone();
|
||||
@ -978,7 +988,7 @@ public final class HttpCookie implements Cloneable {
|
||||
});
|
||||
assignors.put("port", new CookieAttributeAssignor(){
|
||||
public void assign(HttpCookie cookie, String attrName, String attrValue) {
|
||||
if (cookie.getPortlist() == null) cookie.setPortlist(attrValue);
|
||||
if (cookie.getPortlist() == null) cookie.setPortlist(attrValue == null ? "" : attrValue);
|
||||
}
|
||||
});
|
||||
assignors.put("secure", new CookieAttributeAssignor(){
|
||||
@ -1050,24 +1060,31 @@ public final class HttpCookie implements Cloneable {
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
private static SimpleDateFormat[] cDateFormats = null;
|
||||
static {
|
||||
cDateFormats = new SimpleDateFormat[COOKIE_DATE_FORMATS.length];
|
||||
for (int i = 0; i < COOKIE_DATE_FORMATS.length; i++) {
|
||||
cDateFormats[i] = new SimpleDateFormat(COOKIE_DATE_FORMATS[i]);
|
||||
cDateFormats[i].setTimeZone(TimeZone.getTimeZone("GMT"));
|
||||
}
|
||||
}
|
||||
/*
|
||||
* @param dateString a date string in format of
|
||||
* "EEE',' dd-MMM-yyyy HH:mm:ss 'GMT'",
|
||||
* which defined in Netscape cookie spec
|
||||
* @param dateString a date string in one of the formats
|
||||
* defined in Netscape cookie spec
|
||||
*
|
||||
* @return delta seconds between this cookie's creation
|
||||
* time and the time specified by dateString
|
||||
*/
|
||||
private long expiryDate2DeltaSeconds(String dateString) {
|
||||
SimpleDateFormat df = new SimpleDateFormat(NETSCAPE_COOKIE_DATE_FORMAT);
|
||||
df.setTimeZone(TimeZone.getTimeZone("GMT"));
|
||||
for (SimpleDateFormat df : cDateFormats) {
|
||||
try {
|
||||
Date date = df.parse(dateString);
|
||||
return (date.getTime() - whenCreated) / 1000;
|
||||
} catch (Exception e) {
|
||||
|
||||
try {
|
||||
Date date = df.parse(dateString);
|
||||
return (date.getTime() - whenCreated) / 1000;
|
||||
} catch (Exception e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -253,7 +253,8 @@ class Socket implements java.io.Closeable {
|
||||
*
|
||||
* @param host the name of the remote host, or <code>null</code> for the loopback address.
|
||||
* @param port the remote port
|
||||
* @param localAddr the local address the socket is bound to
|
||||
* @param localAddr the local address the socket is bound to, or
|
||||
* <code>null</code> for the <code>anyLocal</code> address.
|
||||
* @param localPort the local port the socket is bound to, or
|
||||
* <code>zero</code> for a system selected free port.
|
||||
* @exception IOException if an I/O error occurs when creating the socket.
|
||||
|
@ -101,13 +101,14 @@ public final class AccessControlContext {
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an AccessControlContext with the given set of ProtectionDomains.
|
||||
* Create an AccessControlContext with the given array of ProtectionDomains.
|
||||
* Context must not be null. Duplicate domains will be removed from the
|
||||
* context.
|
||||
*
|
||||
* @param context the ProtectionDomains associated with this context.
|
||||
* The non-duplicate domains are copied from the array. Subsequent
|
||||
* changes to the array will not affect this AccessControlContext.
|
||||
* @throws NullPointerException if <code>context</code> is <code>null</code>
|
||||
*/
|
||||
public AccessControlContext(ProtectionDomain context[])
|
||||
{
|
||||
@ -125,8 +126,10 @@ public final class AccessControlContext {
|
||||
if ((context[i] != null) && (!v.contains(context[i])))
|
||||
v.add(context[i]);
|
||||
}
|
||||
this.context = new ProtectionDomain[v.size()];
|
||||
this.context = v.toArray(this.context);
|
||||
if (!v.isEmpty()) {
|
||||
this.context = new ProtectionDomain[v.size()];
|
||||
this.context = v.toArray(this.context);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -134,6 +134,7 @@ public class SSLContext {
|
||||
* @exception NoSuchAlgorithmException if no Provider supports a
|
||||
* TrustManagerFactorySpi implementation for the
|
||||
* specified protocol.
|
||||
* @exception NullPointerException if protocol is null.
|
||||
*
|
||||
* @see java.security.Provider
|
||||
*/
|
||||
@ -175,6 +176,7 @@ public class SSLContext {
|
||||
* registered in the security provider list.
|
||||
*
|
||||
* @throws IllegalArgumentException if the provider name is null or empty.
|
||||
* @throws NullPointerException if protocol is null.
|
||||
*
|
||||
* @see java.security.Provider
|
||||
*/
|
||||
@ -210,6 +212,7 @@ public class SSLContext {
|
||||
* from the specified Provider object.
|
||||
*
|
||||
* @throws IllegalArgumentException if the provider name is null.
|
||||
* @throws NullPointerException if protocol is null.
|
||||
*
|
||||
* @see java.security.Provider
|
||||
*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -212,8 +212,10 @@ public abstract class SSLSocket extends Socket
|
||||
* @param host name of the host with which to connect, or
|
||||
* <code>null</code> for the loopback address.
|
||||
* @param port number of the server's port
|
||||
* @param clientAddress the client's host
|
||||
* @param clientPort number of the client's port
|
||||
* @param clientAddress the client's address the socket is bound to, or
|
||||
* <code>null</code> for the <code>anyLocal</code> address.
|
||||
* @param clientPort the client's port the socket is bound to, or
|
||||
* <code>zero</code> for a system selected free port.
|
||||
* @throws IOException if an I/O error occurs when creating the socket
|
||||
* @throws SecurityException if a security manager exists and its
|
||||
* <code>checkConnect</code> method doesn't allow the operation.
|
||||
@ -241,8 +243,10 @@ public abstract class SSLSocket extends Socket
|
||||
*
|
||||
* @param address the server's host
|
||||
* @param port its port
|
||||
* @param clientAddress the client's host
|
||||
* @param clientPort number of the client's port
|
||||
* @param clientAddress the client's address the socket is bound to, or
|
||||
* <code>null</code> for the <code>anyLocal</code> address.
|
||||
* @param clientPort the client's port the socket is bound to, or
|
||||
* <code>zero</code> for a system selected free port.
|
||||
* @throws IOException if an I/O error occurs when creating the socket
|
||||
* @throws SecurityException if a security manager exists and its
|
||||
* <code>checkConnect</code> method doesn't allow the operation.
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -129,6 +129,7 @@ public class TrustManagerFactory {
|
||||
* @exception NoSuchAlgorithmException if no Provider supports a
|
||||
* TrustManagerFactorySpi implementation for the
|
||||
* specified algorithm.
|
||||
* @exception NullPointerException if algorithm is null.
|
||||
*
|
||||
* @see java.security.Provider
|
||||
*/
|
||||
@ -171,6 +172,7 @@ public class TrustManagerFactory {
|
||||
* registered in the security provider list.
|
||||
*
|
||||
* @throws IllegalArgumentException if the provider name is null or empty.
|
||||
* @throws NullPointerException if algorithm is null.
|
||||
*
|
||||
* @see java.security.Provider
|
||||
*/
|
||||
@ -208,6 +210,7 @@ public class TrustManagerFactory {
|
||||
* from the specified Provider object.
|
||||
*
|
||||
* @throws IllegalArgumentException if the provider is null.
|
||||
* @throws NullPointerException if algorithm is null.
|
||||
*
|
||||
* @see java.security.Provider
|
||||
*/
|
||||
@ -274,6 +277,8 @@ public class TrustManagerFactory {
|
||||
/**
|
||||
* Returns one trust manager for each type of trust material.
|
||||
*
|
||||
* @throws IllegalStateException if the factory is not initialized.
|
||||
*
|
||||
* @return the trust managers
|
||||
*/
|
||||
public final TrustManager[] getTrustManagers() {
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -74,6 +74,8 @@ public abstract class TrustManagerFactorySpi {
|
||||
/**
|
||||
* Returns one trust manager for each type of trust material.
|
||||
*
|
||||
* @throws IllegalStateException if the factory is not initialized.
|
||||
*
|
||||
* @return the trust managers
|
||||
*/
|
||||
protected abstract TrustManager[] engineGetTrustManagers();
|
||||
|
@ -36,6 +36,7 @@ import java.util.Random;
|
||||
import sun.net.www.HeaderParser;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import static sun.net.www.protocol.http.HttpURLConnection.HTTP_CONNECT;
|
||||
|
||||
|
||||
/**
|
||||
@ -210,10 +211,38 @@ class DigestAuthentication extends AuthenticationInfo {
|
||||
|
||||
/**
|
||||
* Reclaculates the request-digest and returns it.
|
||||
*
|
||||
* <P> Used in the common case where the requestURI is simply the
|
||||
* abs_path.
|
||||
*
|
||||
* @param url
|
||||
* the URL
|
||||
*
|
||||
* @param method
|
||||
* the HTTP method
|
||||
*
|
||||
* @return the value of the HTTP header this authentication wants set
|
||||
*/
|
||||
String getHeaderValue(URL url, String method) {
|
||||
return getHeaderValueImpl (url.getFile(), method);
|
||||
return getHeaderValueImpl(url.getFile(), method);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reclaculates the request-digest and returns it.
|
||||
*
|
||||
* <P> Used when the requestURI is not the abs_path. The exact
|
||||
* requestURI can be passed as a String.
|
||||
*
|
||||
* @param requestURI
|
||||
* the Request-URI from the HTTP request line
|
||||
*
|
||||
* @param method
|
||||
* the HTTP method
|
||||
*
|
||||
* @return the value of the HTTP header this authentication wants set
|
||||
*/
|
||||
String getHeaderValue(String requestURI, String method) {
|
||||
return getHeaderValueImpl(requestURI, method);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -249,7 +278,16 @@ class DigestAuthentication extends AuthenticationInfo {
|
||||
params.setOpaque (p.findValue("opaque"));
|
||||
params.setQop (p.findValue("qop"));
|
||||
|
||||
String uri = conn.getURL().getFile();
|
||||
String uri;
|
||||
String method;
|
||||
if (type == PROXY_AUTHENTICATION &&
|
||||
conn.tunnelState() == HttpURLConnection.TunnelState.SETUP) {
|
||||
uri = HttpURLConnection.connectRequestURI(conn.getURL());
|
||||
method = HTTP_CONNECT;
|
||||
} else {
|
||||
uri = conn.getURL().getFile();
|
||||
method = conn.getMethod();
|
||||
}
|
||||
|
||||
if (params.nonce == null || authMethod == null || pw == null || realm == null) {
|
||||
return false;
|
||||
@ -275,7 +313,7 @@ class DigestAuthentication extends AuthenticationInfo {
|
||||
params.setNewCnonce();
|
||||
}
|
||||
|
||||
String value = getHeaderValueImpl (uri, conn.getMethod());
|
||||
String value = getHeaderValueImpl (uri, method);
|
||||
if (value != null) {
|
||||
conn.setAuthenticationProperty(getHeaderName(), value);
|
||||
return true;
|
||||
|
@ -75,6 +75,8 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
|
||||
private static Logger logger = Logger.getLogger("sun.net.www.protocol.http.HttpURLConnection");
|
||||
|
||||
static String HTTP_CONNECT = "CONNECT";
|
||||
|
||||
static final String version;
|
||||
public static final String userAgent;
|
||||
|
||||
@ -266,6 +268,20 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
/* If we decide we want to reuse a client, we put it here */
|
||||
private HttpClient reuseClient = null;
|
||||
|
||||
/* Tunnel states */
|
||||
enum TunnelState {
|
||||
/* No tunnel */
|
||||
NONE,
|
||||
|
||||
/* Setting up a tunnel */
|
||||
SETUP,
|
||||
|
||||
/* Tunnel has been successfully setup */
|
||||
TUNNELING
|
||||
}
|
||||
|
||||
private TunnelState tunnelState = TunnelState.NONE;
|
||||
|
||||
/* Redefine timeouts from java.net.URLConnection as we nee -1 to mean
|
||||
* not set. This is to ensure backward compatibility.
|
||||
*/
|
||||
@ -338,7 +354,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
* others that have been set
|
||||
*/
|
||||
// send any pre-emptive authentication
|
||||
if (http.usingProxy) {
|
||||
if (http.usingProxy && tunnelState() != TunnelState.TUNNELING) {
|
||||
setPreemptiveProxyAuthentication(requests);
|
||||
}
|
||||
if (!setRequests) {
|
||||
@ -1404,11 +1420,17 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
String raw = auth.raw();
|
||||
if (proxyAuthentication.isAuthorizationStale (raw)) {
|
||||
/* we can retry with the current credentials */
|
||||
requests.set (proxyAuthentication.getHeaderName(),
|
||||
proxyAuthentication.getHeaderValue(
|
||||
url, method));
|
||||
String value;
|
||||
if (tunnelState() == TunnelState.SETUP &&
|
||||
proxyAuthentication instanceof DigestAuthentication) {
|
||||
value = ((DigestAuthentication)proxyAuthentication)
|
||||
.getHeaderValue(connectRequestURI(url), HTTP_CONNECT);
|
||||
} else {
|
||||
value = proxyAuthentication.getHeaderValue(url, method);
|
||||
}
|
||||
requests.set(proxyAuthentication.getHeaderName(), value);
|
||||
currentProxyCredentials = proxyAuthentication;
|
||||
return proxyAuthentication;
|
||||
return proxyAuthentication;
|
||||
} else {
|
||||
proxyAuthentication.removeFromCache();
|
||||
}
|
||||
@ -1418,6 +1440,24 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
return proxyAuthentication;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the tunnel state.
|
||||
*
|
||||
* @return the state
|
||||
*/
|
||||
TunnelState tunnelState() {
|
||||
return tunnelState;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the tunneling status.
|
||||
*
|
||||
* @param the state
|
||||
*/
|
||||
void setTunnelState(TunnelState tunnelState) {
|
||||
this.tunnelState = tunnelState;
|
||||
}
|
||||
|
||||
/**
|
||||
* establish a tunnel through proxy server
|
||||
*/
|
||||
@ -1437,6 +1477,9 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
boolean inNegotiateProxy = false;
|
||||
|
||||
try {
|
||||
/* Actively setting up a tunnel */
|
||||
setTunnelState(TunnelState.SETUP);
|
||||
|
||||
do {
|
||||
if (!checkReuseConnection()) {
|
||||
proxiedConnect(url, proxyHost, proxyPort, false);
|
||||
@ -1450,6 +1493,9 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
// so ProgressSource is null.
|
||||
http.parseHTTP(responses, null, this);
|
||||
|
||||
/* Log the response to the CONNECT */
|
||||
logger.fine(responses.toString());
|
||||
|
||||
statusLine = responses.getValue(0);
|
||||
StringTokenizer st = new StringTokenizer(statusLine);
|
||||
st.nextToken();
|
||||
@ -1509,11 +1555,13 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
}
|
||||
|
||||
if (respCode == HTTP_OK) {
|
||||
setTunnelState(TunnelState.TUNNELING);
|
||||
break;
|
||||
}
|
||||
// we don't know how to deal with other response code
|
||||
// so disconnect and report error
|
||||
disconnectInternal();
|
||||
setTunnelState(TunnelState.NONE);
|
||||
break;
|
||||
} while (retryTunnel < maxRedirects);
|
||||
|
||||
@ -1535,6 +1583,14 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
responses.reset();
|
||||
}
|
||||
|
||||
static String connectRequestURI(URL url) {
|
||||
String host = url.getHost();
|
||||
int port = url.getPort();
|
||||
port = port != -1 ? port : url.getDefaultPort();
|
||||
|
||||
return host + ":" + port;
|
||||
}
|
||||
|
||||
/**
|
||||
* send a CONNECT request for establishing a tunnel to proxy server
|
||||
*/
|
||||
@ -1548,8 +1604,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
// otherwise, there may have 2 http methods in headers
|
||||
if (setRequests) requests.set(0, null, null);
|
||||
|
||||
requests.prepend("CONNECT " + url.getHost() + ":"
|
||||
+ (port != -1 ? port : url.getDefaultPort())
|
||||
requests.prepend(HTTP_CONNECT + " " + connectRequestURI(url)
|
||||
+ " " + httpVersion, null);
|
||||
requests.setIfNotSet("User-Agent", userAgent);
|
||||
|
||||
@ -1563,6 +1618,10 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
requests.setIfNotSet("Accept", acceptString);
|
||||
|
||||
setPreemptiveProxyAuthentication(requests);
|
||||
|
||||
/* Log the CONNECT request */
|
||||
logger.fine(requests.toString());
|
||||
|
||||
http.writeRequests(requests, null);
|
||||
// remove CONNECT header
|
||||
requests.set(0, null, null);
|
||||
@ -1576,9 +1635,17 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
|
||||
= AuthenticationInfo.getProxyAuth(http.getProxyHostUsed(),
|
||||
http.getProxyPortUsed());
|
||||
if (pauth != null && pauth.supportsPreemptiveAuthorization()) {
|
||||
String value;
|
||||
if (tunnelState() == TunnelState.SETUP &&
|
||||
pauth instanceof DigestAuthentication) {
|
||||
value = ((DigestAuthentication)pauth)
|
||||
.getHeaderValue(connectRequestURI(url), HTTP_CONNECT);
|
||||
} else {
|
||||
value = pauth.getHeaderValue(url, method);
|
||||
}
|
||||
|
||||
// Sets "Proxy-authorization"
|
||||
requests.set(pauth.getHeaderName(),
|
||||
pauth.getHeaderValue(url,method));
|
||||
requests.set(pauth.getHeaderName(), value);
|
||||
currentProxyCredentials = pauth;
|
||||
}
|
||||
}
|
||||
|
@ -35,7 +35,6 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.Comparator;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
/**
|
||||
@ -89,7 +88,9 @@ public class InMemoryCookieStore implements CookieStore {
|
||||
if (cookie.getMaxAge() != 0) {
|
||||
cookieJar.add(cookie);
|
||||
// and add it to domain index
|
||||
addIndex(domainIndex, cookie.getDomain(), cookie);
|
||||
if (cookie.getDomain() != null) {
|
||||
addIndex(domainIndex, cookie.getDomain(), cookie);
|
||||
}
|
||||
// add it to uri index, too
|
||||
addIndex(uriIndex, getEffectiveURI(uri), cookie);
|
||||
}
|
||||
@ -113,12 +114,13 @@ public class InMemoryCookieStore implements CookieStore {
|
||||
}
|
||||
|
||||
List<HttpCookie> cookies = new ArrayList<HttpCookie>();
|
||||
boolean secureLink = "https".equalsIgnoreCase(uri.getScheme());
|
||||
lock.lock();
|
||||
try {
|
||||
// check domainIndex first
|
||||
getInternal(cookies, domainIndex, new DomainComparator(uri.getHost()));
|
||||
getInternal1(cookies, domainIndex, uri.getHost(), secureLink);
|
||||
// check uriIndex then
|
||||
getInternal(cookies, uriIndex, getEffectiveURI(uri));
|
||||
getInternal2(cookies, uriIndex, getEffectiveURI(uri), secureLink);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
@ -217,19 +219,96 @@ public class InMemoryCookieStore implements CookieStore {
|
||||
/* ---------------- Private operations -------------- */
|
||||
|
||||
|
||||
static class DomainComparator implements Comparable<String> {
|
||||
String host = null;
|
||||
|
||||
public DomainComparator(String host) {
|
||||
this.host = host;
|
||||
/*
|
||||
* This is almost the same as HttpCookie.domainMatches except for
|
||||
* one difference: It won't reject cookies when the 'H' part of the
|
||||
* domain contains a dot ('.').
|
||||
* I.E.: RFC 2965 section 3.3.2 says that if host is x.y.domain.com
|
||||
* and the cookie domain is .domain.com, then it should be rejected.
|
||||
* However that's not how the real world works. Browsers don't reject and
|
||||
* some sites, like yahoo.com do actually expect these cookies to be
|
||||
* passed along.
|
||||
* And should be used for 'old' style cookies (aka Netscape type of cookies)
|
||||
*/
|
||||
private boolean netscapeDomainMatches(String domain, String host)
|
||||
{
|
||||
if (domain == null || host == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
public int compareTo(String domain) {
|
||||
if (HttpCookie.domainMatches(domain, host)) {
|
||||
return 0;
|
||||
} else {
|
||||
return -1;
|
||||
// if there's no embedded dot in domain and domain is not .local
|
||||
boolean isLocalDomain = ".local".equalsIgnoreCase(domain);
|
||||
int embeddedDotInDomain = domain.indexOf('.');
|
||||
if (embeddedDotInDomain == 0) {
|
||||
embeddedDotInDomain = domain.indexOf('.', 1);
|
||||
}
|
||||
if (!isLocalDomain && (embeddedDotInDomain == -1 || embeddedDotInDomain == domain.length() - 1)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// if the host name contains no dot and the domain name is .local
|
||||
int firstDotInHost = host.indexOf('.');
|
||||
if (firstDotInHost == -1 && isLocalDomain) {
|
||||
return true;
|
||||
}
|
||||
|
||||
int domainLength = domain.length();
|
||||
int lengthDiff = host.length() - domainLength;
|
||||
if (lengthDiff == 0) {
|
||||
// if the host name and the domain name are just string-compare euqal
|
||||
return host.equalsIgnoreCase(domain);
|
||||
} else if (lengthDiff > 0) {
|
||||
// need to check H & D component
|
||||
String H = host.substring(0, lengthDiff);
|
||||
String D = host.substring(lengthDiff);
|
||||
|
||||
return (D.equalsIgnoreCase(domain));
|
||||
} else if (lengthDiff == -1) {
|
||||
// if domain is actually .host
|
||||
return (domain.charAt(0) == '.' &&
|
||||
host.equalsIgnoreCase(domain.substring(1)));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void getInternal1(List<HttpCookie> cookies, Map<String, List<HttpCookie>> cookieIndex,
|
||||
String host, boolean secureLink) {
|
||||
// Use a separate list to handle cookies that need to be removed so
|
||||
// that there is no conflict with iterators.
|
||||
ArrayList<HttpCookie> toRemove = new ArrayList<HttpCookie>();
|
||||
for (Map.Entry<String, List<HttpCookie>> entry : cookieIndex.entrySet()) {
|
||||
String domain = entry.getKey();
|
||||
List<HttpCookie> lst = entry.getValue();
|
||||
for (HttpCookie c : lst) {
|
||||
if ((c.getVersion() == 0 && netscapeDomainMatches(domain, host)) ||
|
||||
(c.getVersion() == 1 && HttpCookie.domainMatches(domain, host))) {
|
||||
if ((cookieJar.indexOf(c) != -1)) {
|
||||
// the cookie still in main cookie store
|
||||
if (!c.hasExpired()) {
|
||||
// don't add twice and make sure it's the proper
|
||||
// security level
|
||||
if ((secureLink || !c.getSecure()) &&
|
||||
!cookies.contains(c)) {
|
||||
cookies.add(c);
|
||||
}
|
||||
} else {
|
||||
toRemove.add(c);
|
||||
}
|
||||
} else {
|
||||
// the cookie has beed removed from main store,
|
||||
// so also remove it from domain indexed store
|
||||
toRemove.add(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Clear up the cookies that need to be removed
|
||||
for (HttpCookie c : toRemove) {
|
||||
lst.remove(c);
|
||||
cookieJar.remove(c);
|
||||
|
||||
}
|
||||
toRemove.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@ -237,9 +316,9 @@ public class InMemoryCookieStore implements CookieStore {
|
||||
// @param cookieIndex the index
|
||||
// @param comparator the prediction to decide whether or not
|
||||
// a cookie in index should be returned
|
||||
private <T> void getInternal(List<HttpCookie> cookies,
|
||||
private <T> void getInternal2(List<HttpCookie> cookies,
|
||||
Map<T, List<HttpCookie>> cookieIndex,
|
||||
Comparable<T> comparator)
|
||||
Comparable<T> comparator, boolean secureLink)
|
||||
{
|
||||
for (T index : cookieIndex.keySet()) {
|
||||
if (comparator.compareTo(index) == 0) {
|
||||
@ -253,7 +332,8 @@ public class InMemoryCookieStore implements CookieStore {
|
||||
// the cookie still in main cookie store
|
||||
if (!ck.hasExpired()) {
|
||||
// don't add twice
|
||||
if (!cookies.contains(ck))
|
||||
if ((secureLink || !ck.getSecure()) &&
|
||||
!cookies.contains(ck))
|
||||
cookies.add(ck);
|
||||
} else {
|
||||
it.remove();
|
||||
@ -292,14 +372,14 @@ public class InMemoryCookieStore implements CookieStore {
|
||||
|
||||
|
||||
//
|
||||
// for cookie purpose, the effective uri should only be scheme://authority
|
||||
// for cookie purpose, the effective uri should only be http://host
|
||||
// the path will be taken into account when path-match algorithm applied
|
||||
//
|
||||
private URI getEffectiveURI(URI uri) {
|
||||
URI effectiveURI = null;
|
||||
try {
|
||||
effectiveURI = new URI(uri.getScheme(),
|
||||
uri.getAuthority(),
|
||||
effectiveURI = new URI("http",
|
||||
uri.getHost(),
|
||||
null, // path component
|
||||
null, // query component
|
||||
null // fragment component
|
||||
|
@ -112,6 +112,7 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) {
|
||||
(*env)->SetIntField(env, iaObj, ia_familyID, IPv4);
|
||||
} else {
|
||||
static jclass inet6Cls = 0;
|
||||
jint scope;
|
||||
if (inet6Cls == 0) {
|
||||
jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
|
||||
CHECK_NULL_RETURN(c, NULL);
|
||||
@ -129,7 +130,10 @@ NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) {
|
||||
(*env)->SetObjectField(env, iaObj, ia6_ipaddressID, ipaddress);
|
||||
|
||||
(*env)->SetIntField(env, iaObj, ia_familyID, IPv6);
|
||||
(*env)->SetIntField(env, iaObj, ia6_scopeidID, getScopeID(him));
|
||||
scope = getScopeID(him);
|
||||
(*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
|
||||
if (scope > 0)
|
||||
(*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
|
||||
}
|
||||
*port = ntohs(him6->sin6_port);
|
||||
} else
|
||||
|
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6689000
|
||||
* @summary Changes in 6675606 causing regression test failures on windows-i586
|
||||
*/
|
||||
|
||||
import com.sun.security.auth.login.*;
|
||||
import java.io.*;
|
||||
import java.net.URL;
|
||||
|
||||
public class IllegalURL {
|
||||
public static void main(String[] args) throws Exception {
|
||||
FileOutputStream fos = new FileOutputStream("x.conf");
|
||||
fos.close();
|
||||
use("file:" + System.getProperty("user.dir") + "/x.conf");
|
||||
use("file:x.conf");
|
||||
System.out.println("Test passed");
|
||||
}
|
||||
|
||||
static void use(String f) throws Exception {
|
||||
System.out.println("Testing " + f + "...");
|
||||
System.setProperty("java.security.auth.login.config", f);
|
||||
try {
|
||||
new FileInputStream(new URL(f).getFile().replace('/', File.separatorChar));
|
||||
} catch (Exception e) {
|
||||
System.out.println("Even old implementation does not support it. Ignored.");
|
||||
return;
|
||||
}
|
||||
new ConfigFile();
|
||||
}
|
||||
}
|
189
jdk/test/java/net/CookieHandler/B6644726.java
Normal file
189
jdk/test/java/net/CookieHandler/B6644726.java
Normal file
@ -0,0 +1,189 @@
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6644726
|
||||
* @summary Cookie management issues
|
||||
*/
|
||||
|
||||
import java.net.*;
|
||||
import java.util.*;
|
||||
|
||||
public class B6644726 {
|
||||
public static void main(String[] args) throws Exception {
|
||||
testCookieStore();
|
||||
}
|
||||
|
||||
private static void testCookieStore() throws Exception {
|
||||
CookieManager cm = new CookieManager();
|
||||
CookieStore cs = cm.getCookieStore();
|
||||
URI uri = new URI("http://www.s1.sun.com/dir/foo/doc.html");
|
||||
URI suri = new URI("https://www.s1.sun.com/dir/foo/index.html");
|
||||
cm.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
|
||||
|
||||
ArrayList<String> lst = new ArrayList<String>();
|
||||
// Let's test the default path
|
||||
lst.add("myCookie1=foo");
|
||||
// Then some alternate expires format
|
||||
lst.add("myCookie2=bar; path=/dir; expires=Tue, 19 Aug 2025 16:00:00 GMT");
|
||||
lst.add("myCookie3=test; path=/dir; expires=Tue Aug 19 2025 16:00:00 GMT-0100");
|
||||
// Then Netscape draft cookies and domains
|
||||
lst.add("myCookie4=test; domain=.sun.com; path=/dir/foo");
|
||||
HashMap<String, List<String>> map = new HashMap<String, List<String>>();
|
||||
map.put("Set-Cookie", lst);
|
||||
cm.put(uri, map);
|
||||
map.clear();
|
||||
lst.clear();
|
||||
// Test for secure tag
|
||||
lst.add("myCookie5=test; secure");
|
||||
// Test for passing cookies between http and https
|
||||
map.put("Set-Cookie", lst);
|
||||
cm.put(suri, map);
|
||||
|
||||
List<HttpCookie> cookies = cs.getCookies();
|
||||
// There should be 5 cookies if all dates parsed correctly
|
||||
if (cookies.size() != 5) {
|
||||
fail("Should have 5 cookies. Got only "+ cookies.size() + ", expires probably didn't parse correctly");
|
||||
}
|
||||
// Check Path for first Cookie
|
||||
for (HttpCookie c : cookies) {
|
||||
if (c.getName().equals("myCookie1")) {
|
||||
if (!"/dir/foo/".equals(c.getPath())) {
|
||||
fail("Default path for myCookie1 is " + c.getPath());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HashMap<String, List<String>> emptyMap = new HashMap<String, List<String>>();
|
||||
// We should get 1 Cookie: MyCookie4, because of the domain
|
||||
Map<String, List<String>>m = cm.get(new URI("http://www.s2.sun.com/dir/foo/doc2.html"),
|
||||
emptyMap);
|
||||
List<String> clst = m.get("Cookie");
|
||||
if (clst.size() != 1) {
|
||||
fail("We should have only 1 cookie, not " + clst.size());
|
||||
} else {
|
||||
if (!clst.get(0).startsWith("myCookie4")) {
|
||||
fail("The cookie should be myCookie4, not " + clst.get(0));
|
||||
}
|
||||
}
|
||||
// We should get 4 cookies for non secure URI, and 5 for the secure one
|
||||
m = cm.get(suri, emptyMap);
|
||||
clst = m.get("Cookie");
|
||||
if (clst.size() != 5) {
|
||||
fail("Cookies didn't cross from http to https. Got only " + clst.size());
|
||||
}
|
||||
|
||||
m = cm.get(uri, emptyMap);
|
||||
clst = m.get("Cookie");
|
||||
if (clst.size() != 4) {
|
||||
fail("We should have gotten only 4 cookies over http (non secure), got " +
|
||||
clst.size());
|
||||
}
|
||||
if (isIn(clst, "myCookie5=")) {
|
||||
// myCookie5 (the secure one) shouldn't be here
|
||||
fail("Got the secure cookie over a non secure link");
|
||||
}
|
||||
|
||||
// Let's check that empty path is treated correctly
|
||||
uri = new URI("http://www.sun.com/");
|
||||
lst.clear();
|
||||
lst.add("myCookie6=foo");
|
||||
map.clear();
|
||||
map.put("Set-Cookie", lst);
|
||||
cm.put(uri, map);
|
||||
uri = new URI("http://www.sun.com");
|
||||
m = cm.get(uri, emptyMap);
|
||||
clst = m.get("Cookie");
|
||||
if (clst.size() != 1) {
|
||||
fail("Missing a cookie when using an empty path");
|
||||
}
|
||||
|
||||
// And now, the other way around:
|
||||
|
||||
uri = new URI("http://www.sun.com");
|
||||
lst.clear();
|
||||
lst.add("myCookie7=foo");
|
||||
map.clear();
|
||||
map.put("Set-Cookie", lst);
|
||||
cm.put(uri, map);
|
||||
uri = new URI("http://www.sun.com/");
|
||||
m = cm.get(uri, emptyMap);
|
||||
clst = m.get("Cookie");
|
||||
if (!isIn(clst, "myCookie7=")) {
|
||||
fail("Missing a cookie when using an empty path");
|
||||
}
|
||||
|
||||
// Let's make sure the 'Port' optional attributes is enforced
|
||||
|
||||
lst.clear();
|
||||
lst.add("myCookie8=porttest; port");
|
||||
lst.add("myCookie9=porttest; port=\"80,8000\"");
|
||||
lst.add("myCookie10=porttest; port=\"8000\"");
|
||||
map.clear();
|
||||
map.put("Set-Cookie", lst);
|
||||
uri = new URI("http://www.sun.com/");
|
||||
cm.put(uri, map);
|
||||
|
||||
// myCookie10 should have been rejected
|
||||
cookies = cs.getCookies();
|
||||
for (HttpCookie c : cookies) {
|
||||
if (c.getName().equals("myCookie10")) {
|
||||
fail("A cookie with an invalid port list was accepted");
|
||||
}
|
||||
}
|
||||
|
||||
uri = new URI("http://www.sun.com:80/");
|
||||
m = cm.get(uri, emptyMap);
|
||||
clst = m.get("Cookie");
|
||||
// We should find both myCookie8 and myCookie9 but not myCookie10
|
||||
if (!isIn(clst, "myCookie8=") || !isIn(clst, "myCookie9=")) {
|
||||
fail("Missing a cookie on port 80");
|
||||
}
|
||||
uri = new URI("http://www.sun.com:8000/");
|
||||
m = cm.get(uri, emptyMap);
|
||||
clst = m.get("Cookie");
|
||||
// We should find only myCookie9
|
||||
if (!isIn(clst, "myCookie9=")) {
|
||||
fail("Missing a cookie on port 80");
|
||||
}
|
||||
if (isIn(clst, "myCookie8=")) {
|
||||
fail("A cookie with an invalid port list was returned");
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isIn(List<String> lst, String cookie) {
|
||||
if (lst == null || lst.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
for (String s : lst) {
|
||||
if (s.startsWith(cookie))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static void fail(String msg) throws Exception {
|
||||
throw new RuntimeException(msg);
|
||||
}
|
||||
}
|
86
jdk/test/java/net/Inet6Address/B6558853.java
Normal file
86
jdk/test/java/net/Inet6Address/B6558853.java
Normal file
@ -0,0 +1,86 @@
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 6558853
|
||||
* @summary getHostAddress() on connections using IPv6 link-local addrs should have zone id
|
||||
*/
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.net.*;
|
||||
import java.util.Enumeration;
|
||||
|
||||
public class B6558853 implements Runnable {
|
||||
private InetAddress addr = null;
|
||||
private int port = 0;
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
ServerSocket ss = new ServerSocket(0);
|
||||
int port = ss.getLocalPort();
|
||||
Enumeration<NetworkInterface> l = NetworkInterface.getNetworkInterfaces();
|
||||
InetAddress dest = null;
|
||||
while (l.hasMoreElements() && dest == null) {
|
||||
NetworkInterface nif = l.nextElement();
|
||||
for (InterfaceAddress a : nif.getInterfaceAddresses()) {
|
||||
if (a.getAddress() instanceof Inet6Address) {
|
||||
Inet6Address a6 = (Inet6Address) a.getAddress();
|
||||
if (a6.isLinkLocalAddress()) {
|
||||
dest = a6;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (dest != null) {
|
||||
B6558853 test = new B6558853(dest, port);
|
||||
Thread thread = new Thread(test);
|
||||
thread.start();
|
||||
Socket s = ss.accept();
|
||||
InetAddress a = s.getInetAddress();
|
||||
OutputStream out = s.getOutputStream();
|
||||
out.write(1);
|
||||
out.close();
|
||||
if (!(a instanceof Inet6Address) || a.getHostAddress().indexOf("%") == -1) {
|
||||
// No Scope found in the address String
|
||||
throw new RuntimeException("Wrong address: " + a.getHostAddress());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public B6558853(InetAddress a, int port) {
|
||||
addr = a;
|
||||
this.port = port;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
try {
|
||||
Socket s = new Socket(addr, port);
|
||||
InputStream in = s.getInputStream();
|
||||
int i = in.read();
|
||||
in.close();
|
||||
} catch (IOException iOException) {
|
||||
}
|
||||
}
|
||||
}
|
70
jdk/test/java/security/AccessControlContext/CheckCtor.java
Normal file
70
jdk/test/java/security/AccessControlContext/CheckCtor.java
Normal file
@ -0,0 +1,70 @@
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6631361
|
||||
* @summary Test constructor when PD array is null or contains all null contexts
|
||||
*/
|
||||
|
||||
import java.security.AccessControlContext;
|
||||
import java.security.ProtectionDomain;
|
||||
|
||||
public class CheckCtor {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
// check that null PD array throws NPE
|
||||
try {
|
||||
new AccessControlContext(null);
|
||||
throw new Exception("Expected NullPointerException not thrown");
|
||||
} catch (Exception e) {
|
||||
if (!(e instanceof NullPointerException)) {
|
||||
throw new Exception("Expected NullPointerException not thrown");
|
||||
}
|
||||
}
|
||||
|
||||
// check that empty PD array equals PD array of one or more nulls
|
||||
ProtectionDomain zero[] = {};
|
||||
ProtectionDomain null1[] = {null};
|
||||
ProtectionDomain null2[] = {null, null};
|
||||
|
||||
AccessControlContext accZero = new AccessControlContext(zero);
|
||||
AccessControlContext accNull1 = new AccessControlContext(null1);
|
||||
AccessControlContext accNull2 = new AccessControlContext(null2);
|
||||
|
||||
testEquals(accZero, accNull1);
|
||||
testEquals(accZero, accNull2);
|
||||
testEquals(accNull1, accNull2);
|
||||
testEquals(accNull1, accZero);
|
||||
testEquals(accNull2, accZero);
|
||||
testEquals(accNull2, accNull1);
|
||||
}
|
||||
|
||||
private static void testEquals(AccessControlContext acc1,
|
||||
AccessControlContext acc2) throws Exception {
|
||||
if (!acc1.equals(acc2)) {
|
||||
throw new Exception("AccessControlContexts should be equal");
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,50 @@
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6675606
|
||||
* @summary javax.security.auth.login.Configuration does not recognize path with spaces
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import javax.security.auth.login.*;
|
||||
|
||||
import java.net.URI;
|
||||
import java.security.URIParameter;
|
||||
|
||||
public class ConfigFileWithBlank {
|
||||
public static void main(String[] args) throws Exception {
|
||||
File f = new File("a b c");
|
||||
FileOutputStream fos = new FileOutputStream(f);
|
||||
fos.write("".getBytes());
|
||||
fos.close();
|
||||
System.err.println(f.toURI());
|
||||
try {
|
||||
Configuration.getInstance("JavaLoginConfig", new URIParameter(f.toURI()));
|
||||
} finally {
|
||||
f.delete();
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user