import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
/**
// DAV
sessionProvider = new OpenInViewSessionProvider();
+ registerRepositoryServlets(ALIAS_NODE, node);
try {
- registerWebdavServlet(ALIAS_NODE, node, true);
- registerWebdavServlet(ALIAS_NODE, node, false);
- registerRemotingServlet(ALIAS_NODE, node, true);
- registerRemotingServlet(ALIAS_NODE, node, false);
-
httpService.registerFilter("/", rootFilter, null, null);
} catch (Exception e) {
- throw new CmsException("Could not initialise http", e);
+ throw new CmsException("Could not register root filter", e);
}
}
public void destroy() {
sessionProvider.destroy();
+ unregisterRepositoryServlets(ALIAS_NODE);
+ }
+
+ void registerRepositoryServlets(String alias, Repository repository) {
+ try {
+ registerWebdavServlet(alias, repository, true);
+ registerWebdavServlet(alias, repository, false);
+ registerRemotingServlet(alias, repository, true);
+ registerRemotingServlet(alias, repository, false);
+ } catch (Exception e) {
+ throw new CmsException(
+ "Could not register servlets for repository " + alias, e);
+ }
+ }
+
+ void unregisterRepositoryServlets(String alias) {
+ // FIXME unregister servlets
}
void registerWebdavServlet(String alias, Repository repository,
httpService.registerServlet(path, (Servlet) remotingServlet, ip, null);
}
- private Boolean isSessionAuthenticated(HttpSession httpSession) {
- SecurityContext contextFromSession = (SecurityContext) httpSession
- .getAttribute(SPRING_SECURITY_CONTEXT_KEY);
- return contextFromSession != null;
- }
+ // private Boolean isSessionAuthenticated(HttpSession httpSession) {
+ // SecurityContext contextFromSession = (SecurityContext) httpSession
+ // .getAttribute(SPRING_SECURITY_CONTEXT_KEY);
+ // return contextFromSession != null;
+ // }
private void requestBasicAuth(HttpSession httpSession,
HttpServletResponse response) {
public void doFilter(HttpSession httpSession,
HttpServletRequest request, HttpServletResponse response,
FilterChain filterChain) throws IOException, ServletException {
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()) {
+ log.trace(request.getRequestURL().append(
+ request.getQueryString() != null ? "?"
+ + request.getQueryString() : ""));
logRequest(request);
+ }
String servletPath = request.getServletPath();
int pathLength = path.length();
if (pathLength != 0 && (path.charAt(0) == '/')
&& !servletPath.endsWith("rwt-resources")
- && !path.equals("/")) {
+ && path.lastIndexOf('/') != 0) {
String newLocation = request.getServletPath() + "#" + path;
response.setHeader("Location", newLocation);
response.setStatus(HttpServletResponse.SC_FOUND);
}
private void logRequest(HttpServletRequest request) {
- log.debug(request.getContextPath());
- log.debug(request.getServletPath());
- log.debug(request.getRequestURI());
- log.debug(request.getQueryString());
+ log.debug("contextPath=" + request.getContextPath());
+ log.debug("servletPath=" + request.getServletPath());
+ log.debug("requestURI=" + request.getRequestURI());
+ log.debug("queryString=" + request.getQueryString());
StringBuilder buf = new StringBuilder();
// headers
Enumeration<String> en = request.getHeaderNames();
FilterChain filterChain) throws IOException, ServletException {
// Authenticate from session
- if (isSessionAuthenticated(httpSession)) {
- filterChain.doFilter(request, response);
- return;
- }
+ // if (isSessionAuthenticated(httpSession)) {
+ // filterChain.doFilter(request, response);
+ // return;
+ // }
KernelUtils.anonymousLogin(authenticationManager);
filterChain.doFilter(request, response);
UsernamePasswordAuthenticationToken token = basicAuth(basicAuth);
Authentication auth = authenticationManager.authenticate(token);
SecurityContextHolder.getContext().setAuthentication(auth);
- httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
- SecurityContextHolder.getContext());
- httpSession.setAttribute(ATTR_AUTH, Boolean.FALSE);
+ // httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
+ // SecurityContextHolder.getContext());
+ // httpSession.setAttribute(ATTR_AUTH, Boolean.FALSE);
filterChain.doFilter(request, response);
return;
}