Skip to content

Fix cross-tenant cache collision in CachingWorkflowDefinitionService #7318

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
sfmskywalker merged 2 commits into from
Feb 23, 2026
Merged

Fix cross-tenant cache collision in CachingWorkflowDefinitionService #7318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5498f5f
Initial plan
Copilot Feb 23, 2026
7d02d3d
Fix cross-tenant cache collision in WorkflowDefinitionCacheManager
Copilot Feb 23, 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
23 changes: 15 additions & 8 deletions src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionCacheManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,55 @@
using Elsa.Caching;
using Elsa.Common.Models;
using Elsa.Common.Multitenancy;
using Elsa.Workflows.Management.Filters;

namespace Elsa.Workflows.Management.Services;

/// <inheritdoc />
public class WorkflowDefinitionCacheManager(ICacheManager cache, IHasher hasher) : IWorkflowDefinitionCacheManager
public class WorkflowDefinitionCacheManager(ICacheManager cache, IHasher hasher, ITenantAccessor tenantAccessor) : IWorkflowDefinitionCacheManager
{
/// <inheritdoc />
public ICacheManager Cache => cache;

/// <inheritdoc />
public string CreateWorkflowDefinitionVersionCacheKey(string definitionId, VersionOptions versionOptions) => $"WorkflowDefinition:{definitionId}:{versionOptions}";
public string CreateWorkflowDefinitionVersionCacheKey(string definitionId, VersionOptions versionOptions) => TenantPrefix() + $"WorkflowDefinition:{definitionId}:{versionOptions}";

/// <inheritdoc />
public string CreateWorkflowDefinitionFilterCacheKey(WorkflowDefinitionFilter filter)
{
var hash = hasher.Hash(filter);
return $"WorkflowDefinition:{hash}";
return TenantPrefix() + $"WorkflowDefinition:{hash}";
}

/// <inheritdoc />
public string CreateWorkflowVersionCacheKey(string definitionId, VersionOptions versionOptions) => $"Workflow:{definitionId}:{versionOptions}";
public string CreateWorkflowVersionCacheKey(string definitionId, VersionOptions versionOptions) => TenantPrefix() + $"Workflow:{definitionId}:{versionOptions}";

/// <inheritdoc />
public string CreateWorkflowVersionCacheKey(string definitionVersionId) => $"Workflow:{definitionVersionId}";
public string CreateWorkflowVersionCacheKey(string definitionVersionId) => TenantPrefix() + $"Workflow:{definitionVersionId}";

/// <inheritdoc />
public string CreateWorkflowFilterCacheKey(WorkflowDefinitionFilter filter)
{
var hash = hasher.Hash(filter);
return $"Workflow:{hash}";
return TenantPrefix() + $"Workflow:{hash}";
}

/// <inheritdoc />
public string CreateWorkflowDefinitionVersionCacheKey(string definitionVersionId) => $"WorkflowDefinition:{definitionVersionId}";
public string CreateWorkflowDefinitionVersionCacheKey(string definitionVersionId) => TenantPrefix() + $"WorkflowDefinition:{definitionVersionId}";

/// <inheritdoc />
public string CreateWorkflowDefinitionChangeTokenKey(string definitionId) => $"WorkflowChangeToken:{definitionId}";
public string CreateWorkflowDefinitionChangeTokenKey(string definitionId) => TenantPrefix() + $"WorkflowChangeToken:{definitionId}";

/// <inheritdoc />
public async Task EvictWorkflowDefinitionAsync(string definitionId, CancellationToken cancellationToken = default)
{
var changeTokenKey = CreateWorkflowDefinitionChangeTokenKey(definitionId);
await cache.TriggerTokenAsync(changeTokenKey, cancellationToken);
}

private string TenantPrefix()
{
var tenantId = tenantAccessor.TenantId;
return string.IsNullOrEmpty(tenantId) ? string.Empty : $"{tenantId}:";
}
}