Simplify Jetty Web Socket customization

[lgpl/argeo-commons.git] / org.argeo.ext.equinox.jetty / src / org / argeo / equinox / jetty / WebSocketJettyCustomizer.java

diff --git a/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/WebSocketJettyCustomizer.java b/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/WebSocketJettyCustomizer.java
index e59bbc0121e7833441864a2db840e1722d034452..31d62c80be22ea61c337a5dfa0d6bebf18792b5b 100644 (file)
--- a/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/WebSocketJettyCustomizer.java
+++ b/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/WebSocketJettyCustomizer.java
@@ -1,17 +1,11 @@
 package org.argeo.equinox.jetty;
 
-import java.net.HttpCookie;
 import java.util.Dictionary;
-import java.util.List;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
 
 import org.eclipse.equinox.http.jetty.JettyCustomizer;
 import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.websocket.api.UpgradeRequest;
-import org.eclipse.jetty.websocket.common.WebSocketSession;
-import org.eclipse.jetty.websocket.common.WebSocketSessionListener;
 import org.eclipse.jetty.websocket.jsr356.server.ServerContainer;
 import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
 import org.osgi.framework.BundleContext;
@@ -24,6 +18,38 @@ public class WebSocketJettyCustomizer extends JettyCustomizer {
        public Object customizeContext(Object context, Dictionary<String, ?> settings) {
                ServletContextHandler servletContextHandler = (ServletContextHandler) context;
                new WebSocketInit(servletContextHandler).start();
+//             servletContextHandler.addFilter(new FilterHolder(new Filter() {
+//
+//                     @Override
+//                     public void init(FilterConfig filterConfig) throws ServletException {
+//                             // TODO Auto-generated method stub
+//
+//                     }
+//
+//                     @Override
+//                     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+//                                     throws IOException, ServletException {
+//                             HttpServletRequest httpRequest = (HttpServletRequest) request;
+//                             HttpServletResponse httpResponse = (HttpServletResponse) response;
+//
+//                             HttpRequestCallbackHandler callbackHandler = new HttpRequestCallbackHandler(httpRequest, httpResponse);
+//                             try {
+//                                     LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, callbackHandler);
+//                                     lc.login();
+//
+//                                     chain.doFilter(httpRequest, httpResponse);
+//                             } catch (LoginException e) {
+//                                     httpResponse.setStatus(403);
+//                             }
+//
+//                     }
+//
+//                     @Override
+//                     public void destroy() {
+//                             // TODO Auto-generated method stub
+//
+//                     }
+//             }), "/vje/events", EnumSet.of(DispatcherType.REQUEST));
                return super.customizeContext(context, settings);
        }
 
@@ -46,10 +72,57 @@ public class WebSocketJettyCustomizer extends JettyCustomizer {
 //                                     @Override
 //                                     public void onSessionOpened(WebSocketSession session) {
 //                                             UpgradeRequest upgradeRequest = session.getUpgradeRequest();
+//                                             UpgradeResponse upgradeResponse = session.getUpgradeResponse();
 //                                             List<HttpCookie> cookies = upgradeRequest.getCookies();
+//
 //                                             System.out.println("Upgrade request cookies : " + cookies);
-//                                             HttpSession httpSession = (HttpSession) upgradeRequest.getSession();
-//                                             System.out.println("Upgrade request session ID : " + httpSession.getId());
+//                                             String httpSessionId = null;
+//                                             if (cookies != null) {
+//                                                     for (HttpCookie cookie : cookies) {
+//                                                             if (cookie.getName().equals("JSESSIONID")) {
+//                                                                     httpSessionId = cookie.getValue();
+//                                                             }
+//                                                     }
+//                                             }
+//
+//                                             if (httpSessionId == null) {
+//                                                     HttpSession httpSession = (HttpSession) upgradeRequest.getSession();
+//                                                     if (httpSession == null) {
+////                                                   session.disconnect();
+////                                                   return;
+//                                                     } else {
+//                                                             httpSessionId = httpSession.getId();
+//                                                             System.out.println("Upgrade request session ID : " + httpSession.getId());
+//                                                     }
+//                                             }
+//
+//                                             if (httpSessionId != null) {
+//                                                     int dotIdx = httpSessionId.lastIndexOf('.');
+//                                                     if (dotIdx > 0) {
+//                                                             httpSessionId = httpSessionId.substring(0, dotIdx);
+//                                                     }
+//                                             }
+//
+//                                             CmsSession cmsSession = getCmsSession(httpSessionId);
+//                                             if (cmsSession == null) {
+////                                                   session.disconnect();
+////                                                   return;
+//
+////                                                   try {
+////                                                           session.getUpgradeResponse().sendForbidden("Web Sockets must always be authenticated.");
+////                                                   } catch (IOException e) {
+////                                                           e.printStackTrace();
+////                                                   }
+//                                             } else {
+//                                                     JsrSession jsrSession = (JsrSession) session;
+//                                                     String jsrId = jsrSession.getId();
+//                                                     System.out.println("JSR ID: " + jsrId);
+//                                                     jsrSession.getUserProperties().put(CmsSession.SESSION_LOCAL_ID, cmsSession.getLocalId());
+//                                                     jsrSession.getUserProperties().put(CmsSession.SESSION_UUID, cmsSession.getUuid());
+//                                                     jsrSession.getUserProperties().put(HttpContext.REMOTE_USER, cmsSession.getUserDn());
+//                                                     // httpSession.setAttribute(HttpContext.AUTHORIZATION,
+//                                                     // cmsSession.getAuthorization());
+//                                             }
 //                                     }
 //
 //                                     @Override
@@ -85,4 +158,26 @@ public class WebSocketJettyCustomizer extends JettyCustomizer {
 
        }
 
+//     private CmsSession getCmsSession(String httpSessionId) {
+//             if (httpSessionId == null)
+//                     return null;
+//
+//             Collection<ServiceReference<CmsSession>> sr;
+//             try {
+//                     sr = bc.getServiceReferences(CmsSession.class,
+//                                     "(" + CmsSession.SESSION_LOCAL_ID + "=" + httpSessionId + ")");
+//             } catch (InvalidSyntaxException e) {
+//                     throw new IllegalStateException("Cannot get CMS session for id " + httpSessionId, e);
+//             }
+//             if (sr.size() == 1) {
+//                     CmsSession cmsSession = bc.getService(sr.iterator().next());
+//                     Authorization authorization = cmsSession.getAuthorization();
+//                     if (authorization.getName() == null)
+//                             return null;// anonymous is not sufficient
+//                     return cmsSession;
+//             } else {
+//                     return null;
+//             }
+//     }
+
 }