UNDERTOW-400 AJP attributes are not set in HttpRequest

undertow-io · Mar 3, 2015 · 8c5bfa5 · 8c5bfa5
1 parent 350e533
commit 8c5bfa5
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 15 deletions.
diff --git a/core/src/main/java/io/undertow/server/HttpServerExchange.java b/core/src/main/java/io/undertow/server/HttpServerExchange.java
@@ -100,6 +100,11 @@ public final class HttpServerExchange extends AbstractAttachable {
      */
     static final AttachmentKey<Pooled<ByteBuffer>[]> BUFFERED_REQUEST_DATA = AttachmentKey.create(Pooled[].class);
 
+    /**
+     * Attachment key that can be used to hold additional request attributes
+     */
+    public static final AttachmentKey<Map<String, String>> REQUEST_ATTRIBUTES = AttachmentKey.create(Map.class);
+
     private final ServerConnection connection;
     private final HeaderMap requestHeaders;
     private final HeaderMap responseHeaders;

diff --git a/core/src/main/java/io/undertow/server/protocol/ajp/AjpReadListener.java b/core/src/main/java/io/undertow/server/protocol/ajp/AjpReadListener.java
@@ -218,6 +218,9 @@ public void handleEvent(AjpServerResponseConduit channel) {
                 if(scheme != null) {
                     httpServerExchange.setRequestScheme(scheme);
                 }
+                if(state.attributes != null) {
+                    httpServerExchange.putAttachment(HttpServerExchange.REQUEST_ATTRIBUTES, state.attributes);
+                }
                 state = null;
                 this.httpServerExchange = null;
                 httpServerExchange.setPersistent(true);

diff --git a/core/src/main/java/io/undertow/server/protocol/ajp/AjpRequestParseState.java b/core/src/main/java/io/undertow/server/protocol/ajp/AjpRequestParseState.java
@@ -23,7 +23,6 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.security.cert.CertificateException;
-import java.util.HashMap;
 import java.util.Map;
 
 import io.undertow.server.BasicSSLSessionInfo;
@@ -51,7 +50,6 @@ class AjpRequestParseState {
     public static final int READING_HEADERS = 13;
     public static final int READING_ATTRIBUTES = 14;
     public static final int DONE = 15;
-    public static final String AJP_REMOTE_PORT = "AJP_REMOTE_PORT";
 
     int state;
 
@@ -66,9 +64,10 @@ class AjpRequestParseState {
     String currentAttribute;
 
     //TODO: can there be more than one attribute?
-    Map<String, String> attributes = new HashMap<>();
+    Map<String, String> attributes;
 
     String remoteAddress;
+    int remotePort = -1;
     int serverPort = 80;
     String serverAddress;
 
@@ -91,6 +90,10 @@ class AjpRequestParseState {
 
     boolean containsUrlCharacters = false;
     public int readHeaders = 0;
+    public String sslSessionId;
+    public String sslCipher;
+    public String sslCert;
+    public String sslKeySize;
 
     public void reset() {
         stringLength = -1;
@@ -103,9 +106,9 @@ public boolean isComplete() {
     }
 
     BasicSSLSessionInfo createSslSessionInfo() {
-        String sessionId = attributes.get(AjpRequestParser.SSL_SESSION);
+        String sessionId = sslSessionId;
-        String cypher = attributes.get(AjpRequestParser.SSL_CIPHER);
+        String cypher = sslCipher;
-        String cert = attributes.get(AjpRequestParser.SSL_CERT);
+        String cert = sslCert;
         if (cert == null && sessionId == null) {
             return null;
         }
@@ -122,14 +125,7 @@ InetSocketAddress createPeerAddress() {
         if (remoteAddress == null) {
             return null;
         }
-        String portString = attributes.get(AJP_REMOTE_PORT);
+        int port = remotePort > 0 ? remotePort : 0;
-        int port = 0;
-        if (portString != null) {
-            try {
-                port = Integer.parseInt(portString);
-            } catch (IllegalArgumentException e) {
-            }
-        }
         try {
             InetAddress address = InetAddress.getByName(remoteAddress);
             return new InetSocketAddress(address, port);

diff --git a/core/src/main/java/io/undertow/server/protocol/ajp/AjpRequestParser.java b/core/src/main/java/io/undertow/server/protocol/ajp/AjpRequestParser.java
@@ -50,6 +50,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.ByteBuffer;
+import java.util.TreeMap;
 
 import io.undertow.security.impl.ExternalAuthenticationMechanism;
 import io.undertow.server.HttpServerExchange;
@@ -103,6 +104,8 @@ public class AjpRequestParser {
 
     public static final String STORED_METHOD = "stored_method";
 
+    public static final String AJP_REMOTE_PORT = "AJP_REMOTE_PORT";
+
     static {
         HTTP_METHODS = new HttpString[28];
         HTTP_METHODS[1] = OPTIONS;
@@ -391,8 +394,21 @@ public void parse(final ByteBuffer buf, final AjpRequestParseState state, final
                         exchange.putAttachment(ExternalAuthenticationMechanism.EXTERNAL_AUTHENTICATION_TYPE, result);
                     } else if (state.currentAttribute.equals(STORED_METHOD)) {
                         exchange.setRequestMethod(new HttpString(result));
-                    } else {
+                    } else if (state.currentAttribute.equals(AJP_REMOTE_PORT)) {
+                        state.remotePort = Integer.parseInt(result);
+                    } else if (state.currentAttribute.equals(SSL_SESSION)) {
+                        state.sslSessionId = result;
+                    } else if (state.currentAttribute.equals(SSL_CIPHER)) {
+                        state.sslCipher = result;
+                    } else if (state.currentAttribute.equals(SSL_CERT)) {
+                        state.sslCert = result;
+                    } else if (state.currentAttribute.equals(SSL_KEY_SIZE)) {
+                        state.sslKeySize = result;
+                    }  else {
                         //other attributes
+                        if(state.attributes == null) {
+                            state.attributes = new TreeMap<>();
+                        }
                         state.attributes.put(state.currentAttribute, result);
                     }
                     state.currentAttribute = null;

diff --git a/servlet/src/main/java/io/undertow/servlet/handlers/ServletInitialHandler.java b/servlet/src/main/java/io/undertow/servlet/handlers/ServletInitialHandler.java
@@ -67,6 +67,7 @@
 import java.nio.ByteBuffer;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
+import java.util.Map;
 import java.util.concurrent.Executor;
 
 /**
@@ -256,6 +257,15 @@ public void handleFirstRequest(final HttpServerExchange exchange, final ServletC
 
         ThreadSetupAction.Handle handle = setupAction.setup(exchange);
         try {
+            //set request attributes from the connector
+            //generally this is only applicable if apache is sending AJP_ prefixed environment variables
+            Map<String, String> attrs = exchange.getAttachment(HttpServerExchange.REQUEST_ATTRIBUTES);
+            if(attrs != null) {
+                for(Map.Entry<String, String> entry : attrs.entrySet()) {
+                    request.setAttribute(entry.getKey(), entry.getValue());
+                }
+            }
+
             SecurityActions.setCurrentRequestContext(servletRequestContext);
             servletRequestContext.setRunningInsideHandler(true);
             try {