JSR356Endpoint dropping custom attributes on the HTTP request about atmosphere HOT 8 CLOSED

@amy-b-cheng Can you share an app or a test case on github?

from atmosphere.

@jfarcand Hi Jeanfrancois, it's going to take me some time to assemble a testcase since I'm unable to share my application with you. But in the meantime here are some code examples of what I'm talking about, for your clarity.

Here's JSR356Endpoint.java not setting the local attribute:

Here's an example where ProtocolUtil uses the same AtmosphereRequestImpl.Builder but copies the attributes over:

If you were to use AtmosphereRequestImpl#wrap, it would take into account the local attributes:
https://github.com/Atmosphere/atmosphere/blob/atmosphere-2.7.x/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereRequestImpl.java#L1409C1-L1423C6

Let me know if that helps you or if you still need a test case to understand this issue.

from atmosphere.

wow, thanks @amy-b-cheng , I have the same issue with Tomcat, I've spent hours on this. indeed the attributes are not copied over. I'll test locally and send a PR if it works out

from atmosphere.

@vaslabs That would be perfect if you can start a PR. I will look at it and integrate/release ASAP.

from atmosphere.

hello, thanks @jfarcand for your response.

It looks to me that there's no way to get the request attributes in the JSR356 implementation, as the HandshakeRequest doesn't require them . For my case tomcat's WsHandshakeRequest doesn't use them as they are of course not required by HandshakeRequest.

So, it seems not possible for servlet filters to add attributes to the HttpServletRequest right now and the only solution I can see is setting Session attributes instead.

This doesn't seem to be a problem for atmosphere but the way javax.websocket.server.HandshakeRequest is defined, it doesn't concern itself with request attributes.

from atmosphere.

@vaslabs are the attributes not in the HandshakeRequest#getHttpSession? I'm trying to see right now if copying over those will fix my problem

i.e.

index 425e5422c..75800de4a 100644
--- a/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java
+++ b/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java
@@ -43,12 +43,14 @@ import java.net.InetSocketAddress;
 import java.net.URI;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static org.atmosphere.cpr.ApplicationConfig.ALLOW_QUERYSTRING_AS_REQUEST;
 
@@ -224,6 +226,13 @@ public class JSR356Endpoint extends Endpoint {
                     cookies.addAll(CookieUtil.ServerCookieDecoder.STRICT.decode(cookieHeader));
             }
 
+            final Enumeration<String> attributeNames = handshakeSession.getAttributeNames();
+            final Map<String, Object> attributes = new ConcurrentHashMap<>();
+            while (attributeNames.hasMoreElements()) {
+                String attributeName = attributeNames.nextElement();
+                attributes.put(attributeName, handshakeSession.getAttribute(attributeName));
+            }
+
             request = new AtmosphereRequestImpl.Builder()
                     .requestURI(uri.getPath())
                     .requestURL(requestURL)
@@ -237,6 +246,7 @@ public class JSR356Endpoint extends Endpoint {
                     .userPrincipal(session.getUserPrincipal())
                     .remoteInetSocketAddress((Callable<InetSocketAddress>) () -> (InetSocketAddress) endpointConfig.getUserProperties().get(JAVAX_WEBSOCKET_ENDPOINT_REMOTE_ADDRESS))
                     .localInetSocketAddress((Callable<InetSocketAddress>) () -> (InetSocketAddress) endpointConfig.getUserProperties().get(JAVAX_WEBSOCKET_ENDPOINT_LOCAL_ADDRESS))
+                    .attributes(attributes)
                     .build()
                     .queryString(session.getQueryString());```

from atmosphere.

Yes, the above code is copying the handshakeSession attributes to the AtmosphereRequestImpl. With this change + if inside my ServletFilter I set my custom attributes (which were previously going on the HTTP request) to now go on the session itself, I'm able to read the attributes off the AtmosphereResource downstream.

@jfarcand should I open a pull request?

from atmosphere.

@amy-b-cheng Yes, will take a look!

from atmosphere.