Skip to content

Commit 5132a52

Browse files
remove the authenticate token method
Signed-off-by: Stephen Crawford <[email protected]>
1 parent 1447d75 commit 5132a52

File tree

4 files changed

+0
-31
lines changed

4 files changed

+0
-31
lines changed

plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroTokenManager.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,6 @@ public AuthToken issueServiceAccountToken(String audience) {
8888
return token;
8989
}
9090

91-
@Override
92-
public Subject authenticateToken(AuthToken authToken) {
93-
return new NoopSubject();
94-
}
95-
96-
public boolean validateToken(AuthToken token) {
97-
if (token instanceof BasicAuthToken) {
98-
final BasicAuthToken basicAuthToken = (BasicAuthToken) token;
99-
return basicAuthToken.getUser().equals(SecurityUtils.getSubject().toString())
100-
&& basicAuthToken.getPassword().equals(shiroTokenPasswordMap.get(basicAuthToken));
101-
}
102-
return false;
103-
}
104-
10591
public String getTokenInfo(AuthToken token) {
10692
if (token instanceof BasicAuthToken) {
10793
final BasicAuthToken basicAuthToken = (BasicAuthToken) token;

plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/AuthTokenHandlerTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@ public void testShouldFailGetTokenInfo() {
100100
assertThrows(UnsupportedAuthenticationToken.class, () -> shiroAuthTokenHandler.getTokenInfo(bearerAuthToken));
101101
}
102102

103-
public void testShouldFailValidateToken() {
104-
final BearerAuthToken bearerAuthToken = new BearerAuthToken("header.payload.signature");
105-
assertFalse(shiroAuthTokenHandler.validateToken(bearerAuthToken));
106-
}
107-
108103
public void testShoudPassMapLookupWithToken() {
109104
final BasicAuthToken authToken = new BasicAuthToken("Basic dGVzdDp0ZTpzdA==");
110105
shiroAuthTokenHandler.getShiroTokenPasswordMap().put(authToken, "te:st");

server/src/main/java/org/opensearch/identity/noop/NoopTokenManager.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,4 @@ public String asAuthHeaderValue() {
5050
}
5151
};
5252
}
53-
54-
@Override
55-
public Subject authenticateToken(AuthToken authToken) {
56-
return null;
57-
}
5853
}

server/src/main/java/org/opensearch/identity/tokens/TokenManager.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,4 @@ public interface TokenManager {
3030
* @return a new auth token
3131
*/
3232
public AuthToken issueServiceAccountToken(final String audience);
33-
34-
/**
35-
* Authenticates a provided authToken
36-
* @param authToken: The authToken to authenticate
37-
* @return The authenticated subject
38-
*/
39-
public Subject authenticateToken(AuthToken authToken);
4033
}

0 commit comments

Comments
 (0)