Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Derek Ho <[email protected]>
  • Loading branch information
@derek-ho
derek-ho committed Jan 14, 2025
1 parent d7b7e47 commit 6571d9d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 29 deletions.
45 changes: 17 additions & 28 deletions src/test/java/org/opensearch/security/action/apitokens/ApiTokenAuthenticatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.security.authtoken.jwt.EncryptionDecryptionUtil;
import org.opensearch.security.filter.SecurityRequest;
import org.opensearch.security.http.ApiTokenAuthenticator;
import org.opensearch.security.user.AuthCredentials;
Expand Down Expand Up @@ -55,16 +54,11 @@ public class ApiTokenAuthenticatorTest {
private ThreadContext threadcontext;
private final String signingKey = Base64.getEncoder()
.encodeToString("jwt signing key long enough for secure api token authentication testing".getBytes(StandardCharsets.UTF_8));
private final String encryptionKey = Base64.getEncoder().encodeToString("123456678910".getBytes(StandardCharsets.UTF_8));
private final EncryptionDecryptionUtil encryptionUtil = new EncryptionDecryptionUtil(encryptionKey);
private final String tokenName = "test-token";

@Before
public void setUp() {
Settings settings = Settings.builder()
.put("enabled", "true")
.put("signing_key", signingKey)
.put("encryption_key", encryptionKey)
.build();
Settings settings = Settings.builder().put("enabled", "true").put("signing_key", signingKey).build();

authenticator = new ApiTokenAuthenticator(settings, "opensearch-cluster");
authenticator.log = log;
Expand All @@ -91,15 +85,14 @@ public void testAuthenticationFailsWhenJtiNotInCache() {
public void testExtractCredentialsPassWhenJtiInCache() {
String token = Jwts.builder()
.setIssuer("opensearch-cluster")
.setSubject("test-token")
.setAudience("test-token")
.setSubject(tokenName)
.setAudience(tokenName)
.setIssuedAt(Date.from(Instant.now()))
.setExpiration(Date.from(Instant.now().plus(1, ChronoUnit.DAYS)))
.signWith(SignatureAlgorithm.HS512, signingKey)
.compact();

String encryptedToken = encryptionUtil.encrypt(token);
ApiTokenIndexListenerCache.getInstance().getJtis().put(encryptedToken, new Permissions(List.of(), List.of()));
ApiTokenIndexListenerCache.getInstance().getJtis().put(tokenName, new Permissions(List.of(), List.of()));

SecurityRequest request = mock(SecurityRequest.class);
when(request.header("Authorization")).thenReturn("Bearer " + token);
Expand All @@ -114,15 +107,14 @@ public void testExtractCredentialsPassWhenJtiInCache() {
public void testExtractCredentialsFailWhenTokenIsExpired() {
String token = Jwts.builder()
.setIssuer("opensearch-cluster")
.setSubject("test-token")
.setAudience("test-token")
.setSubject(tokenName)
.setAudience(tokenName)
.setIssuedAt(Date.from(Instant.now()))
.setExpiration(Date.from(Instant.now().minus(1, ChronoUnit.DAYS)))
.signWith(SignatureAlgorithm.HS512, signingKey)
.compact();

String encryptedToken = encryptionUtil.encrypt(token);
ApiTokenIndexListenerCache.getInstance().getJtis().put(encryptedToken, new Permissions(List.of(), List.of()));
ApiTokenIndexListenerCache.getInstance().getJtis().put(tokenName, new Permissions(List.of(), List.of()));

SecurityRequest request = mock(SecurityRequest.class);
when(request.header("Authorization")).thenReturn("Bearer " + token);
Expand All @@ -139,15 +131,14 @@ public void testExtractCredentialsFailWhenTokenIsExpired() {
public void testExtractCredentialsFailWhenIssuerDoesNotMatch() {
String token = Jwts.builder()
.setIssuer("not-opensearch-cluster")
.setSubject("test-token")
.setAudience("test-token")
.setSubject(tokenName)
.setAudience(tokenName)
.setIssuedAt(Date.from(Instant.now()))
.setExpiration(Date.from(Instant.now().plus(1, ChronoUnit.DAYS)))
.signWith(SignatureAlgorithm.HS512, signingKey)
.compact();

String encryptedToken = encryptionUtil.encrypt(token);
ApiTokenIndexListenerCache.getInstance().getJtis().put(encryptedToken, new Permissions(List.of(), List.of()));
ApiTokenIndexListenerCache.getInstance().getJtis().put(tokenName, new Permissions(List.of(), List.of()));

SecurityRequest request = mock(SecurityRequest.class);
when(request.header("Authorization")).thenReturn("Bearer " + token);
Expand All @@ -163,15 +154,14 @@ public void testExtractCredentialsFailWhenIssuerDoesNotMatch() {
public void testExtractCredentialsFailWhenAccessingRestrictedEndpoint() {
String token = Jwts.builder()
.setIssuer("opensearch-cluster")
.setSubject("test-token")
.setAudience("test-token")
.setSubject(tokenName)
.setAudience(tokenName)
.setIssuedAt(Date.from(Instant.now()))
.setExpiration(Date.from(Instant.now().plus(1, ChronoUnit.DAYS)))
.signWith(SignatureAlgorithm.HS512, signingKey)
.compact();

String encryptedToken = encryptionUtil.encrypt(token);
ApiTokenIndexListenerCache.getInstance().getJtis().put(encryptedToken, new Permissions(List.of(), List.of()));
ApiTokenIndexListenerCache.getInstance().getJtis().put(tokenName, new Permissions(List.of(), List.of()));

SecurityRequest request = mock(SecurityRequest.class);
when(request.header("Authorization")).thenReturn("Bearer " + token);
Expand All @@ -187,14 +177,13 @@ public void testExtractCredentialsFailWhenAccessingRestrictedEndpoint() {
public void testAuthenticatorNotEnabled() {
String token = Jwts.builder()
.setIssuer("opensearch-cluster")
.setSubject("test-token")
.setAudience("test-token")
.setSubject(tokenName)
.setAudience(tokenName)
.setIssuedAt(Date.from(Instant.now()))
.setExpiration(Date.from(Instant.now().plus(1, ChronoUnit.DAYS)))
.signWith(SignatureAlgorithm.HS512, signingKey)
.compact();
String encryptedToken = encryptionUtil.encrypt(token);
ApiTokenIndexListenerCache.getInstance().getJtis().put(encryptedToken, new Permissions(List.of(), List.of()));
ApiTokenIndexListenerCache.getInstance().getJtis().put(tokenName, new Permissions(List.of(), List.of()));

SecurityRequest request = mock(SecurityRequest.class);

Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/opensearch/security/action/apitokens/ApiTokenIndexHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ public void testIndexTokenStoresTokenPayload() {
String source = capturedRequest.source().utf8ToString();
assertThat(source, containsString("test-token-description"));
assertThat(source, containsString("cluster:admin/something"));
assertThat(source, containsString("test-token-jti"));
assertThat(source, containsString("test-index-*"));
}

Expand Down

0 comments on commit 6571d9d

Please sign in to comment.