Skip to content

[Backport 3.2] Bug fixes: add null checks to prevent undefined property access #1357

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
opensearch-trigger-bot wants to merge 1 commit into
base: 3.2
Choose a base branch
from
Open

[Backport 3.2] Bug fixes: add null checks to prevent undefined property access #1357

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
12 changes: 6 additions & 6 deletions public/pages/Correlations/containers/CorrelationsTableView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,22 @@ export class CorrelationsTableView extends React.Component<
.map((item) => item.id.toLowerCase());

return tableData.filter((row) => {
const logTypeMatch = row.logTypes.some((logType) => selectedLogTypes.includes(logType));
const logTypeMatch = row.logTypes?.some((logType) => selectedLogTypes.includes(logType));

const severityMatch = row.alertSeverity.some((severity) =>
const severityMatch = row.alertSeverity?.some((severity) =>
selectedSeverities.includes(alertSeverityMap[severity])
);

const searchLower = searchTerm.toLowerCase();
const searchMatch =
searchTerm === '' ||
row.correlationRule?.toLowerCase().includes(searchLower) ||
row.logTypes.some((type) => type.toLowerCase().includes(searchLower)) ||
row.alertSeverity.some((severity) =>
row.logTypes?.some((type) => type.toLowerCase().includes(searchLower)) ||
row.alertSeverity?.some((severity) =>
alertSeverityMap[severity].toLowerCase().includes(searchLower)
) ||
row.findingsSeverity.some((severity) => severity.toLowerCase().includes(searchLower)) ||
row.resources.some((resource) => resource.toLowerCase().includes(searchLower));
row.findingsSeverity?.some((severity) => severity.toLowerCase().includes(searchLower)) ||
row.resources?.some((resource) => resource.toLowerCase().includes(searchLower));
return logTypeMatch && severityMatch && searchMatch;
});
};
Expand Down
14 changes: 11 additions & 3 deletions public/pages/Overview/components/Widgets/RecentThreatIntelFindingsWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,17 @@ const columns: EuiBasicTableColumn<ThreatIntelFinding>[] = [
name: 'Threat intel source',
field: 'ioc_feed_ids',
render: (ioc_feed_ids: ThreatIntelFinding['ioc_feed_ids']) => {
return (
<span>{ioc_feed_ids.map((ids) => ids.feed_name).join(', ') || DEFAULT_EMPTY_DATA}</span>
);
// Add defensive checks for undefined/null array and nested properties
if (!ioc_feed_ids || !Array.isArray(ioc_feed_ids) || ioc_feed_ids.length === 0) {
return <span>{DEFAULT_EMPTY_DATA}</span>;
}

const feedNames = ioc_feed_ids
.map((ids) => ids?.feed_name)
.filter((name) => name) // Remove undefined/null values
.join(', ');

return <span>{feedNames || DEFAULT_EMPTY_DATA}</span>;
},
},
];
Expand Down
32 changes: 28 additions & 4 deletions ...ages/Rules/components/RuleContentViewer/__snapshots__/RuleContentYamlViewer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,37 @@ exports[`<RuleContentYamlViewer /> spec renders the component 1`] = `
>
-
</span>

https
<span
class="token string"
class="token punctuation"
>
'https://securelist.com/operation-tunnelsnake-and-moriya-rootkit/101831'
:
</span>

//securelist.com/operation
<span
class="token punctuation"
>
-
</span>
tunnelsnake
<span
class="token punctuation"
>
-
</span>
and
<span
class="token punctuation"
>
-
</span>
moriya
<span
class="token punctuation"
>
-
</span>
rootkit/101831

</span>
<span
Expand Down
Loading