docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
</> | <mask> {formatClientCell(row, t)}
<mask> </div>
<mask> {ipMatchListStatus !== IP_MATCH_LIST_STATUS.CIDR
<mask> && renderBlockingButton(ipMatchListStatus, value, toggleClientStatus, processing)}
<mask> </Fragment>
<mask> );
<mask> };
<mask>
<mask> const Clients = ({
<mask> t,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove <Fragment>
</s> add <> </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove </div>
{isHovered && dataTip
&& <CustomTooltip
className={tooltipClass}
id={id}
columnClass={columnClass}
contentItemClass={contentItemClass}
title={title}
place={place}
content={content}
trigger={trigger}
overridePosition={overridePosition}
scrollHide={scrollHide}
renderContent={renderContent}
/>}
</div>;
};
</s> add </span>}
</TooltipTrigger>; </s> remove
export const touchMediaQuery = '(hover: none)';
</s> add </s> remove dataTip,
</s> add canShowTooltip = true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Dashboard/Clients.js |
<mask> {processedData && getHintElement({
<mask> className: hintClass,
<mask> columnClass: 'grid grid--limited',
<mask> tooltipClass: 'px-5 pb-5 pt-4 mw-75',
<mask> dataTip: true,
<mask> xlinkHref: 'question',
<mask> contentItemClass: 'text-truncate key-colon',
<mask> title: 'client_details',
<mask> content: processedData,
<mask> place: 'bottom',
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove dataTip: true,
</s> add </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove dataTip: true,
</s> add </s> remove dataTip: answer_dnssec,
</s> add canShowTooltip: answer_dnssec, </s> remove place: 'bottom',
</s> add placement: 'bottom', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getClientCell.js | |
placement: 'bottom', | <mask> xlinkHref: 'question',
<mask> contentItemClass: 'text-truncate key-colon',
<mask> title: 'client_details',
<mask> content: processedData,
<mask> place: 'bottom',
<mask> })}
<mask> <div
<mask> className={nameClass}>
<mask> <div data-tip={true} data-for={id}>{formatClientCell(row, t, isDetailed)}</div>
<mask> {isDetailed && name
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove dataTip: true,
</s> add </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove dataTip: true,
</s> add </s> remove dataTip: true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getClientCell.js |
canShowTooltip: answer_dnssec, | <mask>
<mask> const dnssecHint = getHintElement({
<mask> className: lockIconClass,
<mask> tooltipClass: 'py-4 px-5 pb-45',
<mask> dataTip: answer_dnssec,
<mask> xlinkHref: 'lock',
<mask> columnClass: 'w-100',
<mask> content: 'validated_with_dnssec',
<mask> place: 'bottom',
<mask> });
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove dataTip: true,
</s> add </s> remove dataTip: true,
</s> add </s> remove dataTip: true,
</s> add </s> remove place: PropTypes.string,
dataTip: PropTypes.string,
</s> add placement: PropTypes.string,
canShowTooltip: PropTypes.string, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getDomainCell.js |
placement: 'bottom', | <mask> dataTip: answer_dnssec,
<mask> xlinkHref: 'lock',
<mask> columnClass: 'w-100',
<mask> content: 'validated_with_dnssec',
<mask> place: 'bottom',
<mask> });
<mask>
<mask> const protocol = t(SCHEME_TO_PROTOCOL_MAP[client_proto]) || '';
<mask> const ip = type ? `${t('type_table_header')}: ${type}` : '';
<mask>
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove dataTip: answer_dnssec,
</s> add canShowTooltip: answer_dnssec, </s> remove dataTip: true,
</s> add </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, </s> remove dataTip: true,
</s> add </s> remove let nameContainer = client;
</s> add let nameContainer = value; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getDomainCell.js |
'overflow-break': preparedContent.length > 100, | <mask>
<mask> const renderGrid = (content, idx) => {
<mask> const preparedContent = typeof content === 'string' ? t(content) : content;
<mask> const className = classNames('text-truncate key-colon o-hidden', {
<mask> 'word-break--break-all white-space--normal': preparedContent.length > 100,
<mask> });
<mask> return <div key={idx} className={className}>{preparedContent}</div>;
<mask> };
<mask>
<mask> const getGrid = (contentObj, title, className) => [
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove 'white-space--normal': response.length > 100,
</s> add 'overflow-break': response.length > 100, </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove nameContainer = isDetailed ? <small title={client}>{client}</small>
: <div className="logs__text logs__text--nowrap"
title={`${name} (${client})`}>
{name}
<small>{`(${client})`}</small>
</s> add nameContainer = isDetailed
? <small title={value}>{value}</small>
: <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
{name}<small>{`(${value})`}</small> </s> remove let nameContainer = client;
</s> add let nameContainer = value; </s> remove place: 'bottom',
</s> add placement: 'bottom', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getDomainCell.js |
<mask>
<mask> const trackerHint = getHintElement({
<mask> className: privacyIconClass,
<mask> tooltipClass: 'pt-4 pb-5 px-5 mw-75',
<mask> dataTip: true,
<mask> xlinkHref: 'privacy',
<mask> contentItemClass: 'key-colon',
<mask> renderContent,
<mask> place: 'bottom',
<mask> });
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove dataTip: true,
</s> add </s> remove dataTip: answer_dnssec,
</s> add canShowTooltip: answer_dnssec, </s> remove dataTip: true,
</s> add </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove place: PropTypes.string,
dataTip: PropTypes.string,
</s> add placement: PropTypes.string,
canShowTooltip: PropTypes.string, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getDomainCell.js | |
import React from 'react'; | <mask> import React, { useState } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import CustomTooltip from '../Tooltip/CustomTooltip';
<mask>
<mask> const getHintElement = ({
<mask> className,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove import CustomTooltip from '../Tooltip/CustomTooltip';
</s> add import TooltipTrigger from 'react-popper-tooltip';
import { Trans } from 'react-i18next';
import classNames from 'classnames';
import './Tooltip.css';
import 'react-popper-tooltip/dist/styles.css';
import { HIDE_TOOLTIP_DELAY } from '../../../helpers/constants'; </s> remove import React, { Fragment } from 'react';
</s> add import React from 'react'; </s> remove dataTip,
</s> add canShowTooltip = true, </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove let nameContainer = client;
</s> add let nameContainer = value; | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js |
import TooltipTrigger from 'react-popper-tooltip';
import { Trans } from 'react-i18next';
import classNames from 'classnames';
import './Tooltip.css';
import 'react-popper-tooltip/dist/styles.css';
import { HIDE_TOOLTIP_DELAY } from '../../../helpers/constants'; | <mask> import React, { useState } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import CustomTooltip from '../Tooltip/CustomTooltip';
<mask>
<mask> const getHintElement = ({
<mask> className,
<mask> contentItemClass,
<mask> columnClass,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove import React, { useState } from 'react';
</s> add import React from 'react'; </s> remove import React, { Fragment } from 'react';
</s> add import React from 'react'; </s> remove dataTip,
</s> add canShowTooltip = true, </s> remove content,
</s> add </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js |
canShowTooltip = true, | <mask> const getHintElement = ({
<mask> className,
<mask> contentItemClass,
<mask> columnClass,
<mask> dataTip,
<mask> xlinkHref,
<mask> content,
<mask> title,
<mask> place,
<mask> tooltipClass,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove content,
</s> add </s> remove place,
</s> add placement, </s> remove import CustomTooltip from '../Tooltip/CustomTooltip';
</s> add import TooltipTrigger from 'react-popper-tooltip';
import { Trans } from 'react-i18next';
import classNames from 'classnames';
import './Tooltip.css';
import 'react-popper-tooltip/dist/styles.css';
import { HIDE_TOOLTIP_DELAY } from '../../../helpers/constants'; </s> remove import React, { useState } from 'react';
</s> add import React from 'react'; </s> remove </Fragment>
</s> add </> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js |
<mask> contentItemClass,
<mask> columnClass,
<mask> dataTip,
<mask> xlinkHref,
<mask> content,
<mask> title,
<mask> place,
<mask> tooltipClass,
<mask> trigger,
<mask> overridePosition,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove place,
</s> add placement, </s> remove dataTip,
</s> add canShowTooltip = true, </s> remove import CustomTooltip from '../Tooltip/CustomTooltip';
</s> add import TooltipTrigger from 'react-popper-tooltip';
import { Trans } from 'react-i18next';
import classNames from 'classnames';
import './Tooltip.css';
import 'react-popper-tooltip/dist/styles.css';
import { HIDE_TOOLTIP_DELAY } from '../../../helpers/constants'; </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js | |
placement, | <mask> dataTip,
<mask> xlinkHref,
<mask> content,
<mask> title,
<mask> place,
<mask> tooltipClass,
<mask> trigger,
<mask> overridePosition,
<mask> scrollHide,
<mask> renderContent,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove content,
</s> add </s> remove dataTip,
</s> add canShowTooltip = true, </s> remove dataTip: true,
</s> add </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js |
{title && <div className="pb-4 h-25 grid-content font-weight-bold">
<Trans>{title}</Trans>
</div>}
<div className={classNames(columnClass)}>{renderContent}</div>
</div>
}>{({
getTriggerProps, triggerRef,
}) => <span {...getTriggerProps({ ref: triggerRef })}> | <mask> className: classNames('tooltip__container', tooltipClass, { 'd-none': !canShowTooltip }),
<mask> })}
<mask> >
<mask> {xlinkHref && <svg className={className}>
<mask> <use xlinkHref={`#${xlinkHref}`} />
<mask> </svg>}
<mask> </span>}
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove </div>
{isHovered && dataTip
&& <CustomTooltip
className={tooltipClass}
id={id}
columnClass={columnClass}
contentItemClass={contentItemClass}
title={title}
place={place}
content={content}
trigger={trigger}
overridePosition={overridePosition}
scrollHide={scrollHide}
renderContent={renderContent}
/>}
</div>;
};
</s> add </span>}
</TooltipTrigger>; </s> remove dataTip: true,
</s> add </s> remove 'white-space--normal': response.length > 100,
</s> add 'overflow-break': response.length > 100, </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove place: 'bottom',
</s> add placement: 'bottom', | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js |
</span>}
</TooltipTrigger>; | <mask> >
<mask> {xlinkHref && <svg className={className}>
<mask> <use xlinkHref={`#${xlinkHref}`} />
<mask> </svg>}
<mask> </div>
<mask> {isHovered && dataTip
<mask> && <CustomTooltip
<mask> className={tooltipClass}
<mask> id={id}
<mask> columnClass={columnClass}
<mask> contentItemClass={contentItemClass}
<mask> title={title}
<mask> place={place}
<mask> content={content}
<mask> trigger={trigger}
<mask> overridePosition={overridePosition}
<mask> scrollHide={scrollHide}
<mask> renderContent={renderContent}
<mask> />}
<mask> </div>;
<mask> };
<mask>
<mask> getHintElement.propTypes = {
<mask> className: PropTypes.string,
<mask> contentItemClass: PropTypes.string,
<mask> columnClass: PropTypes.string,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove place: PropTypes.string,
dataTip: PropTypes.string,
</s> add placement: PropTypes.string,
canShowTooltip: PropTypes.string, </s> remove overridePosition: PropTypes.func,
scrollHide: PropTypes.bool,
trigger: PropTypes.oneOfType([
PropTypes.string,
PropTypes.arrayOf(PropTypes.string),
]),
</s> add </s> remove </Fragment>
</s> add </> </s> remove dataTip: true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js |
placement: PropTypes.string,
canShowTooltip: PropTypes.string, | <mask> contentItemClass: PropTypes.string,
<mask> columnClass: PropTypes.string,
<mask> tooltipClass: PropTypes.string,
<mask> title: PropTypes.string,
<mask> place: PropTypes.string,
<mask> dataTip: PropTypes.string,
<mask> xlinkHref: PropTypes.string,
<mask> overridePosition: PropTypes.func,
<mask> scrollHide: PropTypes.bool,
<mask> trigger: PropTypes.oneOfType([
<mask> PropTypes.string,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove overridePosition: PropTypes.func,
scrollHide: PropTypes.bool,
trigger: PropTypes.oneOfType([
PropTypes.string,
PropTypes.arrayOf(PropTypes.string),
]),
</s> add </s> remove </div>
{isHovered && dataTip
&& <CustomTooltip
className={tooltipClass}
id={id}
columnClass={columnClass}
contentItemClass={contentItemClass}
title={title}
place={place}
content={content}
trigger={trigger}
overridePosition={overridePosition}
scrollHide={scrollHide}
renderContent={renderContent}
/>}
</div>;
};
</s> add </span>}
</TooltipTrigger>; </s> remove dataTip: true,
</s> add </s> remove dataTip: true,
</s> add </s> remove dataTip: true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js |
<mask> title: PropTypes.string,
<mask> place: PropTypes.string,
<mask> dataTip: PropTypes.string,
<mask> xlinkHref: PropTypes.string,
<mask> overridePosition: PropTypes.func,
<mask> scrollHide: PropTypes.bool,
<mask> trigger: PropTypes.oneOfType([
<mask> PropTypes.string,
<mask> PropTypes.arrayOf(PropTypes.string),
<mask> ]),
<mask> content: PropTypes.oneOfType([
<mask> PropTypes.string,
<mask> PropTypes.array,
<mask> ]),
<mask> renderContent: PropTypes.arrayOf(PropTypes.element),
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove place: PropTypes.string,
dataTip: PropTypes.string,
</s> add placement: PropTypes.string,
canShowTooltip: PropTypes.string, </s> remove </div>
{isHovered && dataTip
&& <CustomTooltip
className={tooltipClass}
id={id}
columnClass={columnClass}
contentItemClass={contentItemClass}
title={title}
place={place}
content={content}
trigger={trigger}
overridePosition={overridePosition}
scrollHide={scrollHide}
renderContent={renderContent}
/>}
</div>;
};
</s> add </span>}
</TooltipTrigger>; </s> remove dataTip: true,
</s> add </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove dataTip: true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getHintElement.js | |
'overflow-break': response.length > 100, | <mask> }
<mask>
<mask> return <div>{responseArr.map((response) => {
<mask> const className = classNames('white-space--nowrap', {
<mask> 'white-space--normal': response.length > 100,
<mask> });
<mask>
<mask> return <div key={response} className={className}>{`${response}\n`}</div>;
<mask> })}</div>;
<mask> };
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, </s> remove <Fragment>
</s> add <> </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove <div className="logs__text" title={client}>
</s> add <div className="logs__text" title={value}> </s> remove let nameContainer = client;
</s> add let nameContainer = value; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getResponseCell.js |
[FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: {
domain,
encryption_status: boldStatusLabel,
filter,
rule_label: rule,
response_code: status,
}, | <mask> response_code: status,
<mask> },
<mask> [FILTERED_STATUS.FILTERED_SAFE_SEARCH]: {
<mask> domain,
<mask> encryption_status: boldStatusLabel,
<mask> install_settings_dns: upstream,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "react-tooltip": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz",
"integrity": "sha512-KX/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
"requires": {
"prop-types": "^15.7.2",
"uuid": "^7.0.3"
},
"dependencies": {
"uuid": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}
}
},
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getResponseCell.js |
<mask> className: classNames('icons mr-4 icon--small cursor--pointer icon--light-gray', { 'my-3': isDetailed }),
<mask> columnClass: 'grid grid--limited',
<mask> tooltipClass: 'px-5 pb-5 pt-4 mw-75 custom-tooltip__response-details',
<mask> contentItemClass: 'text-truncate key-colon o-hidden',
<mask> dataTip: true,
<mask> xlinkHref: 'question',
<mask> title: 'response_details',
<mask> content: fields,
<mask> place: 'bottom',
<mask> })}
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove dataTip: true,
</s> add </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove dataTip: true,
</s> add </s> remove dataTip: answer_dnssec,
</s> add canShowTooltip: answer_dnssec, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getResponseCell.js | |
placement: 'bottom', | <mask> dataTip: true,
<mask> xlinkHref: 'question',
<mask> title: 'response_details',
<mask> content: fields,
<mask> place: 'bottom',
<mask> })}
<mask> <div className="text-truncate">
<mask> <div className="text-truncate" title={statusLabel}>{statusLabel}</div>
<mask> {isDetailed && <div
<mask> className="detailed-info d-none d-sm-block pt-1 text-truncate" title={detailedInfo}>{detailedInfo}</div>}
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove place: 'bottom',
</s> add placement: 'bottom', </s> remove dataTip: true,
</s> add </s> remove dataTip: true,
</s> add </s> remove place: 'bottom',
</s> add placement: 'bottom', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Cells/getResponseCell.js |
<mask>
<mask> .loading__text {
<mask> transform: translateY(3rem);
<mask> }
<mask>
<mask> /*reset position to make absolute position of tooltip on tablets, may cause problems https://github.com/wwayne/react-tooltip/issues/204*/
<mask> @media (hover: none) {
<mask> .logs__action {
<mask> top: 1rem !important;
<mask> right: 1rem;
<mask> }
<mask>
<mask> .logs__table .rt-td,
<mask> .clients__table .rt-td {
<mask> position: initial;
<mask> }
<mask>
<mask> .logs__row {
<mask> position: initial;
<mask> }
<mask> }
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "react-tooltip": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz",
"integrity": "sha512-KX/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
"requires": {
"prop-types": "^15.7.2",
"uuid": "^7.0.3"
},
"dependencies": {
"uuid": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}
}
},
</s> add </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Logs/Logs.css | |
export const HIDE_TOOLTIP_DELAY = 300; | <mask> export const CHECK_TIMEOUT = 1000;
<mask> export const SUCCESS_TOAST_TIMEOUT = 5000;
<mask> export const FAILURE_TOAST_TIMEOUT = 30000;
<mask>
<mask> export const UNSAFE_PORTS = [
<mask> 1,
<mask> 7,
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove
export const touchMediaQuery = '(hover: none)';
</s> add </s> remove let nameContainer = client;
</s> add let nameContainer = value; </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, </s> remove dataTip,
</s> add canShowTooltip = true, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/helpers/constants.js |
<mask> LOGIN: 'login',
<mask> };
<mask>
<mask> export const smallScreenSize = 767;
<mask>
<mask> export const touchMediaQuery = '(hover: none)';
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove let nameContainer = client;
</s> add let nameContainer = value; </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, </s> remove </Fragment>
</s> add </> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/helpers/constants.js | |
const { value, original: { info } } = row; | <mask> );
<mask> };
<mask>
<mask> export const formatClientCell = (row, t, isDetailed = false) => {
<mask> const { info, client } = row.original;
<mask> let whoisContainer = '';
<mask> let nameContainer = client;
<mask>
<mask> if (info) {
<mask> const { name, whois_info } = info;
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove let nameContainer = client;
</s> add let nameContainer = value; </s> remove nameContainer = isDetailed ? <small title={client}>{client}</small>
: <div className="logs__text logs__text--nowrap"
title={`${name} (${client})`}>
{name}
<small>{`(${client})`}</small>
</s> add nameContainer = isDetailed
? <small title={value}>{value}</small>
: <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
{name}<small>{`(${value})`}</small> </s> remove
export const touchMediaQuery = '(hover: none)';
</s> add </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/helpers/formatClientCell.js |
let nameContainer = value; | <mask>
<mask> export const formatClientCell = (row, t, isDetailed = false) => {
<mask> const { info, client } = row.original;
<mask> let whoisContainer = '';
<mask> let nameContainer = client;
<mask>
<mask> if (info) {
<mask> const { name, whois_info } = info;
<mask>
<mask> if (name) {
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove nameContainer = isDetailed ? <small title={client}>{client}</small>
: <div className="logs__text logs__text--nowrap"
title={`${name} (${client})`}>
{name}
<small>{`(${client})`}</small>
</s> add nameContainer = isDetailed
? <small title={value}>{value}</small>
: <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
{name}<small>{`(${value})`}</small> </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, </s> remove
export const touchMediaQuery = '(hover: none)';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/helpers/formatClientCell.js |
nameContainer = isDetailed
? <small title={value}>{value}</small>
: <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
{name}<small>{`(${value})`}</small> | <mask> if (info) {
<mask> const { name, whois_info } = info;
<mask>
<mask> if (name) {
<mask> nameContainer = isDetailed ? <small title={client}>{client}</small>
<mask> : <div className="logs__text logs__text--nowrap"
<mask> title={`${name} (${client})`}>
<mask> {name}
<mask> <small>{`(${client})`}</small>
<mask> </div>;
<mask> }
<mask>
<mask> if (whois_info) {
<mask> whoisContainer = (
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove let nameContainer = client;
</s> add let nameContainer = value; </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, </s> remove <Fragment>
</s> add <> </s> remove 'white-space--normal': response.length > 100,
</s> add 'overflow-break': response.length > 100, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/helpers/formatClientCell.js |
<div className="logs__text" title={value}> | <mask> }
<mask> }
<mask>
<mask> return (
<mask> <div className="logs__text" title={client}>
<mask> <>
<mask> {nameContainer}
<mask> {whoisContainer}
<mask> </>
<mask> </div>
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove <Fragment>
</s> add <> </s> remove </Fragment>
</s> add </> </s> remove 'white-space--normal': response.length > 100,
</s> add 'overflow-break': response.length > 100, </s> remove nameContainer = isDetailed ? <small title={client}>{client}</small>
: <div className="logs__text logs__text--nowrap"
title={`${name} (${client})`}>
{name}
<small>{`(${client})`}</small>
</s> add nameContainer = isDetailed
? <small title={value}>{value}</small>
: <div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
{name}<small>{`(${value})`}</small> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/helpers/formatClientCell.js |
<mask> req *dns.Msg,
<mask> rr rules.RRType,
<mask> v rules.RRValue,
<mask> ) (ans dns.RR, err error) {
<mask> // TODO(a.garipov): As more types are added, we will probably want to use a
<mask> // handler-oriented approach here. So, think of a way to decouple the
<mask> // answer generation logic from the Server.
<mask>
<mask> switch rr {
<mask> case dns.TypeA,
<mask> dns.TypeAAAA:
<mask> ip, ok := v.(net.IP)
<mask> if !ok {
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove case dns.TypeA,
</s> add case
dns.TypeA, </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) </s> remove return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT:
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
</s> add // ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteIP(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not net.IP", dns.Type(rr), v)
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} </s> remove return s.genAnswerSRV(req, srv), nil
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr)
</s> add // ansFromDNSRewriteMX creates a new answer resource record from the MX
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteMX(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSMX",
dns.Type(rr),
v,
)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go | |
case
dns.TypeA, | <mask> // handler-oriented approach here. So, think of a way to decouple the
<mask> // answer generation logic from the Server.
<mask>
<mask> switch rr {
<mask> case dns.TypeA,
<mask> dns.TypeAAAA:
<mask> ip, ok := v.(net.IP)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
<mask> }
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove // TODO(a.garipov): As more types are added, we will probably want to use a
// handler-oriented approach here. So, think of a way to decouple the
// answer generation logic from the Server.
</s> add </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) </s> remove return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT:
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
</s> add // ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteIP(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not net.IP", dns.Type(rr), v)
} </s> remove if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
}
</s> add return nil, nil
}
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) | <mask>
<mask> switch rr {
<mask> case dns.TypeA,
<mask> dns.TypeAAAA:
<mask> ip, ok := v.(net.IP)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
<mask> }
<mask>
<mask> if rr == dns.TypeA {
<mask> return s.genAnswerA(req, ip.To4()), nil
<mask> }
<mask>
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove case dns.TypeA,
</s> add case
dns.TypeA, </s> remove if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
}
</s> add return nil, nil
}
} </s> remove return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT:
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
</s> add // ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteIP(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not net.IP", dns.Type(rr), v)
} </s> remove if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
</s> add if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
} </s> remove if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil
}
</s> add if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
return nil, nil
}
} | <mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
<mask> }
<mask>
<mask> if rr == dns.TypeA {
<mask> return s.genAnswerA(req, ip.To4()), nil
<mask> }
<mask>
<mask> return s.genAnswerAAAA(req, ip), nil
<mask> case dns.TypePTR,
<mask> dns.TypeTXT:
<mask> str, ok := v.(string)
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT:
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
</s> add // ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteIP(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not net.IP", dns.Type(rr), v)
} </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) </s> remove if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
</s> add if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
} </s> remove return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
</s> add return s.genAnswerAAAA(req, ip), nil
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
// ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteIP(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not net.IP", dns.Type(rr), v)
} | <mask> if rr == dns.TypeA {
<mask> return s.genAnswerA(req, ip.To4()), nil
<mask> }
<mask>
<mask> return s.genAnswerAAAA(req, ip), nil
<mask> case dns.TypePTR,
<mask> dns.TypeTXT:
<mask> str, ok := v.(string)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
<mask> }
<mask>
<mask> if rr == dns.TypeTXT {
<mask> return s.genAnswerTXT(req, []string{str}), nil
<mask> }
<mask>
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
}
</s> add return nil, nil
}
} </s> remove if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
</s> add if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
} </s> remove return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
</s> add return s.genAnswerAAAA(req, ip), nil
} </s> remove if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil
}
</s> add if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
} </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
} | <mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
<mask> }
<mask>
<mask> if rr == dns.TypeTXT {
<mask> return s.genAnswerTXT(req, []string{str}), nil
<mask> }
<mask>
<mask> return s.genAnswerPTR(req, str), nil
<mask> case dns.TypeMX:
<mask> mx, ok := v.(*rules.DNSMX)
<mask> if !ok {
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
</s> add return s.genAnswerAAAA(req, ip), nil
} </s> remove if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil
}
</s> add if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
} </s> remove return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT:
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
</s> add // ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteIP(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not net.IP", dns.Type(rr), v)
} </s> remove return s.genAnswerSVCB(req, svcb), nil
case dns.TypeSRV:
srv, ok := v.(*rules.DNSSRV)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
}
</s> add return s.genAnswerPTR(req, str), nil
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
return s.genAnswerAAAA(req, ip), nil
} | <mask> if rr == dns.TypeTXT {
<mask> return s.genAnswerTXT(req, []string{str}), nil
<mask> }
<mask>
<mask> return s.genAnswerPTR(req, str), nil
<mask> case dns.TypeMX:
<mask> mx, ok := v.(*rules.DNSMX)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
<mask> }
<mask>
<mask> return s.genAnswerMX(req, mx), nil
<mask> case dns.TypeHTTPS,
<mask> dns.TypeSVCB:
<mask> svcb, ok := v.(*rules.DNSSVCB)
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
</s> add if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} </s> remove if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil
}
</s> add if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
} </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) </s> remove return s.genAnswerSVCB(req, svcb), nil
case dns.TypeSRV:
srv, ok := v.(*rules.DNSSRV)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
}
</s> add return s.genAnswerPTR(req, str), nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
// ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} | <mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
<mask> }
<mask>
<mask> return s.genAnswerMX(req, mx), nil
<mask> case dns.TypeHTTPS,
<mask> dns.TypeSVCB:
<mask> svcb, ok := v.(*rules.DNSSVCB)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
<mask> }
<mask>
<mask> if rr == dns.TypeHTTPS {
<mask> return s.genAnswerHTTPS(req, svcb), nil
<mask> }
<mask>
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove return s.genAnswerPTR(req, str), nil
case dns.TypeMX:
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSMX", rr, v)
}
</s> add return s.genAnswerAAAA(req, ip), nil
} </s> remove if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil
}
</s> add if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
} </s> remove return s.genAnswerSVCB(req, svcb), nil
case dns.TypeSRV:
srv, ok := v.(*rules.DNSSRV)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
}
</s> add return s.genAnswerPTR(req, str), nil
} </s> remove return nil, nil
</s> add return s.genAnswerMX(req, mx), nil
}
// ansFromDNSRewriteSVCB creates a new answer resource record from the
// SVCB/HTTPS dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteSVCB(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSSVCB",
dns.Type(rr),
v,
)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
} | <mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
<mask> }
<mask>
<mask> if rr == dns.TypeHTTPS {
<mask> return s.genAnswerHTTPS(req, svcb), nil
<mask> }
<mask>
<mask> return s.genAnswerSVCB(req, svcb), nil
<mask> case dns.TypeSRV:
<mask> srv, ok := v.(*rules.DNSSRV)
<mask> if !ok {
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove return s.genAnswerSVCB(req, svcb), nil
case dns.TypeSRV:
srv, ok := v.(*rules.DNSSRV)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
}
</s> add return s.genAnswerPTR(req, str), nil
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} </s> remove if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
}
</s> add if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
} </s> remove return nil, nil
</s> add return s.genAnswerMX(req, mx), nil
}
// ansFromDNSRewriteSVCB creates a new answer resource record from the
// SVCB/HTTPS dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteSVCB(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSSVCB",
dns.Type(rr),
v,
)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
}
</s> add return nil, nil
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
return s.genAnswerPTR(req, str), nil
} | <mask> if rr == dns.TypeHTTPS {
<mask> return s.genAnswerHTTPS(req, svcb), nil
<mask> }
<mask>
<mask> return s.genAnswerSVCB(req, svcb), nil
<mask> case dns.TypeSRV:
<mask> srv, ok := v.(*rules.DNSSRV)
<mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
<mask> }
<mask>
<mask> return s.genAnswerSRV(req, srv), nil
<mask> default:
<mask> log.Debug("don't know how to handle dns rr type %d, skipping", rr)
<mask>
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil
}
</s> add if rr == dns.TypeTXT {
return s.genAnswerTXT(req, []string{str}), nil
} </s> remove return s.genAnswerSRV(req, srv), nil
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr)
</s> add // ansFromDNSRewriteMX creates a new answer resource record from the MX
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteMX(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSMX",
dns.Type(rr),
v,
)
} </s> remove return nil, nil
</s> add return s.genAnswerMX(req, mx), nil
}
// ansFromDNSRewriteSVCB creates a new answer resource record from the
// SVCB/HTTPS dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteSVCB(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSSVCB",
dns.Type(rr),
v,
)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
// ansFromDNSRewriteMX creates a new answer resource record from the MX
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteMX(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSMX",
dns.Type(rr),
v,
)
} | <mask> if !ok {
<mask> return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
<mask> }
<mask>
<mask> return s.genAnswerSRV(req, srv), nil
<mask> default:
<mask> log.Debug("don't know how to handle dns rr type %d, skipping", rr)
<mask>
<mask> return nil, nil
<mask> }
<mask> }
<mask>
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove return s.genAnswerSVCB(req, svcb), nil
case dns.TypeSRV:
srv, ok := v.(*rules.DNSSRV)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
}
</s> add return s.genAnswerPTR(req, str), nil
} </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) </s> remove return nil, nil
</s> add return s.genAnswerMX(req, mx), nil
}
// ansFromDNSRewriteSVCB creates a new answer resource record from the
// SVCB/HTTPS dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteSVCB(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSSVCB",
dns.Type(rr),
v,
)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil </s> remove if rr == dns.TypeA {
return s.genAnswerA(req, ip.To4()), nil
}
</s> add return nil, nil
}
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
return s.genAnswerMX(req, mx), nil
}
// ansFromDNSRewriteSVCB creates a new answer resource record from the
// SVCB/HTTPS dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteSVCB(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSSVCB",
dns.Type(rr),
v,
)
}
if rr == dns.TypeHTTPS {
return s.genAnswerHTTPS(req, svcb), nil | <mask> return s.genAnswerSRV(req, srv), nil
<mask> default:
<mask> log.Debug("don't know how to handle dns rr type %d, skipping", rr)
<mask>
<mask> return nil, nil
<mask> }
<mask> }
<mask>
<mask> // filterDNSRewrite handles dnsrewrite filters. It constructs a DNS response
<mask> // and sets it into pctx.Res. All parameters must not be nil.
</s> Pull request: imp-dnsforward-cyclo
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master
Squashed commit of the following:
commit ab05ebbcc62c5f66f838a9df6ce8e51721606bb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 18:43:18 2022 +0300
dnsforward: imp cyclo </s> remove return s.genAnswerSVCB(req, svcb), nil
case dns.TypeSRV:
srv, ok := v.(*rules.DNSSRV)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSRV", rr, v)
}
</s> add return s.genAnswerPTR(req, str), nil
} </s> remove return s.genAnswerSRV(req, srv), nil
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr)
</s> add // ansFromDNSRewriteMX creates a new answer resource record from the MX
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteMX(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
mx, ok := v.(*rules.DNSMX)
if !ok {
return nil, fmt.Errorf(
"value for rr type %s has type %T, not *rules.DNSMX",
dns.Type(rr),
v,
)
} </s> remove ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not net.IP", rr, v)
}
</s> add return s.ansFromDNSRewriteIP(v, rr, req)
case
dns.TypePTR,
dns.TypeTXT:
return s.ansFromDNSRewriteText(v, rr, req)
case dns.TypeMX:
return s.ansFromDNSRewriteMX(v, rr, req)
case
dns.TypeHTTPS,
dns.TypeSVCB:
return s.ansFromDNSRewriteSVCB(v, rr, req)
case dns.TypeSRV:
return s.ansFromDNSRewriteSRV(v, rr, req)
default:
log.Debug("don't know how to handle dns rr type %d, skipping", rr) </s> remove return s.genAnswerAAAA(req, ip), nil
case dns.TypePTR,
dns.TypeTXT:
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not string", rr, v)
}
</s> add // ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteIP(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
ip, ok := v.(net.IP)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not net.IP", dns.Type(rr), v)
} </s> remove return s.genAnswerMX(req, mx), nil
case dns.TypeHTTPS,
dns.TypeSVCB:
svcb, ok := v.(*rules.DNSSVCB)
if !ok {
return nil, fmt.Errorf("value for rr type %d has type %T, not *rules.DNSSVCB", rr, v)
}
</s> add // ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
// dnsrewrite rule data.
func (s *Server) ansFromDNSRewriteText(
v rules.RRValue,
rr rules.RRType,
req *dns.Msg,
) (ans dns.RR, err error) {
str, ok := v.(string)
if !ok {
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab02c829ea53d2fbb20f17e160f17d232e2788d7 | internal/dnsforward/dnsrewrite.go |
"encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on <0>{{link}}</0> or you can buy it from one of the trusted Certificate Authorities.", | <mask> "encryption_https_desc": "If HTTPS port is configured, AdGuard Home admin interface will be accessible via HTTPS, and it will also provide DNS-over-HTTPS on '\\dns-query' location.",
<mask> "encryption_dot": "DNS-over-TLS port",
<mask> "encryption_dot_desc": "If this port is configured, AdGuard Home will run a DNS-over-TLS server on this port.",
<mask> "encryption_certificates": "Certificates",
<mask> "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on letsencrypt.org or you can buy it from one of the trusted Certificate Authorities.",
<mask> "encryption_certificates_input": "Copy/paste your PEM-encoded cerificates here.",
<mask> "encryption_status": "Status",
<mask> "encryption_certificates_for": "Certificates for {{domains}}",
<mask> "encryption_expire": "Expire on {{date}}",
<mask> "encryption_key": "Private key",
</s> Added topline component and fixed string interpolation </s> remove <Update
announcement={dashboard.announcement}
announcementUrl={dashboard.announcementUrl}
/>
</s> add <Topline type="info">
{dashboard.announcement} <a href={dashboard.announcementUrl} target="_blank" rel="noopener noreferrer">Click here</a> for more info.
</Topline>
}
{isExpiringCertificate &&
<Topline type="warning">
<Trans components={[<a href="#settings" key="0">link</a>]}>
topline_expiring_certificate
</Trans>
</Topline> </s> remove import Update from '../ui/Update';
</s> add import Topline from '../ui/Topline'; </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/__locales/en.json |
"topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.", | <mask> "encryption_key": "Private key",
<mask> "encryption_key_input": "Copy/paste your PEM-encoded private key for your cerficate here.",
<mask> "form_error_port_range": "Enter port value in the range of 80-65535",
<mask> "form_error_equal": "Shouldn't be equal",
<mask> "form_error_password": "Password mismatched"
<mask> } </s> Added topline component and fixed string interpolation </s> remove "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on letsencrypt.org or you can buy it from one of the trusted Certificate Authorities.",
</s> add "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on <0>{{link}}</0> or you can buy it from one of the trusted Certificate Authorities.", </s> remove <Update
announcement={dashboard.announcement}
announcementUrl={dashboard.announcementUrl}
/>
</s> add <Topline type="info">
{dashboard.announcement} <a href={dashboard.announcementUrl} target="_blank" rel="noopener noreferrer">Click here</a> for more info.
</Topline>
}
{isExpiringCertificate &&
<Topline type="warning">
<Trans components={[<a href="#settings" key="0">link</a>]}>
topline_expiring_certificate
</Trans>
</Topline> </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/__locales/en.json |
status.certificate_chain = decodeURIComponent(status.certificate_chain);
status.private_key = decodeURIComponent(status.private_key);
| <mask> dispatch(getTlsStatusRequest());
<mask> try {
<mask> const status = await apiClient.getTlsStatus();
<mask> dispatch(getTlsStatusSuccess(status));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getTlsStatusFailure());
<mask> }
<mask> };
</s> Added topline component and fixed string interpolation </s> remove await apiClient.setTlsConfig(config);
</s> add const values = { ...config };
values.certificate_chain = encodeURIComponent(values.certificate_chain);
values.private_key = encodeURIComponent(values.private_key);
await apiClient.setTlsConfig(values); </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove import Update from '../ui/Update';
</s> add import Topline from '../ui/Topline'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/actions/index.js |
const values = { ...config };
values.certificate_chain = encodeURIComponent(values.certificate_chain);
values.private_key = encodeURIComponent(values.private_key);
await apiClient.setTlsConfig(values); | <mask>
<mask> export const setTlsConfig = config => async (dispatch) => {
<mask> dispatch(setTlsConfigRequest());
<mask> try {
<mask> await apiClient.setTlsConfig(config);
<mask> dispatch(setTlsConfigSuccess(config));
<mask> dispatch(addSuccessToast('encryption_config_saved'));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setTlsConfigFailure());
</s> Added topline component and fixed string interpolation </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove import Update from '../ui/Update';
</s> add import Topline from '../ui/Topline'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/actions/index.js |
import { Trans, withNamespaces } from 'react-i18next'; | <mask> import { HashRouter, Route } from 'react-router-dom';
<mask> import PropTypes from 'prop-types';
<mask> import LoadingBar from 'react-redux-loading-bar';
<mask>
<mask> import 'react-table/react-table.css';
<mask> import '../ui/Tabler.css';
<mask> import '../ui/ReactTable.css';
</s> Added topline component and fixed string interpolation </s> remove import Update from '../ui/Update';
</s> add import Topline from '../ui/Topline'; </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on letsencrypt.org or you can buy it from one of the trusted Certificate Authorities.",
</s> add "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on <0>{{link}}</0> or you can buy it from one of the trusted Certificate Authorities.", </s> remove await apiClient.setTlsConfig(config);
</s> add const values = { ...config };
values.certificate_chain = encodeURIComponent(values.certificate_chain);
values.private_key = encodeURIComponent(values.private_key);
await apiClient.setTlsConfig(values); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/App/index.js |
import Topline from '../ui/Topline'; | <mask> import Logs from '../../containers/Logs';
<mask> import Footer from '../ui/Footer';
<mask> import Toasts from '../Toasts';
<mask> import Status from '../ui/Status';
<mask> import Update from '../ui/Update';
<mask> import i18n from '../../i18n';
<mask>
<mask> class App extends Component {
<mask> componentDidMount() {
<mask> this.props.getDnsStatus();
</s> Added topline component and fixed string interpolation </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on letsencrypt.org or you can buy it from one of the trusted Certificate Authorities.",
</s> add "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on <0>{{link}}</0> or you can buy it from one of the trusted Certificate Authorities.", </s> remove await apiClient.setTlsConfig(config);
</s> add const values = { ...config };
values.certificate_chain = encodeURIComponent(values.certificate_chain);
values.private_key = encodeURIComponent(values.private_key);
await apiClient.setTlsConfig(values); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/App/index.js |
const isExpiringCertificate = false; | <mask> !dashboard.processingVersions &&
<mask> dashboard.isCoreRunning &&
<mask> dashboard.isUpdateAvailable;
<mask>
<mask> return (
<mask> <HashRouter hashType='noslash'>
<mask> <Fragment>
</s> Added topline component and fixed string interpolation </s> remove <Update
announcement={dashboard.announcement}
announcementUrl={dashboard.announcementUrl}
/>
</s> add <Topline type="info">
{dashboard.announcement} <a href={dashboard.announcementUrl} target="_blank" rel="noopener noreferrer">Click here</a> for more info.
</Topline>
}
{isExpiringCertificate &&
<Topline type="warning">
<Trans components={[<a href="#settings" key="0">link</a>]}>
topline_expiring_certificate
</Trans>
</Topline> </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove <Trans>encryption_expire</Trans>
2022-01-01
</s> add <Trans values={{ date: '2022-01-01' }}>
encryption_expire
</Trans> </s> remove <Trans>encryption_certificates_for</Trans>
*.example.org, example.org
</s> add <Trans values={{ domains: '*.example.org, example.org' }}>
encryption_certificates_for
</Trans> </s> remove <Trans>encryption_certificates_desc</Trans>
</s> add <Trans
values={{ link: 'letsencrypt.org' }}
components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
>
encryption_certificates_desc
</Trans> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/App/index.js |
<Topline type="info">
{dashboard.announcement} <a href={dashboard.announcementUrl} target="_blank" rel="noopener noreferrer">Click here</a> for more info.
</Topline>
}
{isExpiringCertificate &&
<Topline type="warning">
<Trans components={[<a href="#settings" key="0">link</a>]}>
topline_expiring_certificate
</Trans>
</Topline> | <mask> return (
<mask> <HashRouter hashType='noslash'>
<mask> <Fragment>
<mask> {updateAvailable &&
<mask> <Update
<mask> announcement={dashboard.announcement}
<mask> announcementUrl={dashboard.announcementUrl}
<mask> />
<mask> }
<mask> <LoadingBar className="loading-bar" updateTime={1000} />
<mask> <Route component={Header} />
<mask> <div className="container container--wrap">
<mask> {!dashboard.processing && !dashboard.isCoreRunning &&
</s> Added topline component and fixed string interpolation </s> remove <Trans>encryption_certificates_for</Trans>
*.example.org, example.org
</s> add <Trans values={{ domains: '*.example.org, example.org' }}>
encryption_certificates_for
</Trans> </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove <Trans>encryption_certificates_desc</Trans>
</s> add <Trans
values={{ link: 'letsencrypt.org' }}
components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
>
encryption_certificates_desc
</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/App/index.js |
encryption: PropTypes.object, | <mask> isCoreRunning: PropTypes.bool,
<mask> error: PropTypes.string,
<mask> getVersion: PropTypes.func,
<mask> changeLanguage: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(App);
</s> Added topline component and fixed string interpolation </s> remove export default App;
</s> add export default withNamespaces()(App); </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove await apiClient.setTlsConfig(config);
</s> add const values = { ...config };
values.certificate_chain = encodeURIComponent(values.certificate_chain);
values.private_key = encodeURIComponent(values.private_key);
await apiClient.setTlsConfig(values); </s> remove <Trans>encryption_expire</Trans>
2022-01-01
</s> add <Trans values={{ date: '2022-01-01' }}>
encryption_expire
</Trans> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/App/index.js |
export default withNamespaces()(App); | <mask> getVersion: PropTypes.func,
<mask> changeLanguage: PropTypes.func,
<mask> };
<mask>
<mask> export default App;
</s> Added topline component and fixed string interpolation </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove await apiClient.setTlsConfig(config);
</s> add const values = { ...config };
values.certificate_chain = encodeURIComponent(values.certificate_chain);
values.private_key = encodeURIComponent(values.private_key);
await apiClient.setTlsConfig(values); </s> remove <Trans>encryption_expire</Trans>
2022-01-01
</s> add <Trans values={{ date: '2022-01-01' }}>
encryption_expire
</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/App/index.js |
<Trans
values={{ link: 'letsencrypt.org' }}
components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
>
encryption_certificates_desc
</Trans> | <mask> <label className="form__label form__label--bold" htmlFor="certificate_chain">
<mask> <Trans>encryption_certificates</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>encryption_certificates_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="certificate_chain"
<mask> name="certificate_chain"
<mask> component="textarea"
</s> Added topline component and fixed string interpolation </s> remove <Trans>encryption_certificates_for</Trans>
*.example.org, example.org
</s> add <Trans values={{ domains: '*.example.org, example.org' }}>
encryption_certificates_for
</Trans> </s> remove <Trans>encryption_expire</Trans>
2022-01-01
</s> add <Trans values={{ date: '2022-01-01' }}>
encryption_expire
</Trans> </s> remove <Update
announcement={dashboard.announcement}
announcementUrl={dashboard.announcementUrl}
/>
</s> add <Topline type="info">
{dashboard.announcement} <a href={dashboard.announcementUrl} target="_blank" rel="noopener noreferrer">Click here</a> for more info.
</Topline>
}
{isExpiringCertificate &&
<Topline type="warning">
<Trans components={[<a href="#settings" key="0">link</a>]}>
topline_expiring_certificate
</Trans>
</Topline> </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove export default App;
</s> add export default withNamespaces()(App); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/Settings/Encryption/Form.js |
<Trans values={{ domains: '*.example.org, example.org' }}>
encryption_certificates_for
</Trans> | <mask> <div className="form__label form__label--bold">
<mask> <Trans>encryption_status</Trans>:
<mask> </div>
<mask> <div>
<mask> <Trans>encryption_certificates_for</Trans>
<mask> *.example.org, example.org
<mask> </div>
<mask> <div>
<mask> <Trans>encryption_expire</Trans>
<mask> 2022-01-01
<mask> </div>
</s> Added topline component and fixed string interpolation </s> remove <Trans>encryption_expire</Trans>
2022-01-01
</s> add <Trans values={{ date: '2022-01-01' }}>
encryption_expire
</Trans> </s> remove <Trans>encryption_certificates_desc</Trans>
</s> add <Trans
values={{ link: 'letsencrypt.org' }}
components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
>
encryption_certificates_desc
</Trans> </s> remove <Update
announcement={dashboard.announcement}
announcementUrl={dashboard.announcementUrl}
/>
</s> add <Topline type="info">
{dashboard.announcement} <a href={dashboard.announcementUrl} target="_blank" rel="noopener noreferrer">Click here</a> for more info.
</Topline>
}
{isExpiringCertificate &&
<Topline type="warning">
<Trans components={[<a href="#settings" key="0">link</a>]}>
topline_expiring_certificate
</Trans>
</Topline> </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove export default App;
</s> add export default withNamespaces()(App); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/Settings/Encryption/Form.js |
<Trans values={{ date: '2022-01-01' }}>
encryption_expire
</Trans> | <mask> <Trans>encryption_certificates_for</Trans>
<mask> *.example.org, example.org
<mask> </div>
<mask> <div>
<mask> <Trans>encryption_expire</Trans>
<mask> 2022-01-01
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
</s> Added topline component and fixed string interpolation </s> remove <Trans>encryption_certificates_for</Trans>
*.example.org, example.org
</s> add <Trans values={{ domains: '*.example.org, example.org' }}>
encryption_certificates_for
</Trans> </s> remove <Trans>encryption_certificates_desc</Trans>
</s> add <Trans
values={{ link: 'letsencrypt.org' }}
components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
>
encryption_certificates_desc
</Trans> </s> remove const { dashboard } = state;
const props = { dashboard };
</s> add const { dashboard, encryption } = state;
const props = { dashboard, encryption }; </s> remove export default App;
</s> add export default withNamespaces()(App); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/components/Settings/Encryption/Form.js |
const { dashboard, encryption } = state;
const props = { dashboard, encryption }; | <mask> import * as actionCreators from '../actions';
<mask> import App from '../components/App';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { dashboard } = state;
<mask> const props = { dashboard };
<mask> return props;
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
</s> Added topline component and fixed string interpolation </s> remove await apiClient.setTlsConfig(config);
</s> add const values = { ...config };
values.certificate_chain = encodeURIComponent(values.certificate_chain);
values.private_key = encodeURIComponent(values.private_key);
await apiClient.setTlsConfig(values); </s> remove import Update from '../ui/Update';
</s> add import Topline from '../ui/Topline'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab11c912db1af9a5b714d012851391630701943c | client/src/containers/App.js |
"dnscrypt": "DNSCrypt", | <mask> "blocking_ipv4": "IPv4-blokering",
<mask> "blocking_ipv6": "IPv6-blokering",
<mask> "dns_over_https": "DNS-over-HTTPS",
<mask> "dns_over_tls": "DNS-over-TLS",
<mask> "dns_over_quic": "DNS-over-Quic",
<mask> "client_id": "Klient-ID",
<mask> "client_id_placeholder": "Indtast klient-ID",
</s> Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 16:18:54 2021 +0300
all: upd translations </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab81ff03f6b1f624f5b70e2f750c502daa4efefb | client/src/__locales/da.json |
"dnscrypt": "DNSCrypt", | <mask> "null_ip": "Nessun IP",
<mask> "custom_ip": "IP personalizzato",
<mask> "blocking_ipv4": "Blocca IPv4",
<mask> "blocking_ipv6": "Blocca IPv6",
<mask> "dns_over_https": "DNS su HTTPS",
<mask> "dns_over_tls": "DNS su TLS",
<mask> "dns_over_quic": "DNS su Quic",
<mask> "client_id": "ID client",
<mask> "client_id_placeholder": "Inserisci ID client",
</s> Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 16:18:54 2021 +0300
all: upd translations </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab81ff03f6b1f624f5b70e2f750c502daa4efefb | client/src/__locales/it.json |
"dnscrypt": "DNSCrypt", | <mask> "null_ip": "Null-IP",
<mask> "custom_ip": "Tilpasset IP",
<mask> "blocking_ipv4": "IPv4-blokkering",
<mask> "blocking_ipv6": "IPv6-blokkering",
<mask> "dns_over_https": "DNS-over-HTTPS",
<mask> "dns_over_tls": "DNS-over-TLS",
<mask> "dns_over_quic": "DNS-over-QUIC",
<mask> "client_id": "Klient-ID",
<mask> "download_mobileconfig_doh": "Last ned .mobileconfig for DNS-over-HTTPS",
<mask> "download_mobileconfig_dot": "Last ned .mobileconfig for DNS-over-TLS",
</s> Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 16:18:54 2021 +0300
all: upd translations </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab81ff03f6b1f624f5b70e2f750c502daa4efefb | client/src/__locales/no.json |
"dnscrypt": "DNSCrypt", | <mask> "custom_ip": "Niestandardowy adres IP",
<mask> "blocking_ipv4": "Blokowanie IPv4",
<mask> "blocking_ipv6": "Blokowanie IPv6",
<mask> "dns_over_https": "DNS-over-HTTPS",
<mask> "dns_over_tls": "DNS-over-TLS",
<mask> "dns_over_quic": "DNS-over-QUIC",
<mask> "client_id": "ID klienta",
</s> Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 16:18:54 2021 +0300
all: upd translations </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab81ff03f6b1f624f5b70e2f750c502daa4efefb | client/src/__locales/pl.json |
"dnscrypt": "DNSCrypt", | <mask> "blocking_ipv4": "A bloquear IPv4",
<mask> "blocking_ipv6": "A bloquear IPv6",
<mask> "dns_over_https": "DNS-sobre-HTTPS",
<mask> "dns_over_tls": "DNS-sobre-TLS",
<mask> "dns_over_quic": "DNS-sobre-QUIC",
<mask> "client_id": "ID do cliente",
</s> Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 16:18:54 2021 +0300
all: upd translations </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab81ff03f6b1f624f5b70e2f750c502daa4efefb | client/src/__locales/pt-pt.json |
"version": "0.2.0",
"lockfileVersion": 2, | <mask> {
<mask> "name": "translations",
<mask> "version": "0.1.0",
<mask> "lockfileVersion": 1,
<mask> "requires": true,
<mask> "dependencies": {
<mask> "ajv": {
<mask> "version": "6.5.5",
<mask> "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
</s> Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 16:18:54 2021 +0300
all: upd translations </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" | [
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab81ff03f6b1f624f5b70e2f750c502daa4efefb | scripts/translations/package-lock.json |
"version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" | <mask> "verror": "1.10.0"
<mask> }
<mask> },
<mask> "lodash": {
<mask> "version": "4.17.15",
<mask> "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
<mask> "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
<mask> },
<mask> "mime-db": {
<mask> "version": "1.37.0",
<mask> "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
<mask> "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
</s> Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 16:18:54 2021 +0300
all: upd translations </s> remove "version": "0.1.0",
"lockfileVersion": 1,
</s> add "version": "0.2.0",
"lockfileVersion": 2, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab81ff03f6b1f624f5b70e2f750c502daa4efefb | scripts/translations/package-lock.json |
"Path to the config file.", | <mask>
<mask> var args []arg
<mask>
<mask> var configArg = arg{
<mask> "Path to the config file",
<mask> "config", "c",
<mask> func(o options, v string) (options, error) { o.configFilename = v; return o, nil },
<mask> nil,
<mask> nil,
<mask> func(o options) []string { return stringSliceOrNil(o.configFilename) },
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Path to a file where PID is stored",
</s> add "Path to a file where PID is stored.", </s> remove "Path to log file. If empty: write to stdout; if 'syslog': write to system log",
</s> add "Path to log file. If empty: write to stdout; if 'syslog': write to system log.", </s> remove "Host address to bind HTTP server on",
</s> add "Host address to bind HTTP server on.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Path to the working directory.", | <mask> func(o options) []string { return stringSliceOrNil(o.configFilename) },
<mask> }
<mask>
<mask> var workDirArg = arg{
<mask> "Path to the working directory",
<mask> "work-dir", "w",
<mask> func(o options, v string) (options, error) { o.workDir = v; return o, nil }, nil, nil,
<mask> func(o options) []string { return stringSliceOrNil(o.workDir) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Path to the config file",
</s> add "Path to the config file.", </s> remove "Path to a file where PID is stored",
</s> add "Path to a file where PID is stored.", </s> remove "Host address to bind HTTP server on",
</s> add "Host address to bind HTTP server on.", </s> remove "Path to log file. If empty: write to stdout; if 'syslog': write to system log",
</s> add "Path to log file. If empty: write to stdout; if 'syslog': write to system log.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Host address to bind HTTP server on.", | <mask> func(o options) []string { return stringSliceOrNil(o.workDir) },
<mask> }
<mask>
<mask> var hostArg = arg{
<mask> "Host address to bind HTTP server on",
<mask> "host", "h",
<mask> func(o options, v string) (options, error) { o.bindHost = net.ParseIP(v); return o, nil }, nil, nil,
<mask> func(o options) []string { return ipSliceOrNil(o.bindHost) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Port to serve HTTP pages on",
</s> add "Port to serve HTTP pages on.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", </s> remove "Disable memory optimization",
</s> add "Disable memory optimization.", </s> remove "Don't check for updates",
</s> add "Don't check for updates.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Port to serve HTTP pages on.", | <mask> func(o options) []string { return ipSliceOrNil(o.bindHost) },
<mask> }
<mask>
<mask> var portArg = arg{
<mask> "Port to serve HTTP pages on",
<mask> "port", "p",
<mask> func(o options, v string) (options, error) {
<mask> var err error
<mask> var p int
<mask> minPort, maxPort := 0, 1<<16-1
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Host address to bind HTTP server on",
</s> add "Host address to bind HTTP server on.", </s> remove "Print this help",
</s> add "Print this help.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Path to a file where PID is stored",
</s> add "Path to a file where PID is stored.", </s> remove "Path to the config file",
</s> add "Path to the config file.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Service control action: status, install, uninstall, start, stop, restart, reload (configuration).", | <mask> func(o options) []string { return intSliceOrNil(o.bindPort) },
<mask> }
<mask>
<mask> var serviceArg = arg{
<mask> "Service control action: status, install, uninstall, start, stop, restart, reload (configuration)",
<mask> "service", "s",
<mask> func(o options, v string) (options, error) {
<mask> o.serviceControlAction = v
<mask> return o, nil
<mask> }, nil, nil,
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", </s> remove "Disable memory optimization",
</s> add "Disable memory optimization.", </s> remove "Host address to bind HTTP server on",
</s> add "Host address to bind HTTP server on.", </s> remove "Don't check for updates",
</s> add "Don't check for updates.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Path to log file. If empty: write to stdout; if 'syslog': write to system log.", | <mask> func(o options) []string { return stringSliceOrNil(o.serviceControlAction) },
<mask> }
<mask>
<mask> var logfileArg = arg{
<mask> "Path to log file. If empty: write to stdout; if 'syslog': write to system log",
<mask> "logfile", "l",
<mask> func(o options, v string) (options, error) { o.logFile = v; return o, nil }, nil, nil,
<mask> func(o options) []string { return stringSliceOrNil(o.logFile) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Path to a file where PID is stored",
</s> add "Path to a file where PID is stored.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Path to the config file",
</s> add "Path to the config file.", </s> remove "Host address to bind HTTP server on",
</s> add "Host address to bind HTTP server on.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Path to a file where PID is stored.", | <mask> func(o options) []string { return stringSliceOrNil(o.logFile) },
<mask> }
<mask>
<mask> var pidfileArg = arg{
<mask> "Path to a file where PID is stored",
<mask> "pidfile", "",
<mask> func(o options, v string) (options, error) { o.pidFile = v; return o, nil }, nil, nil,
<mask> func(o options) []string { return stringSliceOrNil(o.pidFile) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Path to log file. If empty: write to stdout; if 'syslog': write to system log",
</s> add "Path to log file. If empty: write to stdout; if 'syslog': write to system log.", </s> remove "Check configuration and exit",
</s> add "Check configuration and exit.", </s> remove "Path to the config file",
</s> add "Path to the config file.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Check configuration and exit.", | <mask> func(o options) []string { return stringSliceOrNil(o.pidFile) },
<mask> }
<mask>
<mask> var checkConfigArg = arg{
<mask> "Check configuration and exit",
<mask> "check-config", "",
<mask> nil, func(o options) (options, error) { o.checkConfig = true; return o, nil }, nil,
<mask> func(o options) []string { return boolSliceOrNil(o.checkConfig) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Don't check for updates",
</s> add "Don't check for updates.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", </s> remove "Disable memory optimization",
</s> add "Disable memory optimization.", </s> remove "Run in GL-Inet compatibility mode",
</s> add "Run in GL-Inet compatibility mode.", </s> remove "Path to a file where PID is stored",
</s> add "Path to a file where PID is stored.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Don't check for updates.", | <mask> func(o options) []string { return boolSliceOrNil(o.checkConfig) },
<mask> }
<mask>
<mask> var noCheckUpdateArg = arg{
<mask> "Don't check for updates",
<mask> "no-check-update", "",
<mask> nil, func(o options) (options, error) { o.disableUpdate = true; return o, nil }, nil,
<mask> func(o options) []string { return boolSliceOrNil(o.disableUpdate) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Disable memory optimization",
</s> add "Disable memory optimization.", </s> remove "Check configuration and exit",
</s> add "Check configuration and exit.", </s> remove "Enable verbose output",
</s> add "Enable verbose output.", </s> remove "Run in GL-Inet compatibility mode",
</s> add "Run in GL-Inet compatibility mode.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Disable memory optimization.", | <mask> func(o options) []string { return boolSliceOrNil(o.disableUpdate) },
<mask> }
<mask>
<mask> var disableMemoryOptimizationArg = arg{
<mask> "Disable memory optimization",
<mask> "no-mem-optimization", "",
<mask> nil, func(o options) (options, error) { o.disableMemoryOptimization = true; return o, nil }, nil,
<mask> func(o options) []string { return boolSliceOrNil(o.disableMemoryOptimization) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Enable verbose output",
</s> add "Enable verbose output.", </s> remove "Don't check for updates",
</s> add "Don't check for updates.", </s> remove "Check configuration and exit",
</s> add "Check configuration and exit.", </s> remove "Run in GL-Inet compatibility mode",
</s> add "Run in GL-Inet compatibility mode.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Enable verbose output.", | <mask> func(o options) []string { return boolSliceOrNil(o.disableMemoryOptimization) },
<mask> }
<mask>
<mask> var verboseArg = arg{
<mask> "Enable verbose output",
<mask> "verbose", "v",
<mask> nil, func(o options) (options, error) { o.verbose = true; return o, nil }, nil,
<mask> func(o options) []string { return boolSliceOrNil(o.verbose) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Disable memory optimization",
</s> add "Disable memory optimization.", </s> remove "Run in GL-Inet compatibility mode",
</s> add "Run in GL-Inet compatibility mode.", </s> remove "Don't check for updates",
</s> add "Don't check for updates.", </s> remove "Check configuration and exit",
</s> add "Check configuration and exit.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Run in GL-Inet compatibility mode.", | <mask> func(o options) []string { return boolSliceOrNil(o.verbose) },
<mask> }
<mask>
<mask> var glinetArg = arg{
<mask> "Run in GL-Inet compatibility mode",
<mask> "glinet", "",
<mask> nil, func(o options) (options, error) { o.glinetMode = true; return o, nil }, nil,
<mask> func(o options) []string { return boolSliceOrNil(o.glinetMode) },
<mask> }
<mask>
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Enable verbose output",
</s> add "Enable verbose output.", </s> remove "Disable memory optimization",
</s> add "Disable memory optimization.", </s> remove "Don't check for updates",
</s> add "Don't check for updates.", </s> remove "Check configuration and exit",
</s> add "Check configuration and exit.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
description: "Show the version and exit. Show more detailed version description with -v.", | <mask> func(o options) []string { return boolSliceOrNil(o.glinetMode) },
<mask> }
<mask>
<mask> var versionArg = arg{
<mask> description: "Show the version and exit. Show more detailed version description with -v",
<mask> longName: "version",
<mask> shortName: "",
<mask> updateWithValue: nil,
<mask> updateNoValue: nil,
<mask> effect: func(o options, exec string) (effect, error) {
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Print this help",
</s> add "Print this help.", </s> remove "Check configuration and exit",
</s> add "Check configuration and exit.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Run in GL-Inet compatibility mode",
</s> add "Run in GL-Inet compatibility mode.", </s> remove "Path to the config file",
</s> add "Path to the config file.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
"Print this help.", | <mask> serialize: func(o options) []string { return nil },
<mask> }
<mask>
<mask> var helpArg = arg{
<mask> "Print this help",
<mask> "help", "",
<mask> nil, nil, func(o options, exec string) (effect, error) {
<mask> return func() error { _ = printHelp(exec); os.Exit(64); return nil }, nil
<mask> },
<mask> func(o options) []string { return nil },
</s> Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master
Updates #2893.
Squashed commit of the following:
commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 13 14:51:53 2021 +0300
home: fix help </s> remove "Enable verbose output",
</s> add "Enable verbose output.", </s> remove "Disable memory optimization",
</s> add "Disable memory optimization.", </s> remove "Path to the working directory",
</s> add "Path to the working directory.", </s> remove "Don't check for updates",
</s> add "Don't check for updates.", </s> remove "Check configuration and exit",
</s> add "Check configuration and exit.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ab85ad5a55a33093a80bf61bafde5e2dfba2b92f | internal/home/options.go |
func addDNSAddress(dnsAddresses *[]string, addr string) {
if config.DNS.Port != 53 {
addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
}
*dnsAddresses = append(*dnsAddresses, addr)
} | <mask> }
<mask> returnOK(w)
<mask> }
<mask>
<mask> func handleStatus(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask>
<mask> dnsAddresses := []string{}
<mask> if config.DNS.BindHost == "0.0.0.0" {
<mask> ifaces, e := getValidNetInterfacesForWeb()
<mask> if e != nil {
</s> * /status: "dns_addresses": add port if not 53 </s> remove if len(dnsAddresses) == 0 {
dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
}
</s> add return dnsAddresses
}
func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL) </s> remove dnsAddresses = append(dnsAddresses, addr)
</s> add addDNSAddress(&dnsAddresses, addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff | home/control.go |
// Get the list of DNS addresses the server is listening on
func getDNSAddresses() []string { | <mask> }
<mask> *dnsAddresses = append(*dnsAddresses, addr)
<mask> }
<mask>
<mask> dnsAddresses := []string{}
<mask>
<mask> if config.DNS.BindHost == "0.0.0.0" {
<mask>
<mask> ifaces, e := getValidNetInterfacesForWeb()
</s> * /status: "dns_addresses": add port if not 53 </s> remove func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
</s> add func addDNSAddress(dnsAddresses *[]string, addr string) {
if config.DNS.Port != 53 {
addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
}
*dnsAddresses = append(*dnsAddresses, addr)
} </s> remove dnsAddresses = append(dnsAddresses, addr)
</s> add addDNSAddress(&dnsAddresses, addr) </s> remove if len(dnsAddresses) == 0 {
dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
}
</s> add return dnsAddresses
}
func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff | home/control.go |
return []string{} | <mask> ifaces, e := getValidNetInterfacesForWeb()
<mask> if e != nil {
<mask> log.Error("Couldn't get network interfaces: %v", e)
<mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> for _, addr := range iface.Addresses {
</s> * /status: "dns_addresses": add port if not 53 </s> remove dnsAddresses = append(dnsAddresses, addr)
</s> add addDNSAddress(&dnsAddresses, addr) </s> remove func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
</s> add func addDNSAddress(dnsAddresses *[]string, addr string) {
if config.DNS.Port != 53 {
addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
}
*dnsAddresses = append(*dnsAddresses, addr)
} </s> remove if len(dnsAddresses) == 0 {
dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
}
</s> add return dnsAddresses
}
func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff | home/control.go |
addDNSAddress(&dnsAddresses, addr) | <mask> log.Error("Couldn't get network interfaces: %v", e)
<mask> }
<mask> for _, iface := range ifaces {
<mask> for _, addr := range iface.Addresses {
<mask> dnsAddresses = append(dnsAddresses, addr)
<mask> }
<mask> }
<mask> }
<mask> if len(dnsAddresses) == 0 {
<mask> dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
</s> * /status: "dns_addresses": add port if not 53 </s> remove if len(dnsAddresses) == 0 {
dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
}
</s> add return dnsAddresses
}
func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL) </s> remove func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
</s> add func addDNSAddress(dnsAddresses *[]string, addr string) {
if config.DNS.Port != 53 {
addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
}
*dnsAddresses = append(*dnsAddresses, addr)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff | home/control.go |
} else {
addDNSAddress(&dnsAddresses, config.DNS.BindHost) | <mask> }
<mask> }
<mask> }
<mask>
<mask> return dnsAddresses
<mask> }
<mask>
</s> * /status: "dns_addresses": add port if not 53 </s> remove if len(dnsAddresses) == 0 {
dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
}
</s> add return dnsAddresses
}
func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL) </s> remove dnsAddresses = append(dnsAddresses, addr)
</s> add addDNSAddress(&dnsAddresses, addr) </s> remove func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
</s> add func addDNSAddress(dnsAddresses *[]string, addr string) {
if config.DNS.Port != 53 {
addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
}
*dnsAddresses = append(*dnsAddresses, addr)
} </s> remove "dns_addresses": dnsAddresses,
</s> add "dns_addresses": getDNSAddresses(), | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff | home/control.go |
return dnsAddresses
}
func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL) | <mask> dnsAddresses = append(dnsAddresses, addr)
<mask> }
<mask> }
<mask> }
<mask> if len(dnsAddresses) == 0 {
<mask> dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
<mask> }
<mask>
<mask> data := map[string]interface{}{
<mask> "dns_addresses": dnsAddresses,
<mask> "http_port": config.BindPort,
<mask> "dns_port": config.DNS.Port,
</s> * /status: "dns_addresses": add port if not 53 </s> remove "dns_addresses": dnsAddresses,
</s> add "dns_addresses": getDNSAddresses(), </s> remove dnsAddresses = append(dnsAddresses, addr)
</s> add addDNSAddress(&dnsAddresses, addr) </s> remove func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
</s> add func addDNSAddress(dnsAddresses *[]string, addr string) {
if config.DNS.Port != 53 {
addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
}
*dnsAddresses = append(*dnsAddresses, addr)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff | home/control.go |
"dns_addresses": getDNSAddresses(), | <mask> dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
<mask> }
<mask>
<mask> data := map[string]interface{}{
<mask> "dns_addresses": dnsAddresses,
<mask> "http_port": config.BindPort,
<mask> "dns_port": config.DNS.Port,
<mask> "protection_enabled": config.DNS.ProtectionEnabled,
<mask> "querylog_enabled": config.DNS.QueryLogEnabled,
<mask> "running": isRunning(),
</s> * /status: "dns_addresses": add port if not 53 </s> remove if len(dnsAddresses) == 0 {
dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
}
</s> add return dnsAddresses
}
func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL) </s> remove dnsAddresses = append(dnsAddresses, addr)
</s> add addDNSAddress(&dnsAddresses, addr) </s> remove func handleStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
</s> add func addDNSAddress(dnsAddresses *[]string, addr string) {
if config.DNS.Port != 53 {
addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
}
*dnsAddresses = append(*dnsAddresses, addr)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff | home/control.go |
ID int64 // auto-assigned when filter is added (see nextFilterID)
Data []byte `yaml:"-"` // List of rules divided by '\n'
FilePath string `yaml:"-"` // Path to a filtering rules file | <mask> }
<mask>
<mask> // Filter represents a filter list
<mask> type Filter struct {
<mask> ID int64 `json:"id"` // auto-assigned when filter is added (see nextFilterID), json by default keeps ID uppercase but we need lowercase
<mask> Data []byte `json:"-" yaml:"-"` // List of rules divided by '\n'
<mask> FilePath string `json:"-" yaml:"-"` // Path to a filtering rules file
<mask> }
<mask>
<mask> //go:generate stringer -type=Reason
<mask>
<mask> // Reason holds an enum detailing why it was filtered or not filtered
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
</s> remove Enabled bool `json:"enabled"`
URL string `json:"url"`
Name string `json:"name" yaml:"name"`
RulesCount int `json:"rulesCount" yaml:"-"`
LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"-"`
</s> add Enabled bool
URL string
Name string `yaml:"name"`
RulesCount int `yaml:"-"`
LastUpdated time.Time `yaml:"-"` </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
BlockingMode: "nxdomain", // mode how to answer filtered requests
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
QueryLogInterval: 1,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false,
</s> add ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
FiltersUpdateIntervalHours: 24,
BlockingMode: "nxdomain", // mode how to answer filtered requests
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
QueryLogInterval: 1,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false, </s> remove if valid := govalidator.IsRequestURL(url); !valid {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
</s> add func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
updated := refreshFiltersIfNecessary(true)
fmt.Fprintf(w, "OK %d filters updated\n", updated)
}
type filterJSON struct {
ID int64 `json:"id"`
Enabled bool `json:"enabled"`
URL string `json:"url"`
Name string `json:"name"`
RulesCount uint32 `json:"rules_count"`
LastUpdated string `json:"last_updated"`
}
type filteringConfig struct {
Enabled bool `json:"enabled"`
Interval uint32 `json:"interval"` // in hours
Filters []filterJSON `json:"filters"`
UserRules []string `json:"user_rules"`
}
// Get filtering configuration
func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
resp := filteringConfig{}
config.RLock()
resp.Enabled = config.DNS.FilteringEnabled
resp.Interval = config.DNS.FiltersUpdateIntervalHours
for _, f := range config.Filters {
fj := filterJSON{
ID: f.ID,
Enabled: f.Enabled,
URL: f.URL,
Name: f.Name,
RulesCount: uint32(f.RulesCount),
}
if f.LastUpdated.Second() != 0 {
fj.LastUpdated = f.LastUpdated.Format(time.RFC3339)
}
resp.Filters = append(resp.Filters, fj) </s> remove // New - create instance
</s> add // New - create a new instance of the query log | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | dnsfilter/dnsfilter.go |
ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
| <mask>
<mask> // FilteringConfig represents the DNS filtering configuration of AdGuard Home
<mask> // The zero FilteringConfig is empty and ready for use.
<mask> type FilteringConfig struct {
<mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
<mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
<mask> BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
<mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
<mask> QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
<mask> QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
<mask> Ratelimit int `yaml:"ratelimit"` // max number of requests per second from a given IP (0 to disable)
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
BlockingMode: "nxdomain", // mode how to answer filtered requests
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
QueryLogInterval: 1,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false,
</s> add ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
FiltersUpdateIntervalHours: 24,
BlockingMode: "nxdomain", // mode how to answer filtered requests
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
QueryLogInterval: 1,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false, </s> remove // New - create instance
</s> add // New - create a new instance of the query log </s> remove ID int64 `json:"id"` // auto-assigned when filter is added (see nextFilterID), json by default keeps ID uppercase but we need lowercase
Data []byte `json:"-" yaml:"-"` // List of rules divided by '\n'
FilePath string `json:"-" yaml:"-"` // Path to a filtering rules file
</s> add ID int64 // auto-assigned when filter is added (see nextFilterID)
Data []byte `yaml:"-"` // List of rules divided by '\n'
FilePath string `yaml:"-"` // Path to a filtering rules file </s> remove Enabled bool `json:"enabled"`
URL string `json:"url"`
Name string `json:"name" yaml:"name"`
RulesCount int `json:"rulesCount" yaml:"-"`
LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"-"`
</s> add Enabled bool
URL string
Name string `yaml:"name"`
RulesCount int `yaml:"-"`
LastUpdated time.Time `yaml:"-"` </s> remove // newQueryLog creates a new instance of the query log
</s> add // create a new instance of the query log | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | dnsforward/dnsforward.go |
<mask> github.com/AdguardTeam/dnsproxy v0.19.1
<mask> github.com/AdguardTeam/golibs v0.2.1
<mask> github.com/AdguardTeam/urlfilter v0.5.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf
<mask> github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833
<mask> github.com/etcd-io/bbolt v1.3.3
<mask> github.com/go-test/deep v1.0.1
<mask> github.com/gobuffalo/packr v1.19.0
<mask> github.com/joomcode/errorx v0.8.0
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove // New - create instance
</s> add // New - create a new instance of the query log </s> remove f.Enabled = true
</s> add </s> remove
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
return
</s> add if len(url.Scheme) == 0 {
return false //No Scheme found </s> remove f := filter{}
err := json.NewDecoder(r.Body).Decode(&f)
</s> add fj := filterAddJSON{}
err := json.NewDecoder(r.Body).Decode(&fj) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | go.mod | |
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/stats"
<mask> "github.com/AdguardTeam/golibs/file"
<mask> "github.com/AdguardTeam/golibs/log"
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove "time"
</s> add </s> remove "github.com/asaskevich/govalidator"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/config.go | |
filteringStarted bool | <mask> transport *http.Transport
<mask> client *http.Client
<mask> stats stats.Stats
<mask> queryLog querylog.QueryLog
<mask>
<mask> // cached version.json to avoid hammering github.io for each page reload
<mask> versionCheckJSON []byte
<mask> versionCheckLastTime time.Time
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove ID int64 `json:"id"` // auto-assigned when filter is added (see nextFilterID), json by default keeps ID uppercase but we need lowercase
Data []byte `json:"-" yaml:"-"` // List of rules divided by '\n'
FilePath string `json:"-" yaml:"-"` // Path to a filtering rules file
</s> add ID int64 // auto-assigned when filter is added (see nextFilterID)
Data []byte `yaml:"-"` // List of rules divided by '\n'
FilePath string `yaml:"-"` // Path to a filtering rules file </s> remove Enabled bool `json:"enabled"`
URL string `json:"url"`
Name string `json:"name" yaml:"name"`
RulesCount int `json:"rulesCount" yaml:"-"`
LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"-"`
</s> add Enabled bool
URL string
Name string `yaml:"name"`
RulesCount int `yaml:"-"`
LastUpdated time.Time `yaml:"-"` </s> remove for range time.Tick(time.Minute) {
</s> add for {
time.Sleep(1 * time.Hour)
if config.DNS.FiltersUpdateIntervalHours == 0 {
continue
}
</s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
</s> remove // Update filters we've just loaded right away, don't wait for periodic update timer
go func() {
refreshFiltersIfNecessary(false)
}()
// Schedule automatic filters updates
go periodicallyRefreshFilters()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/config.go |
ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
FiltersUpdateIntervalHours: 24,
BlockingMode: "nxdomain", // mode how to answer filtered requests
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
QueryLogInterval: 1,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false, | <mask> BindHost: "0.0.0.0",
<mask> Port: 53,
<mask> StatsInterval: 1,
<mask> FilteringConfig: dnsforward.FilteringConfig{
<mask> ProtectionEnabled: true, // whether or not use any of dnsfilter features
<mask> FilteringEnabled: true, // whether or not use filter lists
<mask> BlockingMode: "nxdomain", // mode how to answer filtered requests
<mask> BlockedResponseTTL: 10, // in seconds
<mask> QueryLogEnabled: true,
<mask> QueryLogInterval: 1,
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> BootstrapDNS: defaultBootstrap,
<mask> AllServers: false,
<mask> },
<mask> UpstreamDNS: defaultDNS,
<mask> },
<mask> TLS: tlsConfig{
<mask> tlsConfigSettings: tlsConfigSettings{
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
</s> remove Filters: []filter{
{Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
{Filter: dnsfilter.Filter{ID: 3}, Enabled: false, URL: "https://hosts-file.net/ad_servers.txt", Name: "hpHosts - Ad and Tracking servers only"},
{Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
},
</s> add </s> remove ID int64 `json:"id"` // auto-assigned when filter is added (see nextFilterID), json by default keeps ID uppercase but we need lowercase
Data []byte `json:"-" yaml:"-"` // List of rules divided by '\n'
FilePath string `json:"-" yaml:"-"` // Path to a filtering rules file
</s> add ID int64 // auto-assigned when filter is added (see nextFilterID)
Data []byte `yaml:"-"` // List of rules divided by '\n'
FilePath string `yaml:"-"` // Path to a filtering rules file </s> remove go refreshFiltersIfNecessary(false)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/config.go |
<mask> PortHTTPS: 443,
<mask> PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
<mask> },
<mask> },
<mask> Filters: []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
<mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
<mask> {Filter: dnsfilter.Filter{ID: 3}, Enabled: false, URL: "https://hosts-file.net/ad_servers.txt", Name: "hpHosts - Ad and Tracking servers only"},
<mask> {Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
<mask> },
<mask> DHCP: dhcpd.ServerConfig{
<mask> LeaseDuration: 86400,
<mask> ICMPTimeout: 1000,
<mask> },
<mask> SchemaVersion: currentSchemaVersion,
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
BlockingMode: "nxdomain", // mode how to answer filtered requests
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
QueryLogInterval: 1,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false,
</s> add ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
FiltersUpdateIntervalHours: 24,
BlockingMode: "nxdomain", // mode how to answer filtered requests
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
QueryLogInterval: 1,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: defaultBootstrap,
AllServers: false, </s> remove if valid := govalidator.IsRequestURL(url); !valid {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
</s> add func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
updated := refreshFiltersIfNecessary(true)
fmt.Fprintf(w, "OK %d filters updated\n", updated)
}
type filterJSON struct {
ID int64 `json:"id"`
Enabled bool `json:"enabled"`
URL string `json:"url"`
Name string `json:"name"`
RulesCount uint32 `json:"rules_count"`
LastUpdated string `json:"last_updated"`
}
type filteringConfig struct {
Enabled bool `json:"enabled"`
Interval uint32 `json:"interval"` // in hours
Filters []filterJSON `json:"filters"`
UserRules []string `json:"user_rules"`
}
// Get filtering configuration
func handleFilteringInfo(w http.ResponseWriter, r *http.Request) {
resp := filteringConfig{}
config.RLock()
resp.Enabled = config.DNS.FilteringEnabled
resp.Interval = config.DNS.FiltersUpdateIntervalHours
for _, f := range config.Filters {
fj := filterJSON{
ID: f.ID,
Enabled: f.Enabled,
URL: f.URL,
Name: f.Name,
RulesCount: uint32(f.RulesCount),
}
if f.LastUpdated.Second() != 0 {
fj.LastUpdated = f.LastUpdated.Format(time.RFC3339)
}
resp.Filters = append(resp.Filters, fj) </s> remove go refreshFiltersIfNecessary(false)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/config.go | |
config.Filters = defaultFilters() | <mask> config.DNS.SafeSearchCacheSize = 1 * 1024 * 1024
<mask> config.DNS.ParentalCacheSize = 1 * 1024 * 1024
<mask> config.DNS.CacheTime = 30
<mask> }
<mask>
<mask> // getConfigFilename returns path to the current config file
<mask> func (c *configuration) getConfigFilename() string {
<mask> configFile, err := filepath.EvalSymlinks(config.ourConfigFilename)
<mask> if err != nil {
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove for range time.Tick(time.Minute) {
</s> add for {
time.Sleep(1 * time.Hour)
if config.DNS.FiltersUpdateIntervalHours == 0 {
continue
}
</s> remove const updatePeriod = time.Hour * 24
</s> add </s> remove loadFilters()
</s> add </s> remove // getQueryLogJson returns a map with the current query log ready to be converted to a JSON
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/config.go |
if !checkFiltersUpdateIntervalHours(config.DNS.FiltersUpdateIntervalHours) {
config.DNS.FiltersUpdateIntervalHours = 24
} | <mask> if !checkStatsInterval(config.DNS.StatsInterval) {
<mask> config.DNS.StatsInterval = 1
<mask> }
<mask>
<mask> if !checkQueryLogInterval(config.DNS.QueryLogInterval) {
<mask> config.DNS.QueryLogInterval = 1
<mask> }
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove uf.LastUpdated = time.Now()
</s> add uf.LastUpdated = now </s> remove if !force && time.Since(f.LastUpdated) <= updatePeriod {
</s> add expireTime := f.LastUpdated.Unix() + int64(config.DNS.FiltersUpdateIntervalHours)*60*60
if !force && expireTime > now.Unix() { </s> remove func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
updated := refreshFiltersIfNecessary(true)
fmt.Fprintf(w, "OK %d filters updated\n", updated)
</s> add // RegisterFilteringHandlers - register handlers
func RegisterFilteringHandlers() {
httpRegister(http.MethodGet, "/control/filtering_info", handleFilteringInfo)
httpRegister(http.MethodPost, "/control/filtering_config", handleFilteringConfig)
httpRegister(http.MethodPost, "/control/filtering/add_url", handleFilteringAddURL)
httpRegister(http.MethodPost, "/control/filtering/remove_url", handleFilteringRemoveURL)
httpRegister(http.MethodPost, "/control/filtering/set_url", handleFilteringSetURL)
httpRegister(http.MethodPost, "/control/filtering/refresh", handleFilteringRefresh)
httpRegister(http.MethodPost, "/control/filtering/set_rules", handleFilteringSetRules)
}
func checkFiltersUpdateIntervalHours(i uint32) bool {
return i == 0 || i == 1 || i == 12 || i == 1*24 || i == 3*24 || i == 7*24 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/config.go |
<mask> log.Error("%s", status.WarningValidation)
<mask> return err
<mask> }
<mask>
<mask> // Deduplicate filters
<mask> deduplicateFilters()
<mask>
<mask> updateUniqueFilterID(config.Filters)
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // readConfigFile reads config file contents if it exists
<mask> func readConfigFile() ([]byte, error) {
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove // This is okay for the first start, the filter will be loaded later
log.Debug("Couldn't load filter %d contents due to %s", filter.ID, err)
</s> add log.Error("Couldn't load filter %d contents due to %s", filter.ID, err) </s> remove loadFilters()
</s> add </s> remove for range time.Tick(time.Minute) {
</s> add for {
time.Sleep(1 * time.Hour)
if config.DNS.FiltersUpdateIntervalHours == 0 {
continue
}
</s> remove f.Enabled = true
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/config.go | |
<mask> "net"
<mask> "net/http"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/utils"
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove "github.com/AdguardTeam/AdGuardHome/dnsfilter"
</s> add </s> remove "github.com/asaskevich/govalidator"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control.go | |
<mask> "github.com/NYTimes/gziphandler"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const updatePeriod = time.Hour * 24
<mask>
<mask> var protocols = []string{"tls://", "https://", "tcp://", "sdns://"}
<mask>
<mask> // ----------------
<mask> // helper functions
<mask> // ----------------
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove if !force && time.Since(f.LastUpdated) <= updatePeriod {
</s> add expireTime := f.LastUpdated.Unix() + int64(config.DNS.FiltersUpdateIntervalHours)*60*60
if !force && expireTime > now.Unix() { </s> remove if config.firstRun {
return 0
}
</s> add now := time.Now() </s> remove for range time.Tick(time.Minute) {
</s> add for {
time.Sleep(1 * time.Hour)
if config.DNS.FiltersUpdateIntervalHours == 0 {
continue
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control.go | |
<mask> httpRegister(http.MethodPost, "/control/i18n/change_language", handleI18nChangeLanguage)
<mask> httpRegister(http.MethodGet, "/control/i18n/current_language", handleI18nCurrentLanguage)
<mask> http.HandleFunc("/control/version.json", postInstall(optionalAuth(handleGetVersionJSON)))
<mask> httpRegister(http.MethodPost, "/control/update", handleUpdate)
<mask> httpRegister(http.MethodPost, "/control/filtering/enable", handleFilteringEnable)
<mask> httpRegister(http.MethodPost, "/control/filtering/disable", handleFilteringDisable)
<mask> httpRegister(http.MethodPost, "/control/filtering/add_url", handleFilteringAddURL)
<mask> httpRegister(http.MethodPost, "/control/filtering/remove_url", handleFilteringRemoveURL)
<mask> httpRegister(http.MethodPost, "/control/filtering/enable_url", handleFilteringEnableURL)
<mask> httpRegister(http.MethodPost, "/control/filtering/disable_url", handleFilteringDisableURL)
<mask> httpRegister(http.MethodPost, "/control/filtering/refresh", handleFilteringRefresh)
<mask> httpRegister(http.MethodGet, "/control/filtering/status", handleFilteringStatus)
<mask> httpRegister(http.MethodPost, "/control/filtering/set_rules", handleFilteringSetRules)
<mask> httpRegister(http.MethodPost, "/control/safebrowsing/enable", handleSafeBrowsingEnable)
<mask> httpRegister(http.MethodPost, "/control/safebrowsing/disable", handleSafeBrowsingDisable)
<mask> httpRegister(http.MethodGet, "/control/safebrowsing/status", handleSafeBrowsingStatus)
<mask> httpRegister(http.MethodPost, "/control/parental/enable", handleParentalEnable)
<mask> httpRegister(http.MethodPost, "/control/parental/disable", handleParentalDisable)
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
updated := refreshFiltersIfNecessary(true)
fmt.Fprintf(w, "OK %d filters updated\n", updated)
</s> add // RegisterFilteringHandlers - register handlers
func RegisterFilteringHandlers() {
httpRegister(http.MethodGet, "/control/filtering_info", handleFilteringInfo)
httpRegister(http.MethodPost, "/control/filtering_config", handleFilteringConfig)
httpRegister(http.MethodPost, "/control/filtering/add_url", handleFilteringAddURL)
httpRegister(http.MethodPost, "/control/filtering/remove_url", handleFilteringRemoveURL)
httpRegister(http.MethodPost, "/control/filtering/set_url", handleFilteringSetURL)
httpRegister(http.MethodPost, "/control/filtering/refresh", handleFilteringRefresh)
httpRegister(http.MethodPost, "/control/filtering/set_rules", handleFilteringSetRules)
}
func checkFiltersUpdateIntervalHours(i uint32) bool {
return i == 0 || i == 1 || i == 12 || i == 1*24 || i == 3*24 || i == 7*24 </s> remove // New - create instance
</s> add // New - create a new instance of the query log </s> remove func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
data := map[string]interface{}{
"enabled": config.DNS.FilteringEnabled,
}
config.RLock()
data["filters"] = config.Filters
data["user_rules"] = config.UserRules
jsonVal, err := json.Marshal(data)
config.RUnlock()
</s> add // IsValidURL - return TRUE if URL is valid
func IsValidURL(rawurl string) bool {
url, err := url.ParseRequestURI(rawurl) </s> remove
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
return
</s> add if len(url.Scheme) == 0 {
return false //No Scheme found | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control.go | |
RegisterFilteringHandlers() | <mask>
<mask> httpRegister(http.MethodGet, "/control/access/list", handleAccessList)
<mask> httpRegister(http.MethodPost, "/control/access/set", handleAccessSet)
<mask>
<mask> RegisterTLSHandlers()
<mask> RegisterClientsHandlers()
<mask> registerRewritesHandlers()
<mask> RegisterBlockedServicesHandlers()
<mask> RegisterQueryLogHandlers()
<mask> RegisterStatsHandlers()
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove httpRegister(http.MethodPost, "/control/filtering/enable", handleFilteringEnable)
httpRegister(http.MethodPost, "/control/filtering/disable", handleFilteringDisable)
httpRegister(http.MethodPost, "/control/filtering/add_url", handleFilteringAddURL)
httpRegister(http.MethodPost, "/control/filtering/remove_url", handleFilteringRemoveURL)
httpRegister(http.MethodPost, "/control/filtering/enable_url", handleFilteringEnableURL)
httpRegister(http.MethodPost, "/control/filtering/disable_url", handleFilteringDisableURL)
httpRegister(http.MethodPost, "/control/filtering/refresh", handleFilteringRefresh)
httpRegister(http.MethodGet, "/control/filtering/status", handleFilteringStatus)
httpRegister(http.MethodPost, "/control/filtering/set_rules", handleFilteringSetRules)
</s> add </s> remove func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
updated := refreshFiltersIfNecessary(true)
fmt.Fprintf(w, "OK %d filters updated\n", updated)
</s> add // RegisterFilteringHandlers - register handlers
func RegisterFilteringHandlers() {
httpRegister(http.MethodGet, "/control/filtering_info", handleFilteringInfo)
httpRegister(http.MethodPost, "/control/filtering_config", handleFilteringConfig)
httpRegister(http.MethodPost, "/control/filtering/add_url", handleFilteringAddURL)
httpRegister(http.MethodPost, "/control/filtering/remove_url", handleFilteringRemoveURL)
httpRegister(http.MethodPost, "/control/filtering/set_url", handleFilteringSetURL)
httpRegister(http.MethodPost, "/control/filtering/refresh", handleFilteringRefresh)
httpRegister(http.MethodPost, "/control/filtering/set_rules", handleFilteringSetRules)
}
func checkFiltersUpdateIntervalHours(i uint32) bool {
return i == 0 || i == 1 || i == 12 || i == 1*24 || i == 3*24 || i == 7*24 </s> remove // New - create instance
</s> add // New - create a new instance of the query log </s> remove func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
data := map[string]interface{}{
"enabled": config.DNS.FilteringEnabled,
}
config.RLock()
data["filters"] = config.Filters
data["user_rules"] = config.UserRules
jsonVal, err := json.Marshal(data)
config.RUnlock()
</s> add // IsValidURL - return TRUE if URL is valid
func IsValidURL(rawurl string) bool {
url, err := url.ParseRequestURI(rawurl) </s> remove
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
return
</s> add if len(url.Scheme) == 0 {
return false //No Scheme found | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control.go |
"net/url" | <mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net/http"
<mask> "os"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove "time"
</s> add </s> remove "github.com/asaskevich/govalidator"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/dnsfilter"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control_filtering.go |
"time" | <mask> "net/url"
<mask> "os"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove "github.com/asaskevich/govalidator"
</s> add </s> remove "time"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/dnsfilter"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control_filtering.go |
<mask> "os"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/asaskevich/govalidator"
<mask> )
<mask>
<mask> func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.FilteringEnabled = true
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
data := map[string]interface{}{
"enabled": config.DNS.FilteringEnabled,
}
config.RLock()
data["filters"] = config.Filters
data["user_rules"] = config.UserRules
jsonVal, err := json.Marshal(data)
config.RUnlock()
</s> add // IsValidURL - return TRUE if URL is valid
func IsValidURL(rawurl string) bool {
url, err := url.ParseRequestURI(rawurl) </s> remove config.UserRules = strings.Split(string(body), "\n")
</s> add if !checkFiltersUpdateIntervalHours(req.Interval) {
httpError(w, http.StatusBadRequest, "Unsupported interval")
return
}
config.DNS.FilteringEnabled = req.Enabled
config.DNS.FiltersUpdateIntervalHours = req.Interval </s> remove func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) {
parameters, err := parseParametersFromBody(r.Body)
</s> add func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control_filtering.go | |
// IsValidURL - return TRUE if URL is valid
func IsValidURL(rawurl string) bool {
url, err := url.ParseRequestURI(rawurl) | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/asaskevich/govalidator"
<mask> )
<mask>
<mask> func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.FilteringEnabled = true
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.FilteringEnabled = false
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := map[string]interface{}{
<mask> "enabled": config.DNS.FilteringEnabled,
<mask> }
<mask>
<mask> config.RLock()
<mask> data["filters"] = config.Filters
<mask> data["user_rules"] = config.UserRules
<mask> jsonVal, err := json.Marshal(data)
<mask> config.RUnlock()
<mask>
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Unable to marshal status json: %s", err)
<mask> return
<mask> }
<mask>
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove "github.com/asaskevich/govalidator"
</s> add </s> remove
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
return
</s> add if len(url.Scheme) == 0 {
return false //No Scheme found </s> remove httpError(w, http.StatusInternalServerError, "Unable to marshal status json: %s", err)
return
</s> add return false //Couldn't even parse the rawurl </s> remove config.UserRules = strings.Split(string(body), "\n")
</s> add if !checkFiltersUpdateIntervalHours(req.Interval) {
httpError(w, http.StatusBadRequest, "Unsupported interval")
return
}
config.DNS.FilteringEnabled = req.Enabled
config.DNS.FiltersUpdateIntervalHours = req.Interval </s> remove func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) {
parameters, err := parseParametersFromBody(r.Body)
</s> add func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"ke... | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control_filtering.go |
return false //Couldn't even parse the rawurl | <mask> jsonVal, err := json.Marshal(data)
<mask> config.RUnlock()
<mask>
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Unable to marshal status json: %s", err)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
</s> filtering: refactor; change API; add "filters_update_interval" setting
+ config: "filters_update_interval"
* add /control/filtering_info
* remove /control/filtering/enable
* remove /control/filtering/disable
* add /control/filtering_config
* remove /control/filtering/status
* add /control/filtering/set_url
* remove /control/filtering/enable_url
* remove /control/filtering/disable_url </s> remove
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
return
</s> add if len(url.Scheme) == 0 {
return false //No Scheme found </s> remove
httpUpdateConfigReloadDNSReturnOK(w, r)
</s> add w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "http write: %s", err)
} </s> remove func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.FilteringEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
data := map[string]interface{}{
"enabled": config.DNS.FilteringEnabled,
}
config.RLock()
data["filters"] = config.Filters
data["user_rules"] = config.UserRules
jsonVal, err := json.Marshal(data)
config.RUnlock()
</s> add // IsValidURL - return TRUE if URL is valid
func IsValidURL(rawurl string) bool {
url, err := url.ParseRequestURI(rawurl) </s> remove found := filterEnable(url, false)
if !found {
http.Error(w, "URL parameter was not previously added", http.StatusBadRequest)
</s> add jsonVal, err := json.Marshal(resp)
if err != nil {
httpError(w, http.StatusInternalServerError, "json encode: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/adb422fedf64a2fc87bd296c9dc3d12c5e3a4d72 | home/control_filtering.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.