JBossWeb SVN: r1851 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-10-12 11:26:42 -0400 (Wed, 12 Oct 2011)
New Revision: 1851
Modified:
trunk/java/org/apache/catalina/core/StandardService.java
Log:
- With delay connector startup, don't do any connector stop either.
Modified: trunk/java/org/apache/catalina/core/StandardService.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardService.java 2011-10-12 14:52:10 UTC (rev 1850)
+++ trunk/java/org/apache/catalina/core/StandardService.java 2011-10-12 15:26:42 UTC (rev 1851)
@@ -420,11 +420,13 @@
}
if (j < 0)
return;
- if (started && (connectors[j] instanceof Lifecycle)) {
- try {
- ((Lifecycle) connectors[j]).stop();
- } catch (LifecycleException e) {
- log.error("Connector.stop", e);
+ if (!DELAY_CONNECTOR_STARTUP) {
+ if (started && (connectors[j] instanceof Lifecycle)) {
+ try {
+ ((Lifecycle) connectors[j]).stop();
+ } catch (LifecycleException e) {
+ log.error("Connector.stop", e);
+ }
}
}
connectors[j].setContainer(null);
14 years
- 1
- 0
JBossWeb SVN: r1850 - in trunk/java/org/apache/catalina: core and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-10-12 10:52:10 -0400 (Wed, 12 Oct 2011)
New Revision: 1850
Modified:
trunk/java/org/apache/catalina/Service.java
trunk/java/org/apache/catalina/core/StandardService.java
Log:
- With delay connector startup, don't do any connector startup.
Modified: trunk/java/org/apache/catalina/Service.java
===================================================================
--- trunk/java/org/apache/catalina/Service.java 2011-10-12 14:29:54 UTC (rev 1849)
+++ trunk/java/org/apache/catalina/Service.java 2011-10-12 14:52:10 UTC (rev 1850)
@@ -115,7 +115,7 @@
*
* @param connector The Connector to be added
*/
- public void addConnector(Connector connector) throws LifecycleException;
+ public void addConnector(Connector connector);
/**
* Find and return the set of Connectors associated with this Service.
Modified: trunk/java/org/apache/catalina/core/StandardService.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardService.java 2011-10-12 14:29:54 UTC (rev 1849)
+++ trunk/java/org/apache/catalina/core/StandardService.java 2011-10-12 14:52:10 UTC (rev 1850)
@@ -336,7 +336,7 @@
*
* @param connector The Connector to be added
*/
- public void addConnector(Connector connector) throws LifecycleException {
+ public void addConnector(Connector connector) {
synchronized (connectors) {
connector.setContainer(this.container);
@@ -346,21 +346,21 @@
results[connectors.length] = connector;
connectors = results;
- if (initialized) {
- try {
- connector.init();
- } catch (LifecycleException e) {
- log.error("Connector.initialize", e);
- throw new LifecycleException("Can't initialize Connector");
+ if (!DELAY_CONNECTOR_STARTUP) {
+ if (initialized) {
+ try {
+ connector.init();
+ } catch (LifecycleException e) {
+ log.error("Connector.initialize", e);
+ }
}
- }
- if (started && (connector instanceof Lifecycle)) {
- try {
- ((Lifecycle) connector).start();
- } catch (LifecycleException e) {
- log.error("Connector.start", e);
- throw new LifecycleException("Can't start Connector");
+ if (started && (connector instanceof Lifecycle)) {
+ try {
+ ((Lifecycle) connector).start();
+ } catch (LifecycleException e) {
+ log.error("Connector.start", e);
+ }
}
}
@@ -757,9 +757,11 @@
addLifecycleListener(mapperListener);
// Initialize our defined Connectors
- synchronized (connectors) {
- for (int i = 0; i < connectors.length; i++) {
- connectors[i].init();
+ if (!DELAY_CONNECTOR_STARTUP) {
+ synchronized (connectors) {
+ for (int i = 0; i < connectors.length; i++) {
+ connectors[i].init();
+ }
}
}
14 years
- 1
- 0
JBossWeb SVN: r1849 - in trunk/java/org/apache/catalina: core and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-10-12 10:29:54 -0400 (Wed, 12 Oct 2011)
New Revision: 1849
Modified:
trunk/java/org/apache/catalina/Service.java
trunk/java/org/apache/catalina/core/StandardService.java
Log:
Fix for AS7-2073.
Modified: trunk/java/org/apache/catalina/Service.java
===================================================================
--- trunk/java/org/apache/catalina/Service.java 2011-10-11 15:29:56 UTC (rev 1848)
+++ trunk/java/org/apache/catalina/Service.java 2011-10-12 14:29:54 UTC (rev 1849)
@@ -115,7 +115,7 @@
*
* @param connector The Connector to be added
*/
- public void addConnector(Connector connector);
+ public void addConnector(Connector connector) throws LifecycleException;
/**
* Find and return the set of Connectors associated with this Service.
Modified: trunk/java/org/apache/catalina/core/StandardService.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardService.java 2011-10-11 15:29:56 UTC (rev 1848)
+++ trunk/java/org/apache/catalina/core/StandardService.java 2011-10-12 14:29:54 UTC (rev 1849)
@@ -336,7 +336,7 @@
*
* @param connector The Connector to be added
*/
- public void addConnector(Connector connector) {
+ public void addConnector(Connector connector) throws LifecycleException {
synchronized (connectors) {
connector.setContainer(this.container);
@@ -351,6 +351,7 @@
connector.init();
} catch (LifecycleException e) {
log.error("Connector.initialize", e);
+ throw new LifecycleException("Can't initialize Connector");
}
}
@@ -359,6 +360,7 @@
((Lifecycle) connector).start();
} catch (LifecycleException e) {
log.error("Connector.start", e);
+ throw new LifecycleException("Can't start Connector");
}
}
14 years
- 1
- 0
JBossWeb SVN: r1848 - in trunk: java/org/apache/catalina/realm and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-10-11 11:29:56 -0400 (Tue, 11 Oct 2011)
New Revision: 1848
Modified:
trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
trunk/java/org/apache/catalina/realm/RealmBase.java
trunk/webapps/docs/changelog.xml
Log:
- Port DIGEST improvements.
Modified: trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2011-10-05 07:36:35 UTC (rev 1847)
+++ trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2011-10-11 15:29:56 UTC (rev 1848)
@@ -82,8 +82,17 @@
// ----------------------------------------------------- Instance Variables
+ /**
+ * Authentication header
+ */
+ protected static final String AUTH_HEADER_NAME = "WWW-Authenticate";
/**
+ * Default authentication realm name.
+ */
+ protected static final String REALM_NAME = "Authentication required";
+
+ /**
* The number of random bytes to include when generating a
* session identifier.
*/
Modified: trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2011-10-05 07:36:35 UTC (rev 1847)
+++ trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2011-10-11 15:29:56 UTC (rev 1848)
@@ -23,11 +23,18 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
+import java.security.SecureRandom;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Random;
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.Container;
+import org.apache.catalina.Engine;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.Realm;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.LoginConfig;
@@ -42,7 +49,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
*/
public class DigestAuthenticator
@@ -65,6 +72,11 @@
"org.apache.catalina.authenticator.DigestAuthenticator/1.0";
+ /**
+ * Tomcat's DIGEST implementation only supports auth quality of protection.
+ */
+ protected static final String QOP = "auth";
+
// ----------------------------------------------------------- Constructors
@@ -89,17 +101,49 @@
/**
+ * List of client nonce values currently being tracked
+ */
+ protected Map<String,NonceInfo> cnonces;
+
+
+ /**
+ * Maximum number of client nonces to keep in the cache. If not specified,
+ * the default value of 1000 is used.
+ */
+ protected int cnonceCacheSize = 1000;
+
+
+ /**
* Private key.
*/
- protected String key = "Catalina";
+ protected String key = null;
- // ------------------------------------------------------------- Properties
+ /**
+ * How long server nonces are valid for in milliseconds. Defaults to 5
+ * minutes.
+ */
+ protected long nonceValidity = 5 * 60 * 1000;
/**
+ * Opaque string.
+ */
+ protected String opaque;
+
+
+ /**
+ * Should the URI be validated as required by RFC2617? Can be disabled in
+ * reverse proxies where the proxy has modified the URI.
+ */
+ protected boolean validateUri = true;
+
+ // ------------------------------------------------------------- Properties
+
+ /**
* Return descriptive information about this Valve implementation.
*/
+ @Override
public String getInfo() {
return (info);
@@ -107,9 +151,58 @@
}
+ public int getCnonceCacheSize() {
+ return cnonceCacheSize;
+ }
+
+
+ public void setCnonceCacheSize(int cnonceCacheSize) {
+ this.cnonceCacheSize = cnonceCacheSize;
+ }
+
+
+ public String getKey() {
+ return key;
+ }
+
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+
+ public long getNonceValidity() {
+ return nonceValidity;
+ }
+
+
+ public void setNonceValidity(long nonceValidity) {
+ this.nonceValidity = nonceValidity;
+ }
+
+
+ public String getOpaque() {
+ return opaque;
+ }
+
+
+ public void setOpaque(String opaque) {
+ this.opaque = opaque;
+ }
+
+
+ public boolean isValidateUri() {
+ return validateUri;
+ }
+
+
+ public void setValidateUri(boolean validateUri) {
+ this.validateUri = validateUri;
+ }
+
+
// --------------------------------------------------------- Public Methods
-
/**
* Authenticate the user making this request, based on the specified
* login configuration. Return <code>true</code> if any specified
@@ -123,6 +216,7 @@
*
* @exception IOException if an input/output error occurs
*/
+ @Override
public boolean authenticate(Request request,
HttpServletResponse response,
LoginConfig config)
@@ -169,8 +263,13 @@
// Validate any credentials already included with this request
String authorization = request.getHeader("authorization");
+ DigestInfo digestInfo = new DigestInfo(getOpaque(), getNonceValidity(),
+ getKey(), cnonces, isValidateUri());
if (authorization != null) {
- principal = findPrincipal(request, authorization, context.getRealm());
+ if (digestInfo.validate(request, authorization, config)) {
+ principal = digestInfo.authenticate(context.getRealm());
+ }
+
if (principal != null) {
String username = parseUsername(authorization);
register(request, response, principal,
@@ -182,11 +281,12 @@
// Send an "unauthorized" response and an appropriate challenge
- // Next, generate a nOnce token (that is a token which is supposed
+ // Next, generate a nonce token (that is a token which is supposed
// to be unique).
- String nOnce = generateNOnce(request);
+ String nonce = generateNonce(request);
- setAuthenticateHeader(request, response, config, nOnce);
+ setAuthenticateHeader(request, response, config, nonce,
+ digestInfo.isNonceStale());
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
// hres.flushBuffer();
return (false);
@@ -198,92 +298,6 @@
/**
- * Parse the specified authorization credentials, and return the
- * associated Principal that these credentials authenticate (if any)
- * from the specified Realm. If there is no such Principal, return
- * <code>null</code>.
- *
- * @param request HTTP servlet request
- * @param authorization Authorization credentials from this request
- * @param realm Realm used to authenticate Principals
- */
- protected static Principal findPrincipal(Request request,
- String authorization,
- Realm realm) {
-
- //System.out.println("Authorization token : " + authorization);
- // Validate the authorization credentials format
- if (authorization == null)
- return (null);
- if (!authorization.startsWith("Digest "))
- return (null);
- authorization = authorization.substring(7).trim();
-
- // Bugzilla 37132: http://issues.apache.org/bugzilla/show_bug.cgi?id=37132
- String[] tokens = authorization.split(",(?=(?:[^\"]*\"[^\"]*\")+$)");
-
- String userName = null;
- String realmName = null;
- String nOnce = null;
- String nc = null;
- String cnonce = null;
- String qop = null;
- String uri = null;
- String response = null;
- String method = request.getMethod();
-
- for (int i = 0; i < tokens.length; i++) {
- String currentToken = tokens[i];
- if (currentToken.length() == 0)
- continue;
-
- int equalSign = currentToken.indexOf('=');
- if (equalSign < 0)
- return null;
- String currentTokenName =
- currentToken.substring(0, equalSign).trim();
- String currentTokenValue =
- currentToken.substring(equalSign + 1).trim();
- if ("username".equals(currentTokenName))
- userName = removeQuotes(currentTokenValue);
- if ("realm".equals(currentTokenName))
- realmName = removeQuotes(currentTokenValue, true);
- if ("nonce".equals(currentTokenName))
- nOnce = removeQuotes(currentTokenValue);
- if ("nc".equals(currentTokenName))
- nc = removeQuotes(currentTokenValue);
- if ("cnonce".equals(currentTokenName))
- cnonce = removeQuotes(currentTokenValue);
- if ("qop".equals(currentTokenName))
- qop = removeQuotes(currentTokenValue);
- if ("uri".equals(currentTokenName))
- uri = removeQuotes(currentTokenValue);
- if ("response".equals(currentTokenName))
- response = removeQuotes(currentTokenValue);
- }
-
- if ( (userName == null) || (realmName == null) || (nOnce == null)
- || (uri == null) || (response == null) )
- return null;
-
- // Second MD5 digest used to calculate the digest :
- // MD5(Method + ":" + uri)
- String a2 = method + ":" + uri;
- //System.out.println("A2:" + a2);
-
- byte[] buffer = null;
- synchronized (md5Helper) {
- buffer = md5Helper.digest(a2.getBytes());
- }
- String md5a2 = md5Encoder.encode(buffer);
-
- return (realm.authenticate(userName, response, nOnce, nc, cnonce, qop,
- realmName, md5a2));
-
- }
-
-
- /**
* Parse the username from the specified authorization string. If none
* can be identified, return <code>null</code>
*
@@ -291,7 +305,6 @@
*/
protected String parseUsername(String authorization) {
- //System.out.println("Authorization token : " + authorization);
// Validate the authorization credentials format
if (authorization == null)
return (null);
@@ -351,20 +364,20 @@
*
* @param request HTTP Servlet request
*/
- protected String generateNOnce(Request request) {
+ protected String generateNonce(Request request) {
long currentTime = System.currentTimeMillis();
- String nOnceValue = request.getRemoteAddr() + ":" +
- currentTime + ":" + key;
+
+ String ipTimeKey =
+ request.getRemoteAddr() + ":" + currentTime + ":" + getKey();
- byte[] buffer = null;
+ byte[] buffer;
synchronized (md5Helper) {
- buffer = md5Helper.digest(nOnceValue.getBytes());
+ buffer = md5Helper.digest(ipTimeKey.getBytes());
}
- nOnceValue = md5Encoder.encode(buffer);
- return nOnceValue;
+ return currentTime + ":" + md5Encoder.encode(buffer);
}
@@ -376,7 +389,7 @@
* WWW-Authenticate = "WWW-Authenticate" ":" "Digest"
* digest-challenge
*
- * digest-challenge = 1#( realm | [ domain ] | nOnce |
+ * digest-challenge = 1#( realm | [ domain ] | nonce |
* [ digest-opaque ] |[ stale ] | [ algorithm ] )
*
* realm = "realm" "=" realm-value
@@ -393,29 +406,318 @@
* @param response HTTP Servlet response
* @param config Login configuration describing how authentication
* should be performed
- * @param nOnce nonce token
+ * @param nonce nonce token
*/
protected void setAuthenticateHeader(Request request,
HttpServletResponse response,
LoginConfig config,
- String nOnce) {
+ String nonce,
+ boolean isNonceStale) {
// Get the realm name
String realmName = config.getRealmName();
if (realmName == null)
- realmName = "Realm";
+ realmName = REALM_NAME;
- byte[] buffer = null;
- synchronized (md5Helper) {
- buffer = md5Helper.digest(nOnce.getBytes());
+ String authenticateHeader;
+ if (isNonceStale) {
+ authenticateHeader = "Digest realm=\"" + realmName + "\", " +
+ "qop=\"" + QOP + "\", nonce=\"" + nonce + "\", " + "opaque=\"" +
+ getOpaque() + "\", stale=true";
+ } else {
+ authenticateHeader = "Digest realm=\"" + realmName + "\", " +
+ "qop=\"" + QOP + "\", nonce=\"" + nonce + "\", " + "opaque=\"" +
+ getOpaque() + "\"";
}
- String authenticateHeader = "Digest realm=\"" + realmName + "\", "
- + "qop=\"auth\", nonce=\"" + nOnce + "\", " + "opaque=\""
- + md5Encoder.encode(buffer) + "\"";
response.setHeader("WWW-Authenticate", authenticateHeader);
}
+ // ------------------------------------------------------- Lifecycle Methods
+
+ @Override
+ public void start() throws LifecycleException {
+ super.start();
+
+ Container engine = container;
+ while (engine != null) {
+ if (engine instanceof Engine)
+ break;
+ engine = engine.getParent();
+ }
+ Random random = null;
+ if (engine != null && engine instanceof Engine && ((Engine) engine).getService() != null) {
+ random = ((Engine) engine).getService().getRandom();
+ }
+ if (random == null) {
+ // Shouldn't happen
+ random = new SecureRandom();
+ }
+
+ // Generate a random secret key
+ if (getKey() == null) {
+ setKey(generateSessionId(random));
+ }
+
+ // Generate the opaque string the same way
+ if (getOpaque() == null) {
+ setOpaque(generateSessionId(random));
+ }
+
+ cnonces = new LinkedHashMap<String, DigestAuthenticator.NonceInfo>() {
+
+ private static final long serialVersionUID = 1L;
+ private static final long LOG_SUPPRESS_TIME = 5 * 60 * 1000;
+
+ private long lastLog = 0;
+
+ @Override
+ protected boolean removeEldestEntry(
+ Map.Entry<String,NonceInfo> eldest) {
+ // This is called from a sync so keep it simple
+ long currentTime = System.currentTimeMillis();
+ if (size() > getCnonceCacheSize()) {
+ if (lastLog < currentTime &&
+ currentTime - eldest.getValue().getTimestamp() <
+ getNonceValidity()) {
+ // Replay attack is possible
+ log.warn(sm.getString(
+ "digestAuthenticator.cacheRemove"));
+ lastLog = currentTime + LOG_SUPPRESS_TIME;
+ }
+ return true;
+ }
+ return false;
+ }
+ };
+ }
+
+ private static class DigestInfo {
+
+ private String opaque;
+ private long nonceValidity;
+ private String key;
+ private Map<String,NonceInfo> cnonces;
+ private boolean validateUri = true;
+
+ private String userName = null;
+ private String method = null;
+ private String uri = null;
+ private String response = null;
+ private String nonce = null;
+ private String nc = null;
+ private String cnonce = null;
+ private String realmName = null;
+ private String qop = null;
+
+ private boolean nonceStale = false;
+
+
+ public DigestInfo(String opaque, long nonceValidity, String key,
+ Map<String,NonceInfo> cnonces, boolean validateUri) {
+ this.opaque = opaque;
+ this.nonceValidity = nonceValidity;
+ this.key = key;
+ this.cnonces = cnonces;
+ this.validateUri = validateUri;
+ }
+
+ public boolean validate(Request request, String authorization,
+ LoginConfig config) {
+ // Validate the authorization credentials format
+ if (authorization == null) {
+ return false;
+ }
+ if (!authorization.startsWith("Digest ")) {
+ return false;
+ }
+ authorization = authorization.substring(7).trim();
+
+ // Bugzilla 37132: http://issues.apache.org/bugzilla/show_bug.cgi?id=37132
+ String[] tokens = authorization.split(",(?=(?:[^\"]*\"[^\"]*\")+$)");
+
+ method = request.getMethod();
+ String opaque = null;
+
+ for (int i = 0; i < tokens.length; i++) {
+ String currentToken = tokens[i];
+ if (currentToken.length() == 0)
+ continue;
+
+ int equalSign = currentToken.indexOf('=');
+ if (equalSign < 0) {
+ return false;
+ }
+ String currentTokenName =
+ currentToken.substring(0, equalSign).trim();
+ String currentTokenValue =
+ currentToken.substring(equalSign + 1).trim();
+ if ("username".equals(currentTokenName))
+ userName = removeQuotes(currentTokenValue);
+ if ("realm".equals(currentTokenName))
+ realmName = removeQuotes(currentTokenValue, true);
+ if ("nonce".equals(currentTokenName))
+ nonce = removeQuotes(currentTokenValue);
+ if ("nc".equals(currentTokenName))
+ nc = removeQuotes(currentTokenValue);
+ if ("cnonce".equals(currentTokenName))
+ cnonce = removeQuotes(currentTokenValue);
+ if ("qop".equals(currentTokenName))
+ qop = removeQuotes(currentTokenValue);
+ if ("uri".equals(currentTokenName))
+ uri = removeQuotes(currentTokenValue);
+ if ("response".equals(currentTokenName))
+ response = removeQuotes(currentTokenValue);
+ if ("opaque".equals(currentTokenName))
+ opaque = removeQuotes(currentTokenValue);
+ }
+
+ if ( (userName == null) || (realmName == null) || (nonce == null)
+ || (uri == null) || (response == null) ) {
+ return false;
+ }
+
+ // Validate the URI - should match the request line sent by client
+ if (validateUri) {
+ String uriQuery;
+ String query = request.getQueryString();
+ if (query == null) {
+ uriQuery = request.getRequestURI();
+ } else {
+ uriQuery = request.getRequestURI() + "?" + query;
+ }
+ if (!uri.equals(uriQuery)) {
+ return false;
+ }
+ }
+
+ // Validate the Realm name
+ String lcRealm = config.getRealmName();
+ if (lcRealm == null) {
+ lcRealm = REALM_NAME;
+ }
+ if (!lcRealm.equals(realmName)) {
+ return false;
+ }
+
+ // Validate the opaque string
+ if (!this.opaque.equals(opaque)) {
+ return false;
+ }
+
+ // Validate nonce
+ int i = nonce.indexOf(":");
+ if (i < 0 || (i + 1) == nonce.length()) {
+ return false;
+ }
+ long nonceTime;
+ try {
+ nonceTime = Long.parseLong(nonce.substring(0, i));
+ } catch (NumberFormatException nfe) {
+ return false;
+ }
+ String md5clientIpTimeKey = nonce.substring(i + 1);
+ long currentTime = System.currentTimeMillis();
+ if ((currentTime - nonceTime) > nonceValidity) {
+ nonceStale = true;
+ return false;
+ }
+ String serverIpTimeKey =
+ request.getRemoteAddr() + ":" + nonceTime + ":" + key;
+ byte[] buffer = null;
+ synchronized (md5Helper) {
+ buffer = md5Helper.digest(serverIpTimeKey.getBytes());
+ }
+ String md5ServerIpTimeKey = md5Encoder.encode(buffer);
+ if (!md5ServerIpTimeKey.equals(md5clientIpTimeKey)) {
+ return false;
+ }
+
+ // Validate qop
+ if (qop != null && !QOP.equals(qop)) {
+ return false;
+ }
+
+ // Validate cnonce and nc
+ // Check if presence of nc and nonce is consistent with presence of qop
+ if (qop == null) {
+ if (cnonce != null || nc != null) {
+ return false;
+ }
+ } else {
+ if (cnonce == null || nc == null) {
+ return false;
+ }
+ if (nc.length() != 8) {
+ return false;
+ }
+ long count;
+ try {
+ count = Long.parseLong(nc, 16);
+ } catch (NumberFormatException nfe) {
+ return false;
+ }
+ NonceInfo info;
+ synchronized (cnonces) {
+ info = cnonces.get(cnonce);
+ }
+ if (info == null) {
+ info = new NonceInfo();
+ } else {
+ if (count <= info.getCount()) {
+ return false;
+ }
+ }
+ info.setCount(count);
+ info.setTimestamp(currentTime);
+ synchronized (cnonces) {
+ cnonces.put(cnonce, info);
+ }
+ }
+ return true;
+ }
+
+ public boolean isNonceStale() {
+ return nonceStale;
+ }
+
+ public Principal authenticate(Realm realm) {
+ // Second MD5 digest used to calculate the digest :
+ // MD5(Method + ":" + uri)
+ String a2 = method + ":" + uri;
+
+ byte[] buffer;
+ synchronized (md5Helper) {
+ buffer = md5Helper.digest(a2.getBytes());
+ }
+ String md5a2 = md5Encoder.encode(buffer);
+
+ return realm.authenticate(userName, response, nonce, nc, cnonce,
+ qop, realmName, md5a2);
+ }
+
+ }
+
+ private static class NonceInfo {
+ private volatile long count;
+ private volatile long timestamp;
+
+ public void setCount(long l) {
+ count = l;
+ }
+
+ public long getCount() {
+ return count;
+ }
+
+ public void setTimestamp(long l) {
+ timestamp = l;
+ }
+
+ public long getTimestamp() {
+ return timestamp;
+ }
+ }
}
Modified: trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/catalina/authenticator/LocalStrings.properties 2011-10-05 07:36:35 UTC (rev 1847)
+++ trunk/java/org/apache/catalina/authenticator/LocalStrings.properties 2011-10-11 15:29:56 UTC (rev 1848)
@@ -15,3 +15,5 @@
formAuthenticator.forwardErrorFail=Unexpected error forwarding to error page
formAuthenticator.forwardLoginFail=Unexpected error forwarding to login page
+
+digestAuthenticator.cacheRemove=A valid entry has been removed from client nonce cache to make room for new entries. A replay attack is now possible. To prevent the possibility of replay attacks, reduce nonceValidity or increase cnonceCacheSize. Further warnings of this type will be suppressed for 5 minutes
Modified: trunk/java/org/apache/catalina/realm/RealmBase.java
===================================================================
--- trunk/java/org/apache/catalina/realm/RealmBase.java 2011-10-05 07:36:35 UTC (rev 1847)
+++ trunk/java/org/apache/catalina/realm/RealmBase.java 2011-10-11 15:29:56 UTC (rev 1848)
@@ -370,8 +370,13 @@
String md5a1 = getDigest(username, realm);
if (md5a1 == null)
return null;
- String serverDigestValue = md5a1 + ":" + nOnce + ":" + nc + ":"
- + cnonce + ":" + qop + ":" + md5a2;
+ String serverDigestValue;
+ if (qop == null) {
+ serverDigestValue = md5a1 + ":" + nOnce + ":" + md5a2;
+ } else {
+ serverDigestValue = md5a1 + ":" + nOnce + ":" + nc + ":" +
+ cnonce + ":" + qop + ":" + md5a2;
+ }
byte[] valueBytes = null;
if(getDigestEncoding() == null) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2011-10-05 07:36:35 UTC (rev 1847)
+++ trunk/webapps/docs/changelog.xml 2011-10-11 15:29:56 UTC (rev 1848)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.3.Final (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Improve DIGEST authentication security. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.2.Final (remm)">
<subsection name="Catalina">
<changelog>
14 years, 1 month
- 1
- 0
JBossWeb SVN: r1847 - trunk/java/org/apache/catalina/filters.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2011-10-05 03:36:35 -0400 (Wed, 05 Oct 2011)
New Revision: 1847
Modified:
trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
Log:
Port patch.
Modified: trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
===================================================================
--- trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java 2011-10-03 09:49:24 UTC (rev 1846)
+++ trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java 2011-10-05 07:36:35 UTC (rev 1847)
@@ -79,7 +79,7 @@
@Override
public void doFilterEvent(HttpEvent event, HttpEventFilterChain chain)
throws IOException, ServletException {
- processCometEvent(event.getHttpServletRequest().getRemoteHost(),
+ processCometEvent(event.getHttpServletRequest().getRemoteAddr(),
event, chain);
}
14 years, 1 month
- 1
- 0
JBossWeb SVN: r1846 - in branches/3.0.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-10-03 05:49:24 -0400 (Mon, 03 Oct 2011)
New Revision: 1846
Modified:
branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java
branches/3.0.x/webapps/docs/changelog.xml
Log:
Fix for JBWEB-201
Modified: branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java
===================================================================
--- branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2011-10-03 08:03:55 UTC (rev 1845)
+++ branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2011-10-03 09:49:24 UTC (rev 1846)
@@ -425,7 +425,7 @@
// Error flag
error = false;
- boolean openSocket = true;
+ boolean openSocket = false;
boolean keptAlive = false;
while (!error && !event) {
@@ -437,7 +437,7 @@
// This means that no data is available right now
// (long keepalive), so that the processor should be recycled
// and the method should return true
- rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
+ openSocket = true;
// Add the socket to the poller
endpoint.getPoller().add(socket);
break;
@@ -533,7 +533,7 @@
}
} else {
recycle();
- return SocketState.CLOSED;
+ return (openSocket) ? SocketState.OPEN : SocketState.CLOSED;
}
}
Modified: branches/3.0.x/webapps/docs/changelog.xml
===================================================================
--- branches/3.0.x/webapps/docs/changelog.xml 2011-10-03 08:03:55 UTC (rev 1845)
+++ branches/3.0.x/webapps/docs/changelog.xml 2011-10-03 09:49:24 UTC (rev 1846)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 3.0.0.CR3 (jfclere)">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <jira>JBWEB-201</jira>JBoss Web Native causes JVM crash with AJP. (jfclere/remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 3.0.0.CR2 (jfclere)">
<subsection name="Catalina">
<changelog>
14 years, 1 month
- 1
- 0