Merge pull request #2512 from slovdahl/copy-secure-property-from-JSR356-session

Copy `isSecure()` property from JSR356 `Session`

Author: jfarcand

modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java

@@ -248,6 +248,7 @@ public void onOpen(Session session, final EndpointConfig endpointConfig) {
                     .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)
+                    .isSSecure(session.isSecure())
                     .build()
                     .queryString(session.getQueryString());
 

modules/cpr/src/test/java/org/atmosphere/container/version/JSR356WebSocketTest.java

@@ -55,6 +55,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 public class JSR356WebSocketTest {
 
@@ -220,6 +221,57 @@ public void testOnOpenWithNullHandshakeSession() throws IOException {
         endpoint.onOpen(mockSession, mockConfig);
 
         verify(mockSession, never()).close(Mockito.any());
+    }
+
+    @Test
+    public void testSecureRequestPropertyPropagated() throws NoSuchFieldException, IllegalAccessException {
+        Session mockSession = Mockito.mock(Session.class);
+        HttpSession mockHttpSession = mock(HttpSession.class);
+        HandshakeRequest mockHandshakeRequest = Mockito.mock(HandshakeRequest.class);
+        ServerEndpointConfig mockConfig = Mockito.mock(ServerEndpointConfig.class);
+        WebSocketProcessor mockProcessor = Mockito.mock(WebSocketProcessor.class);
+        RemoteEndpoint.Async mockAsyncRemote = Mockito.mock(RemoteEndpoint.Async.class);
+
+        AtmosphereFramework mockFramework = mock(AtmosphereFramework.class);
+        AtmosphereConfig mockAtmosphereConfig = mock(AtmosphereConfig.class);
+
+        when(mockProcessor.handshake(Mockito.any(AtmosphereRequest.class))).thenReturn(true);
+        when(mockFramework.getAtmosphereConfig()).thenReturn(mockAtmosphereConfig);
+        when(mockFramework.getServletContext()).thenReturn(mock(ServletContext.class));
+        when(mockAtmosphereConfig.getInitParameter(JSR356_MAPPING_PATH)).thenReturn("/");
+        when(mockAtmosphereConfig.getServletContext()).thenReturn(mock(ServletContext.class));
+        when(mockFramework.getAtmosphereConfig()).thenReturn(mockAtmosphereConfig);
+        when(mockFramework.getServletContext()).thenReturn(mock(ServletContext.class));
+        when(mockAtmosphereConfig.getInitParameter(JSR356_MAPPING_PATH)).thenReturn("/");
+        when(mockAtmosphereConfig.getServletContext()).thenReturn(mock(ServletContext.class));
+
+        Map<String, Object> sessionAttributes = new HashMap<>();
+        sessionAttributes.put("attribute1", "value1");
+        sessionAttributes.put("attribute2", "value2");
+
+        when(mockHandshakeRequest.getHttpSession()).thenReturn(mockHttpSession);
+        when(mockHttpSession.getAttributeNames()).thenReturn(new Vector<>(sessionAttributes.keySet()).elements());
+        when(mockHttpSession.getAttribute("attribute1")).thenReturn(sessionAttributes.get("attribute1"));
+        when(mockHttpSession.getAttribute("attribute2")).thenReturn(sessionAttributes.get("attribute2"));
+
+        JSR356Endpoint endpoint = new JSR356Endpoint(mockFramework, mockProcessor);
+
+        when(mockSession.getAsyncRemote()).thenReturn(mockAsyncRemote);
+        when(mockSession.isOpen()).thenReturn(true);
+        when(mockSession.getRequestURI()).thenReturn(URI.create("/"));
+        when(mockSession.isSecure()).thenReturn(true);
+
+        when(mockHandshakeRequest.getHttpSession()).thenReturn(mockHttpSession);
+        when(mockHandshakeRequest.getHeaders()).thenReturn(Collections.emptyMap());
+
+        endpoint.handshakeRequest(mockHandshakeRequest);
+
+        endpoint.onOpen(mockSession, mockConfig);
+
+        Field requestField = JSR356Endpoint.class.getDeclaredField("request");
+        requestField.setAccessible(true);
+        AtmosphereRequest request = (AtmosphereRequest) requestField.get(endpoint);
 
+        assertTrue(request.isSecure());
     }
-}
+}