Skip to content

Commit

Permalink
#207 Update dependencies [version does not work]
Browse files Browse the repository at this point in the history
  • Loading branch information
sklein94 committed Mar 29, 2023
1 parent 975d76c commit 398a7bf
Show file tree
Hide file tree
Showing 5 changed files with 153 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Provides configuration details for cas authentication.
*/
//@Component
@Component
public class CasConfiguration {

private final String contextPath;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
Expand All @@ -25,7 +26,7 @@
* CasInfrastructureRegistration will take the configuration parameters from the application configuration and will
* construct the required infrastructure for cas authentication.
*/
//@Configuration
@Configuration
public class CasInfrastructureRegistration {

private static final Logger LOG = LoggerFactory.getLogger(CasInfrastructureRegistration.class);
Expand All @@ -49,22 +50,23 @@ public CasInfrastructureRegistration(CasConfiguration configuration, Stage stage
*/
@Bean
public ServletListenerRegistrationBean<HttpSessionListener> singleSignOutListener() {
throw new RuntimeException("asdasdasd");
// ServletListenerRegistrationBean<HttpSessionListener> listener = new ServletListenerRegistrationBean<>();
// // TODO
//// listener.setListener(new SingleSignOutHttpSessionListener());
// listener.setListener(new HttpSessionListener() {
// @Override
// public void sessionCreated(HttpSessionEvent se) {
// HttpSessionListener.super.sessionCreated(se);
// }
//
// @Override
// public void sessionDestroyed(HttpSessionEvent se) {
// HttpSessionListener.super.sessionDestroyed(se);
// }
// });
// return listener;
ServletListenerRegistrationBean<HttpSessionListener> listener = new ServletListenerRegistrationBean<>();
// TODO
// listener.setListener(new SingleSignOutHttpSessionListener());
listener.setListener(new HttpSessionListener() {
private final SingleSignOutHttpSessionListener sessionListener = new SingleSignOutHttpSessionListener();
@Override
public void sessionCreated(HttpSessionEvent se) {
// sessionListener.sessionCreated(new javax.servlet.http.HttpSessionEvent();
HttpSessionListener.super.sessionCreated(se);
}

@Override
public void sessionDestroyed(HttpSessionEvent se) {
HttpSessionListener.super.sessionDestroyed(se);
}
});
return listener;
}

/**
Expand All @@ -74,15 +76,14 @@ public ServletListenerRegistrationBean<HttpSessionListener> singleSignOutListene
*/
// @Bean
public FilterRegistrationBean singleSignOutFilter() {
throw new RuntimeException("asdasdasd");
// // TODO
//// return casFilterRegistration(new SingleSignOutFilter(), 0);
// return casFilterRegistration(new Filter() {
// @Override
// public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
//
// }
// }, 0);
// return casFilterRegistration(new SingleSignOutFilter(), 0);
return casFilterRegistration(new Filter() {
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {

}
}, 0);
}

/**
Expand All @@ -92,16 +93,14 @@ public FilterRegistrationBean singleSignOutFilter() {
*/
// @Bean
public FilterRegistrationBean proxyReceivingTicketValidationFilter() {
throw new RuntimeException("asdasdasd");

// TODO
//// return casFilterRegistration(new Cas30ProxyReceivingTicketValidationFilter(), 1);
// return casFilterRegistration(new Filter() {
// @Override
// public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
//
// }
// }, 1);
// return casFilterRegistration(new Cas30ProxyReceivingTicketValidationFilter(), 1);
return casFilterRegistration(new Filter() {
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {

}
}, 1);
}

/**
Expand All @@ -111,16 +110,15 @@ public FilterRegistrationBean proxyReceivingTicketValidationFilter() {
*/
// @Bean
public FilterRegistrationBean authenticationFilter() {
throw new RuntimeException("asdasdasd");
//
// // TODO
//// return casFilterRegistration(new AuthenticationFilter(), 2);
// return casFilterRegistration(new Filter() {
// @Override
// public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
//
// }
// }, 2);

// TODO
// return casFilterRegistration(new AuthenticationFilter(), 2);
return casFilterRegistration(new Filter() {
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {

}
}, 2);
}

/**
Expand All @@ -131,16 +129,15 @@ public FilterRegistrationBean authenticationFilter() {
*/
// @Bean
public FilterRegistrationBean requestWrapperFilter() {
throw new RuntimeException("asdasdasd");
//
// // TODO
//// return casFilterRegistration(new HttpServletRequestWrapperFilter(), 3);
// return casFilterRegistration(new Filter() {
// @Override
// public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
//
// }
// }, 3);

// TODO
// return casFilterRegistration(new HttpServletRequestWrapperFilter(), 3);
return casFilterRegistration(new Filter() {
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {

}
}, 3);
}

private FilterRegistrationBean casFilterRegistration(Filter filter, int order){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/**
* Destroy the user session and redirects to the cas server.
*/
//@RestController
//@RequestMapping("/api/v1/logout")
@RestController
@RequestMapping("/api/v1/logout")
public class SignOutController {

private CasConfiguration casConfiguration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* - cas redirects back to /api/v1/authc ({@link UICasAuthenticationController})
* - {@link UICasAuthenticationController} extracts the location parameter and redirects back to ui
*/
//@RestController
//@RequestMapping("/api/v1/authc")
@RestController
@RequestMapping("/api/v1/authc")
public class UICasAuthenticationController {

@RequestMapping
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package com.cloudogu.smeagol.authc.infrastructure.fake;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
import java.util.Enumeration;

public class HttpSessionFake implements HttpSession {
public HttpSessionFake(jakarta.servlet.http.HttpSessionEvent event) {

}

@Override
public long getCreationTime() {
return 0;
}

@Override
public String getId() {
return null;
}

@Override
public long getLastAccessedTime() {
return 0;
}

@Override
public ServletContext getServletContext() {
return null;
}

@Override
public void setMaxInactiveInterval(int i) {

}

@Override
public int getMaxInactiveInterval() {
return 0;
}

@Override
public HttpSessionContext getSessionContext() {
return null;
}

@Override
public Object getAttribute(String s) {
return null;
}

@Override
public Object getValue(String s) {
return null;
}

@Override
public Enumeration getAttributeNames() {
return null;
}

@Override
public String[] getValueNames() {
return new String[0];
}

@Override
public void setAttribute(String s, Object o) {

}

@Override
public void putValue(String s, Object o) {

}

@Override
public void removeAttribute(String s) {

}

@Override
public void removeValue(String s) {

}

@Override
public void invalidate() {

}

@Override
public boolean isNew() {
return false;
}
}

0 comments on commit 398a7bf

Please sign in to comment.