X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.ext.equinox.jetty%2Fsrc%2Forg%2Fargeo%2Fequinox%2Fjetty%2FWebSocketJettyCustomizer.java;h=f582a43bc404810c6a64ba4e7e60edc03a6f52a7;hb=681290ba6cddc797e8a955d06d40c054b47e2ab2;hp=83934537c364a99e08d6304d35d4244e03d53b08;hpb=8d69d13b486f10aed4aeb37ed8617a908ce98f5f;p=lgpl%2Fargeo-commons.git

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 83934537c..f582a43bc 100644
--- 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,29 +1,15 @@
 package org.argeo.equinox.jetty;
 
-import java.net.HttpCookie;
-import java.util.Collection;
 import java.util.Dictionary;
-import java.util.List;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
 
-import org.argeo.cms.auth.CmsSession;
 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.api.UpgradeResponse;
-import org.eclipse.jetty.websocket.common.WebSocketSession;
-import org.eclipse.jetty.websocket.common.WebSocketSessionListener;
-import org.eclipse.jetty.websocket.jsr356.JsrSession;
 import org.eclipse.jetty.websocket.jsr356.server.ServerContainer;
 import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.http.HttpContext;
-import org.osgi.service.useradmin.Authorization;
 
 public class WebSocketJettyCustomizer extends JettyCustomizer {
 	private BundleContext bc = FrameworkUtil.getBundle(WebSocketJettyCustomizer.class).getBundleContext();
@@ -32,38 +18,6 @@ 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);
 	}
 
@@ -81,116 +35,61 @@ public class WebSocketJettyCustomizer extends JettyCustomizer {
 			ServerContainer serverContainer;
 			try {
 				serverContainer = WebSocketServerContainerInitializer.configureContext(servletContextHandler);
-				serverContainer.addSessionListener(new WebSocketSessionListener() {
-
-					@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);
-						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;
+//				serverContainer.addSessionListener(new WebSocketSessionListener() {
+//
+//					@Override
+//					public void onSessionOpened(WebSocketSession session) {
+//						UpgradeRequest upgradeRequest = session.getUpgradeRequest();
+//						UpgradeResponse upgradeResponse = session.getUpgradeResponse();
+//						List<String> acceptHeader = upgradeResponse.getHeaders("Sec-WebSocket-Accept");
+//						if (acceptHeader.contains("no"))
 //							try {
-//								session.getUpgradeResponse().sendForbidden("Web Sockets must always be authenticated.");
+//								upgradeResponse.sendForbidden("FORBIDDEN");
+//								return;
 //							} catch (IOException e) {
+//								// TODO Auto-generated catch block
 //								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
-					public void onSessionClosed(WebSocketSession session) {
-						// TODO Auto-generated method stub
-
-					}
-				});
+//						List<HttpCookie> cookies = upgradeRequest.getCookies();
+//
+//						System.out.println("Upgrade request cookies : " + cookies);
+//						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);
+//							}
+//						}
+//					}
+//
+//					@Override
+//					public void onSessionClosed(WebSocketSession session) {
+//					}
+//				});
 			} catch (ServletException e) {
 				throw new IllegalStateException("Cannot configure web sockets", e);
 			}
 			bc.registerService(javax.websocket.server.ServerContainer.class, serverContainer, null);
-//			ServiceTracker<ServerEndpointConfig.Builder, ServerEndpointConfig.Builder> endpointsTracker = new ServiceTracker<ServerEndpointConfig.Builder, ServerEndpointConfig.Builder>(
-//					bc, ServerEndpointConfig.Builder.class, null) {
-//
-//				@Override
-//				public ServerEndpointConfig.Builder addingService(
-//						ServiceReference<ServerEndpointConfig.Builder> reference) {
-//
-//					ServerEndpointConfig.Builder serverEndpointConfig = super.addingService(reference);
-//					try {
-//						serverContainer.addEndpoint(serverEndpointConfig.build());
-//					} catch (DeploymentException e) {
-//						throw new IllegalArgumentException("Cannot add end point " + reference, e);
-//					}
-//					return serverEndpointConfig;
-//				}
-//			};
-//			endpointsTracker.open();
-			// TODO log it properly
-			// TODO close itproperly
 		}
 
 	}
-
-	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;
-		}
-	}
-
 }