smolnar82 commented on code in PR #1343:
URL: https://github.com/apache/knox/pull/1343#discussion_r3757428815
##########
gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java:
##########
@@ -785,13 +785,19 @@ private Response setTokenEnabledFlags(String tokenIds,
boolean enabled) {
private Response setTokenEnabledFlag(String tokenId, boolean enable, boolean
batch) {
String error = "";
ErrorCode errorCode = ErrorCode.UNKNOWN;
+ Response.Status errorStatus = Response.Status.BAD_REQUEST;
Review Comment:
I'd call it `responseStatus` (as it could be `OK`, which isn't an error).
##########
gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java:
##########
@@ -785,13 +785,19 @@ private Response setTokenEnabledFlags(String tokenIds,
boolean enabled) {
private Response setTokenEnabledFlag(String tokenId, boolean enable, boolean
batch) {
String error = "";
ErrorCode errorCode = ErrorCode.UNKNOWN;
+ Response.Status errorStatus = Response.Status.BAD_REQUEST;
if (tokenStateService == null) {
error = "Unable to " + (enable ? "enable" : "disable") + " tokens
because token management is not configured";
errorCode = ErrorCode.CONFIGURATION_ERROR;
} else {
try {
final TokenMetadata tokenMetadata =
tokenStateService.getTokenMetadata(tokenId);
- if (!batch && enable && tokenMetadata.isEnabled()) {
+ final String caller = SubjectUtils.getCurrentEffectivePrincipalName();
+ if (!(triesToRevokeOwnToken(tokenId, caller) ||
tokenRenewalOrRevocationAuthorized(caller))) {
Review Comment:
We may want to rename `tokenRenewalOrRevocationAuthorized` to something that
reflects these use cases too. Maybe `tokenStateChangeAuthorized`?
##########
gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java:
##########
@@ -785,13 +785,19 @@ private Response setTokenEnabledFlags(String tokenIds,
boolean enabled) {
private Response setTokenEnabledFlag(String tokenId, boolean enable, boolean
batch) {
String error = "";
ErrorCode errorCode = ErrorCode.UNKNOWN;
+ Response.Status errorStatus = Response.Status.BAD_REQUEST;
if (tokenStateService == null) {
error = "Unable to " + (enable ? "enable" : "disable") + " tokens
because token management is not configured";
errorCode = ErrorCode.CONFIGURATION_ERROR;
} else {
try {
final TokenMetadata tokenMetadata =
tokenStateService.getTokenMetadata(tokenId);
- if (!batch && enable && tokenMetadata.isEnabled()) {
+ final String caller = SubjectUtils.getCurrentEffectivePrincipalName();
+ if (!(triesToRevokeOwnToken(tokenId, caller) ||
tokenRenewalOrRevocationAuthorized(caller))) {
Review Comment:
The same goes for `triesToRevokeOwnToken`. It's no longer about revocation.
--
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]
