From 7c34c04ce94fa835d9dd6adc5f57f4d068a79c13 Mon Sep 17 00:00:00 2001 From: myrle-krantz Date: Fri, 17 Mar 2017 11:31:51 +0100 Subject: [PATCH] Replacing seshat with system/provisioner, and isis with identity/tenant. --- .../io/mifos/anubis/api/v1/client/Anubis.java | 8 ++-- .../java/TestAnubisTenantPermissions.java | 2 +- .../config/TenantSignatureProvider.java | 2 +- .../anubis/filter/InitializationFilter.java | 26 ++++++------ .../anubis/provider/SystemRsaKeyProvider.java | 20 +++++----- .../TenantAuthorizationDataRepository.java | 4 +- .../security/AmitAuthenticationException.java | 4 +- .../anubis/security/SystemAuthenticator.java | 2 +- .../anubis/security/TenantAuthenticator.java | 2 +- .../java/io/mifos/anubis/token/TokenType.java | 2 +- .../filter/InitializationFilterTest.java | 8 ++-- .../SystemAccessTokenSerializerTest.java | 8 ++-- .../TenantAccessTokenSerializerTest.java | 8 ++-- .../io/mifos/anubis/token/TokenTypeTest.java | 8 ++-- .../test/v1/SystemSecurityEnvironment.java | 40 +++++++++---------- ...pplicationSecurityEnvironmentTestRule.java | 16 ++++---- 16 files changed, 80 insertions(+), 80 deletions(-) diff --git a/api/src/main/java/io/mifos/anubis/api/v1/client/Anubis.java b/api/src/main/java/io/mifos/anubis/api/v1/client/Anubis.java index 4493c85..de2ddb5 100644 --- a/api/src/main/java/io/mifos/anubis/api/v1/client/Anubis.java +++ b/api/src/main/java/io/mifos/anubis/api/v1/client/Anubis.java @@ -29,8 +29,8 @@ @SuppressWarnings("WeakerAccess") @FeignClient public interface Anubis { - String ISIS_PUBLIC_KEY_MODULUS_HEADER = "X-Isis-Public-Key-Modulus"; - String ISIS_PUBLIC_KEY_EXPONENT_HEADER = "X-Isis-Public-Key-Exponent"; + String TENANT_PUBLIC_KEY_MODULUS_HEADER = "X-Tenant-Public-Key-Modulus"; + String TENANT_PUBLIC_KEY_EXPONENT_HEADER = "X-Tenant-Public-Key-Exponent"; @RequestMapping( value = "/permittables", @@ -44,7 +44,7 @@ public interface Anubis { consumes = {MediaType.APPLICATION_JSON_VALUE}, produces = {MediaType.ALL_VALUE}) void initialize( - @RequestHeader(ISIS_PUBLIC_KEY_MODULUS_HEADER) BigInteger isisKeyMod, - @RequestHeader(ISIS_PUBLIC_KEY_EXPONENT_HEADER) BigInteger isisKeyExp) + @RequestHeader(TENANT_PUBLIC_KEY_MODULUS_HEADER) BigInteger tenantKeyMod, + @RequestHeader(TENANT_PUBLIC_KEY_EXPONENT_HEADER) BigInteger tenantKeyExp) throws InvalidTokenException, TenantNotFoundException; } diff --git a/component-test/src/main/java/TestAnubisTenantPermissions.java b/component-test/src/main/java/TestAnubisTenantPermissions.java index 05b4be4..4db3a71 100644 --- a/component-test/src/main/java/TestAnubisTenantPermissions.java +++ b/component-test/src/main/java/TestAnubisTenantPermissions.java @@ -231,7 +231,7 @@ public void requestYourOwnInformationWhenYoureOnlyPermittedToAccessOwnShouldWork @Test public void tenantTokenForSystemEndpointShouldNotWorkRegardlessOfPermissions() { - try (final AutoSeshat ignored = new AutoSeshat(tenantApplicationSecurityEnvironment.seshatToken())) + try (final AutoSeshat ignored = new AutoSeshat(tenantApplicationSecurityEnvironment.systemToken())) { example.callSystemEndpoint(); } diff --git a/library/src/main/java/io/mifos/anubis/config/TenantSignatureProvider.java b/library/src/main/java/io/mifos/anubis/config/TenantSignatureProvider.java index 757d6e2..378e28f 100644 --- a/library/src/main/java/io/mifos/anubis/config/TenantSignatureProvider.java +++ b/library/src/main/java/io/mifos/anubis/config/TenantSignatureProvider.java @@ -24,7 +24,7 @@ public interface TenantSignatureProvider { /** * * @param version The version of the signature to get. - * @return The public keys that isis uses for signing tokens. + * @return The public keys that the identity service uses for signing tokens. * @throws IllegalArgumentException if the tenant context is not set. */ Optional getSignature(String version) throws IllegalArgumentException; diff --git a/library/src/main/java/io/mifos/anubis/filter/InitializationFilter.java b/library/src/main/java/io/mifos/anubis/filter/InitializationFilter.java index bf41ab2..57e3bdf 100644 --- a/library/src/main/java/io/mifos/anubis/filter/InitializationFilter.java +++ b/library/src/main/java/io/mifos/anubis/filter/InitializationFilter.java @@ -30,8 +30,8 @@ import java.math.BigInteger; import java.util.Optional; -import static io.mifos.anubis.api.v1.client.Anubis.ISIS_PUBLIC_KEY_EXPONENT_HEADER; -import static io.mifos.anubis.api.v1.client.Anubis.ISIS_PUBLIC_KEY_MODULUS_HEADER; +import static io.mifos.anubis.api.v1.client.Anubis.TENANT_PUBLIC_KEY_EXPONENT_HEADER; +import static io.mifos.anubis.api.v1.client.Anubis.TENANT_PUBLIC_KEY_MODULUS_HEADER; /** @@ -57,25 +57,25 @@ protected void doFilterInternal(final HttpServletRequest request, final String method = request.getMethod(); if (method.equals("POST")) { - final Optional isisPublicKeyExponent = - toBigInteger(request.getHeader(ISIS_PUBLIC_KEY_EXPONENT_HEADER)); - final Optional isisPublicKeyModulus = - toBigInteger(request.getHeader(ISIS_PUBLIC_KEY_MODULUS_HEADER)); + final Optional tenantPublicKeyExponent = + toBigInteger(request.getHeader(TENANT_PUBLIC_KEY_EXPONENT_HEADER)); + final Optional tenantPublicKeyModulus = + toBigInteger(request.getHeader(TENANT_PUBLIC_KEY_MODULUS_HEADER)); - if (!isisPublicKeyExponent.isPresent()) { + if (!tenantPublicKeyExponent.isPresent()) { response.sendError(HttpServletResponse.SC_BAD_REQUEST, - "Header [" + ISIS_PUBLIC_KEY_EXPONENT_HEADER + "] must be a valid big integer."); - } else if (!isisPublicKeyModulus.isPresent()) { + "Header [" + TENANT_PUBLIC_KEY_EXPONENT_HEADER + "] must be a valid big integer."); + } else if (!tenantPublicKeyModulus.isPresent()) { response.sendError(HttpServletResponse.SC_BAD_REQUEST, - "Header [" + ISIS_PUBLIC_KEY_MODULUS_HEADER + "] must be a valid big integer."); + "Header [" + TENANT_PUBLIC_KEY_MODULUS_HEADER + "] must be a valid big integer."); } else { //NOTE: we are provisioning, whether the tenant is already provisioned or not. This is - // for the case that isis public key has for some reason changed, and need to be + // for the case that tenant public key has for some reason changed, and need to be // re-broadcast. try { tenantAuthorizationDataRepository - .provisionTenant(isisPublicKeyModulus.get(), - isisPublicKeyExponent.get()); + .provisionTenant(tenantPublicKeyModulus.get(), + tenantPublicKeyExponent.get()); } catch (final ServiceException e) { diff --git a/library/src/main/java/io/mifos/anubis/provider/SystemRsaKeyProvider.java b/library/src/main/java/io/mifos/anubis/provider/SystemRsaKeyProvider.java index 7be4c84..c1f62bd 100644 --- a/library/src/main/java/io/mifos/anubis/provider/SystemRsaKeyProvider.java +++ b/library/src/main/java/io/mifos/anubis/provider/SystemRsaKeyProvider.java @@ -29,30 +29,30 @@ */ @Component public class SystemRsaKeyProvider { - private String seshatPublicKeyMod; - private String seshatPublicKeyExp; + private String systemPublicKeyMod; + private String systemPublicKeyExp; - private PublicKey seshatPublicKey; + private PublicKey systemPublicKey; @Autowired - public SystemRsaKeyProvider(final @Value("${seshat.publicKey.modulus}") String seshatPublicKeyMod, final @Value("${seshat.publicKey.exponent}") String seshatPublicKeyExp) + public SystemRsaKeyProvider(final @Value("${system.publicKey.modulus}") String systemPublicKeyMod, final @Value("${system.publicKey.exponent}") String systemPublicKeyExp) { - this.seshatPublicKeyMod = seshatPublicKeyMod; - this.seshatPublicKeyExp = seshatPublicKeyExp; + this.systemPublicKeyMod = systemPublicKeyMod; + this.systemPublicKeyExp = systemPublicKeyExp; } @PostConstruct public void init() { - this.seshatPublicKey = + this.systemPublicKey = new RsaPublicKeyBuilder() - .setPublicKeyMod(new BigInteger(seshatPublicKeyMod)) - .setPublicKeyExp(new BigInteger(seshatPublicKeyExp)) + .setPublicKeyMod(new BigInteger(systemPublicKeyMod)) + .setPublicKeyExp(new BigInteger(systemPublicKeyExp)) .build(); } public PublicKey getPublicKey(final String tokenVersion) throws InvalidKeyVersionException { if (!tokenVersion.equals("1")) throw new InvalidKeyVersionException(tokenVersion); - return seshatPublicKey; + return systemPublicKey; } } diff --git a/library/src/main/java/io/mifos/anubis/repository/TenantAuthorizationDataRepository.java b/library/src/main/java/io/mifos/anubis/repository/TenantAuthorizationDataRepository.java index d7ccf6d..c9a4124 100644 --- a/library/src/main/java/io/mifos/anubis/repository/TenantAuthorizationDataRepository.java +++ b/library/src/main/java/io/mifos/anubis/repository/TenantAuthorizationDataRepository.java @@ -53,11 +53,11 @@ public TenantAuthorizationDataRepository( this.cassandraSessionProvider = cassandraSessionProvider; } - public void provisionTenant(final BigInteger isisPublicKeyModulus, final BigInteger isisPublicKeyExponent) { + public void provisionTenant(final BigInteger tenantPublicKeyModulus, final BigInteger tenantPublicKeyExponent) { final Session session = cassandraSessionProvider.getTenantSession(); createTable(session); - createEntry(session, isisPublicKeyModulus, isisPublicKeyExponent); + createEntry(session, tenantPublicKeyModulus, tenantPublicKeyExponent); } private void createTable(final Session tenantSession) { diff --git a/library/src/main/java/io/mifos/anubis/security/AmitAuthenticationException.java b/library/src/main/java/io/mifos/anubis/security/AmitAuthenticationException.java index 5610a71..ba890a0 100644 --- a/library/src/main/java/io/mifos/anubis/security/AmitAuthenticationException.java +++ b/library/src/main/java/io/mifos/anubis/security/AmitAuthenticationException.java @@ -58,12 +58,12 @@ public static AmitAuthenticationException missingTokenContent() { return new AmitAuthenticationException("Token does not contain content. Perhaps you submitted a refresh token instead of the access token?"); } - @SuppressWarnings("unused") //used in isis + @SuppressWarnings("unused") //used in identity public static AmitAuthenticationException userPasswordCombinationNotFound() { return new AmitAuthenticationException("A user with the given useridentifier and password doesn't exist."); } - @SuppressWarnings("unused") //used in isis + @SuppressWarnings("unused") //used in identity public static AmitAuthenticationException passwordExpired() { return new AmitAuthenticationException("Users password has expired."); } diff --git a/library/src/main/java/io/mifos/anubis/security/SystemAuthenticator.java b/library/src/main/java/io/mifos/anubis/security/SystemAuthenticator.java index e12bab6..badaa78 100644 --- a/library/src/main/java/io/mifos/anubis/security/SystemAuthenticator.java +++ b/library/src/main/java/io/mifos/anubis/security/SystemAuthenticator.java @@ -83,7 +83,7 @@ public AnubisAuthentication authenticate( logger.debug("token = {}", token); throw AmitAuthenticationException.invalidToken(); } catch (final InvalidKeyVersionException e) { - throw AmitAuthenticationException.invalidTokenVersion("seshat", version); + throw AmitAuthenticationException.invalidTokenVersion("system", version); } } } diff --git a/library/src/main/java/io/mifos/anubis/security/TenantAuthenticator.java b/library/src/main/java/io/mifos/anubis/security/TenantAuthenticator.java index 44911c6..3ef9a63 100644 --- a/library/src/main/java/io/mifos/anubis/security/TenantAuthenticator.java +++ b/library/src/main/java/io/mifos/anubis/security/TenantAuthenticator.java @@ -86,7 +86,7 @@ AnubisAuthentication authenticate( catch (final JwtException e) { throw AmitAuthenticationException.invalidToken(); } catch (final InvalidKeyVersionException e) { - throw AmitAuthenticationException.invalidTokenVersion("isis", version); + throw AmitAuthenticationException.invalidTokenVersion("tenant", version); } } diff --git a/library/src/main/java/io/mifos/anubis/token/TokenType.java b/library/src/main/java/io/mifos/anubis/token/TokenType.java index 4300b58..c6f3da7 100644 --- a/library/src/main/java/io/mifos/anubis/token/TokenType.java +++ b/library/src/main/java/io/mifos/anubis/token/TokenType.java @@ -18,7 +18,7 @@ import java.util.Optional; public enum TokenType { - SYSTEM("seshat"), TENANT("isis"), ; + SYSTEM("system"), TENANT("tenant"), ; private final String issuer; diff --git a/library/src/test/java/io/mifos/anubis/filter/InitializationFilterTest.java b/library/src/test/java/io/mifos/anubis/filter/InitializationFilterTest.java index 6bf797f..0d48ff3 100644 --- a/library/src/test/java/io/mifos/anubis/filter/InitializationFilterTest.java +++ b/library/src/test/java/io/mifos/anubis/filter/InitializationFilterTest.java @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.Collection; -import static io.mifos.anubis.api.v1.client.Anubis.ISIS_PUBLIC_KEY_EXPONENT_HEADER; -import static io.mifos.anubis.api.v1.client.Anubis.ISIS_PUBLIC_KEY_MODULUS_HEADER; +import static io.mifos.anubis.api.v1.client.Anubis.TENANT_PUBLIC_KEY_EXPONENT_HEADER; +import static io.mifos.anubis.api.v1.client.Anubis.TENANT_PUBLIC_KEY_MODULUS_HEADER; import static javax.servlet.http.HttpServletResponse.*; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -107,9 +107,9 @@ public void setup() request = Mockito.mock(HttpServletRequest.class); when(request.getMethod()).thenReturn(testCase.method); - when(request.getHeader(ISIS_PUBLIC_KEY_EXPONENT_HEADER)).thenReturn( + when(request.getHeader(TENANT_PUBLIC_KEY_EXPONENT_HEADER)).thenReturn( String.valueOf(testCase.publicKeyExp)); - when(request.getHeader(ISIS_PUBLIC_KEY_MODULUS_HEADER)).thenReturn( + when(request.getHeader(TENANT_PUBLIC_KEY_MODULUS_HEADER)).thenReturn( String.valueOf(testCase.publicKeyMod)); response = Mockito.mock(HttpServletResponse.class); diff --git a/library/src/test/java/io/mifos/anubis/token/SystemAccessTokenSerializerTest.java b/library/src/test/java/io/mifos/anubis/token/SystemAccessTokenSerializerTest.java index 1f0aef3..86338b5 100644 --- a/library/src/test/java/io/mifos/anubis/token/SystemAccessTokenSerializerTest.java +++ b/library/src/test/java/io/mifos/anubis/token/SystemAccessTokenSerializerTest.java @@ -68,11 +68,11 @@ public void shouldCreateValidSeshatToken() throws Exception { final SystemAccessTokenSerializer testSubject = new SystemAccessTokenSerializer(); final LocalDateTime now = LocalDateTime.now(ZoneId.of("UTC")); - final TokenSerializationResult seshatToken = testSubject.build(specification); + final TokenSerializationResult systemToken = testSubject.build(specification); - Assert.assertNotNull(seshatToken); + Assert.assertNotNull(systemToken); - final LocalDateTime expiration = seshatToken.getExpiration(); + final LocalDateTime expiration = systemToken.getExpiration(); final long diff = expiration.toInstant(ZoneOffset.ofHours(0)).getEpochSecond() - now.toInstant(ZoneOffset.ofHours(0)).getEpochSecond(); @@ -82,7 +82,7 @@ public void shouldCreateValidSeshatToken() throws Exception { final Jwt parsedToken = Jwts .parser() .setSigningKey(keyPairHolder.publicKey()) - .parse(seshatToken.getToken().substring("Bearer ".length()).trim()); + .parse(systemToken.getToken().substring("Bearer ".length()).trim()); Assert.assertNotNull(parsedToken); diff --git a/library/src/test/java/io/mifos/anubis/token/TenantAccessTokenSerializerTest.java b/library/src/test/java/io/mifos/anubis/token/TenantAccessTokenSerializerTest.java index f048884..4e51bf5 100644 --- a/library/src/test/java/io/mifos/anubis/token/TenantAccessTokenSerializerTest.java +++ b/library/src/test/java/io/mifos/anubis/token/TenantAccessTokenSerializerTest.java @@ -63,11 +63,11 @@ public void shouldCreateValidSeshatToken() throws Exception final TenantAccessTokenSerializer testSubject = new TenantAccessTokenSerializer(new Gson()); final LocalDateTime now = LocalDateTime.now(ZoneId.of("UTC")); - final TokenSerializationResult seshatToken = testSubject.build(specification); + final TokenSerializationResult systemToken = testSubject.build(specification); - Assert.assertNotNull(seshatToken); + Assert.assertNotNull(systemToken); - final LocalDateTime expiration = seshatToken.getExpiration(); + final LocalDateTime expiration = systemToken.getExpiration(); final long diff = expiration.toInstant(ZoneOffset.ofHours(0)).getEpochSecond() - now.toInstant(ZoneOffset.ofHours(0)).getEpochSecond(); @@ -77,7 +77,7 @@ public void shouldCreateValidSeshatToken() throws Exception final Jwt parsedToken = Jwts .parser() .setSigningKey(keyPairHolder.publicKey()) - .parse(seshatToken.getToken().substring("Bearer ".length()).trim()); + .parse(systemToken.getToken().substring("Bearer ".length()).trim()); Assert.assertNotNull(parsedToken); diff --git a/library/src/test/java/io/mifos/anubis/token/TokenTypeTest.java b/library/src/test/java/io/mifos/anubis/token/TokenTypeTest.java index fc98051..9f4c153 100644 --- a/library/src/test/java/io/mifos/anubis/token/TokenTypeTest.java +++ b/library/src/test/java/io/mifos/anubis/token/TokenTypeTest.java @@ -29,15 +29,15 @@ public class TokenTypeTest { @Test public void valueOfIssuer() { - Assert.assertEquals(TokenType.valueOfIssuer("seshat").get(), TokenType.SYSTEM); - Assert.assertEquals(TokenType.valueOfIssuer("isis").get(), TokenType.TENANT); + Assert.assertEquals(TokenType.valueOfIssuer("system").get(), TokenType.SYSTEM); + Assert.assertEquals(TokenType.valueOfIssuer("tenant").get(), TokenType.TENANT); Assert.assertEquals(TokenType.valueOfIssuer("ra"), Optional.empty()); } @Test public void getIssuer() { - Assert.assertEquals(TokenType.SYSTEM.getIssuer(), "seshat"); - Assert.assertEquals(TokenType.TENANT.getIssuer(), "isis"); + Assert.assertEquals(TokenType.SYSTEM.getIssuer(), "system"); + Assert.assertEquals(TokenType.TENANT.getIssuer(), "tenant"); } } diff --git a/test/src/main/java/io/mifos/anubis/test/v1/SystemSecurityEnvironment.java b/test/src/main/java/io/mifos/anubis/test/v1/SystemSecurityEnvironment.java index f597c83..ca2b881 100644 --- a/test/src/main/java/io/mifos/anubis/test/v1/SystemSecurityEnvironment.java +++ b/test/src/main/java/io/mifos/anubis/test/v1/SystemSecurityEnvironment.java @@ -58,39 +58,39 @@ public class SystemSecurityEnvironment { private final TenantAccessTokenSerializer tenantAccessTokenSerializer; private final SystemAccessTokenSerializer systemAccessTokenSerializer; - private final PublicKey seshatPublicKey; - private final PrivateKey seshatPrivateKey; - private final Map isisKeyPairHolders; + private final PublicKey systemPublicKey; + private final PrivateKey systemPrivateKey; + private final Map tenantKeyPairHolders; - public SystemSecurityEnvironment(final PublicKey seshatPublicKey, final PrivateKey seshatPrivateKey) { + public SystemSecurityEnvironment(final PublicKey systemPublicKey, final PrivateKey systemPrivateKey) { final Gson gson = new GsonBuilder().create(); this.tenantAccessTokenSerializer = new TenantAccessTokenSerializer(gson); this.systemAccessTokenSerializer = new SystemAccessTokenSerializer(); - this.seshatPublicKey = seshatPublicKey; - this.seshatPrivateKey = seshatPrivateKey; + this.systemPublicKey = systemPublicKey; + this.systemPrivateKey = systemPrivateKey; - this.isisKeyPairHolders = new HashMap<>(); + this.tenantKeyPairHolders = new HashMap<>(); } - public AutoUserContext createAutoSeshatContext(final String applicationName) + public AutoUserContext createAutoSystemContext(final String applicationName) { - return new AutoSeshat(seshatToken(applicationName)); + return new AutoSeshat(systemToken(applicationName)); } - public AutoUserContext createAutoSeshatContext(final String tenantName, final String applicationName) { - return new AutoSeshat(seshatToken(tenantName, applicationName)); + public AutoUserContext createAutoSystemContext(final String tenantName, final String applicationName) { + return new AutoSeshat(systemToken(tenantName, applicationName)); } - public String seshatToken(final String applicationName) { - return seshatToken(TenantContextHolder.checkedGetIdentifier(), applicationName); + public String systemToken(final String applicationName) { + return systemToken(TenantContextHolder.checkedGetIdentifier(), applicationName); } - private String seshatToken(final String tenantName, final String applicationName) { + private String systemToken(final String tenantName, final String applicationName) { return systemAccessTokenSerializer.build(new SystemAccessTokenSerializer.Specification() .setTenant(tenantName) .setRole(RoleConstants.SYSTEM_ADMIN_ROLE_IDENTIFIER) .setSecondsToLive(TimeUnit.HOURS.toSeconds(12)) - .setPrivateKey(seshatPrivateKey) + .setPrivateKey(systemPrivateKey) .setTargetApplicationName(applicationName) ).getToken(); } @@ -131,13 +131,13 @@ private TokenContent generateOnePermissionTokenContent(final String applicationN public RSAPublicKey tenantPublicKey() { - return isisKeyPairHolders.computeIfAbsent(TenantContextHolder.checkedGetIdentifier(), + return tenantKeyPairHolders.computeIfAbsent(TenantContextHolder.checkedGetIdentifier(), x -> RsaKeyPairFactory.createKeyPair()).publicKey(); } public RSAPrivateKey tenantPrivateKey() { - return isisKeyPairHolders.computeIfAbsent(TenantContextHolder.checkedGetIdentifier(), + return tenantKeyPairHolders.computeIfAbsent(TenantContextHolder.checkedGetIdentifier(), x -> RsaKeyPairFactory.createKeyPair()).privateKey(); } @@ -183,19 +183,19 @@ public boolean isValidToken(final String token, final SystemRsaKeyProvider systemRsaKeyProvider = Mockito.mock(SystemRsaKeyProvider.class); try { - Mockito.doReturn(seshatPublicKey).when(systemRsaKeyProvider).getPublicKey(Mockito.anyString()); + Mockito.doReturn(systemPublicKey).when(systemRsaKeyProvider).getPublicKey(Mockito.anyString()); } catch (final InvalidKeyVersionException ignored) {} final Logger logger = LoggerFactory.getLogger(LOGGER_NAME); - final SystemAuthenticator isisSystemAuthenticator = new SystemAuthenticator( + final SystemAuthenticator systemAuthenticator = new SystemAuthenticator( systemRsaKeyProvider, ApplicationName.appNameWithVersion(forService, forServiceVersion), permittableService, logger); try { - return (isisSystemAuthenticator.authenticate(forUser, jwtToken, "1") != null); + return (systemAuthenticator.authenticate(forUser, jwtToken, "1") != null); } catch (final Exception e) { diff --git a/test/src/main/java/io/mifos/anubis/test/v1/TenantApplicationSecurityEnvironmentTestRule.java b/test/src/main/java/io/mifos/anubis/test/v1/TenantApplicationSecurityEnvironmentTestRule.java index 76e62b0..cabdf0d 100644 --- a/test/src/main/java/io/mifos/anubis/test/v1/TenantApplicationSecurityEnvironmentTestRule.java +++ b/test/src/main/java/io/mifos/anubis/test/v1/TenantApplicationSecurityEnvironmentTestRule.java @@ -55,8 +55,8 @@ public TenantApplicationSecurityEnvironmentTestRule(final TestEnvironment testEn this(testEnvironment.getProperty(SPRING_APPLICATION_NAME_PROPERTY), testEnvironment.serverURI(), new SystemSecurityEnvironment( - testEnvironment.getSeshatPublicKey(), - testEnvironment.getSeshatPrivateKey()), + testEnvironment.getSystemPublicKey(), + testEnvironment.getSystemPrivateKey()), waitForInitialize); } @@ -83,10 +83,10 @@ public void initializeTenantInApplication() { final Anubis anubis = AnubisApiFactory.create(applicationUri); - final String seshatToken = systemSecurityEnvironment.seshatToken(applicationName); + final String systemToken = systemSecurityEnvironment.systemToken(applicationName); try (final AutoTenantContext x = new AutoTenantContext(TenantContextHolder.checkedGetIdentifier())) { - try (final AutoSeshat y = new AutoSeshat(seshatToken)) { + try (final AutoSeshat y = new AutoSeshat(systemToken)) { final RSAPublicKey publicKey = systemSecurityEnvironment.tenantPublicKey(); anubis.initialize(publicKey.getModulus(), publicKey.getPublicExponent()); }} @@ -104,12 +104,12 @@ public AutoUserContext createAutoUserContext(final String userName) public AutoUserContext createAutoSeshatContext() { - return systemSecurityEnvironment.createAutoSeshatContext(applicationName); + return systemSecurityEnvironment.createAutoSystemContext(applicationName); } public AutoUserContext createAutoSeshatContext(final String tenantName) { - return systemSecurityEnvironment.createAutoSeshatContext(tenantName, applicationName); + return systemSecurityEnvironment.createAutoSystemContext(tenantName, applicationName); } public String getPermissionToken( @@ -119,7 +119,7 @@ public String getPermissionToken( return systemSecurityEnvironment.getPermissionToken(userName, applicationName, uri, allowedOperation); } - public String seshatToken() { - return systemSecurityEnvironment.seshatToken(applicationName); + public String systemToken() { + return systemSecurityEnvironment.systemToken(applicationName); } }