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=6c868875f2c4407b8a66f4f7b54e0bcead47fa7f;hpb=e189cb9175c4f220f98b0b663d12c4e5fac4dc4f;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 6c868875f..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
@@ -3,10 +3,10 @@ package org.argeo.equinox.jetty;
 import java.util.Dictionary;
 
 import javax.servlet.ServletException;
-import javax.websocket.server.ServerContainer;
 
 import org.eclipse.equinox.http.jetty.JettyCustomizer;
 import org.eclipse.jetty.servlet.ServletContextHandler;
+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;
@@ -35,31 +35,61 @@ public class WebSocketJettyCustomizer extends JettyCustomizer {
 			ServerContainer serverContainer;
 			try {
 				serverContainer = WebSocketServerContainerInitializer.configureContext(servletContextHandler);
-			} catch (ServletException e) {
-				throw new IllegalStateException("Cannot configure web sockets", e);
-			}
-			bc.registerService(ServerContainer.class, serverContainer, null);
-//			ServiceTracker<ServerEndpointConfig.Builder, ServerEndpointConfig.Builder> endpointsTracker = new ServiceTracker<ServerEndpointConfig.Builder, ServerEndpointConfig.Builder>(
-//					bc, ServerEndpointConfig.Builder.class, null) {
+//				serverContainer.addSessionListener(new WebSocketSessionListener() {
 //
-//				@Override
-//				public ServerEndpointConfig.Builder addingService(
-//						ServiceReference<ServerEndpointConfig.Builder> reference) {
+//					@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 {
+//								upgradeResponse.sendForbidden("FORBIDDEN");
+//								return;
+//							} catch (IOException e) {
+//								// TODO Auto-generated catch block
+//								e.printStackTrace();
+//							}
+//						List<HttpCookie> cookies = upgradeRequest.getCookies();
 //
-//					ServerEndpointConfig.Builder serverEndpointConfig = super.addingService(reference);
-//					try {
-//						serverContainer.addEndpoint(serverEndpointConfig.build());
-//					} catch (DeploymentException e) {
-//						throw new IllegalArgumentException("Cannot add end point " + reference, e);
+//						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);
+//							}
+//						}
 //					}
-//					return serverEndpointConfig;
-//				}
-//			};
-//			endpointsTracker.open();
-			// TODO log it properly
-			// TODO close itproperly
+//
+//					@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);
 		}
 
 	}
-
 }