December 2010 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r1627 - branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-12-21 00:18:05 -0500 (Tue, 21 Dec 2010) New Revision: 1627 Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESupport.java Log: Fix ConcurrentModificationException in HandshakeCompletedNotify-Thread for [JBPAPP-5637]. Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2010-12-21 05:03:13 UTC (rev 1626) +++ branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2010-12-21 05:18:05 UTC (rev 1627) @@ -51,6 +51,7 @@ import javax.net.ssl.SSLException; import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; +import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.TrustManager; @@ -152,40 +153,24 @@ SSLSocket asock = null; try { asock = (SSLSocket)socket.accept(); - if (!allowUnsafeLegacyRenegotiation) { - asock.addHandshakeCompletedListener( - new DisableSslRenegotiation()); - } - configureClientAuth(asock); } catch (SSLException e){ throw new SocketException("SSL handshake error" + e.toString()); } return asock; } - private static class DisableSslRenegotiation - implements HandshakeCompletedListener { - private volatile boolean completed = false; + public void handshake(Socket sock) throws IOException { + // We do getSession instead of startHandshake() so we can call this multiple times + SSLSession session = ((SSLSocket)sock).getSession(); + if (session.getCipherSuite().equals("SSL_NULL_WITH_NULL_NULL")) + throw new IOException("SSL handshake failed. Ciper suite in SSL Session is SSL_NULL_WITH_NULL_NULL"); - public void handshakeCompleted(HandshakeCompletedEvent event) { - if (completed) { - try { - log.warn("SSL renegotiation is disabled, closing connection"); - event.getSession().invalidate(); - event.getSocket().close(); - } catch (IOException e) { - // ignore - } - } - completed = true; + if (!allowUnsafeLegacyRenegotiation) { + // Prevent futher handshakes by removing all cipher suites + ((SSLSocket) sock).setEnabledCipherSuites(new String[0]); } } - - public void handshake(Socket sock) throws IOException { - ((SSLSocket)sock).startHandshake(); - } - /* * Determines the SSL cipher suites to be enabled. * Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESupport.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESupport.java 2010-12-21 05:03:13 UTC (rev 1626) +++ branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/src/share/classes/org/apache/tomcat/util/net/jsse/JSSESupport.java 2010-12-21 05:18:05 UTC (rev 1627) @@ -148,6 +148,15 @@ ssl.setNeedClientAuth(true); } + if (ssl.getEnabledCipherSuites().length == 0) { + // Handshake is never going to be successful. + // Assume this is because handshakes are disabled + log.warn("SSL server initiated renegotiation is disabled, closing connection"); + session.invalidate(); + ssl.close(); + return; + } + InputStream in = ssl.getInputStream(); int oldTimeout = ssl.getSoTimeout(); ssl.setSoTimeout(1000); @@ -170,10 +179,7 @@ break; } } - // If legacy re-negotiation is disabled, socked could be closed here - if (!ssl.isClosed()) { - ssl.setSoTimeout(oldTimeout); - } + ssl.setSoTimeout(oldTimeout); if (listener.completed == false) { throw new SocketException("SSL Cert handshake timeout"); }

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1626 - branches.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-12-21 00:03:13 -0500 (Tue, 21 Dec 2010) New Revision: 1626 Added: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637/ Log: Create JBPAPP-5637 patch branch from JBOSSWEB_2_0_0_GA_CP14 tag Copied: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5637 (from rev 1625, tags/JBOSSWEB_2_0_0_GA_CP14)

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1625 - in trunk: docs and 6 other directories.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-12-16 03:26:10 -0500 (Thu, 16 Dec 2010) New Revision: 1625 Added: trunk/docs/ trunk/docs/pom.xml trunk/docs/userguide/ trunk/docs/userguide/en/ trunk/docs/userguide/en/images/ trunk/docs/userguide/pom.xml trunk/docs/userguide/src/ trunk/docs/userguide/src/main/ trunk/docs/userguide/src/main/docbook/ trunk/docs/userguide/src/main/docbook/UserGuide.xml trunk/docs/userguide/src/main/docbook/User_Guide.ent trunk/docs/userguide/src/main/docbook/general/ trunk/docs/userguide/src/main/docbook/general/intro.xml Log: Add a skeleton for the docs. Added: trunk/docs/pom.xml =================================================================== --- trunk/docs/pom.xml (rev 0) +++ trunk/docs/pom.xml 2010-12-16 08:26:10 UTC (rev 1625) @@ -0,0 +1,20 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>5</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>org.jboss.web-docs</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Jbossweb Docs</name> + <url>http://jboss.org/jboss_web_docs</url> + <description>JbossWeb Documentation</description> + + <modules> + <module>userguide</module> + </modules> +</project> Added: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml (rev 0) +++ trunk/docs/userguide/pom.xml 2010-12-16 08:26:10 UTC (rev 1625) @@ -0,0 +1,80 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>4</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>User-Guide-${translation}</artifactId> + <packaging>jdocbook</packaging> + <name>User Guide (${translation})</name> + + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.2</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>UserGuide.xml</sourceDocumentName> + <imageResource> + <directory>${basedir}/en</directory> + <includes> + <include>images/**/*</include> + </includes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>JbossWeb-UserGuide.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>eclipse</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + </options> + </configuration> + </plugin> + </plugins> + </build> + + <properties> + <translation>en</translation> + </properties> +</project> Added: trunk/docs/userguide/src/main/docbook/UserGuide.xml =================================================================== --- trunk/docs/userguide/src/main/docbook/UserGuide.xml (rev 0) +++ trunk/docs/userguide/src/main/docbook/UserGuide.xml 2010-12-16 08:26:10 UTC (rev 1625) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> +<book> + <title>JBossWeb Documentation</title> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="general/intro.xml" /> +</book> Added: trunk/docs/userguide/src/main/docbook/User_Guide.ent =================================================================== --- trunk/docs/userguide/src/main/docbook/User_Guide.ent (rev 0) +++ trunk/docs/userguide/src/main/docbook/User_Guide.ent 2010-12-16 08:26:10 UTC (rev 1625) @@ -0,0 +1,4 @@ +<!ENTITY PRODUCT "JBossWeb 7.0.x"> +<!ENTITY BOOKID "User Guide"> +<!ENTITY YEAR "2010"> +<!ENTITY HOLDER "Red Hat, Inc"> Added: trunk/docs/userguide/src/main/docbook/general/intro.xml =================================================================== --- trunk/docs/userguide/src/main/docbook/general/intro.xml (rev 0) +++ trunk/docs/userguide/src/main/docbook/general/intro.xml 2010-12-16 08:26:10 UTC (rev 1625) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" +"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % BOOK_ENTITIES SYSTEM "../User_Guide.ent"> +%BOOK_ENTITIES; +]> +<chapter id="Intro"> + <title>Overview</title> + + <para> TODO :-( + </para> + +</chapter>

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1624 - in trunk/java/org/apache: naming/resources and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-12-14 05:43:54 -0500 (Tue, 14 Dec 2010) New Revision: 1624 Modified: trunk/java/org/apache/jasper/compiler/JspDocumentParser.java trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java Log: - Port exception cleanup. Modified: trunk/java/org/apache/jasper/compiler/JspDocumentParser.java =================================================================== --- trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 2010-12-13 13:18:09 UTC (rev 1623) +++ trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 2010-12-14 10:43:54 UTC (rev 1624) @@ -60,11 +60,6 @@ "http://xml.org/sax/properties/lexical-handler"; private static final String JSP_URI = "http://java.sun.com/JSP/Page"; - private static final EnableDTDValidationException ENABLE_DTD_VALIDATION_EXCEPTION = - new EnableDTDValidationException( - "jsp.error.enable_dtd_validation", - null); - private ParserController parserController; private JspCompilationContext ctxt; private PageInfo pageInfo; @@ -751,7 +746,7 @@ public void startDTD(String name, String publicId, String systemId) throws SAXException { if (!isValidating) { - fatalError(ENABLE_DTD_VALIDATION_EXCEPTION); + fatalError(new EnableDTDValidationException("jsp.error.enable_dtd_validation", null)); } inDTD = true; @@ -1450,6 +1445,11 @@ EnableDTDValidationException(String message, Locator loc) { super(message, loc); } + + public synchronized Throwable fillInStackTrace() { + // No stack trace + return this; + } } private static String getBodyType(Node.CustomTag custom) { Modified: trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java =================================================================== --- trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java 2010-12-13 13:18:09 UTC (rev 1623) +++ trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java 2010-12-14 10:43:54 UTC (rev 1624) @@ -37,4 +37,8 @@ public void setResolverName(Name name) {} public void setRootCause(Throwable e) {} + public synchronized Throwable fillInStackTrace() { + // No stack trace + return this; + } }

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1623 - in trunk: java/org/apache/catalina/session and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2010-12-13 08:18:09 -0500 (Mon, 13 Dec 2010) New Revision: 1623 Modified: trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java trunk/java/org/apache/catalina/session/ManagerBase.java trunk/webapps/docs/changelog.xml Log: - Also update SSO id generation. Modified: trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2010-12-10 04:35:45 UTC (rev 1622) +++ trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 2010-12-13 13:18:09 UTC (rev 1623) @@ -20,8 +20,6 @@ import java.io.IOException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.security.Principal; import java.text.SimpleDateFormat; import java.util.Date; @@ -47,6 +45,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.deploy.SecurityConstraint; +import org.apache.catalina.session.ManagerBase; import org.apache.catalina.util.DateTool; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; @@ -85,28 +84,13 @@ /** - * The default message digest algorithm to use if we cannot use - * the requested one. - */ - protected static final String DEFAULT_ALGORITHM = "MD5"; - - - /** * The number of random bytes to include when generating a * session identifier. */ - protected static final int SESSION_ID_BYTES = 16; + protected static final int SESSION_ID_BYTES = 18; /** - * The message digest algorithm to be used when generating session - * identifiers. This must be an algorithm supported by the - * <code>java.security.MessageDigest</code> class on your platform. - */ - protected String algorithm = DEFAULT_ALGORITHM; - - - /** * Should we cache authenticated Principals if the request is part of * an HTTP session? */ @@ -128,20 +112,6 @@ /** - * Return the MessageDigest implementation to be used when - * creating session identifiers. - */ - protected MessageDigest digest = null; - - - /** - * A String initialization parameter used to increase the entropy of - * the initialization of our random number generator. - */ - protected String entropy = null; - - - /** * Descriptive information about this implementation. */ protected static final String info = @@ -166,19 +136,6 @@ /** - * A random number generator to use when generating session identifiers. - */ - protected Random random = null; - - - /** - * The Java class name of the random number generator class to be used - * when generating session identifiers. - */ - protected String randomClass = "java.security.SecureRandom"; - - - /** * The string manager for this package. */ protected static final StringManager sm = @@ -210,28 +167,6 @@ /** - * Return the message digest algorithm for this Manager. - */ - public String getAlgorithm() { - - return (this.algorithm); - - } - - - /** - * Set the message digest algorithm for this Manager. - * - * @param algorithm The new message digest algorithm - */ - public void setAlgorithm(String algorithm) { - - this.algorithm = algorithm; - - } - - - /** * Return the cache authenticated Principals flag. */ public boolean getCache() { @@ -292,33 +227,6 @@ /** - * Return the entropy increaser value, or compute a semi-useful value - * if this String has not yet been set. - */ - public String getEntropy() { - - // Calculate a semi-useful value if this has not been set - if (this.entropy == null) - setEntropy(this.toString()); - - return (this.entropy); - - } - - - /** - * Set the entropy increaser value. - * - * @param entropy The new entropy increaser value - */ - public void setEntropy(String entropy) { - - this.entropy = entropy; - - } - - - /** * Return descriptive information about this Valve implementation. */ public String getInfo() { @@ -329,27 +237,6 @@ /** - * Return the random number generator class name. - */ - public String getRandomClass() { - - return (this.randomClass); - - } - - - /** - * Set the random number generator class name. - * - * @param randomClass The new random number generator class name - */ - public void setRandomClass(String randomClass) { - - this.randomClass = randomClass; - - } - - /** * Return the flag that states if we add headers to disable caching by * proxies. */ @@ -639,87 +526,18 @@ * Generate and return a new session identifier for the cookie that * identifies an SSO principal. */ - protected synchronized String generateSessionId() { + protected synchronized String generateSessionId(Random random) { - // Generate a byte array containing a session identifier - byte bytes[] = new byte[SESSION_ID_BYTES]; - getRandom().nextBytes(bytes); - bytes = getDigest().digest(bytes); + byte[] bytes = new byte[SESSION_ID_BYTES]; + random.nextBytes(bytes); + // Encode the result + char[] id = ManagerBase.encode(bytes); + return String.valueOf(id); - // Render the result as a String of hexadecimal digits - StringBuilder result = new StringBuilder(); - for (int i = 0; i < bytes.length; i++) { - byte b1 = (byte) ((bytes[i] & 0xf0) >> 4); - byte b2 = (byte) (bytes[i] & 0x0f); - if (b1 < 10) - result.append((char) ('0' + b1)); - else - result.append((char) ('A' + (b1 - 10))); - if (b2 < 10) - result.append((char) ('0' + b2)); - else - result.append((char) ('A' + (b2 - 10))); - } - return (result.toString()); - } /** - * Return the MessageDigest object to be used for calculating - * session identifiers. If none has been created yet, initialize - * one the first time this method is called. - */ - protected synchronized MessageDigest getDigest() { - - if (this.digest == null) { - try { - this.digest = MessageDigest.getInstance(algorithm); - } catch (NoSuchAlgorithmException e) { - try { - this.digest = MessageDigest.getInstance(DEFAULT_ALGORITHM); - } catch (NoSuchAlgorithmException f) { - this.digest = null; - } - } - } - - return (this.digest); - - } - - - /** - * Return the random number generator instance we should use for - * generating session identifiers. If there is no such generator - * currently defined, construct and seed a new one. - */ - protected synchronized Random getRandom() { - - if (this.random == null) { - // Calculate the new random number generator seed - long seed = System.nanoTime(); - char entropy[] = getEntropy().toCharArray(); - for (int i = 0; i < entropy.length; i++) { - long update = ((byte) entropy[i]) << ((i % 8) * 8); - seed ^= update; - } - // Construct and seed a new random number generator - try { - Class clazz = Class.forName(randomClass); - this.random = (Random) clazz.newInstance(); - } catch (Exception e) { - this.random = new java.util.Random(); - } - this.random.setSeed(seed); - } - - return (this.random); - - } - - - /** * Attempts reauthentication to the <code>Realm</code> using * the credentials included in argument <code>entry</code>. * @@ -813,7 +631,7 @@ String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE); if (ssoId == null) { // Construct a cookie to be returned to the client - ssoId = generateSessionId(); + ssoId = generateSessionId(request.getRandom()); Cookie cookie = new Cookie(Constants.SINGLE_SIGN_ON_COOKIE, ssoId); cookie.setMaxAge(-1); cookie.setPath("/"); Modified: trunk/java/org/apache/catalina/session/ManagerBase.java =================================================================== --- trunk/java/org/apache/catalina/session/ManagerBase.java 2010-12-10 04:35:45 UTC (rev 1622) +++ trunk/java/org/apache/catalina/session/ManagerBase.java 2010-12-13 13:18:09 UTC (rev 1623) @@ -613,7 +613,7 @@ * @param data The bytes you want to encode * @return the encoded String */ - protected static char[] encode(byte[] data) { + public static char[] encode(byte[] data) { char[] out = new char[((data.length + 2) / 3) * 4]; char[] alphabet = SESSION_ID_ALPHABET; // Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-12-10 04:35:45 UTC (rev 1622) +++ trunk/webapps/docs/changelog.xml 2010-12-13 13:18:09 UTC (rev 1623) @@ -26,7 +26,7 @@ <jira>189</jira>: Overlay timestamps need special treatment. (remm) </fix> <fix> - Improve session id creation. (remm) + Improve session id and SSO id creation. (remm) </fix> <fix> <bug>49779</bug>: Interaction between continue and FORM. (markt)

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1622 - branches/JBOSSWEB_2_0_0_GA_CP09_JBPAPP-5562/src/share/classes/org/apache/catalina/valves.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-12-09 23:35:45 -0500 (Thu, 09 Dec 2010) New Revision: 1622 Modified: branches/JBOSSWEB_2_0_0_GA_CP09_JBPAPP-5562/src/share/classes/org/apache/catalina/valves/AccessLogValve.java Log: Add thread name logging pattern to AccessLogValve capabilities for [JBPAPP-5562]. Modified: branches/JBOSSWEB_2_0_0_GA_CP09_JBPAPP-5562/src/share/classes/org/apache/catalina/valves/AccessLogValve.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP09_JBPAPP-5562/src/share/classes/org/apache/catalina/valves/AccessLogValve.java 2010-12-10 04:13:08 UTC (rev 1621) +++ branches/JBOSSWEB_2_0_0_GA_CP09_JBPAPP-5562/src/share/classes/org/apache/catalina/valves/AccessLogValve.java 2010-12-10 04:35:45 UTC (rev 1622) @@ -43,6 +43,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; +import org.apache.coyote.RequestInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -79,6 +80,7 @@ * <li>%v - Local server name * <li>%D - Time taken to process the request, in millis * <li>%T - Time taken to process the request, in seconds + * <li>%I - current Request thread name (can compare later with stacktraces) * </ul> * In addition, the caller can specify one of the following aliases for * commonly utilized patterns: @@ -868,6 +870,7 @@ .getString("accessLogValve.notStarted")); lifecycle.fireLifecycleEvent(STOP_EVENT, null); started = false; + close(); } @@ -881,6 +884,21 @@ } /** + * write thread name - %I + */ + protected class ThreadNameElement implements AccessLogElement { + public void addElement(StringBuffer buf, Date date, Request request, + Response response, long time) { + RequestInfo info = request.getCoyoteRequest().getRequestProcessor(); + if(info != null) { + buf.append(info.getWorkerThreadName()); + } else { + buf.append("-"); + } + } + } + + /** * write local IP address - %A */ protected class LocalAddrElement implements AccessLogElement { @@ -1401,6 +1419,8 @@ return new RequestURIElement(); case 'v': return new LocalServerNameElement(); + case 'I': + return new ThreadNameElement(); default: return new StringElement("???" + pattern + "???"); }

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1621 - branches.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-12-09 23:13:08 -0500 (Thu, 09 Dec 2010) New Revision: 1621 Added: branches/JBOSSWEB_2_0_0_GA_CP09_JBPAPP-5562/ Log: Create JBPAPP-5562 patch branch from JBOSSWEB_2_0_0_GA_CP09 tag Copied: branches/JBOSSWEB_2_0_0_GA_CP09_JBPAPP-5562 (from rev 1620, tags/JBOSSWEB_2_0_0_GA_CP09)

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1620 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/valves.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-12-09 23:01:43 -0500 (Thu, 09 Dec 2010) New Revision: 1620 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/valves/AccessLogValve.java Log: Add thread name logging pattern to AccessLogValve capabilities for [JBPAPP-5512]. Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/valves/AccessLogValve.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/valves/AccessLogValve.java 2010-12-09 19:52:14 UTC (rev 1619) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/valves/AccessLogValve.java 2010-12-10 04:01:43 UTC (rev 1620) @@ -43,6 +43,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; +import org.apache.coyote.RequestInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -79,6 +80,7 @@ * <li>%v - Local server name * <li>%D - Time taken to process the request, in millis * <li>%T - Time taken to process the request, in seconds + * <li>%I - current Request thread name (can compare later with stacktraces) * </ul> * In addition, the caller can specify one of the following aliases for * commonly utilized patterns: @@ -868,6 +870,7 @@ .getString("accessLogValve.notStarted")); lifecycle.fireLifecycleEvent(STOP_EVENT, null); started = false; + close(); } @@ -881,6 +884,21 @@ } /** + * write thread name - %I + */ + protected class ThreadNameElement implements AccessLogElement { + public void addElement(StringBuffer buf, Date date, Request request, + Response response, long time) { + RequestInfo info = request.getCoyoteRequest().getRequestProcessor(); + if(info != null) { + buf.append(info.getWorkerThreadName()); + } else { + buf.append("-"); + } + } + } + + /** * write local IP address - %A */ protected class LocalAddrElement implements AccessLogElement { @@ -1401,6 +1419,8 @@ return new RequestURIElement(); case 'v': return new LocalServerNameElement(); + case 'I': + return new ThreadNameElement(); default: return new StringElement("???" + pattern + "???"); }

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1619 - in branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina: core and 1 other directories.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-12-09 14:52:14 -0500 (Thu, 09 Dec 2010) New Revision: 1619 Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/connector/Response.java branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/core/StandardHostValve.java branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/session/StandardSession.java Log: Session attribute NullPointerException checks and allow extra response headers to be sent with a custom error page for [JBPAPP-5560]. Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/connector/Response.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/connector/Response.java 2010-12-09 19:00:06 UTC (rev 1618) +++ branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/connector/Response.java 2010-12-09 19:52:14 UTC (rev 1619) @@ -675,6 +675,30 @@ /** + * Reset the data buffer and the using Writer/Stream flags but not any + * status or header information. + * + * @param resetWriterStreamFlags <code>true</code> if the internal + * <code>usingWriter</code>, <code>usingOutputStream</code>, + * <code>isCharacterEncodingSet</code> flags should also be reset + * + * @exception IllegalStateException if the response has already + * been committed + */ + public void resetBuffer(boolean resetWriterStreamFlags) { + + resetBuffer(); + + if(resetWriterStreamFlags) { + usingOutputStream = false; + usingWriter = false; + isCharacterEncodingSet = false; + } + + } + + + /** * Set the buffer size to be used for this Response. * * @param size The new buffer size Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/core/StandardHostValve.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/core/StandardHostValve.java 2010-12-09 19:00:06 UTC (rev 1618) +++ branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/core/StandardHostValve.java 2010-12-09 19:52:14 UTC (rev 1619) @@ -368,7 +368,7 @@ if (exception == null) return (null); - Class clazz = exception.getClass(); + Class<?> clazz = exception.getClass(); String name = clazz.getName(); while (!Object.class.equals(clazz)) { ErrorPage errorPage = context.findErrorPage(name); @@ -406,15 +406,8 @@ try { - // Reset the response if possible (else IllegalStateException) - //hres.reset(); // Reset the response (keeping the real error code and message) - Integer statusCodeObj = - (Integer) request.getAttribute(Globals.STATUS_CODE_ATTR); - int statusCode = statusCodeObj.intValue(); - String message = - (String) request.getAttribute(Globals.ERROR_MESSAGE_ATTR); - response.reset(statusCode, message); + response.resetBuffer(true); // Forward control to the specified location ServletContext servletContext = Modified: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/session/StandardSession.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/session/StandardSession.java 2010-12-09 19:00:06 UTC (rev 1618) +++ branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/src/share/classes/org/apache/catalina/session/StandardSession.java 2010-12-09 19:52:14 UTC (rev 1619) @@ -1032,6 +1032,10 @@ throw new IllegalStateException (sm.getString("standardSession.getAttribute.ise")); + if (name == null) { + return null; + } + return (attributes.get(name)); } @@ -1634,6 +1638,9 @@ */ protected void removeAttributeInternal(String name, boolean notify) { + // Avoid NPE + if (name == null) return; + // Remove this attribute from our collection Object value = attributes.remove(name);

13 years, 4 months

1
0
0 / 0

JBossWeb SVN: r1618 - branches.

by jbossweb-commits＠lists.jboss.org

Author: mmillson Date: 2010-12-09 14:00:06 -0500 (Thu, 09 Dec 2010) New Revision: 1618 Added: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560/ Log: Create JBPAPP-5560 patch branch from JBOSSWEB_2_0_0_GA_CP14 tag Copied: branches/JBOSSWEB_2_0_0_GA_CP14_JBPAPP-5560 (from rev 1617, tags/JBOSSWEB_2_0_0_GA_CP14)

13 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits December 2010