X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.ext.equinox.jetty%2Fsrc%2Forg%2Fargeo%2Fequinox%2Fjetty%2FWebSocketJettyCustomizer.java;h=f582a43bc404810c6a64ba4e7e60edc03a6f52a7;hb=862da18b7053df010348b3ed1096afd3b5778c10;hp=31d62c80be22ea61c337a5dfa0d6bebf18792b5b;hpb=33be7f0920e65d7295ea0847d6b39f1657fd14f4;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 31d62c80b..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
@@ -18,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);
 	}
 
@@ -73,6 +41,15 @@ public class WebSocketJettyCustomizer extends JettyCustomizer {
 //					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();
 //
 //						System.out.println("Upgrade request cookies : " + cookies);
@@ -102,82 +79,17 @@ public class WebSocketJettyCustomizer extends JettyCustomizer {
 //								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
 //					public void onSessionClosed(WebSocketSession session) {
-//						// TODO Auto-generated method stub
-//
 //					}
 //				});
 			} 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;
-//		}
-//	}
-
 }