-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make PermissionTicket events marshallable
Fixes #35328 Signed-off-by: Pedro Ruivo <[email protected]>
- Loading branch information
Showing
6 changed files
with
355 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
.../org/keycloak/models/cache/infinispan/authorization/events/BasePermissionTicketEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Copyright 2024 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.models.cache.infinispan.authorization.events; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| import org.infinispan.protostream.annotations.ProtoField; | ||
| import org.keycloak.models.cache.infinispan.events.InvalidationEvent; | ||
|
|
||
| abstract class BasePermissionTicketEvent extends InvalidationEvent implements AuthorizationCacheInvalidationEvent { | ||
|
|
||
| private final String owner; | ||
| private final String resource; | ||
| private final String scope; | ||
| private final String serverId; | ||
| private final String requester; | ||
| private final String resourceName; | ||
|
|
||
| BasePermissionTicketEvent(String id, String owner, String resource, String scope, String serverId, String requester, String resourceName) { | ||
| super(id); | ||
| this.owner = owner; | ||
| this.resource = resource; | ||
| this.scope = scope; | ||
| this.serverId = serverId; | ||
| this.requester = requester; | ||
| this.resourceName = resourceName; | ||
| } | ||
|
|
||
| @ProtoField(2) | ||
| public String getOwner() { | ||
| return owner; | ||
| } | ||
|
|
||
| @ProtoField(3) | ||
| public String getRequester() { | ||
| return requester; | ||
| } | ||
|
|
||
| @ProtoField(4) | ||
| public String getResource() { | ||
| return resource; | ||
| } | ||
|
|
||
| @ProtoField(5) | ||
| public String getResourceName() { | ||
| return resourceName; | ||
| } | ||
|
|
||
| @ProtoField(6) | ||
| public String getScope() { | ||
| return scope; | ||
| } | ||
|
|
||
| @ProtoField(7) | ||
| public String getServerId() { | ||
| return serverId; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "%s [ id=%s, name=%s]".formatted(getClass().getName(), getId(), resource); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| if (!super.equals(o)) return false; | ||
| BasePermissionTicketEvent that = (BasePermissionTicketEvent) o; | ||
| return Objects.equals(resource, that.resource) && Objects.equals(serverId, that.serverId); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(super.hashCode(), resource, serverId); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,60 +17,30 @@ | |
|
|
||
| package org.keycloak.models.cache.infinispan.authorization.events; | ||
|
|
||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| import org.infinispan.protostream.annotations.ProtoFactory; | ||
| import org.infinispan.protostream.annotations.ProtoTypeId; | ||
| import org.keycloak.marshalling.Marshalling; | ||
| import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; | ||
| import org.keycloak.models.cache.infinispan.events.InvalidationEvent; | ||
|
|
||
| /** | ||
| * @author <a href="mailto:[email protected]">Marek Posolda</a> | ||
| */ | ||
| public class PermissionTicketRemovedEvent extends InvalidationEvent implements AuthorizationCacheInvalidationEvent { | ||
| @ProtoTypeId(Marshalling.PERMISSION_TICKET_REMOVED_EVENT) | ||
| public class PermissionTicketRemovedEvent extends BasePermissionTicketEvent { | ||
|
|
||
| private String owner; | ||
| private String resource; | ||
| private String scope; | ||
| private String serverId; | ||
| private String requester; | ||
| private String resourceName; | ||
|
|
||
| private PermissionTicketRemovedEvent(String id) { | ||
| super(id); | ||
| @ProtoFactory | ||
| PermissionTicketRemovedEvent(String id, String owner, String resource, String scope, String serverId, String requester, String resourceName) { | ||
| super(id, owner, resource, scope, serverId, requester, resourceName); | ||
| } | ||
|
|
||
| public static PermissionTicketRemovedEvent create(String id, String owner, String requester, String resource, String resourceName, String scope, String serverId) { | ||
| PermissionTicketRemovedEvent event = new PermissionTicketRemovedEvent(id); | ||
| event.owner = owner; | ||
| event.requester = requester; | ||
| event.resource = resource; | ||
| event.resourceName = resourceName; | ||
| event.scope = scope; | ||
| event.serverId = serverId; | ||
| return event; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| if (!super.equals(o)) return false; | ||
| PermissionTicketRemovedEvent that = (PermissionTicketRemovedEvent) o; | ||
| return Objects.equals(resource, that.resource) && Objects.equals(serverId, that.serverId); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(super.hashCode(), resource, serverId); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return String.format("PermissionTicketRemovedEvent [ id=%s, name=%s]", getId(), resource); | ||
| return new PermissionTicketRemovedEvent(id, owner, resource, scope, serverId, requester, resourceName); | ||
| } | ||
|
|
||
| @Override | ||
| public void addInvalidations(StoreFactoryCacheManager cache, Set<String> invalidations) { | ||
| cache.permissionTicketRemoval(getId(), owner, requester, resource, resourceName, scope, serverId, invalidations); | ||
| cache.permissionTicketRemoval(getId(), getOwner(), getRequester(), getResource(), getResourceName(), getScope(), getServerId(), invalidations); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,60 +17,30 @@ | |
|
|
||
| package org.keycloak.models.cache.infinispan.authorization.events; | ||
|
|
||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| import org.infinispan.protostream.annotations.ProtoFactory; | ||
| import org.infinispan.protostream.annotations.ProtoTypeId; | ||
| import org.keycloak.marshalling.Marshalling; | ||
| import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; | ||
| import org.keycloak.models.cache.infinispan.events.InvalidationEvent; | ||
|
|
||
| /** | ||
| * @author <a href="mailto:[email protected]">Marek Posolda</a> | ||
| */ | ||
| public class PermissionTicketUpdatedEvent extends InvalidationEvent implements AuthorizationCacheInvalidationEvent { | ||
| @ProtoTypeId(Marshalling.PERMISSION_TICKET_UPDATED_EVENT) | ||
| public class PermissionTicketUpdatedEvent extends BasePermissionTicketEvent { | ||
|
|
||
| private String owner; | ||
| private String resource; | ||
| private String scope; | ||
| private String serverId; | ||
| private String requester; | ||
| private String resourceName; | ||
|
|
||
| private PermissionTicketUpdatedEvent(String id) { | ||
| super(id); | ||
| @ProtoFactory | ||
| PermissionTicketUpdatedEvent(String id, String owner, String resource, String scope, String serverId, String requester, String resourceName) { | ||
| super(id, owner, resource, scope, serverId, requester, resourceName); | ||
| } | ||
|
|
||
| public static PermissionTicketUpdatedEvent create(String id, String owner, String requester, String resource, String resourceName, String scope, String serverId) { | ||
| PermissionTicketUpdatedEvent event = new PermissionTicketUpdatedEvent(id); | ||
| event.owner = owner; | ||
| event.requester = requester; | ||
| event.resource = resource; | ||
| event.resourceName = resourceName; | ||
| event.scope = scope; | ||
| event.serverId = serverId; | ||
| return event; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| if (!super.equals(o)) return false; | ||
| PermissionTicketUpdatedEvent that = (PermissionTicketUpdatedEvent) o; | ||
| return Objects.equals(resource, that.resource) && Objects.equals(serverId, that.serverId); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(super.hashCode(), resource, serverId); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return String.format("PermissionTicketUpdatedEvent [ id=%s, name=%s]", getId(), resource); | ||
| return new PermissionTicketUpdatedEvent(id, owner, resource, scope, serverId, requester, resourceName); | ||
| } | ||
|
|
||
| @Override | ||
| public void addInvalidations(StoreFactoryCacheManager cache, Set<String> invalidations) { | ||
| cache.permissionTicketUpdated(getId(), owner, requester, resource, resourceName, scope, serverId, invalidations); | ||
| cache.permissionTicketUpdated(getId(), getOwner(), getRequester(), getResource(), getResourceName(), getScope(), getServerId(), invalidations); | ||
| } | ||
| } | ||
Oops, something went wrong.