github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Security Solution] Fix ip.replace error on Network/HTTP Tab (#116288) (#117514)

Browse source 
Co-authored-by: Steph Milovic <stephanie.milovic@elastic.co>
This commit is contained in:
Kibana Machine 2021-11-04 11:34:54 -04:00 • committed by GitHub
parent 16e75d7f40
commit 7601fdc57e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
x-pack/plugins/security_solution/public/common/components/links/index.test.tsx
View file

@ -46,6 +46,7 @@ jest.mock('../../lib/kibana', () => {
describe('Custom Links', () => {
const hostName = 'Host Name';
const ipv4 = '192.0.2.255';
const ipv4a = '192.0.2.266';
const ipv6 = '2001:db8:ffff:ffff:ffff:ffff:ffff:ffff';
const ipv6Encoded = encodeIpv6(ipv6);
@ -64,6 +65,16 @@ describe('Custom Links', () => {
});
describe('NetworkDetailsLink', () => {
test('can handle array of ips', () => {
const wrapper = mount(<NetworkDetailsLink ip={[ipv4, ipv4a]} />);
expect(wrapper.find('EuiLink').first().prop('href')).toEqual(
`/ip/${encodeURIComponent(ipv4)}/source`
);
expect(wrapper.text()).toEqual(`${ipv4}${ipv4a}`);
expect(wrapper.find('EuiLink').last().prop('href')).toEqual(
`/ip/${encodeURIComponent(ipv4a)}/source`
);
});
test('should render valid link to IP Details with ipv4 as the display text', () => {
const wrapper = mount(<NetworkDetailsLink ip={ipv4} />);
expect(wrapper.find('EuiLink').prop('href')).toEqual(

59
x-pack/plugins/security_solution/public/common/components/links/index.tsx
View file

@ -14,7 +14,7 @@ import {
EuiToolTip,
} from '@elastic/eui';
import React, { useMemo, useCallback, SyntheticEvent } from 'react';
import { isNil } from 'lodash/fp';
import { isArray, isNil } from 'lodash/fp';
import { IP_REPUTATION_LINKS_SETTING, APP_UI_ID } from '../../../../common/constants';
import {
@ -172,7 +172,7 @@ const NetworkDetailsLinkComponent: React.FC<{
children?: React.ReactNode;
/** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
ip: string;
ip: string | string[];
flowTarget?: FlowTarget | FlowTargetSourceDest;
isButton?: boolean;
onClick?: (e: SyntheticEvent) => void | undefined;
@ -181,39 +181,46 @@ const NetworkDetailsLinkComponent: React.FC<{
const { formatUrl, search } = useFormatUrl(SecurityPageName.network);
const { navigateToApp } = useKibana().services.application;
const goToNetworkDetails = useCallback(
(ev) => {
(ev, cIp: string) => {
ev.preventDefault();
navigateToApp(APP_UI_ID, {
deepLinkId: SecurityPageName.network,
path: getNetworkDetailsUrl(encodeURIComponent(encodeIpv6(ip)), flowTarget, search),
path: getNetworkDetailsUrl(encodeURIComponent(encodeIpv6(cIp)), flowTarget, search),
});
},
[flowTarget, ip, navigateToApp, search]
[flowTarget, navigateToApp, search]
);
const href = useMemo(
() => formatUrl(getNetworkDetailsUrl(encodeURIComponent(encodeIpv6(ip)))),
[formatUrl, ip]
const getHref = useCallback(
(cIp: string) => formatUrl(getNetworkDetailsUrl(encodeURIComponent(encodeIpv6(cIp)))),
[formatUrl]
);
return isButton ? (
<GenericLinkButton
Component={Component}
dataTestSubj="data-grid-network-details"
onClick={onClick ?? goToNetworkDetails}
href={href}
title={title ?? ip}
>
{children}
</GenericLinkButton>
) : (
<LinkAnchor
onClick={onClick ?? goToNetworkDetails}
href={href}
data-test-subj="network-details"
>
{children ? children : ip}
</LinkAnchor>
const getLink = useCallback(
(cIp: string, i: number) =>
isButton ? (
<GenericLinkButton
Component={Component}
key={`${cIp}-${i}`}
dataTestSubj="data-grid-network-details"
onClick={onClick ?? ((e: SyntheticEvent) => goToNetworkDetails(e, cIp))}
href={getHref(cIp)}
title={title ?? cIp}
>
{children}
</GenericLinkButton>
) : (
<LinkAnchor
key={`${cIp}-${i}`}
onClick={onClick ?? ((e: SyntheticEvent) => goToNetworkDetails(e, cIp))}
href={getHref(cIp)}
data-test-subj="network-details"
>
{children ? children : cIp}
</LinkAnchor>
),
[Component, children, getHref, goToNetworkDetails, isButton, onClick, title]
);
return isArray(ip) ? <>{ip.map(getLink)}</> : getLink(ip, 0);
};
export const NetworkDetailsLink = React.memo(NetworkDetailsLinkComponent);