diff --git a/jdk/src/share/classes/java/net/HttpURLConnection.java b/jdk/src/share/classes/java/net/HttpURLConnection.java
index c6b1ffab6c9..0b3e578022c 100644
--- a/jdk/src/share/classes/java/net/HttpURLConnection.java
+++ b/jdk/src/share/classes/java/net/HttpURLConnection.java
@@ -399,6 +399,8 @@ abstract public class HttpURLConnection extends URLConnection {
* @param method the HTTP method
* @exception ProtocolException if the method cannot be reset or if
* the requested method isn't valid for HTTP.
+ * @exception SecurityException if a security manager is set and the
+ * "allowHttpTrace" NetPermission is not granted.
* @see #getRequestMethod()
*/
public void setRequestMethod(String method) throws ProtocolException {
@@ -412,6 +414,12 @@ abstract public class HttpURLConnection extends URLConnection {
for (int i = 0; i < methods.length; i++) {
if (methods[i].equals(method)) {
+ if (method.equals("TRACE")) {
+ SecurityManager s = System.getSecurityManager();
+ if (s != null) {
+ s.checkPermission(new NetPermission("allowHttpTrace"));
+ }
+ }
this.method = method;
return;
}
diff --git a/jdk/src/share/classes/java/net/NetPermission.java b/jdk/src/share/classes/java/net/NetPermission.java
index 5083a40fb34..1cff4a87676 100644
--- a/jdk/src/share/classes/java/net/NetPermission.java
+++ b/jdk/src/share/classes/java/net/NetPermission.java
@@ -54,62 +54,12 @@ import java.util.StringTokenizer;
* | What the Permission Allows |
* Risks of Allowing this Permission |
*
- *
*
- * | setDefaultAuthenticator |
- * The ability to set the
- * way authentication information is retrieved when
- * a proxy or HTTP server asks for authentication |
- * Malicious
- * code can set an authenticator that monitors and steals user
- * authentication input as it retrieves the input from the user. |
- *
- *
- *
- * | requestPasswordAuthentication |
- * The ability
- * to ask the authenticator registered with the system for
- * a password |
- * Malicious code may steal this password. |
- *
- *
- *
- * | specifyStreamHandler |
- * The ability
- * to specify a stream handler when constructing a URL |
- * Malicious code may create a URL with resources that it would
-normally not have access to (like file:/foo/fum/), specifying a
-stream handler that gets the actual bytes from someplace it does
-have access to. Thus it might be able to trick the system into
-creating a ProtectionDomain/CodeSource for a class even though
-that class really didn't come from that location. |
- *
- *
- *
- * | setProxySelector |
- * The ability to set the proxy selector used to make decisions
- * on which proxies to use when making network connections. |
- * Malicious code can set a ProxySelector that directs network
- * traffic to an arbitrary network host. |
- *
- *
- *
- * | getProxySelector |
- * The ability to get the proxy selector used to make decisions
- * on which proxies to use when making network connections. |
- * Malicious code can get a ProxySelector to discover proxy
- * hosts and ports on internal networks, which could then become
- * targets for attack. |
- *
- *
- *
- * | setCookieHandler |
- * The ability to set the cookie handler that processes highly
- * security sensitive cookie information for an Http session. |
- * Malicious code can set a cookie handler to obtain access to
- * highly security sensitive cookie information. Some web servers
- * use cookies to save user private information such as access
- * control information, or to track user browsing habit. |
+ * allowHttpTrace |
+ * The ability to use the HTTP TRACE method in HttpURLConnection. |
+ * Malicious code using HTTP TRACE could get access to security sensitive
+ * information in the HTTP headers (such as cookies) that it might not
+ * otherwise have access to. |
*
*
*
@@ -123,13 +73,13 @@ that class really didn't come from that location.
*
*
*
- * | setResponseCache |
- * The ability to set the response cache that provides access to
- * a local response cache. |
- * Malicious code getting access to the local response cache
- * could access security sensitive information, or create false
- * entries in the response cache. |
- *
+ * getProxySelector |
+ * The ability to get the proxy selector used to make decisions
+ * on which proxies to use when making network connections. |
+ * Malicious code can get a ProxySelector to discover proxy
+ * hosts and ports on internal networks, which could then become
+ * targets for attack. |
+ *
*
*
* | getResponseCache |
@@ -139,6 +89,62 @@ that class really didn't come from that location.
* could access security sensitive information.
*
*
+ *
+ * | requestPasswordAuthentication |
+ * The ability
+ * to ask the authenticator registered with the system for
+ * a password |
+ * Malicious code may steal this password. |
+ *
+ *
+ *
+ * | setCookieHandler |
+ * The ability to set the cookie handler that processes highly
+ * security sensitive cookie information for an Http session. |
+ * Malicious code can set a cookie handler to obtain access to
+ * highly security sensitive cookie information. Some web servers
+ * use cookies to save user private information such as access
+ * control information, or to track user browsing habit. |
+ *
+ *
+ *
+ * | setDefaultAuthenticator |
+ * The ability to set the
+ * way authentication information is retrieved when
+ * a proxy or HTTP server asks for authentication |
+ * Malicious
+ * code can set an authenticator that monitors and steals user
+ * authentication input as it retrieves the input from the user. |
+ *
+ *
+ *
+ * | setProxySelector |
+ * The ability to set the proxy selector used to make decisions
+ * on which proxies to use when making network connections. |
+ * Malicious code can set a ProxySelector that directs network
+ * traffic to an arbitrary network host. |
+ *
+ *
+ *
+ * | setResponseCache |
+ * The ability to set the response cache that provides access to
+ * a local response cache. |
+ * Malicious code getting access to the local response cache
+ * could access security sensitive information, or create false
+ * entries in the response cache. |
+ *
+ *
+ *
+ * | specifyStreamHandler |
+ * The ability
+ * to specify a stream handler when constructing a URL |
+ * Malicious code may create a URL with resources that it would
+normally not have access to (like file:/foo/fum/), specifying a
+stream handler that gets the actual bytes from someplace it does
+have access to. Thus it might be able to trick the system into
+creating a ProtectionDomain/CodeSource for a class even though
+that class really didn't come from that location. |
+ *
*
*
* @see java.security.BasicPermission