Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9eAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65fAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
253 lines
9.1 KiB
JavaScript
253 lines
9.1 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 '../Logs.css';
|
|
import { toggleClientBlock } from '../../../actions/access';
|
|
import { getBlockClientInfo, BUTTON_PREFIX } from './helpers';
|
|
import { updateLogs } from '../../../actions/queryLogs';
|
|
|
|
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 clients = useSelector((state) => state.dashboard.clients);
|
|
|
|
const onClick = () => {
|
|
if (!isSmallScreen) {
|
|
return;
|
|
}
|
|
const {
|
|
answer_dnssec,
|
|
client,
|
|
domain,
|
|
elapsedMs,
|
|
info,
|
|
info: { disallowed, disallowed_rule },
|
|
reason,
|
|
response,
|
|
time,
|
|
tracker,
|
|
upstream,
|
|
type,
|
|
client_proto,
|
|
client_id,
|
|
rules,
|
|
originalResponse,
|
|
status,
|
|
service_name,
|
|
} = rowProps;
|
|
|
|
const hasTracker = !!tracker;
|
|
|
|
const autoClient = autoClients
|
|
.find((autoClient) => autoClient.name === client);
|
|
|
|
const { whois_info } = info;
|
|
const country = whois_info?.country;
|
|
const city = whois_info?.city;
|
|
const network = whois_info?.orgname;
|
|
|
|
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,
|
|
isNotInAllowedList,
|
|
} = getBlockClientInfo(client, disallowed, disallowed_rule);
|
|
|
|
const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
|
|
const clientNameBlockingFor = getBlockingClientName(clients, client);
|
|
|
|
const onBlockingForClientClick = () => {
|
|
dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
|
|
};
|
|
|
|
const onBlockingClientClick = async () => {
|
|
if (window.confirm(confirmMessage)) {
|
|
await dispatch(toggleClientBlock(client, disallowed, 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={isNotInAllowedList}>
|
|
{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: upstream,
|
|
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: info?.name || client_id,
|
|
country,
|
|
city,
|
|
network,
|
|
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,
|
|
info: propTypes.oneOfType([
|
|
propTypes.string,
|
|
propTypes.shape({
|
|
whois_info: propTypes.shape({
|
|
country: propTypes.string,
|
|
city: propTypes.string,
|
|
orgname: propTypes.string,
|
|
}),
|
|
})]),
|
|
response: propTypes.array.isRequired,
|
|
time: propTypes.string.isRequired,
|
|
tracker: propTypes.object,
|
|
upstream: propTypes.string.isRequired,
|
|
type: propTypes.string.isRequired,
|
|
client_proto: propTypes.string.isRequired,
|
|
client_id: propTypes.string,
|
|
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;
|