Skip to content

Security Solution] Fix string spread bug when syncing watchlists to Entity Store #260941

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
CAWilson94 merged 2 commits into from
Apr 2, 2026
+16 −5
Merged

Security Solution] Fix string spread bug when syncing watchlists to Entity Store #260941

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
b87f4ff
Security Solution] Fix string spread bug when syncing watchlists to e…
CAWilson94 Apr 2, 2026
375c5e2
Changes from node scripts/eslint_all_files --no-cache --fix
kibanamachine Apr 2, 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
10 changes: 8 additions & 2 deletions ...rity/plugins/security_solution/server/lib/entity_analytics/watchlists/entities/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,15 @@ export const createWatchlistEntitiesService = ({

acc.entityIdsByType[entityType].push(euid);

const watchlists = get(record, 'entity.attributes.watchlists') as string[] | undefined;
const rawWatchlists = get(record, 'entity.attributes.watchlists');
const watchlists = Array.isArray(rawWatchlists)
? rawWatchlists
: typeof rawWatchlists === 'string'
? [rawWatchlists]
: undefined;

if (watchlists) {
acc.watchlistsByEuid.set(euid, watchlists);
acc.watchlistsByEuid.set(euid, watchlists as string[]);
}

if (!isIndexSync) {
Expand Down
11 changes: 8 additions & 3 deletions ..._solution/server/lib/entity_analytics/watchlists/entity_sources/sync/entity_store_sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ export const addWatchlistAttributeToStore = async ({
if (entityRefs.length === 0) return;

const objects = entityRefs.map(({ euid, type, currentWatchlists }) => {
const watchlists = currentWatchlists ?? [];
const watchlists = Array.isArray(currentWatchlists)
? currentWatchlists
: typeof currentWatchlists === 'string'
? [currentWatchlists]
: [];
const updated = watchlists.includes(watchlistId) ? watchlists : [...watchlists, watchlistId];

return {
Expand Down Expand Up @@ -72,8 +76,9 @@ export const removeWatchlistAttributeFromStore = async ({
watchlistId: string;
}): Promise<void> => {
// Only update entities whose current watchlists are known — if we don't have the current value we'd blindly write an empty array to the store.
const knownRefs = entityRefs.filter((ref): ref is EntityRef & { currentWatchlists: string[] } =>
Boolean(ref.currentWatchlists)
const knownRefs = entityRefs.filter(
(ref): ref is EntityRef & { currentWatchlists: string[] } =>
Boolean(ref.currentWatchlists) && Array.isArray(ref.currentWatchlists)
);
if (knownRefs.length === 0) return;

Expand Down
Loading