Skip to content

fix: Entity sharing enumerates every content pack entity on every share #26976

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

Open
Tarantula471 wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −1
Open

fix: Entity sharing enumerates every content pack entity on every share #26976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3d9f2f
fix: Entity sharing enumerates every content pack entity on every share
Tarantula471 Aug 13, 2026
5e93d20
Merge branch 'master' into 26896
Tarantula471 Aug 14, 2026
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: 2 additions & 1 deletion graylog2-server/src/main/java/org/graylog/security/SecurityModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ protected void configure() {
OptionalBinder.newOptionalBinder(binder(), GranteeService.class)
.setDefault().to(DefaultGranteeService.class);
OptionalBinder.newOptionalBinder(binder(), EntityDependencyResolver.class)
.setDefault().to(DefaultEntityDependencyResolver.class);
.setDefault().to(DefaultEntityDependencyResolver.class)
.in(Scopes.SINGLETON);

addEntityRegistrationHandler(EntityOwnershipRegistrationHandler.class);

Expand Down
13 changes: 13 additions & 0 deletions ...2-server/src/main/java/org/graylog/security/entities/DefaultEntityDependencyResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.graylog.security.entities;

import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import jakarta.inject.Inject;
Expand All @@ -36,15 +37,20 @@
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import static com.google.common.base.MoreObjects.firstNonNull;

public class DefaultEntityDependencyResolver implements EntityDependencyResolver {
// Matches the TTL already used for the equivalent cache in org.graylog2.lookup.Catalog.
private static final long ENTITY_EXCERPTS_CACHE_TTL_SECONDS = 5;
private final ContentPackEntityResolver contentPackEntityResolver;
private final GRNRegistry grnRegistry;
private final GRNDescriptorService descriptorService;
private final DBGrantService grantService;
private final Supplier<ImmutableMap<GRN, Optional<String>>> entityExcerptsSupplier;

@Inject
public DefaultEntityDependencyResolver(ContentPackEntityResolver contentPackEntityResolver,
Expand All @@ -55,6 +61,9 @@ public DefaultEntityDependencyResolver(ContentPackEntityResolver contentPackEnti
this.grnRegistry = grnRegistry;
this.descriptorService = descriptorService;
this.grantService = grantService;
this.entityExcerptsSupplier = Suppliers.memoizeWithExpiration(
this::computeEntityExcerpts, ENTITY_EXCERPTS_CACHE_TTL_SECONDS, TimeUnit.SECONDS);

}

@Override
Expand Down Expand Up @@ -130,6 +139,10 @@ private String getExcerptTitle(GRN entity, ImmutableMap<GRN, Optional<String>> e
}

private ImmutableMap<GRN, Optional<String>> entityExcerpts() {
return entityExcerptsSupplier.get();
}

private ImmutableMap<GRN, Optional<String>> computeEntityExcerpts() {
// TODO: Replace entity excerpt usage with GRNDescriptors once we implemented GRN descriptors for every entity
return contentPackEntityResolver.listAllEntityExcerpts().stream()
// TODO: Use the GRNRegistry instead of manually building a GRN. Requires all entity types to be in the registry.
Expand Down