Added tests for ensuring the references between a refresh token and its authentication holder are preserved over import. Minor cleanup of other tests.
arielak
parent
60dce353a5
commit
af60bf7e7f
|
|
@ -23,7 +23,6 @@ import java.util.Set;
|
|||
import static org.hamcrest.CoreMatchers.*;
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.fail;
|
||||
import org.junit.Before;
|
||||
|
|
@ -57,6 +56,7 @@ import org.mockito.runners.MockitoJUnitRunner;
|
|||
import org.mockito.stubbing.Answer;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.oauth2.provider.AuthorizationRequest;
|
||||
import org.springframework.security.oauth2.provider.DefaultAuthorizationRequest;
|
||||
import org.springframework.security.oauth2.provider.OAuth2Authentication;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
|
|
@ -224,7 +224,6 @@ public class TestMITREidDataService_1_0 {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testImportRefreshTokens() throws IOException, ParseException {
|
||||
String expiration1 = "2014-09-10T22:49:44.090+0000";
|
||||
|
|
@ -282,7 +281,7 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
final Map<Long, OAuth2RefreshTokenEntity> fakeDb = new HashMap<Long, OAuth2RefreshTokenEntity>();
|
||||
when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer<OAuth2RefreshTokenEntity>() {
|
||||
Long id = 3L;
|
||||
Long id = 323L;
|
||||
@Override
|
||||
public OAuth2RefreshTokenEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
OAuth2RefreshTokenEntity _token = (OAuth2RefreshTokenEntity) invocation.getArguments()[0];
|
||||
|
|
@ -310,7 +309,7 @@ public class TestMITREidDataService_1_0 {
|
|||
}
|
||||
});
|
||||
when(authHolderRepository.getById(isNull(Long.class))).thenAnswer(new Answer<AuthenticationHolderEntity>() {
|
||||
Long id = 1L;
|
||||
Long id = 142L;
|
||||
@Override
|
||||
public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
AuthenticationHolderEntity _auth = mock(AuthenticationHolderEntity.class);
|
||||
|
|
@ -330,12 +329,10 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
assertThat(savedRefreshTokens.get(0).getClient().getClientId(), equalTo(token1.getClient().getClientId()));
|
||||
assertThat(savedRefreshTokens.get(0).getExpiration(), equalTo(token1.getExpiration()));
|
||||
assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getId(), equalTo(token1.getAuthenticationHolder().getId()));
|
||||
assertThat(savedRefreshTokens.get(0).getValue(), equalTo(token1.getValue()));
|
||||
|
||||
assertThat(savedRefreshTokens.get(1).getClient().getClientId(), equalTo(token2.getClient().getClientId()));
|
||||
assertThat(savedRefreshTokens.get(1).getExpiration(), equalTo(token2.getExpiration()));
|
||||
assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getId(), equalTo(token2.getAuthenticationHolder().getId()));
|
||||
assertThat(savedRefreshTokens.get(1).getValue(), equalTo(token2.getValue()));
|
||||
}
|
||||
|
||||
|
|
@ -553,7 +550,7 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
final Map<Long, OAuth2AccessTokenEntity> fakeDb = new HashMap<Long, OAuth2AccessTokenEntity>();
|
||||
when(tokenRepository.saveAccessToken(isA(OAuth2AccessTokenEntity.class))).thenAnswer(new Answer<OAuth2AccessTokenEntity>() {
|
||||
Long id = 3L;
|
||||
Long id = 335L;
|
||||
@Override
|
||||
public OAuth2AccessTokenEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
OAuth2AccessTokenEntity _token = (OAuth2AccessTokenEntity) invocation.getArguments()[0];
|
||||
|
|
@ -581,7 +578,7 @@ public class TestMITREidDataService_1_0 {
|
|||
}
|
||||
});
|
||||
when(authHolderRepository.getById(isNull(Long.class))).thenAnswer(new Answer<AuthenticationHolderEntity>() {
|
||||
Long id = 1L;
|
||||
Long id = 135L;
|
||||
@Override
|
||||
public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
AuthenticationHolderEntity _auth = mock(AuthenticationHolderEntity.class);
|
||||
|
|
@ -601,12 +598,10 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
assertThat(savedAccessTokens.get(0).getClient().getClientId(), equalTo(token1.getClient().getClientId()));
|
||||
assertThat(savedAccessTokens.get(0).getExpiration(), equalTo(token1.getExpiration()));
|
||||
assertThat(savedAccessTokens.get(0).getAuthenticationHolder().getId(), equalTo(token1.getAuthenticationHolder().getId()));
|
||||
assertThat(savedAccessTokens.get(0).getValue(), equalTo(token1.getValue()));
|
||||
|
||||
assertThat(savedAccessTokens.get(1).getClient().getClientId(), equalTo(token2.getClient().getClientId()));
|
||||
assertThat(savedAccessTokens.get(1).getExpiration(), equalTo(token2.getExpiration()));
|
||||
assertThat(savedAccessTokens.get(1).getAuthenticationHolder().getId(), equalTo(token2.getAuthenticationHolder().getId()));
|
||||
assertThat(savedAccessTokens.get(1).getValue(), equalTo(token2.getValue()));
|
||||
}
|
||||
|
||||
|
|
@ -1061,7 +1056,7 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
final Map<Long, WhitelistedSite> fakeDb = new HashMap<Long, WhitelistedSite>();
|
||||
when(wlSiteRepository.save(isA(WhitelistedSite.class))).thenAnswer(new Answer<WhitelistedSite>() {
|
||||
Long id = 3L;
|
||||
Long id = 332L;
|
||||
@Override
|
||||
public WhitelistedSite answer(InvocationOnMock invocation) throws Throwable {
|
||||
WhitelistedSite _site = (WhitelistedSite) invocation.getArguments()[0];
|
||||
|
|
@ -1267,7 +1262,7 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
final Map<Long, ApprovedSite> fakeDb = new HashMap<Long, ApprovedSite>();
|
||||
when(approvedSiteRepository.save(isA(ApprovedSite.class))).thenAnswer(new Answer<ApprovedSite>() {
|
||||
Long id = 3L;
|
||||
Long id = 343L;
|
||||
@Override
|
||||
public ApprovedSite answer(InvocationOnMock invocation) throws Throwable {
|
||||
ApprovedSite _site = (ApprovedSite) invocation.getArguments()[0];
|
||||
|
|
@ -1286,7 +1281,7 @@ public class TestMITREidDataService_1_0 {
|
|||
}
|
||||
});
|
||||
when(wlSiteRepository.getById(isNull(Long.class))).thenAnswer(new Answer<WhitelistedSite>() {
|
||||
Long id = 2L;
|
||||
Long id = 235L;
|
||||
@Override
|
||||
public WhitelistedSite answer(InvocationOnMock invocation) throws Throwable {
|
||||
WhitelistedSite _site = mock(WhitelistedSite.class);
|
||||
|
|
@ -1320,19 +1315,17 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
@Test
|
||||
public void testExportAuthenticationHolders() throws IOException {
|
||||
AuthorizationRequest mockRequest1 = mock(AuthorizationRequest.class);
|
||||
when(mockRequest1.getAuthorizationParameters()).thenReturn(new HashMap<String, String>());
|
||||
Authentication mockAuth1 = null;
|
||||
OAuth2Authentication auth1 = new OAuth2Authentication(mockRequest1, mockAuth1);
|
||||
AuthorizationRequest req1 = new DefaultAuthorizationRequest(new HashMap<String,String>(), new HashMap<String,String>(), "client1", new ArrayList<String>());
|
||||
Authentication mockAuth1 = mock(Authentication.class, withSettings().serializable());
|
||||
OAuth2Authentication auth1 = new OAuth2Authentication(req1, mockAuth1);
|
||||
|
||||
AuthenticationHolderEntity holder1 = new AuthenticationHolderEntity();
|
||||
holder1.setId(1L);
|
||||
holder1.setAuthentication(auth1);
|
||||
|
||||
AuthorizationRequest mockRequest2 = mock(AuthorizationRequest.class);
|
||||
when(mockRequest2.getAuthorizationParameters()).thenReturn(new HashMap<String, String>());
|
||||
Authentication mockAuth2 = null;
|
||||
OAuth2Authentication auth2 = new OAuth2Authentication(mockRequest2, mockAuth2);
|
||||
AuthorizationRequest req2 = new DefaultAuthorizationRequest(new HashMap<String,String>(), new HashMap<String,String>(), "client2", new ArrayList<String>());
|
||||
Authentication mockAuth2 = mock(Authentication.class, withSettings().serializable());
|
||||
OAuth2Authentication auth2 = new OAuth2Authentication(req2, mockAuth2);
|
||||
|
||||
AuthenticationHolderEntity holder2 = new AuthenticationHolderEntity();
|
||||
holder2.setId(2L);
|
||||
|
|
@ -1417,19 +1410,17 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
@Test
|
||||
public void testImportAuthenticationHolders() throws IOException {
|
||||
AuthorizationRequest mockRequest1 = mock(AuthorizationRequest.class);
|
||||
when(mockRequest1.getAuthorizationParameters()).thenReturn(new HashMap<String, String>());
|
||||
Authentication mockAuth1 = null;
|
||||
OAuth2Authentication auth1 = new OAuth2Authentication(mockRequest1, mockAuth1);
|
||||
AuthorizationRequest req1 = new DefaultAuthorizationRequest(new HashMap<String,String>(), new HashMap<String,String>(), "client1", new ArrayList<String>());
|
||||
Authentication mockAuth1 = mock(Authentication.class, withSettings().serializable());
|
||||
OAuth2Authentication auth1 = new OAuth2Authentication(req1, mockAuth1);
|
||||
|
||||
AuthenticationHolderEntity holder1 = new AuthenticationHolderEntity();
|
||||
holder1.setId(1L);
|
||||
holder1.setAuthentication(auth1);
|
||||
|
||||
AuthorizationRequest mockRequest2 = mock(AuthorizationRequest.class);
|
||||
when(mockRequest2.getAuthorizationParameters()).thenReturn(new HashMap<String, String>());
|
||||
Authentication mockAuth2 = null;
|
||||
OAuth2Authentication auth2 = new OAuth2Authentication(mockRequest2, mockAuth2);
|
||||
AuthorizationRequest req2 = new DefaultAuthorizationRequest(new HashMap<String,String>(), new HashMap<String,String>(), "client2", new ArrayList<String>());
|
||||
Authentication mockAuth2 = mock(Authentication.class, withSettings().serializable());
|
||||
OAuth2Authentication auth2 = new OAuth2Authentication(req2, mockAuth2);
|
||||
|
||||
AuthenticationHolderEntity holder2 = new AuthenticationHolderEntity();
|
||||
holder2.setId(2L);
|
||||
|
|
@ -1445,8 +1436,8 @@ public class TestMITREidDataService_1_0 {
|
|||
"\"" + MITREidDataService.SYSTEMSCOPES + "\": [], " +
|
||||
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [" +
|
||||
|
||||
"{\"id\":1,\"authentication\":{\"clientAuthorization\":{},\"userAuthentication\":\"\"}}," +
|
||||
"{\"id\":2,\"authentication\":{\"clientAuthorization\":{},\"userAuthentication\":\"\"}}" +
|
||||
"{\"id\":1,\"authentication\":{\"clientAuthorization\":{\"clientId\":\"client1\"},\"userAuthentication\":null}}," +
|
||||
"{\"id\":2,\"authentication\":{\"clientAuthorization\":{\"clientId\":\"client2\"},\"userAuthentication\":null}}" +
|
||||
|
||||
" ]" +
|
||||
"}";
|
||||
|
|
@ -1457,7 +1448,7 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
final Map<Long, AuthenticationHolderEntity> fakeDb = new HashMap<Long, AuthenticationHolderEntity>();
|
||||
when(authHolderRepository.save(isA(AuthenticationHolderEntity.class))).thenAnswer(new Answer<AuthenticationHolderEntity>() {
|
||||
Long id = 3L;
|
||||
Long id = 323L;
|
||||
@Override
|
||||
public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
AuthenticationHolderEntity _site = (AuthenticationHolderEntity) invocation.getArguments()[0];
|
||||
|
|
@ -1475,8 +1466,8 @@ public class TestMITREidDataService_1_0 {
|
|||
List<AuthenticationHolderEntity> savedAuthHolders = capturedAuthHolders.getAllValues();
|
||||
|
||||
assertThat(savedAuthHolders.size(), is(2));
|
||||
assertThat(savedAuthHolders.get(0).getAuthentication().getName(), equalTo(holder1.getAuthentication().getName()));
|
||||
assertThat(savedAuthHolders.get(1).getAuthentication().getName(), equalTo(holder2.getAuthentication().getName()));
|
||||
assertThat(savedAuthHolders.get(0).getAuthentication().getAuthorizationRequest().getClientId(), equalTo(holder1.getAuthentication().getAuthorizationRequest().getClientId()));
|
||||
assertThat(savedAuthHolders.get(1).getAuthentication().getAuthorizationRequest().getClientId(), equalTo(holder2.getAuthentication().getAuthorizationRequest().getClientId()));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -1662,6 +1653,135 @@ public class TestMITREidDataService_1_0 {
|
|||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFixRefreshTokenReferencesOnImport() throws IOException, ParseException {
|
||||
String expiration1 = "2014-09-10T22:49:44.090+0000";
|
||||
Date expirationDate1 = DateUtil.utcToDate(expiration1);
|
||||
|
||||
ClientDetailsEntity mockedClient1 = mock(ClientDetailsEntity.class);
|
||||
when(mockedClient1.getClientId()).thenReturn("mocked_client_1");
|
||||
|
||||
AuthorizationRequest req1 = new DefaultAuthorizationRequest(new HashMap<String,String>(), new HashMap<String,String>(), "client1", new ArrayList<String>());
|
||||
Authentication mockAuth1 = mock(Authentication.class, withSettings().serializable());
|
||||
OAuth2Authentication auth1 = new OAuth2Authentication(req1, mockAuth1);
|
||||
|
||||
AuthenticationHolderEntity holder1 = new AuthenticationHolderEntity();
|
||||
holder1.setId(1L);
|
||||
holder1.setAuthentication(auth1);
|
||||
|
||||
OAuth2RefreshTokenEntity token1 = new OAuth2RefreshTokenEntity();
|
||||
token1.setId(1L);
|
||||
token1.setClient(mockedClient1);
|
||||
token1.setExpiration(expirationDate1);
|
||||
token1.setValue("eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.");
|
||||
token1.setAuthenticationHolder(holder1);
|
||||
|
||||
String expiration2 = "2015-01-07T18:31:50.079+0000";
|
||||
Date expirationDate2 = DateUtil.utcToDate(expiration2);
|
||||
|
||||
ClientDetailsEntity mockedClient2 = mock(ClientDetailsEntity.class);
|
||||
when(mockedClient2.getClientId()).thenReturn("mocked_client_2");
|
||||
|
||||
AuthorizationRequest req2 = new DefaultAuthorizationRequest(new HashMap<String,String>(), new HashMap<String,String>(), "client2", new ArrayList<String>());
|
||||
Authentication mockAuth2 = mock(Authentication.class, withSettings().serializable());
|
||||
OAuth2Authentication auth2 = new OAuth2Authentication(req2, mockAuth2);
|
||||
|
||||
AuthenticationHolderEntity holder2 = new AuthenticationHolderEntity();
|
||||
holder2.setId(2L);
|
||||
holder2.setAuthentication(auth2);
|
||||
|
||||
OAuth2RefreshTokenEntity token2 = new OAuth2RefreshTokenEntity();
|
||||
token2.setId(2L);
|
||||
token2.setClient(mockedClient2);
|
||||
token2.setExpiration(expirationDate2);
|
||||
token2.setValue("eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.");
|
||||
token2.setAuthenticationHolder(holder2);
|
||||
|
||||
String configJson = "{" +
|
||||
"\"" + MITREidDataService.SYSTEMSCOPES + "\": [], " +
|
||||
"\"" + MITREidDataService.ACCESSTOKENS + "\": [], " +
|
||||
"\"" + MITREidDataService.CLIENTS + "\": [], " +
|
||||
"\"" + MITREidDataService.GRANTS + "\": [], " +
|
||||
"\"" + MITREidDataService.WHITELISTEDSITES + "\": [], " +
|
||||
"\"" + MITREidDataService.BLACKLISTEDSITES + "\": [], " +
|
||||
"\"" + MITREidDataService.AUTHENTICATIONHOLDERS + "\": [" +
|
||||
|
||||
"{\"id\":1,\"authentication\":{\"clientAuthorization\":{\"clientId\":\"client1\"},\"userAuthentication\":null}}," +
|
||||
"{\"id\":2,\"authentication\":{\"clientAuthorization\":{\"clientId\":\"client2\"},\"userAuthentication\":null}}" +
|
||||
|
||||
" ]," +
|
||||
"\"" + MITREidDataService.REFRESHTOKENS + "\": [" +
|
||||
|
||||
"{\"id\":1,\"clientId\":\"mocked_client_1\",\"expiration\":\"2014-09-10T22:49:44.090+0000\","
|
||||
+ "\"authenticationHolderId\":1,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJmOTg4OWQyOS0xMTk1LTQ4ODEtODgwZC1lZjVlYzAwY2Y4NDIifQ.\"}," +
|
||||
"{\"id\":2,\"clientId\":\"mocked_client_2\",\"expiration\":\"2015-01-07T18:31:50.079+0000\","
|
||||
+ "\"authenticationHolderId\":2,\"value\":\"eyJhbGciOiJub25lIn0.eyJqdGkiOiJlYmEyYjc3My0xNjAzLTRmNDAtOWQ3MS1hMGIxZDg1OWE2MDAifQ.\"}" +
|
||||
|
||||
" ]" +
|
||||
"}";
|
||||
System.err.println(configJson);
|
||||
|
||||
JsonReader reader = new JsonReader(new StringReader(configJson));
|
||||
final Map<Long, OAuth2RefreshTokenEntity> fakeRefreshTokenTable = new HashMap<Long, OAuth2RefreshTokenEntity>();
|
||||
final Map<Long, AuthenticationHolderEntity> fakeAuthHolderTable = new HashMap<Long, AuthenticationHolderEntity>();
|
||||
when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer<OAuth2RefreshTokenEntity>() {
|
||||
Long id = 343L;
|
||||
@Override
|
||||
public OAuth2RefreshTokenEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
OAuth2RefreshTokenEntity _token = (OAuth2RefreshTokenEntity) invocation.getArguments()[0];
|
||||
if(_token.getId() == null) {
|
||||
_token.setId(id++);
|
||||
}
|
||||
fakeRefreshTokenTable.put(_token.getId(), _token);
|
||||
return _token;
|
||||
}
|
||||
});
|
||||
when(tokenRepository.getRefreshTokenById(anyLong())).thenAnswer(new Answer<OAuth2RefreshTokenEntity>() {
|
||||
@Override
|
||||
public OAuth2RefreshTokenEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
Long _id = (Long) invocation.getArguments()[0];
|
||||
return fakeRefreshTokenTable.get(_id);
|
||||
}
|
||||
});
|
||||
when(clientRepository.getClientByClientId(anyString())).thenAnswer(new Answer<ClientDetailsEntity>() {
|
||||
@Override
|
||||
public ClientDetailsEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
String _clientId = (String) invocation.getArguments()[0];
|
||||
ClientDetailsEntity _client = mock(ClientDetailsEntity.class);
|
||||
when(_client.getClientId()).thenReturn(_clientId);
|
||||
return _client;
|
||||
}
|
||||
});
|
||||
when(authHolderRepository.save(isA(AuthenticationHolderEntity.class))).thenAnswer(new Answer<AuthenticationHolderEntity>() {
|
||||
Long id = 356L;
|
||||
@Override
|
||||
public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
AuthenticationHolderEntity _holder = (AuthenticationHolderEntity) invocation.getArguments()[0];
|
||||
if(_holder.getId() == null) {
|
||||
_holder.setId(id++);
|
||||
}
|
||||
fakeAuthHolderTable.put(_holder.getId(), _holder);
|
||||
return _holder;
|
||||
}
|
||||
});
|
||||
when(authHolderRepository.getById(anyLong())).thenAnswer(new Answer<AuthenticationHolderEntity>() {
|
||||
@Override
|
||||
public AuthenticationHolderEntity answer(InvocationOnMock invocation) throws Throwable {
|
||||
Long _id = (Long) invocation.getArguments()[0];
|
||||
return fakeAuthHolderTable.get(_id);
|
||||
}
|
||||
});
|
||||
dataService.importData(reader);
|
||||
|
||||
List<OAuth2RefreshTokenEntity> savedRefreshTokens = new ArrayList(fakeRefreshTokenTable.values()); //capturedRefreshTokens.getAllValues();
|
||||
Collections.sort(savedRefreshTokens, new refreshTokenIdComparator());
|
||||
|
||||
assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getClientId(),
|
||||
equalTo(token1.getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getClientId()));
|
||||
assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getClientId(),
|
||||
equalTo(token2.getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getClientId()));
|
||||
}
|
||||
|
||||
private Set<String> jsonArrayToStringSet(JsonArray a) {
|
||||
Set<String> s = new HashSet<String>();
|
||||
for (JsonElement jsonElement : a) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue