Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions celements-spring-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
<artifactId>celements-servlet</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-user-manager</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-reference</artifactId>
Expand Down Expand Up @@ -144,6 +149,11 @@
<artifactId>celements-shared-tests</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-subsystem-migration-manager</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
import org.xwiki.context.Execution;

import com.celements.auth.MainAdminConfig;
import com.celements.auth.user.UserService;
import com.celements.spring.security.oauth2.IdentityService;
import com.celements.spring.security.oauth2.cookietoken.CompositeBearerTokenResolver;
Expand All @@ -53,6 +54,7 @@ public class CelSecurityFilterChainConfig {
private final AuthenticationManagerResolver<HttpServletRequest> authManagerResolver;
private final UserService userService;
private final CookieTokenService tokenService;
private final MainAdminConfig mainAdminConfig;
private final Execution execution;

@Inject
Expand All @@ -61,11 +63,13 @@ public CelSecurityFilterChainConfig(
AuthenticationManagerResolver<HttpServletRequest> authManagerResolver,
UserService userService,
CookieTokenService tokenService,
MainAdminConfig mainAdminConfig,
Execution execution) {
this.identityService = identityService;
this.authManagerResolver = authManagerResolver;
this.userService = userService;
this.tokenService = tokenService;
this.mainAdminConfig = mainAdminConfig;
this.execution = execution;
}

Expand Down Expand Up @@ -102,7 +106,7 @@ public SecurityFilterChain loginFilterChain(
new TokenRefreshFilter(tokenService),
BearerTokenAuthenticationFilter.class)
.addFilterAfter(
new ExecutionContextAuthenticationFilter(userService, execution),
new ExecutionContextAuthenticationFilter(userService, mainAdminConfig, execution),
BearerTokenAuthenticationFilter.class)
.addFilterAfter(
new HeaderToCookieAccessTokenFilter(tokenService),
Expand Down Expand Up @@ -144,7 +148,7 @@ public SecurityFilterChain apiFilterChain(HttpSecurity http) throws Exception {
new TokenRefreshFilter(tokenService),
BearerTokenAuthenticationFilter.class)
.addFilterAfter(
new ExecutionContextAuthenticationFilter(userService, execution),
new ExecutionContextAuthenticationFilter(userService, mainAdminConfig, execution),
BearerTokenAuthenticationFilter.class)
.addFilterAfter(
new HeaderToCookieAccessTokenFilter(tokenService),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.celements.spring.security.oauth2.filter;

import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.Set;

Expand All @@ -11,7 +12,9 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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;
import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
import org.springframework.security.oauth2.core.user.OAuth2User;
Expand All @@ -20,32 +23,47 @@
import org.springframework.web.filter.OncePerRequestFilter;
import org.xwiki.context.Execution;

import com.celements.auth.MainAdminConfig;
import com.celements.auth.user.User;
import com.celements.auth.user.UserInstantiationException;
import com.celements.auth.user.UserService;
import com.celements.execution.XWikiExecutionProp;
import com.xpn.xwiki.user.api.XWikiUser;

public class ExecutionContextAuthenticationFilter extends OncePerRequestFilter {

private static final Logger LOGGER = LoggerFactory
.getLogger(ExecutionContextAuthenticationFilter.class);

private final Execution execution;
private final UserService userService;
private final MainAdminConfig mainAdminConfig;
private final Execution execution;

public ExecutionContextAuthenticationFilter(UserService userService, Execution execution) {
public ExecutionContextAuthenticationFilter(
UserService userService,
MainAdminConfig mainAdminConfig,
Execution execution) {
this.userService = userService;
this.mainAdminConfig = mainAdminConfig;
this.execution = execution;
}

@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
FilterChain filterChain) throws ServletException, IOException {
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
var securityContext = SecurityContextHolder.getContext();
autoLogin(securityContext)
.or(() -> processAuthentication(securityContext))
.ifPresent(user -> execution.getContext().set(XWikiExecutionProp.XWIKI_USER, user));
filterChain.doFilter(request, response);
}

private Optional<XWikiUser> processAuthentication(SecurityContext securityContext) {
Authentication auth = securityContext.getAuthentication();
if ((auth != null) && auth.isAuthenticated()) {
String userId = auth.getName(); // the Keycloak GUID (sub)
String username;
String email;

if (auth instanceof JwtAuthenticationToken) {
JwtAuthenticationToken jwtAuth = (JwtAuthenticationToken) auth;
Jwt jwt = jwtAuth.getToken();
Expand All @@ -70,7 +88,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
User user = userOpt.get();
LOGGER.debug("setting xwiki isGlobal='{}', username='{}', email='{}'", user.isGlobal(),
user.asXWikiUser().getUser(), user.email());
execution.getContext().set(XWikiExecutionProp.XWIKI_USER, user.asXWikiUser());
return Optional.of(user.asXWikiUser());
} else {
LOGGER.info("no celements user found for email='{}'", email);
}
Expand All @@ -81,7 +99,17 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
} else {
LOGGER.info("is NOT authenticated with user '{}'", "null");
}
filterChain.doFilter(request, response);
return Optional.empty();
}

private Optional<XWikiUser> autoLogin(SecurityContext securityContext) {
if (!mainAdminConfig.isAutoLoginEnabled()) {
return Optional.empty();
}
var xwikiUser = mainAdminConfig.getXWikiUser();
var auth = new UsernamePasswordAuthenticationToken(xwikiUser.getUser(), null, List.of());
securityContext.setAuthentication(auth);
return Optional.of(xwikiUser);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package com.celements.spring.security.oauth2.filter;

import static com.celements.execution.XWikiExecutionProp.*;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;

import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.security.core.context.SecurityContextHolder;
import org.xwiki.context.Execution;

import com.celements.auth.MainAdminConfig;
import com.celements.auth.user.UserService;
import com.celements.common.test.AbstractComponentTest;
import com.xpn.xwiki.user.api.XWikiUser;

public class ExecutionContextAuthenticationFilterTest extends AbstractComponentTest {

private ExecutionContextAuthenticationFilter filter;
private UserService userService;
private MainAdminConfig mainAdminConfig;

@Before
public void prepareTest() throws Exception {
userService = createDefaultMock(UserService.class);
mainAdminConfig = createDefaultMock(MainAdminConfig.class);
filter = new ExecutionContextAuthenticationFilter(userService, mainAdminConfig,
getBeanFactory().getBean(Execution.class));
}

@After
public void clearSecurityContext() {
SecurityContextHolder.clearContext();
}

@Test
public void test_doFilterInternal_autoLoginAdmin() throws Exception {
HttpServletRequest request = createDefaultMock(HttpServletRequest.class);
HttpServletResponse response = createDefaultMock(HttpServletResponse.class);
FilterChain chain = createDefaultMock(FilterChain.class);
XWikiUser xwikiUser = new XWikiUser("xwiki:XWiki.Admin", true);
expect(mainAdminConfig.isAutoLoginEnabled()).andReturn(true);
expect(mainAdminConfig.getXWikiUser()).andReturn(xwikiUser);
chain.doFilter(request, response);
replayDefault();

filter.doFilterInternal(request, response, chain);

verifyDefault();
assertEquals("xwiki:XWiki.Admin",
SecurityContextHolder.getContext().getAuthentication().getName());
assertTrue(SecurityContextHolder.getContext().getAuthentication().isAuthenticated());
assertSame(xwikiUser, getBeanFactory().getBean(Execution.class).getContext()
.get(XWIKI_USER).orElseThrow());
}

@Test
public void test_doFilterInternal_autoLoginDisabled() throws Exception {
HttpServletRequest request = createDefaultMock(HttpServletRequest.class);
HttpServletResponse response = createDefaultMock(HttpServletResponse.class);
FilterChain chain = createDefaultMock(FilterChain.class);
expect(mainAdminConfig.isAutoLoginEnabled()).andReturn(false);
chain.doFilter(request, response);
replayDefault();

filter.doFilterInternal(request, response, chain);

verifyDefault();
assertNull(SecurityContextHolder.getContext().getAuthentication());
}

}