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> clients: [],
<mask> autoClients: [],
<mask> });
<mask>
<mask> const filtering = handleActions({
<mask> [actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
<mask> [actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
<mask> [actions.setRule... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/d0fc1dc54dfbc017f28c6c0afa4623c6259af557 | client/src/reducers/index.js | |
"install_devices_router_list_4": "You can't set a custom DNS server on some types of routers. In this case it may help if you set up AdGuard Home as a <0>DHCP server</0>. Otherwise, you should search for the manual on how to customize DNS servers for your particular router model.", | <mask> "install_devices_address": "AdGuard Home DNS server is listening on the following addresses",
<mask> "install_devices_router_list_1": "Open the preferences for your router. Usually, you can access it from your browser via a URL (like http://192.168.0.1/ or http://192.168.1.1/). You may be asked to ente... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/__locales/en.json |
"example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>",
"example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>",
"example_upstream_sdns": "anda bisa menggunakan <0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>", | <mask> "example_comment_meaning": "hanya sebuah komentar",
<mask> "example_comment_hash": "Juga sebuah komentar",
<mask> "example_regex_meaning": "blokir akses ke domain yang cocok dengan <0>ekspresi reguler yang ditentukan</0>",
<mask> "example_upstream_regular": "DNS reguler (melalui UDP)",
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/__locales/id.json |
<mask> "client_confirm_unblock": "Apa anda yakin ingin meng-unblock klien ini \"{{ip}}\"?",
<mask> "client_blocked": "Klien \"{{ip}}\" sukses di blokir",
<mask> "client_unblocked": "Klien \"{{ip}}\" sukses di unblock",
<mask> "static_ip": "Alamat IP statis"
<mask> } </s> - client: Refactor Setup gu... | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/__locales/id.json | |
"example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
"example_upstream_doh": "versleutelde <0>DNS_over_HTTPS</0>",
"example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers", | <mask> "example_comment_meaning": "zomaar een opmerking",
<mask> "example_comment_hash": "# Nog een opmerking",
<mask> "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
<mask> "example_upstream_regular": "standaard DNS (over UDP)",
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/__locales/nl.json |
"unblock_btn": "Deblokkeren",
"block_btn": "Blokkeren", | <mask> "all_lists_up_to_date_toast": "Alle lijsten zijn reeds up-to-date",
<mask> "updated_upstream_dns_toast": "De upstream DNS-servers zijn bijgewerkt",
<mask> "dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
<mask> "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/__locales/nl.json |
"fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.", | <mask> "domain_desc": "Voer de domeinnaam of wildcard in die herschreven moet worden.",
<mask> "example_rewrite_domain": "herschrijf reacties uitsluitend voor deze domeinnaam.",
<mask> "example_rewrite_wildcard": "herschrijf reacties voor alle subdomeinen van <0>example.org</0>.",
<mask> "fastest_ad... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/__locales/nl.json |
import React, { useState } from 'react'; | <mask> import React from 'react';
<mask> import { connect } from 'react-redux';
<mask> import PropTypes from 'prop-types';
<mask> import {
<mask> Field, FieldArray, reduxForm, formValueSelector,
<mask> } from 'redux-form';
</s> - client: Refactor Setup guide component: Merge pull request #633 in DNS/adguard-... | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/Settings/Clients/Form.js |
options: PropTypes.array, | <mask>
<mask> renderMultiselect.propTypes = {
<mask> input: PropTypes.object.isRequired,
<mask> placeholder: PropTypes.string,
<mask> options: PropTypes.object,
<mask> };
<mask>
<mask> let Form = (props) => {
<mask> const {
<mask> t,
</s> - client: Refactor Setup guide component: Me... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/Settings/Clients/Form.js |
<Tabs controlClass="form" tabs={tabs} activeTabLabel={activeTabLabel}
setActiveTabLabel={setActiveTabLabel}>
{activeTab} | <mask> />
<mask> </div>
<mask> </div>
<mask>
<mask> <Tabs controlClass="form">
<mask> <div label="settings" title={props.t('main_settings')}>
<mask> {settingsCheckboxes.map((setting) => (
<ma... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/Settings/Clients/Form.js |
import React, { useState } from 'react'; | <mask> import React, { Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask>
<mask> import Tabs from './Tabs';
<mask> import Icons from './Icons';
</s> - client: Refactor Setup guide component: Merge pull request #633 in DNS/adg... | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Guide.js |
const dnsPrivacyList = [{
title: 'Android',
list: [
{
label: 'setup_dns_privacy_android_1',
},
{
label: 'setup_dns_privacy_android_2',
components: [
{
key: 0,
href: 'https://adguard.com/adguard-an... | <mask>
<mask> import Tabs from './Tabs';
<mask> import Icons from './Icons';
<mask>
<mask> const Guide = (props) => {
<mask> const { dnsAddresses } = props;
<mask> const tlsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('tls://'))) || '';
<mask> const httpsAddress = (dnsAdd... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Guide.js |
const [activeTabLabel, setActiveTabLabel] = useState('Router');
const tabs = getTabs({
tlsAddress,
httpsAddress,
showDnsPrivacyNotice,
t,
});
const activeTab = renderContent(tabs[activeTabLabel], t);
| <mask> const httpsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('https://'))) || '';
<mask> const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
<mask>
<mask> return (
<mask> <div>
<mask> <Icons />
<mask> <Tabs tabs={... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Guide.js |
<Tabs tabs={tabs} activeTabLabel={activeTabLabel}
setActiveTabLabel={setActiveTabLabel}>{activeTab}</Tabs> | <mask>
<mask> return (
<mask> <div>
<mask> <Icons />
<mask> <Tabs>
<mask> <div label="Router">
<mask> <div className="tab__title">
<mask> <Trans>install_devices_router</Trans>
<mask> </div>
<ma... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Guide.js |
renderDnsPrivacyList.propTypes = {
title: PropTypes.string.isRequired,
list: PropTypes.array.isRequired,
};
renderContent.propTypes = {
title: PropTypes.string.isRequired,
list: PropTypes.array.isRequired,
getTitle: PropTypes.func,
};
| <mask> dnsAddresses: PropTypes.array,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withTranslation()(Guide);
</s> - client: Refactor Setup guide component: Merge pull request #633 in DNS/adguard-home from fix/1740 to master
Close #1740
Squashed commit of the following:
co... | [
"keep",
"keep",
"keep",
"add",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Guide.js |
import React from 'react'; | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import classnames from 'classnames';
<mask>
<mask> class Tab extends Component {
<mask> handleClick = () => {
</s> - client: Refactor Setup guide component: Merge pull request #633 in DNS/adguard-home from fix... | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tab.js |
import { useTranslation } from 'react-i18next'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import classnames from 'classnames';
<mask>
<mask> const Tab = ({
<mask> activeTabLabel, label, title, onClick,
<mask> }) => {
<mask> const [t] = useTranslation();
<mask> const handleClick = () => onClick(label);
... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tab.js |
const Tab = ({
activeTabLabel, label, title, onClick,
}) => {
const [t] = useTranslation();
const handleClick = () => onClick(label); | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import classnames from 'classnames';
<mask>
<mask> class Tab extends Component {
<mask> handleClick = () => {
<mask> this.props.onClick(this.props.label);
<mask> }
<mask>
<mask> render() {
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tab.js |
const tabClass = classnames({
tab__control: true,
'tab__control--active': activeTabLabel === label,
}); | <mask> handleClick = () => {
<mask> this.props.onClick(this.props.label);
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> activeTab,
<mask> label,
<mask> title,
<mask> } = this.props;
<mask>
<mask> const tabClass = cla... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tab.js |
return (
<div
className={tabClass}
onClick={handleClick}
>
<svg className="tab__icon">
<use xlinkHref={`#${label.toLowerCase()}`} />
</svg>
{t(title || label)}
</div>
);
}; | <mask> label,
<mask> title,
<mask> } = this.props;
<mask>
<mask> const tabClass = classnames({
<mask> tab__control: true,
<mask> 'tab__control--active': activeTab === label,
<mask> });
<mask>
<mask> return (
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"k... | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tab.js |
activeTabLabel: PropTypes.string.isRequired, | <mask> }
<mask> }
<mask>
<mask> Tab.propTypes = {
<mask> activeTab: PropTypes.string.isRequired,
<mask> label: PropTypes.string.isRequired,
<mask> onClick: PropTypes.func.isRequired,
<mask> title: PropTypes.string,
<mask> };
<mask>
</s> - client: Refactor Setup guide component: Merge pu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tab.js |
<mask> opacity: 1;
<mask> }
<mask>
<mask> .tab__control--active {
<mask> font-weight: 700;
<mask> color: #4a4a4a;
<mask> opacity: 1;
<mask> }
<mask>
<mask> .tab__title {
</s> - client: Refactor Setup guide component: Merge pull request #633 in DNS/adguard-home from fix/1740 to master
Close ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tabs.css | |
import React from 'react'; | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import classnames from 'classnames';
<mask>
<mask> import Tab from './Tab';
<mask> import './Tabs.css';
</s> - client: Refactor Setup guide component: Merge pull request #633 in DNS/adguard-home from fix/1740 to m... | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tabs.js |
const Tabs = (props) => {
const {
tabs, controlClass, activeTabLabel, setActiveTabLabel, children: activeTab,
} = props;
const onClickTabControl = (tabLabel) => setActiveTabLabel(tabLabel);
const getControlClass = classnames({
tabs__controls: true,
[`tabs__controls--${controlCl... | <mask>
<mask> import Tab from './Tab';
<mask> import './Tabs.css';
<mask>
<mask> class Tabs extends Component {
<mask> state = {
<mask> activeTab: this.props.children[0].props.label,
<mask> };
<mask>
<mask> onClickTabControl = (tab) => {
<mask> this.setState({ activeTab: tab })... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tabs.js |
activeTabLabel={activeTabLabel}
onClick={onClickTabControl} | <mask> <Tab
<mask> key={label}
<mask> label={label}
<mask> title={title}
<mask> activeTab={activeTab}
<mask> onClick={this.onC... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tabs.js |
<mask> onClick={this.onClickTabControl}
<mask> />
<mask> );
<mask> })}
<mask> </div>
<mask> <div className="tabs__content">
<mask> {children.map((child) => {... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tabs.js | |
<div className="tabs__content">
{activeTab}
</div>
</div>
);
}; | <mask> return child.props.children;
<mask> })}
<mask> </div>
<mask> </div>
<mask> );
<mask> }
<mask> }
<mask>
<mask> Tabs.propTypes = {
<mask> controlClass: PropTypes.string,
<mask> children: PropTypes.array.isRequir... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tabs.js |
tabs: PropTypes.object.isRequired,
activeTabLabel: PropTypes.string.isRequired,
setActiveTabLabel: PropTypes.func.isRequired,
children: PropTypes.element.isRequired, | <mask> }
<mask>
<mask> Tabs.propTypes = {
<mask> controlClass: PropTypes.string,
<mask> children: PropTypes.array.isRequired,
<mask> };
<mask>
<mask> export default Tabs;
</s> - client: Refactor Setup guide component: Merge pull request #633 in DNS/adguard-home from fix/1740 to master
Close #1740
Sq... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/components/ui/Tabs.js |
id: PropTypes.string, | <mask> };
<mask>
<mask> renderGroupField.propTypes = {
<mask> input: PropTypes.object.isRequired,
<mask> id: PropTypes.string.isRequired,
<mask> className: PropTypes.string,
<mask> placeholder: PropTypes.string,
<mask> type: PropTypes.string,
<mask> disabled: PropTypes.bool,
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d1472afb96921c0c83295dec9de0820dec0435a9 | client/src/helpers/form.js |
<mask> import { useTranslation } from 'react-i18next';
<mask>
<mask> import {
<mask> HIDE_TOOLTIP_DELAY,
<mask> HIDE_TOOLTIP_CLICK_DELAY,
<mask> MEDIUM_SCREEN_SIZE,
<mask> } from '../../helpers/constants';
<mask> import 'react-popper-tooltip/dist/styles.css';
<mask> import './Tooltip.css';
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/components/ui/Tooltip.js | |
SHOW_TOOLTIP_DELAY, | <mask>
<mask> import {
<mask> HIDE_TOOLTIP_DELAY,
<mask> MEDIUM_SCREEN_SIZE,
<mask> } from '../../helpers/constants';
<mask> import 'react-popper-tooltip/dist/styles.css';
<mask> import './Tooltip.css';
<mask>
<mask> const Tooltip = ({
</s> - client: tooltip show delay </s> remove HIDE_TOOLTIP_C... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/components/ui/Tooltip.js |
delayShow = SHOW_TOOLTIP_DELAY, | <mask> placement = 'bottom',
<mask> trigger = 'hover',
<mask> delayHide = HIDE_TOOLTIP_DELAY,
<mask> }) => {
<mask> const { t } = useTranslation();
<mask> let triggerValue = trigger;
</s> - client: tooltip show delay </s> remove let delayValue = delayHide;
</s> add let delayHideValue... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/components/ui/Tooltip.js |
let delayHideValue = delayHide;
let delayShowValue = delayShow; | <mask> delayHide = HIDE_TOOLTIP_DELAY,
<mask> }) => {
<mask> const { t } = useTranslation();
<mask> let triggerValue = trigger;
<mask> let delayValue = delayHide;
<mask>
<mask> if (window.matchMedia(`(max-width: ${MEDIUM_SCREEN_SIZE}px)`).matches) {
<mask> triggerValue = 'click';
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/components/ui/Tooltip.js |
delayHideValue = 0;
delayShowValue = 0; | <mask> let delayValue = delayHide;
<mask>
<mask> if (window.matchMedia(`(max-width: ${MEDIUM_SCREEN_SIZE}px)`).matches) {
<mask> triggerValue = 'click';
<mask> delayValue = HIDE_TOOLTIP_CLICK_DELAY;
<mask> }
<mask>
<mask> return (
<mask> <TooltipTrigger
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/components/ui/Tooltip.js |
delayHide={delayHideValue}
delayShow={delayShowValue} | <mask> return (
<mask> <TooltipTrigger
<mask> placement={placement}
<mask> trigger={triggerValue}
<mask> delayHide={delayValue}
<mask> tooltip={({ tooltipRef, getTooltipProps }) => (
<mask> <div
<mask> {...getTooltip... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/components/ui/Tooltip.js |
delayShow: propTypes.string, | <mask> placement: propTypes.string,
<mask> trigger: propTypes.string,
<mask> delayHide: propTypes.string,
<mask> className: propTypes.string,
<mask> triggerClass: propTypes.string,
<mask> };
<mask>
<mask> export default Tooltip;
</s> - client: tooltip show delay </s> remove export const HI... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/components/ui/Tooltip.js |
export const SHOW_TOOLTIP_DELAY = 200; | <mask> export const CHECK_TIMEOUT = 1000;
<mask> export const SUCCESS_TOAST_TIMEOUT = 5000;
<mask> export const FAILURE_TOAST_TIMEOUT = 30000;
<mask> export const HIDE_TOOLTIP_DELAY = 300;
<mask> export const HIDE_TOOLTIP_CLICK_DELAY = 100;
<mask> export const MODAL_OPEN_TIMEOUT = 150;
<mask>
<mask> export con... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d154456ae52c349d5858bfc51dd293fe2bf3c1fe | client/src/helpers/constants.js |
<mask> "log"
<mask> "os"
<mask> "path/filepath"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
</s> Move filter-related variables, types and methods to filter.go </s> remove "path/filepath"
"reflect"
"regexp"
</... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | config.go | |
<mask> const (
<mask> currentSchemaVersion = 1 // used for upgrading from old configs to new config
<mask> dataDir = "data" // data storage
<mask> filterDir = "filters" // cache location for downloaded filters, it's under DataDir
<mask> userFilterID = 0 // spe... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | config.go | |
<mask> filterDir = "filters" // cache location for downloaded filters, it's under DataDir
<mask> userFilterID = 0 // special filter ID, always 0
<mask> )
<mask>
<mask> // Just a counter that we use for incrementing the filter ID
<mask> var nextFilterID int64 = time.Now().Unix()
<mas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | config.go | |
<mask> BootstrapDNS string `yaml:"bootstrap_dns"`
<mask> UpstreamDNS []string `yaml:"upstream_dns"`
<mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type filter struct {
<mask> Enabled bool `json:"enabled"`
<mask> URL strin... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | config.go | |
<mask> {Filter: dnsforward.Filter{ID: 4}, Enabled: false, URL: "http://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
<mask> },
<mask> }
<mask>
<mask> // Creates a helper object for working with the user rules
<mask> func userFilter() filter {
<mask> return filter... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | config.go | |
<mask> func writeAllConfigs() error {
<mask> return config.write()
<mask> }
<mask>
<mask> // Set the next filter ID to max(filter.ID) + 1
<mask> func updateUniqueFilterID(filters []filter) {
<mask> for _, filter := range filters {
<mask> if nextFilterID < filter.ID {
<mask> nextFilterID = filter.ID + 1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | config.go | |
<mask> "io/ioutil"
<mask> "log"
<mask> "net/http"
<mask> "os"
<mask> "path/filepath"
<mask> "reflect"
<mask> "regexp"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/upstream"
</s> Move filter-related variables, types and methods to filter.go </... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | control.go | |
<mask> )
<mask>
<mask> const updatePeriod = time.Minute * 30
<mask>
<mask> var filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
<mask>
<mask> // cached version.json to avoid hammering github.io for each page reload
<mask> var versionCheckJSON []byte
<mask> var versionCheckLastTime time.Time
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | control.go | |
<mask> updated := refreshFiltersIfNeccessary(force != "")
<mask> fmt.Fprintf(w, "OK %d filters updated\n", updated)
<mask> }
<mask>
<mask> // Sets up a timer that will be checking for filters updates periodically
<mask> func periodicallyRefreshFilters() {
<mask> for range time.Tick(time.Minute) {
<mask> r... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/d27fd0488d4d415271e5233bf9d7a371790df1ee | control.go | |
ReadTimeout: readTimeout,
ReadHeaderTimeout: readHdrTimeout,
WriteTimeout: writeTimeout, | <mask> BindHost: config.BindHost,
<mask> BindPort: config.BindPort,
<mask> BetaBindPort: config.BetaBindPort,
<mask>
<mask> ReadTimeout: ReadTimeout,
<mask> ReadHeaderTimeout: ReadHeaderTimeout,
<mask> WriteTimeout: WriteTimeout,
<mask> }
<mask> Context.web = CreateWeb(&webCon... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d295621352f7dde326529a5d58bc6c9ed7db39bf | internal/home/home.go |
// readTimeout is the maximum duration for reading the entire request, | <mask> "github.com/gobuffalo/packr"
<mask> )
<mask>
<mask> const (
<mask> // ReadTimeout is the maximum duration for reading the entire request,
<mask> // including the body.
<mask> ReadTimeout = 10 * time.Second
<mask>
<mask> // ReadHeaderTimeout is the amount of time allowed to read request
<mask> /... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d295621352f7dde326529a5d58bc6c9ed7db39bf | internal/home/web.go |
readTimeout = 30 * time.Second
// readHdrTimeout is the amount of time allowed to read request headers.
readHdrTimeout = 30 * time.Second
// writeTimeout is the maximum duration before timing out writes of the | <mask>
<mask> const (
<mask> // ReadTimeout is the maximum duration for reading the entire request,
<mask> // including the body.
<mask> ReadTimeout = 10 * time.Second
<mask>
<mask> // ReadHeaderTimeout is the amount of time allowed to read request
<mask> // headers.
<mask> ReadHeaderTimeout = 10 * tim... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d295621352f7dde326529a5d58bc6c9ed7db39bf | internal/home/web.go |
writeTimeout = 30 * time.Second | <mask> ReadHeaderTimeout = 10 * time.Second
<mask>
<mask> // WriteTimeout is the maximum duration before timing out writes of the
<mask> // response.
<mask> WriteTimeout = 10 * time.Second
<mask> )
<mask>
<mask> type webConfig struct {
<mask> firstRun bool
<mask> BindHost net.IP
</s> Pull req... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d295621352f7dde326529a5d58bc6c9ed7db39bf | internal/home/web.go |
// TODO(e.burkov): Inspect special cases when user want to apply some
// rules handled by other processors to the hosts with TLD. | <mask> }
<mask>
<mask> ip, ok := s.hostToIP(host)
<mask> if !ok {
<mask> // TODO(e.burkov): Inspect special cases when user want to apply
<mask> // some rules handled by other processors to the hosts with TLD.
<mask> d.Res = s.genNXDomain(req)
<mask>
<mask> return resultCodeFinish
<mask> }
<mas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/dns.go |
// anonymizer masks the client's IP addresses if needed.
anonymizer *aghnet.IPMut
| <mask> localResolvers *proxy.Proxy
<mask> sysResolvers aghnet.SystemResolvers
<mask> recDetector *recursionDetector
<mask>
<mask> tableHostToIP hostToIPTable
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tableIPToHost *netutil.IPMap
</s> Pull request: 3890 fix anonymization
Merge in D... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/dnsforward.go |
Anonymizer *aghnet.IPMut | <mask> QueryLog querylog.QueryLog
<mask> DHCPServer dhcpd.ServerInterface
<mask> SubnetDetector *aghnet.SubnetDetector
<mask> LocalDomain string
<mask> }
<mask>
<mask> // domainNameToSuffix converts a domain name into a local domain suffix.
</s> Pull request: 3890 fix anonymization
Merge in D... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/dnsforward.go |
if p.Anonymizer == nil {
p.Anonymizer = aghnet.NewIPMut(nil)
} | <mask> localDomainSuffix = domainNameToSuffix(p.LocalDomain)
<mask> }
<mask>
<mask> s = &Server{
<mask> dnsFilter: p.DNSFilter,
<mask> stats: p.Stats,
<mask> queryLog: p.QueryLog,
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/dnsforward.go |
anonymizer: p.Anonymizer, | <mask> clientIDCache: cache.New(cache.Config{
<mask> EnableLRU: true,
<mask> MaxCount: defaultClientIDCacheCount,
<mask> }),
<mask> }
<mask>
<mask> // TODO(e.burkov): Enable the refresher after the actual implementation
<mask> // passes the public testing.
<mask> s.sysResolvers, err = aghnet.Ne... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/dnsforward.go |
"net" | <mask>
<mask> import (
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squa... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats.go |
"github.com/AdguardTeam/golibs/log" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/miekg/dns"
... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats.go |
ip, _ := netutil.IPAndPortFromAddr(pctx.Addr)
ip = netutil.CloneIP(ip)
s.anonymizer.Load()(ip)
log.Debug("client ip: %s", ip)
// Synchronize access to s.queryLog and s.stats so they won't be suddenly
// uninitialized while in use. This can happen after proxy server has been
// stopped, but its workers haven't... | <mask>
<mask> s.serverLock.RLock()
<mask> defer s.serverLock.RUnlock()
<mask>
<mask> // Synchronize access to s.queryLog and s.stats so they won't be suddenly uninitialized while in use.
<mask> // This can happen after proxy server has been stopped, but its workers haven't yet exited.
<mask> if shouldLog ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats.go |
<mask>
<mask> // Synchronize access to s.queryLog and s.stats so they won't be suddenly uninitialized while in use.
<mask> // This can happen after proxy server has been stopped, but its workers haven't yet exited.
<mask> if shouldLog && s.queryLog != nil {
<mask> ip, _ := netutil.IPAndPortFromAddr(pctx.Addr... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats.go | |
s.updateStats(ctx, elapsed, *ctx.result, ip) | <mask>
<mask> s.queryLog.Add(p)
<mask> }
<mask>
<mask> s.updateStats(ctx, elapsed, *ctx.result)
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) {
</s> Pull request: 3890 fix anonymization
Merge ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats.go |
func (s *Server) updateStats(
ctx *dnsContext,
elapsed time.Duration,
res filtering.Result,
clientIP net.IP,
) { | <mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) {
<mask> if s.stats == nil {
<mask> return
<mask> }
<mask>
<mask> pctx := ctx.proxyCtx
</s> Pull request: 3890 fix anonymization
Merge in DNS/adgu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats.go |
} else if clientIP != nil {
e.Client = clientIP.String() | <mask> e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
<mask>
<mask> if clientID := ctx.clientID; clientID != "" {
<mask> e.Client = clientID
<mask> } else if ip, _ := netutil.IPAndPortFromAddr(pctx.Addr); ip != nil {
<mask> e.Client = ip.String()
<mask> }
<mask>
<mask> e.Time = uint32(elap... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "net"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/A... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats_test.go |
queryLog: ql,
stats: st,
anonymizer: aghnet.NewIPMut(nil), | <mask> for _, tc := range testCases {
<mask> ql := &testQueryLog{}
<mask> st := &testStats{}
<mask> srv := &Server{
<mask> queryLog: ql,
<mask> stats: st,
<mask> }
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> req := &dns.Msg{
<mask> Question: []dns.Question{{
<mask> Name:... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/dnsforward/stats_test.go |
func shutdownSrv(ctx context.Context, srv *http.Server) { | <mask>
<mask> // shutdownTimeout is the timeout for shutting HTTP server down operation.
<mask> const shutdownTimeout = 5 * time.Second
<mask>
<mask> func shutdownSrv(ctx context.Context, cancel context.CancelFunc, srv *http.Server) {
<mask> defer log.OnPanic("")
<mask>
<mask> if srv == nil {
<mask> ret... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/controlinstall.go |
<mask> if srv == nil {
<mask> return
<mask> }
<mask>
<mask> defer cancel()
<mask>
<mask> err := srv.Shutdown(ctx)
<mask> if err != nil {
<mask> log.Error("error while shutting down http server %q: %s", srv.Addr, err)
<mask> }
<mask> }
</s> Pull request: 3890 fix anonymization
Merge in DNS/adgua... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/controlinstall.go | |
if !restartHTTP {
return | <mask> if f, ok := w.(http.Flusher); ok {
<mask> f.Flush()
<mask> }
<mask>
<mask> // Method http.(*Server).Shutdown needs to be called in a separate
<mask> // goroutine and with its own context, because it waits until all
<mask> // requests are handled and will be blocked by it's own caller.
<mask> if ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/controlinstall.go |
// Method http.(*Server).Shutdown needs to be called in a separate goroutine
// and with its own context, because it waits until all requests are handled
// and will be blocked by it's own caller.
go func(timeout time.Duration) {
defer log.OnPanic("web")
ctx, cancel := context.WithTimeout(context.Background(),... | <mask> return
<mask> }
<mask> }
<mask>
<mask> // decodeApplyConfigReq decodes the configuration, validates some parameters,
<mask> // and returns it along with the boolean indicating whether or not the HTTP
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Up... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/controlinstall.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "net/url"
<mask> "os"
<mask> "path/filepath"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stat... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/dns.go |
func initDNSServer() (err error) { | <mask>
<mask> // initDNSServer creates an instance of the dnsforward.Server
<mask> // Please note that we must do it even if we don't start it
<mask> // so that we had access to the query log and the stats
<mask> func initDNSServer() error {
<mask> var err error
<mask> baseDir := Context.getDataDir()
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/dns.go |
var anonFunc aghnet.IPMutFunc
if config.DNS.AnonymizeClientIP {
anonFunc = querylog.AnonymizeIP
}
anonymizer := aghnet.NewIPMut(anonFunc)
| <mask> func initDNSServer() (err error) {
<mask> baseDir := Context.getDataDir()
<mask>
<mask> statsConf := stats.Config{
<mask> Filename: filepath.Join(baseDir, "stats.db"),
<mask> LimitDays: config.DNS.StatsInterval,
<mask> ConfigModified: onConfigModified,
</s> Pull request: 3890 fix anon... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/dns.go |
Filename: filepath.Join(baseDir, "stats.db"),
LimitDays: config.DNS.StatsInterval,
ConfigModified: onConfigModified,
HTTPRegister: httpRegister, | <mask> var err error
<mask> baseDir := Context.getDataDir()
<mask>
<mask> statsConf := stats.Config{
<mask> Filename: filepath.Join(baseDir, "stats.db"),
<mask> LimitDays: config.DNS.StatsInterval,
<mask> AnonymizeClientIP: config.DNS.AnonymizeClientIP,
<mask> ConfigModified: onC... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/dns.go |
Anonymizer: anonymizer, | <mask> Enabled: config.DNS.QueryLogEnabled,
<mask> FileEnabled: config.DNS.QueryLogFileEnabled,
<mask> AnonymizeClientIP: config.DNS.AnonymizeClientIP,
<mask> }
<mask> Context.queryLog = querylog.New(conf)
<mask>
<mask> filterConf := config.DNS.DnsfilterConf
<mask> filterConf.EtcHosts... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/dns.go |
Anonymizer: anonymizer, | <mask> QueryLog: Context.queryLog,
<mask> SubnetDetector: Context.subnetDetector,
<mask> LocalDomain: config.DNS.LocalDomainName,
<mask> }
<mask> if Context.dhcpServer != nil {
<mask> p.DHCPServer = Context.dhcpServer
<mask> }
<mask>
</s> Pull request: 3890 fix anonymization
Merge in DNS/... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/dns.go |
var dnsConfig dnsforward.ServerConfig
dnsConfig, err = generateServerConfig() | <mask> return fmt.Errorf("dnsforward.NewServer: %w", err)
<mask> }
<mask>
<mask> Context.clients.dnsServer = Context.dnsServer
<mask> dnsConfig, err := generateServerConfig()
<mask> if err != nil {
<mask> closeDNSServer()
<mask>
<mask> return fmt.Errorf("generateServerConfig: %w", err)
<mask> }
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/dns.go |
shutdownSrv(ctx, web.httpsServer.server)
cancel() | <mask> web.httpsServer.cond.L.Lock()
<mask> if web.httpsServer.server != nil {
<mask> var cancel context.CancelFunc
<mask> ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
<mask> shutdownSrv(ctx, cancel, web.httpsServer.server)
<mask> }
<mask>
<mask> web.httpsServer.enabled = enabled
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/web.go |
defer cancel() | <mask>
<mask> var cancel context.CancelFunc
<mask> ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
<mask>
<mask> shutdownSrv(ctx, web.httpsServer.server)
<mask> shutdownSrv(ctx, web.httpServer)
<mask> shutdownSrv(ctx, web.httpServerBeta)
</s> Pull request: 3890 fix anonymization
Merge in DNS/adg... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/web.go |
shutdownSrv(ctx, web.httpsServer.server)
shutdownSrv(ctx, web.httpServer)
shutdownSrv(ctx, web.httpServerBeta) | <mask>
<mask> var cancel context.CancelFunc
<mask> ctx, cancel = context.WithTimeout(ctx, shutdownTimeout)
<mask>
<mask> shutdownSrv(ctx, cancel, web.httpsServer.server)
<mask> shutdownSrv(ctx, cancel, web.httpServer)
<mask> shutdownSrv(ctx, cancel, web.httpServerBeta)
<mask>
<mask> log.Info("stopped ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/home/web.go |
"net" | <mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "net/http"
<mask> "net/url"
<mask> "strconv"
<mask> "strings"
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit of the following:
commit a77a6204bc8a58f62a4fac70efd... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go |
"github.com/AdguardTeam/golibs/timeutil" | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "golang.org/x/net/idna"
<mask> )
<mask>
<mask> type qlogConfig struct {
<mask> Enabled bool `json:"enabled"`
<mask> // Use float64 here to support fractional numbers and not mess the API
</s> Pull request:... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go |
d := &qlogConfig{}
req, err := jsonutil.DecodeObject(d, r.Body) | <mask> }
<mask>
<mask> // Set configuration
<mask> func (l *queryLog) handleQueryLogConfig(w http.ResponseWriter, r *http.Request) {
<mask> d := qlogConfig{}
<mask> req, err := jsonutil.DecodeObject(&d, r.Body)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> retur... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go |
ivl := time.Duration(float64(timeutil.Day) * d.Interval) | <mask> httpError(r, w, http.StatusBadRequest, "%s", err)
<mask> return
<mask> }
<mask>
<mask> ivl := time.Duration(24*d.Interval) * time.Hour
<mask> if req.Exists("interval") && !checkInterval(ivl) {
<mask> httpError(r, w, http.StatusBadRequest, "Unsupported interval")
<mask> return
<mask> }
<mas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go |
defer l.conf.ConfigModified()
| <mask> }
<mask>
<mask> l.lock.Lock()
<mask> defer l.lock.Unlock()
<mask>
<mask> // Copy data, modify it, then activate. Other threads (readers) don't need
<mask> // to use this lock.
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squas... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go |
defer l.lock.Unlock()
// Copy data, modify it, then activate. Other threads (readers) don't need
// to use this lock. | <mask> return
<mask> }
<mask>
<mask> l.lock.Lock()
<mask> // copy data, modify it, then activate. Other threads (readers) don't need to use this lock.
<mask> conf := *l.conf
<mask> if req.Exists("enabled") {
<mask> conf.Enabled = d.Enabled
<mask> }
<mask> if req.Exists("interval") {
</s> Pull re... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go |
if conf.AnonymizeClientIP = d.AnonymizeClientIP; conf.AnonymizeClientIP {
l.anonymizer.Store(AnonymizeIP)
} else {
l.anonymizer.Store(nil)
} | <mask> if req.Exists("interval") {
<mask> conf.RotationIvl = ivl
<mask> }
<mask> if req.Exists("anonymize_client_ip") {
<mask> conf.AnonymizeClientIP = d.AnonymizeClientIP
<mask> }
<mask> l.conf = &conf
<mask> l.lock.Unlock()
<mask>
<mask> l.conf.ConfigModified()
</s> Pull request: 3890 fix anony... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go |
<mask> if req.Exists("anonymize_client_ip") {
<mask> conf.AnonymizeClientIP = d.AnonymizeClientIP
<mask> }
<mask> l.conf = &conf
<mask> l.lock.Unlock()
<mask>
<mask> l.conf.ConfigModified()
<mask> }
<mask>
<mask> // "value" -> value, return TRUE
<mask> func getDoubleQuotesEnclosedValue(s *string) bo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/http.go | |
<mask> package querylog
<mask>
<mask> import (
<mask> "fmt"
<mask> "net"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go | |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/miekg/dns"
<mask> "golang.org/x/net/idna"
<mask> )
</s> Pull request: 3890 fix anonymization
Merge in DNS/adgu... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
"github.com/AdguardTeam/golibs/netutil" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> "golang.org/x/net/idna"
<mask> )
<mask>
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed ... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
<mask> )
<mask>
<mask> // TODO(a.garipov): Use a proper structured approach here.
<mask>
<mask> // Get Client IP address
<mask> func (l *queryLog) getClientIP(ip net.IP) (clientIP net.IP) {
<mask> if l.conf.AnonymizeClientIP && ip != nil {
<mask> const AnonymizeClientIPv4Mask = 16
<mask> const Anonymize... | [
"keep",
"keep",
"keep",
"keep",
"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/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go | |
data := make([]jobject, 0, len(entries)) | <mask> type jobject = map[string]interface{}
<mask>
<mask> // entriesToJSON converts query log entries to JSON.
<mask> func (l *queryLog) entriesToJSON(entries []*logEntry, oldest time.Time) (res jobject) {
<mask> data := []jobject{}
<mask>
<mask> // the elements order is already reversed (from newer to olde... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
// The elements order is already reversed to be from newer to older.
for _, entry := range entries {
jsonEntry := l.entryToJSON(entry, l.anonymizer.Load()) | <mask> // entriesToJSON converts query log entries to JSON.
<mask> func (l *queryLog) entriesToJSON(entries []*logEntry, oldest time.Time) (res jobject) {
<mask> data := []jobject{}
<mask>
<mask> // the elements order is already reversed (from newer to older)
<mask> for i := 0; i < len(entries); i++ {
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
func (l *queryLog) entryToJSON(entry *logEntry, anonFunc aghnet.IPMutFunc) (jsonEntry jobject) { | <mask>
<mask> return res
<mask> }
<mask>
<mask> func (l *queryLog) logEntryToJSONEntry(entry *logEntry) (jsonEntry jobject) {
<mask> var msg *dns.Msg
<mask>
<mask> if len(entry.Answer) > 0 {
<mask> msg = new(dns.Msg)
<mask> if err := msg.Unpack(entry.Answer); err != nil {
</s> Pull request: 3890 fi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
eip := netutil.CloneIP(entry.IP)
anonFunc(eip)
| <mask> }
<mask>
<mask> jsonEntry = jobject{
<mask> "reason": entry.Result.Reason.String(),
<mask> "elapsedMs": strconv.FormatFloat(entry.Elapsed.Seconds()*1000, 'f', -1, 64),
<mask> "time": entry.Time.Format(time.RFC3339Nano),
<mask> "client": eip,
<mask> "client_proto": entr... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
"client": eip, | <mask> jsonEntry = jobject{
<mask> "reason": entry.Result.Reason.String(),
<mask> "elapsedMs": strconv.FormatFloat(entry.Elapsed.Seconds()*1000, 'f', -1, 64),
<mask> "time": entry.Time.Format(time.RFC3339Nano),
<mask> "client": l.getClientIP(entry.IP),
<mask> "client_info": entr... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
if eip.Equal(entry.IP) {
jsonEntry["client_info"] = entry.client
} | <mask> "question": question,
<mask> }
<mask>
<mask> if entry.ClientID != "" {
<mask> jsonEntry["client_id"] = entry.ClientID
<mask> }
<mask>
<mask> if msg != nil {
</s> Pull request: 3890 fix anonymization
Merge in DNS/adguard-home from 3890-fix-stats to master
Updates #3890.
Squashed commit o... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/json.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: 3890 fix ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/qlog.go |
anonymizer *aghnet.IPMut | <mask> fileFlushLock sync.Mutex // synchronize a file-flushing goroutine and main thread
<mask> flushPending bool // don't start another goroutine while the previous one is still running
<mask> fileWriteLock sync.Mutex
<mask> }
<mask>
<mask> // ClientProto values are names of the client protocols.
<ma... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/qlog.go |
IP: params.ClientIP, | <mask> }
<mask>
<mask> now := time.Now()
<mask> entry := logEntry{
<mask> IP: l.getClientIP(params.ClientIP),
<mask> Time: now,
<mask>
<mask> Result: *params.Result,
<mask> Elapsed: params.Elapsed,
<mask> Upstream: params.Upstream,
</s> Pull request: 3890 fix anonymization
Merge... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/qlog.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> "path/filepath"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d2cf3233b8fc65538bdc052d600f224a7126f2e0 | internal/querylog/querylog.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.