Skip to content

Reflect SingleUseObject store objectKey changes to HotRod implementation #12756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abstractj merged 1 commit into from
Jul 8, 2022
Merged

Reflect SingleUseObject store objectKey changes to HotRod implementation #12756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...src/main/java/org/keycloak/models/map/storage/hotRod/SingleUseObjectHotRodMapStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ public HotRodSingleUseObjectEntityDelegate create(HotRodSingleUseObjectEntityDel
if (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {
value.setId(value.getUserId() + ":" + value.getActionId() + ":" + value.getActionVerificationNonce());
}
if (value.getObjectKey() != null) {
value.setId(value.getObjectKey());
}
}
return super.create(value);
}
Expand Down
3 changes: 3 additions & 0 deletions ...ain/java/org/keycloak/models/map/storage/chm/SingleUseObjectConcurrentHashMapStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public MapSingleUseObjectEntity create(MapSingleUseObjectEntity value) {
if (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {
value.setId(value.getUserId() + ":" + value.getActionId() + ":" + value.getActionVerificationNonce());
}
if (value.getObjectKey() != null) {
value.setId(value.getObjectKey());
}
}
return super.create(value);
}
Expand Down
3 changes: 3 additions & 0 deletions ...src/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectKeycloakTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public MapSingleUseObjectEntity create(MapSingleUseObjectEntity value) {
if (value.getUserId() != null && value.getActionId() != null && value.getActionVerificationNonce() != null) {
value.setId(value.getUserId() + ":" + value.getActionId() + ":" + value.getActionVerificationNonce());
}
if (value.getObjectKey() != null) {
value.setId(value.getObjectKey());
}
}
return super.create(value);
}
Expand Down
19 changes: 15 additions & 4 deletions ...rc/main/java/org/keycloak/models/map/storage/chm/SingleUseObjectModelCriteriaBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.keycloak.models.map.storage.chm;

import org.keycloak.models.ActionTokenValueModel;
import org.keycloak.models.map.storage.ModelCriteriaBuilder;
import org.keycloak.storage.SearchableModelField;

Expand All @@ -31,13 +32,16 @@ public class SingleUseObjectModelCriteriaBuilder implements ModelCriteriaBuilder

private String actionVerificationNonce;

private String objectKey;

public SingleUseObjectModelCriteriaBuilder() {
}

public SingleUseObjectModelCriteriaBuilder(String userId, String actionId, String actionVerificationNonce) {
public SingleUseObjectModelCriteriaBuilder(String userId, String actionId, String actionVerificationNonce, String objectKey) {
this.userId = userId;
this.actionId = actionId;
this.actionVerificationNonce = actionVerificationNonce;
this.objectKey = objectKey;
}

@Override
Expand All @@ -48,15 +52,18 @@ public ModelCriteriaBuilder compare(SearchableModelField modelField, Operator op
actionId = value[0].toString();
} else if (modelField == org.keycloak.models.ActionTokenValueModel.SearchableFields.ACTION_VERIFICATION_NONCE) {
actionVerificationNonce = value[0].toString();
} else if (modelField == ActionTokenValueModel.SearchableFields.OBJECT_KEY) {
objectKey = value[0].toString();
}
return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce);
return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce, objectKey);
}

@Override
public ModelCriteriaBuilder and(ModelCriteriaBuilder[] builders) {
String userId = null;
String actionId = null;
String actionVerificationNonce = null;
String objectKey = null;

for (ModelCriteriaBuilder builder: builders) {
SingleUseObjectModelCriteriaBuilder suoMcb = (SingleUseObjectModelCriteriaBuilder) builder;
Expand All @@ -69,8 +76,11 @@ public ModelCriteriaBuilder and(ModelCriteriaBuilder[] builders) {
if (suoMcb.actionVerificationNonce != null) {
actionVerificationNonce = suoMcb.actionVerificationNonce;
}
if (suoMcb.objectKey != null) {
objectKey = suoMcb.objectKey;
}
}
return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce);
return new SingleUseObjectModelCriteriaBuilder(userId, actionId, actionVerificationNonce, objectKey);
}

@Override
Expand All @@ -84,10 +94,11 @@ public ModelCriteriaBuilder not(ModelCriteriaBuilder builder) {
}

public boolean isValid() {
return userId != null && actionId != null && actionVerificationNonce != null;
return (userId != null && actionId != null && actionVerificationNonce != null) || objectKey != null;
}

public String getKey() {
if (objectKey != null) return objectKey;
return userId + ":" + actionId + ":" + actionVerificationNonce;
}
}