zeroflag commented on code in PR #799:
URL: https://github.com/apache/knox/pull/799#discussion_r1350035362
##########
gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java:
##########
@@ -452,8 +459,11 @@ public Response getUserTokens(@Context UriInfo uriInfo) {
final String userName =
uriInfo.getQueryParameters().getFirst("userName");
final String createdBy =
uriInfo.getQueryParameters().getFirst("createdBy");
final String userNameOrCreatedBy =
uriInfo.getQueryParameters().getFirst("userNameOrCreatedBy");
+ final boolean allTokens =
Boolean.parseBoolean(uriInfo.getQueryParameters().getFirst("allTokens"));
Review Comment:
What happens if there are no query parameters? Will this fail with an
exception?
##########
gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/TokenStateDatabase.java:
##########
@@ -192,7 +196,9 @@ Collection<KnoxToken> getDoAsTokens(String userName) throws
SQLException {
private Collection<KnoxToken> fetchTokens(String userName, String sql)
throws SQLException {
Map<String, KnoxToken> tokenMap = new LinkedHashMap<>();
try (Connection connection = dataSource.getConnection(); PreparedStatement
getTokenIdsStatement = connection.prepareStatement(sql)) {
- getTokenIdsStatement.setString(1, userName);
+ if (userName != null) {
+ getTokenIdsStatement.setString(1, userName);
Review Comment:
What happens if we don't set the userName parameter of the prepared
statement? Does it work too?
##########
knox-token-management-ui/token-management/app/knox.token.ts:
##########
@@ -25,4 +25,8 @@ export class KnoxToken {
expirationLong: number;
maxLifetime: string;
metadata: Metadata;
+
+ public toString = (): string => {
+ return `KnoxToken (tokenId: ${this.tokenId})`;
Review Comment:
What is the backtick here?
##########
gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java:
##########
@@ -648,17 +673,47 @@ private String getTokenId(String token) throws
ParseException {
@Path(ENABLE_PATH)
@Produces({ APPLICATION_JSON })
public Response enable(String tokenId) {
- return setTokenEnabledFlag(tokenId, true);
+ return setTokenEnabledFlag(tokenId, true, false);
+ }
+
+ @PUT
+ @Path(BATCH_ENABLE_PATH)
+ @Consumes({ APPLICATION_JSON })
+ @Produces({ APPLICATION_JSON })
+ public Response enableTokens(String tokenIds) {
+ return setTokenEnabledFlags(tokenIds, true);
}
@PUT
@Path(DISABLE_PATH)
@Produces({ APPLICATION_JSON })
public Response disable(String tokenId) {
- return setTokenEnabledFlag(tokenId, false);
+ return setTokenEnabledFlag(tokenId, false, false);
+ }
+
+ @PUT
+ @Path(BATCH_DISABLE_PATH)
+ @Consumes({ APPLICATION_JSON })
+ @Produces({ APPLICATION_JSON })
+ public Response disableTokens(String tokenIds) {
+ return setTokenEnabledFlags(tokenIds, false);
}
- private Response setTokenEnabledFlag(String tokenId, boolean enabled) {
+ @SuppressWarnings("unchecked")
+ private Response setTokenEnabledFlags(String tokenIds, boolean enabled) {
+ final List<String> ids = GSON.fromJson(tokenIds, List.class);
Review Comment:
Same as above.
##########
gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java:
##########
@@ -559,6 +569,22 @@ public Response renew(String token) {
return resp;
}
+ @DELETE
+ @Path(BATCH_REVOKE_PATH)
+ @Produces({APPLICATION_JSON})
+ public Response revokeTokens(String tokenIds) {
+ final List<String> ids = GSON.fromJson(tokenIds, List.class);
Review Comment:
I wonder if the JSON input parsing would work with
`@Consumes(APPLICATION_JSON)` out of the box, without manually doing it with
Gson.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]