Merge in DNS/adguard-home from 3772-cache-upstreams to master
Updates #3772.
Squashed commit of the following:
commit 809e874fe8847fdbd7f8a7221f18393509f41339
Merge: 5774798c 2d328ea8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 7 17:15:59 2021 +0300
Merge branch 'master' into 3772-cache-upstreams
commit 5774798ce1897bf292be49410794ce06cd084f93
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:48:38 2021 +0300
client: fix formatting
commit 4b4bb668c762c9b4d47cf40a007f34fe47a6e260
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:47:18 2021 +0300
client: remove comment
commit a2a9f904a6ab52194bb811a2a83967660a25f2cc
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:45:31 2021 +0300
client: handle cached upstream
commit a56804c4910da838cb10c8ef0af2a525e9722b1c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:33:43 2021 +0300
querylog: rm todo
commit 16c0a62ad2dfc7fcb5a6adbc868b296b7840fd27
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:31:53 2021 +0300
all: revise log of changes
commit 9f4b793205f17b6e85d74e83126093ed09eb24e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:23:42 2021 +0300
WIP
commit 7fbc6d596295570d2c61c3e507160f65c9adccb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:03:42 2021 +0300
all: imp upstream info in querylog
266 lines
9.7 KiB
JavaScript
266 lines
9.7 KiB
JavaScript
import React, { memo } from 'react';
|
||
import classNames from 'classnames';
|
||
import { useTranslation } from 'react-i18next';
|
||
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
||
import propTypes from 'prop-types';
|
||
import {
|
||
captitalizeWords,
|
||
checkFiltered,
|
||
getRulesToFilterList,
|
||
formatDateTime,
|
||
formatElapsedMs,
|
||
formatTime,
|
||
getBlockingClientName,
|
||
getServiceName,
|
||
processContent,
|
||
} from '../../../helpers/helpers';
|
||
import {
|
||
BLOCK_ACTIONS,
|
||
DEFAULT_SHORT_DATE_FORMAT_OPTIONS,
|
||
FILTERED_STATUS,
|
||
FILTERED_STATUS_TO_META_MAP,
|
||
LONG_TIME_FORMAT,
|
||
QUERY_STATUS_COLORS,
|
||
SCHEME_TO_PROTOCOL_MAP,
|
||
} from '../../../helpers/constants';
|
||
import { getSourceData } from '../../../helpers/trackers/trackers';
|
||
import { toggleBlocking, toggleBlockingForClient } from '../../../actions';
|
||
import DateCell from './DateCell';
|
||
import DomainCell from './DomainCell';
|
||
import ResponseCell from './ResponseCell';
|
||
import ClientCell from './ClientCell';
|
||
import { toggleClientBlock } from '../../../actions/access';
|
||
import { getBlockClientInfo, BUTTON_PREFIX } from './helpers';
|
||
import { updateLogs } from '../../../actions/queryLogs';
|
||
|
||
import '../Logs.css';
|
||
|
||
const Row = memo(({
|
||
style,
|
||
rowProps,
|
||
rowProps: { reason },
|
||
isSmallScreen,
|
||
setDetailedDataCurrent,
|
||
setButtonType,
|
||
setModalOpened,
|
||
}) => {
|
||
const dispatch = useDispatch();
|
||
const { t } = useTranslation();
|
||
const dnssec_enabled = useSelector((state) => state.dnsConfig.dnssec_enabled);
|
||
const filters = useSelector((state) => state.filtering.filters, shallowEqual);
|
||
const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
|
||
const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);
|
||
const processingSet = useSelector((state) => state.access.processingSet);
|
||
const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);
|
||
|
||
const clients = useSelector((state) => state.dashboard.clients);
|
||
|
||
const onClick = () => {
|
||
if (!isSmallScreen) {
|
||
return;
|
||
}
|
||
const {
|
||
answer_dnssec,
|
||
client,
|
||
domain,
|
||
elapsedMs,
|
||
client_info,
|
||
response,
|
||
time,
|
||
tracker,
|
||
upstream,
|
||
type,
|
||
client_proto,
|
||
client_id,
|
||
rules,
|
||
originalResponse,
|
||
status,
|
||
service_name,
|
||
cached,
|
||
} = rowProps;
|
||
|
||
const hasTracker = !!tracker;
|
||
|
||
const autoClient = autoClients
|
||
.find((autoClient) => autoClient.name === client);
|
||
|
||
const source = autoClient?.source;
|
||
|
||
const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
|
||
const isFiltered = checkFiltered(reason);
|
||
|
||
const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
|
||
|| reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
|
||
|
||
const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
|
||
const onToggleBlock = () => {
|
||
dispatch(toggleBlocking(buttonType, domain));
|
||
};
|
||
|
||
const isBlockedByResponse = originalResponse.length > 0 && isBlocked;
|
||
const requestStatus = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.LABEL || reason);
|
||
|
||
const protocol = t(SCHEME_TO_PROTOCOL_MAP[client_proto]) || '';
|
||
|
||
const sourceData = getSourceData(tracker);
|
||
|
||
const {
|
||
confirmMessage,
|
||
buttonKey: blockingClientKey,
|
||
lastRuleInAllowlist,
|
||
} = getBlockClientInfo(
|
||
client,
|
||
client_info?.disallowed || false,
|
||
client_info?.disallowed_rule || '',
|
||
allowedСlients,
|
||
);
|
||
|
||
const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
|
||
const clientNameBlockingFor = getBlockingClientName(clients, client);
|
||
const upstreamString = cached
|
||
? t('served_from_cache', { value: upstream, i: <i /> })
|
||
: upstream;
|
||
|
||
const onBlockingForClientClick = () => {
|
||
dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
|
||
};
|
||
|
||
const onBlockingClientClick = async () => {
|
||
if (window.confirm(confirmMessage)) {
|
||
await dispatch(
|
||
toggleClientBlock(
|
||
client,
|
||
client_info?.disallowed || false,
|
||
client_info?.disallowed_rule || '',
|
||
),
|
||
);
|
||
await dispatch(updateLogs());
|
||
setModalOpened(false);
|
||
}
|
||
};
|
||
|
||
const blockButton = <button
|
||
className={classNames('title--border text-center button-action--arrow-option', { 'bg--danger': !isBlocked })}
|
||
onClick={onToggleBlock}>
|
||
{t(buttonType)}
|
||
</button>;
|
||
|
||
const blockForClientButton = <button
|
||
className='text-center font-weight-bold py-2 button-action--arrow-option'
|
||
onClick={onBlockingForClientClick}>
|
||
{t(blockingForClientKey)}
|
||
</button>;
|
||
|
||
const blockClientButton = <button
|
||
className='text-center font-weight-bold py-2 button-action--arrow-option'
|
||
onClick={onBlockingClientClick}
|
||
disabled={processingSet || lastRuleInAllowlist}>
|
||
{t(blockingClientKey)}
|
||
</button>;
|
||
|
||
const detailedData = {
|
||
time_table_header: formatTime(time, LONG_TIME_FORMAT),
|
||
date: formatDateTime(time, DEFAULT_SHORT_DATE_FORMAT_OPTIONS),
|
||
encryption_status: isBlocked
|
||
? <div className="bg--danger">{requestStatus}</div> : requestStatus,
|
||
...(FILTERED_STATUS.FILTERED_BLOCKED_SERVICE && service_name
|
||
&& { service_name: getServiceName(service_name) }),
|
||
domain,
|
||
type_table_header: type,
|
||
protocol,
|
||
known_tracker: hasTracker && 'title',
|
||
table_name: tracker?.name,
|
||
category_label: hasTracker && captitalizeWords(tracker.category),
|
||
tracker_source: hasTracker && sourceData
|
||
&& <a
|
||
href={sourceData.url}
|
||
target="_blank"
|
||
rel="noopener noreferrer"
|
||
className="link--green">{sourceData.name}
|
||
</a>,
|
||
response_details: 'title',
|
||
install_settings_dns: upstreamString,
|
||
elapsed: formattedElapsedMs,
|
||
...(rules.length > 0
|
||
&& { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
|
||
),
|
||
response_table_header: response?.join('\n'),
|
||
response_code: status,
|
||
client_details: 'title',
|
||
ip_address: client,
|
||
name: client_info?.name || client_id,
|
||
country: client_info?.whois?.country,
|
||
city: client_info?.whois?.city,
|
||
network: client_info?.whois?.orgname,
|
||
source_label: source,
|
||
validated_with_dnssec: dnssec_enabled ? Boolean(answer_dnssec) : false,
|
||
original_response: originalResponse?.join('\n'),
|
||
[BUTTON_PREFIX + buttonType]: blockButton,
|
||
[BUTTON_PREFIX + blockingForClientKey]: blockForClientButton,
|
||
[BUTTON_PREFIX + blockingClientKey]: blockClientButton,
|
||
};
|
||
|
||
setDetailedDataCurrent(processContent(detailedData));
|
||
setButtonType(buttonType);
|
||
setModalOpened(true);
|
||
};
|
||
|
||
const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
|
||
|
||
const className = classNames('d-flex px-5 logs__row',
|
||
`logs__row--${FILTERED_STATUS_TO_META_MAP?.[reason]?.COLOR ?? QUERY_STATUS_COLORS.WHITE}`, {
|
||
'logs__cell--detailed': isDetailed,
|
||
});
|
||
|
||
return <div style={style} className={className} onClick={onClick} role="row">
|
||
<DateCell {...rowProps} />
|
||
<DomainCell {...rowProps} />
|
||
<ResponseCell {...rowProps} />
|
||
<ClientCell {...rowProps} />
|
||
</div>;
|
||
});
|
||
|
||
Row.displayName = 'Row';
|
||
|
||
Row.propTypes = {
|
||
style: propTypes.object,
|
||
rowProps: propTypes.shape({
|
||
reason: propTypes.string.isRequired,
|
||
answer_dnssec: propTypes.bool.isRequired,
|
||
client: propTypes.string.isRequired,
|
||
domain: propTypes.string.isRequired,
|
||
elapsedMs: propTypes.string.isRequired,
|
||
response: propTypes.array.isRequired,
|
||
time: propTypes.string.isRequired,
|
||
tracker: propTypes.object,
|
||
upstream: propTypes.string.isRequired,
|
||
cached: propTypes.bool.isRequired,
|
||
type: propTypes.string.isRequired,
|
||
client_proto: propTypes.string.isRequired,
|
||
client_id: propTypes.string,
|
||
client_info: propTypes.shape({
|
||
name: propTypes.string.isRequired,
|
||
whois: propTypes.shape({
|
||
country: propTypes.string,
|
||
city: propTypes.string,
|
||
orgname: propTypes.string,
|
||
}).isRequired,
|
||
disallowed: propTypes.bool.isRequired,
|
||
disallowed_rule: propTypes.string.isRequired,
|
||
}),
|
||
rules: propTypes.arrayOf(propTypes.shape({
|
||
text: propTypes.string.isRequired,
|
||
filter_list_id: propTypes.number.isRequired,
|
||
})),
|
||
originalResponse: propTypes.array,
|
||
status: propTypes.string.isRequired,
|
||
service_name: propTypes.string,
|
||
}).isRequired,
|
||
isSmallScreen: propTypes.bool.isRequired,
|
||
setDetailedDataCurrent: propTypes.func.isRequired,
|
||
setButtonType: propTypes.func.isRequired,
|
||
setModalOpened: propTypes.func.isRequired,
|
||
};
|
||
|
||
export default Row;
|