Skip to content

Commit

Permalink
Fixed a bug where the remote user operations cache always used the sa…
Browse files Browse the repository at this point in the history 
…me key. (#2483)
  • Loading branch information
@jwomeara
jwomeara authored Jul 30, 2024
1 parent 58b9c89 commit 2900475
Show file tree
Hide file tree
Showing 3 changed files with 144 additions and 42 deletions.
10 changes: 10 additions & 0 deletions web-services/security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,21 @@
<artifactId>weld-core-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
Expand Down
2 changes: 1 addition & 1 deletion ...curity/src/main/java/datawave/security/authorization/remote/RemoteUserOperationsImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void init() {
}

@Override
@Cacheable(value = "getRemoteUser", key = "{#principal}", cacheManager = "remoteOperationsCacheManager")
@Cacheable(value = "getRemoteUser", key = "{#currentUser}", cacheManager = "remoteOperationsCacheManager")
public ProxiedUserDetails getRemoteUser(ProxiedUserDetails currentUser) throws AuthorizationException {
log.info("Cache fault: Retrieving user for " + currentUser.getPrimaryUser().getDn());
return UserOperations.super.getRemoteUser(currentUser);
Expand Down
174 changes: 133 additions & 41 deletions ...rc/test/java/datawave/security/authorization/remote/RemoteUserOperationsImplHttpTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package datawave.security.authorization.remote;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;

import java.io.IOException;
import java.math.BigInteger;
Expand All @@ -9,33 +10,58 @@
import java.nio.charset.Charset;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.SecureRandom;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Collections;
import java.util.List;

import javax.enterprise.concurrent.ManagedExecutorService;
import javax.security.auth.x500.X500Principal;
import javax.ws.rs.core.MediaType;

import org.apache.accumulo.core.security.Authorizations;
import org.apache.commons.io.IOUtils;
import org.jboss.security.JSSESecurityDomain;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.concurrent.ConcurrentMapCache;
import org.springframework.cache.support.SimpleCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.wildfly.security.x500.cert.X509CertificateBuilder;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Sets;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;

import datawave.microservice.query.Query;
import datawave.security.authorization.DatawavePrincipal;
import datawave.security.authorization.DatawaveUser;
import datawave.security.authorization.ProxiedUserDetails;
import datawave.security.authorization.SubjectIssuerDNPair;
import datawave.security.authorization.UserOperations;
import datawave.security.util.DnUtils;
import datawave.user.AuthorizationsListBase;
import datawave.user.DefaultAuthorizationsList;
import datawave.webservice.common.json.DefaultMapperDecorator;
import datawave.webservice.common.json.ObjectMapperDecorator;
import datawave.webservice.common.remote.TestJSSESecurityDomain;
import datawave.webservice.dictionary.data.DataDictionaryBase;
import datawave.webservice.dictionary.data.DescriptionBase;
Expand All @@ -54,46 +80,105 @@
import datawave.webservice.result.FacetQueryResponseBase;
import datawave.webservice.result.GenericResponse;

@RunWith(SpringRunner.class)
@ContextConfiguration
public class RemoteUserOperationsImplHttpTest {

private static final int keysize = 2048;
@EnableCaching
@Configuration
static class Config {

@Bean
public CacheManager remoteOperationsCacheManager() {
SimpleCacheManager cacheManager = new SimpleCacheManager();
List<Cache> caches = new ArrayList<Cache>();
caches.add(new ConcurrentMapCache("listEffectiveAuthorizations"));
caches.add(new ConcurrentMapCache("getRemoteUser"));
cacheManager.setCaches(caches);
return cacheManager;
}

@Bean
public ObjectMapperDecorator objectMapperDecorator() {
return new DefaultMapperDecorator();
}

private static final String commonName = "cn=www.test.us";
private static final String alias = "tomcat";
private static final char[] keyPass = "changeit".toCharArray();
@Bean
public ManagedExecutorService executorService() {
return Mockito.mock(ManagedExecutorService.class);
}

@Bean
public JSSESecurityDomain jsseSecurityDomain() throws CertificateException, NoSuchAlgorithmException {
String alias = "tomcat";
char[] keyPass = "changeit".toCharArray();
int keysize = 2048;
String commonName = "cn=www.test.us";

KeyPairGenerator generater = KeyPairGenerator.getInstance("RSA");
generater.initialize(keysize);
KeyPair keypair = generater.generateKeyPair();
PrivateKey privKey = keypair.getPrivate();
final X509Certificate[] chain = new X509Certificate[1];
X500Principal x500Principal = new X500Principal(commonName);
final ZonedDateTime start = ZonedDateTime.now().minusWeeks(1);
final ZonedDateTime until = start.plusYears(1);
X509CertificateBuilder builder = new X509CertificateBuilder().setIssuerDn(x500Principal).setSerialNumber(new BigInteger(10, new SecureRandom()))
.setNotValidBefore(start).setNotValidAfter(until).setSubjectDn(x500Principal).setPublicKey(keypair.getPublic())
.setSigningKey(keypair.getPrivate()).setSignatureAlgorithmName("SHA256withRSA");
chain[0] = builder.build();

return new TestJSSESecurityDomain(alias, privKey, keyPass, chain);
}

@Bean
public HttpServer server() throws IOException {
HttpServer server = HttpServer.create(new InetSocketAddress(PORT), 0);
server.setExecutor(null);
server.start();
return server;
}

@Bean
public RemoteUserOperationsImpl remote(HttpServer server) {
// create a remote event query logic that has our own server behind it
RemoteUserOperationsImpl remote = new RemoteUserOperationsImpl();
remote.setQueryServiceURI("/Security/User/");
remote.setQueryServiceScheme("http");
remote.setQueryServiceHost("localhost");
remote.setQueryServicePort(server.getAddress().getPort());
remote.setResponseObjectFactory(new MockResponseObjectFactory());
return remote;
}
}

private X500Principal x500Principal;
private static final SubjectIssuerDNPair userDN = SubjectIssuerDNPair.of("userDn", "issuerDn");
private static final SubjectIssuerDNPair otherUserDN = SubjectIssuerDNPair.of("otherUserDn", "issuerDn");
private static Authorizations auths = new Authorizations("auth1", "auth2");

private static final int PORT = 0;

private final DatawaveUser user = new DatawaveUser(userDN, DatawaveUser.UserType.USER, Sets.newHashSet(auths.toString().split(",")), null, null, -1L);
private final DatawavePrincipal principal = new DatawavePrincipal((Collections.singleton(user)));

private final DatawaveUser otherUser = new DatawaveUser(otherUserDN, DatawaveUser.UserType.USER, Sets.newHashSet(auths.toString().split(",")), null, null,
-1L);
private final DatawavePrincipal otherPrincipal = new DatawavePrincipal((Collections.singleton(otherUser)));

@Autowired
private HttpServer server;

private RemoteUserOperationsImpl remote;
@Autowired
private UserOperations remote;

private DefaultAuthorizationsList listEffectiveAuthResponse;

@Before
public void setup() throws Exception {
final ObjectMapper objectMapper = new DefaultMapperDecorator().decorate(new ObjectMapper());
System.setProperty(DnUtils.SUBJECT_DN_PATTERN_PROPERTY, ".*ou=server.*");
KeyPairGenerator generater = KeyPairGenerator.getInstance("RSA");
generater.initialize(keysize);
KeyPair keypair = generater.generateKeyPair();
PrivateKey privKey = keypair.getPrivate();
final X509Certificate[] chain = new X509Certificate[1];
x500Principal = new X500Principal(commonName);
final ZonedDateTime start = ZonedDateTime.now().minusWeeks(1);
final ZonedDateTime until = start.plusYears(1);
X509CertificateBuilder builder = new X509CertificateBuilder().setIssuerDn(x500Principal).setSerialNumber(new BigInteger(10, new SecureRandom()))
.setNotValidBefore(start).setNotValidAfter(until).setSubjectDn(x500Principal).setPublicKey(keypair.getPublic())
.setSigningKey(keypair.getPrivate()).setSignatureAlgorithmName("SHA256withRSA");
chain[0] = builder.build();

server = HttpServer.create(new InetSocketAddress(PORT), 0);
server.setExecutor(null);
server.start();

DefaultAuthorizationsList listEffectiveAuthResponse = new DefaultAuthorizationsList();
listEffectiveAuthResponse.setUserAuths("testuserDn", "testissuerDn", Arrays.asList("auth1", "auth2"));
listEffectiveAuthResponse.setAuthMapping(new HashMap<>());

setListEffectiveAuthResponse(userDN, auths);

HttpHandler listEffectiveAuthorizationsHandler = new HttpHandler() {
@Override
Expand Down Expand Up @@ -122,17 +207,6 @@ public void handle(HttpExchange exchange) throws IOException {

server.createContext("/Security/User/listEffectiveAuthorizations", listEffectiveAuthorizationsHandler);
server.createContext("/Security/User/flushCachedCredentials", flushHandler);

// create a remote event query logic that has our own server behind it
remote = new RemoteUserOperationsImpl();
remote.setQueryServiceURI("/Security/User/");
remote.setQueryServiceScheme("http");
remote.setQueryServiceHost("localhost");
remote.setQueryServicePort(server.getAddress().getPort());
remote.setExecutorService(null);
remote.setObjectMapperDecorator(new DefaultMapperDecorator());
remote.setResponseObjectFactory(new MockResponseObjectFactory());
remote.setJsseSecurityDomain(new TestJSSESecurityDomain(alias, privKey, keyPass, chain));
}

@After
Expand All @@ -142,15 +216,33 @@ public void after() {
}
}

private void setListEffectiveAuthResponse(SubjectIssuerDNPair userDN, Authorizations auths) {
listEffectiveAuthResponse = new DefaultAuthorizationsList();
listEffectiveAuthResponse.setUserAuths(userDN.subjectDN(), userDN.issuerDN(), Arrays.asList(auths.toString().split(",")));
listEffectiveAuthResponse.addAuths(userDN.subjectDN(), userDN.issuerDN(), Arrays.asList(auths.toString().split(",")));
}

@Test
public void testRemoteUserOperations() throws Exception {
DatawavePrincipal principal = new DatawavePrincipal(commonName);

AuthorizationsListBase auths = remote.listEffectiveAuthorizations(principal);
assertEquals(2, auths.getAllAuths().size());
AuthorizationsListBase returnedAuths = remote.listEffectiveAuthorizations(principal);
assertEquals(2, returnedAuths.getAllAuths().size());

GenericResponse flush = remote.flushCachedCredentials(principal);
assertEquals("test flush result", flush.getResult());

ProxiedUserDetails returnedUser = remote.getRemoteUser(principal);

// ensure that we get the cached user details
ProxiedUserDetails dupeReturnedUser = remote.getRemoteUser(principal);
assertEquals(returnedUser, dupeReturnedUser);

// setup the list effective auth response for the other user
setListEffectiveAuthResponse(otherUserDN, auths);

// ensure that we get the other user details, not the cached user details
ProxiedUserDetails newReturnedUser = remote.getRemoteUser(otherPrincipal);
assertNotEquals(returnedUser, newReturnedUser);
}

public static class MockResponseObjectFactory extends ResponseObjectFactory {
Expand Down

0 comments on commit 2900475

Please sign in to comment.