code_before stringlengths 16 1.81M | edits stringlengths 4 328k | next_edit stringlengths 0 76.5k | code_after stringlengths 3 49.9M | label_window listlengths 4 1.81k | instruction stringlengths 20 51.9k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|---|---|---|
if !filter.Enabled {
continue
}
if !force && time.Since(filter.LastUpdated) <= updatePeriod {
continue
}
updated, err := filter.update()
if err != nil {
| </s> remove updated, err := filter.update()
</s> add var uf filter
uf.ID = f.ID
uf.URL = f.URL
uf.checksum = f.checksum
updateFilters = append(updateFilters, uf)
}
config.RUnlock()
updateCount := 0
for i := range updateFilters {
uf := &updateFilters[i]
updated, err := uf.update() </s> remove if ... | if !force && time.Since(f.LastUpdated) <= updatePeriod { | if !filter.Enabled {
continue
}
if !force && time.Since(f.LastUpdated) <= updatePeriod {
continue
}
updated, err := filter.update()
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go |
if !force && time.Since(filter.LastUpdated) <= updatePeriod {
continue
}
updated, err := filter.update()
if err != nil {
log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
continue
}
if updated {
| </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
</s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err) </s> remove if !force && time.Since(filter.LastUpdated) <= updatePeriod {
</s> add if !force && time.Since(f.LastUpdated) <= updatePeriod { </s> remove if !filte... | var uf filter
uf.ID = f.ID
uf.URL = f.URL
uf.checksum = f.checksum
updateFilters = append(updateFilters, uf)
}
config.RUnlock()
updateCount := 0
for i := range updateFilters {
uf := &updateFilters[i]
updated, err := uf.update() | if !force && time.Since(filter.LastUpdated) <= updatePeriod {
continue
}
var uf filter
uf.ID = f.ID
uf.URL = f.URL
uf.checksum = f.checksum
updateFilters = append(updateFilters, uf)
}
config.RUnlock()
updateCount := 0
for i := range updateFilters {
uf := &updateFilters[i]
updated, err... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go |
}
updated, err := filter.update()
if err != nil {
log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
continue
}
if updated {
// Saving it to the filters dir now
err = filter.save()
| </s> remove updated, err := filter.update()
</s> add var uf filter
uf.ID = f.ID
uf.URL = f.URL
uf.checksum = f.checksum
updateFilters = append(updateFilters, uf)
}
config.RUnlock()
updateCount := 0
for i := range updateFilters {
uf := &updateFilters[i]
updated, err := uf.update() </s> remove er... | log.Printf("Failed to update filter %s: %s\n", uf.URL, err) | }
updated, err := filter.update()
if err != nil {
log.Printf("Failed to update filter %s: %s\n", uf.URL, err)
continue
}
if updated {
// Saving it to the filters dir now
err = filter.save() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go |
continue
}
if updated {
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", filter.ID, err)
continue
}
| </s> remove log.Printf("Failed to save the updated filter %d: %s", filter.ID, err)
</s> add log.Printf("Failed to save the updated filter %d: %s", uf.ID, err) </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
</s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err) ... | err = uf.save() | continue
}
if updated {
// Saving it to the filters dir now
err = uf.save()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", filter.ID, err)
continue
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go |
if updated {
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", filter.ID, err)
continue
}
updateCount++
| </s> remove err = filter.save()
</s> add err = uf.save() </s> remove log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
</s> add log.Printf("Failed to update filter %s: %s\n", uf.URL, err) </s> remove updateCount++
</s> add </s> remove updated, err := filter.update()
</s> add var u... | log.Printf("Failed to save the updated filter %d: %s", uf.ID, err) | if updated {
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue
}
updateCount++
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go |
log.Printf("Failed to save the updated filter %d: %s", filter.ID, err)
continue
}
updateCount++
} else {
mtime := time.Now()
os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
}
| </s> remove os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
</s> add e := os.Chtimes(uf.Path(), mtime, mtime)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
uf.LastUpdated = mtime
}
config.Lock()
for k := range config.Filters {
f := &config.Filters[k]
if f.ID != ... | log.Printf("Failed to save the updated filter %d: %s", filter.ID, err)
continue
}
} else {
mtime := time.Now()
os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go | |
updateCount++
} else {
mtime := time.Now()
os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
}
}
config.Unlock()
if updateCount > 0 && isRunning() {
| </s> remove updateCount++
</s> add </s> remove config.Unlock()
</s> add </s> remove updated, err := filter.update()
</s> add var uf filter
uf.ID = f.ID
uf.URL = f.URL
uf.checksum = f.checksum
updateFilters = append(updateFilters, uf)
}
config.RUnlock()
updateCount := 0
for i := range updateFi... | e := os.Chtimes(uf.Path(), mtime, mtime)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
uf.LastUpdated = mtime
}
config.Lock()
for k := range config.Filters {
f := &config.Filters[k]
if f.ID != uf.ID || f.URL != uf.URL {
continue
}
f.LastUpdated = uf.LastUpdated
if !updated {... | updateCount++
} else {
mtime := time.Now()
e := os.Chtimes(uf.Path(), mtime, mtime)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
uf.LastUpdated = mtime
}
config.Lock()
for k := range config.Filters {
f := &config.Filters[k]
if f.ID != uf.ID || f.URL != uf.URL {
cont... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go |
f.checksum = uf.checksum
updateCount++
}
}
if updateCount > 0 && isRunning() {
err := reconfigureDNSServer()
if err != nil {
msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconfigure DNS server with the new filters: %s", err)
| </s> remove config.Unlock()
</s> add </s> remove os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
</s> add e := os.Chtimes(uf.Path(), mtime, mtime)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
uf.LastUpdated = mtime
}
config.Lock()
for k := range config.Filters {
... | config.Unlock() | f.checksum = uf.checksum
updateCount++
}
config.Unlock()
}
if updateCount > 0 && isRunning() {
err := reconfigureDNSServer()
if err != nil {
msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconfigure DNS server with the new filters: %s", err) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go |
os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
}
}
config.Unlock()
if updateCount > 0 && isRunning() {
err := reconfigureDNSServer()
if err != nil {
msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconfigure DNS server with the new filters: %s", err)
| </s> remove os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
</s> add e := os.Chtimes(uf.Path(), mtime, mtime)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
uf.LastUpdated = mtime
}
config.Lock()
for k := range config.Filters {
f := &config.Filters[k]
if f.ID != ... | os.Chtimes(filter.Path(), mtime, mtime)
filter.LastUpdated = mtime
}
}
if updateCount > 0 && isRunning() {
err := reconfigureDNSServer()
if err != nil {
msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconfigure DNS server with the new filters: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * filters: rework update mechanism so that UI doesn't get locked while update is in progress | https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a | filter.go | |
}
}
},
"react-i18next": {
"version": "11.4.0",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz",
"integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==",
"requires": {
... | </s> remove dispatch(addNoticeToast({ error: 'update_failed' }));
</s> add const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
};
dispatch(addNoticeToast({ error... | "version": "11.7.2",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz",
"integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==", | }
}
},
"react-i18next": {
"version": "11.7.2",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz",
"integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==",
"version": "11.7.2",
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/package-lock.json |
"query-string": "^6.13.1",
"react": "^16.13.1",
"react-click-outside": "^3.0.1",
"react-dom": "^16.13.1",
"react-i18next": "^11.4.0",
"react-modal": "^3.11.2",
"react-popper-tooltip": "^2.11.1",
"react-redux": "^7.2.0",
"react-red... | </s> remove "version": "11.4.0",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz",
"integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==",
</s> add "version": "11.7.2",
"resolved": "https://registry.n... | "react-i18next": "^11.7.2", | "query-string": "^6.13.1",
"react": "^16.13.1",
"react-click-outside": "^3.0.1",
"react-dom": "^16.13.1",
"react-i18next": "^11.7.2",
"react-modal": "^3.11.2",
"react-popper-tooltip": "^2.11.1",
"react-redux": "^7.2.0",
"react-redux... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/package.json |
"down": "Down",
"fix": "Fix",
"dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.",
"update_now": "Update now",
"update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>follow the steps</a> to u... | </s> remove dispatch(addNoticeToast({ error: 'update_failed' }));
</s> add const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
};
dispatch(addNoticeToast({ error... | "update_failed": "Auto-update failed. Please <a>follow these steps</a> to update manually.", | "down": "Down",
"fix": "Fix",
"dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.",
"update_now": "Update now",
"update_failed": "Auto-update failed. Please <a>follow these steps</a> to update manually.",
"processing_update": "Please wait, AdGuard Home is bei... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/__locales/en.json |
import axios from 'axios';
import endsWith from 'lodash/endsWith';
import escapeRegExp from 'lodash/escapeRegExp';
import { splitByNewLine, sortClients } from '../helpers/helpers';
import {
BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK,
} from '../he... | </s> remove BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
</s> add BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK, </s> remove import { useTranslation } from 'react-i18next';
</s> add import { Trans } from 'react-i18next'; </s> remove... | import React from 'react'; | import axios from 'axios';
import endsWith from 'lodash/endsWith';
import escapeRegExp from 'lodash/escapeRegExp';
import React from 'react';
import { splitByNewLine, sortClients } from '../helpers/helpers';
import {
BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_ST... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/actions/index.js |
import endsWith from 'lodash/endsWith';
import escapeRegExp from 'lodash/escapeRegExp';
import { splitByNewLine, sortClients } from '../helpers/helpers';
import {
BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
} from '../helpers/constants';
import { areEqualVersions } from '... | </s> remove import { useTranslation } from 'react-i18next';
</s> add import { Trans } from 'react-i18next'; </s> remove "version": "11.4.0",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz",
"integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5Yx... | BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK, | import endsWith from 'lodash/endsWith';
import escapeRegExp from 'lodash/escapeRegExp';
import { splitByNewLine, sortClients } from '../helpers/helpers';
import {
BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK,
} from '../helpers/constants';
import { areEq... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/actions/index.js |
const { dnsVersion } = getState().dashboard;
dispatch(getUpdateRequest());
const handleRequestError = () => {
dispatch(addNoticeToast({ error: 'update_failed' }));
dispatch(getUpdateFailure());
};
const handleRequestSuccess = (response) => {
const respon... | </s> remove const { t } = useTranslation();
</s> add </s> remove export const SUCCESS_TOAST_TIMEOUT = 5000;
export const FAILURE_TOAST_TIMEOUT = 30000;
</s> add | const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
};
dispatch(addNoticeToast({ error: 'update_failed', options })); | const { dnsVersion } = getState().dashboard;
dispatch(getUpdateRequest());
const handleRequestError = () => {
const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/actions/index.js |
import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';
import { TOAST_TIMEOUTS } from '../../helpers/constants';
import { removeToast } from '../../actions';
const Toast = ({
| </s> remove BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
</s> add BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK, </s> remove "version": "11.4.0",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.... | import { Trans } from 'react-i18next'; | import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { Trans } from 'react-i18next';
import { useDispatch } from 'react-redux';
import { TOAST_TIMEOUTS } from '../../helpers/constants';
import { removeToast } from '../../actions';
const Toast = ({ | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/components/Toasts/Toast.js |
const Toast = ({
id,
message,
type,
}) => {
const dispatch = useDispatch();
const [timerId, setTimerId] = useState(null);
const clearRemoveToastTimeout = () => clearTimeout(timerId);
| </s> remove const { t } = useTranslation();
</s> add </s> remove dispatch(addNoticeToast({ error: 'update_failed' }));
</s> add const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
... | options, | const Toast = ({
id,
message,
type,
options,
}) => {
const dispatch = useDispatch();
const [timerId, setTimerId] = useState(null);
const clearRemoveToastTimeout = () => clearTimeout(timerId); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/components/Toasts/Toast.js |
id,
message,
type,
}) => {
const { t } = useTranslation();
const dispatch = useDispatch();
const [timerId, setTimerId] = useState(null);
const clearRemoveToastTimeout = () => clearTimeout(timerId);
const removeCurrentToast = () => dispatch(removeToast(id));
| </s> remove dispatch(addNoticeToast({ error: 'update_failed' }));
</s> add const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
};
dispatch(addNoticeToast({ error... | id,
message,
type,
}) => {
const dispatch = useDispatch();
const [timerId, setTimerId] = useState(null);
const clearRemoveToastTimeout = () => clearTimeout(timerId);
const removeCurrentToast = () => dispatch(removeToast(id)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/components/Toasts/Toast.js | |
return <div className={`toast toast--${type}`}
onMouseOver={clearRemoveToastTimeout}
onMouseOut={setRemoveToastTimeout}>
<p className="toast__content">{t(message)}</p>
<button className="toast__dismiss" onClick={removeCurrentToast}>
<svg str... | </s> remove "react-i18next": "^11.4.0",
</s> add "react-i18next": "^11.7.2", </s> remove "update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>follow the steps</a> to update manually.",
</s> add "update_failed": "Auto-upda... | <p className="toast__content">
<Trans
i18nKey={message}
{...options}
/>
</p> |
return <div className={`toast toast--${type}`}
onMouseOver={clearRemoveToastTimeout}
onMouseOut={setRemoveToastTimeout}>
<p className="toast__content">
<Trans
i18nKey={message}
{...options}
/>
</... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/components/Toasts/Toast.js |
Toast.propTypes = {
id: PropTypes.string.isRequired,
message: PropTypes.string.isRequired,
type: PropTypes.string.isRequired,
};
export default Toast;
| </s> remove [TOAST_TYPES.SUCCESS]: 5000,
[TOAST_TYPES.ERROR]: 30000,
[TOAST_TYPES.NOTICE]: 30000,
</s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, | options: PropTypes.object, | Toast.propTypes = {
id: PropTypes.string.isRequired,
message: PropTypes.string.isRequired,
type: PropTypes.string.isRequired,
options: PropTypes.object,
};
export default Toast; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/components/Toasts/Toast.js |
export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html';
export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse';
export const ADDRESS_IN_USE_TEXT = 'address already in use';
export const INSTALL_FIRST_STEP = 1;
export const INSTALL_TOTAL_STE... | </s> remove export const SUCCESS_TOAST_TIMEOUT = 5000;
export const FAILURE_TOAST_TIMEOUT = 30000;
</s> add </s> remove [TOAST_TYPES.SUCCESS]: 5000,
[TOAST_TYPES.ERROR]: 30000,
[TOAST_TYPES.NOTICE]: 30000,
</s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_T... | export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update';
|
export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html';
export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse';
export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update';
export const ADDRESS_IN_... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/helpers/constants.js |
export const DEBOUNCE_TIMEOUT = 300;
export const DEBOUNCE_FILTER_TIMEOUT = 500;
export const CHECK_TIMEOUT = 1000;
export const SUCCESS_TOAST_TIMEOUT = 5000;
export const FAILURE_TOAST_TIMEOUT = 30000;
export const HIDE_TOOLTIP_DELAY = 300;
export const SHOW_TOOLTIP_DELAY = 200;
export const MODAL_O... | </s> remove [TOAST_TYPES.SUCCESS]: 5000,
[TOAST_TYPES.ERROR]: 30000,
[TOAST_TYPES.NOTICE]: 30000,
</s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, </s> remove const { t } = useTranslation();
</s>... |
export const DEBOUNCE_TIMEOUT = 300;
export const DEBOUNCE_FILTER_TIMEOUT = 500;
export const CHECK_TIMEOUT = 1000;
export const HIDE_TOOLTIP_DELAY = 300;
export const SHOW_TOOLTIP_DELAY = 200;
export const MODAL_OPEN_TIMEOUT = 150;
export const UNSAFE_PORTS = [ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/helpers/constants.js | |
NOTICE: 'notice',
};
export const TOAST_TIMEOUTS = {
[TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT,
};
| </s> remove [TOAST_TYPES.SUCCESS]: 5000,
[TOAST_TYPES.ERROR]: 30000,
[TOAST_TYPES.NOTICE]: 30000,
</s> add [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, </s> remove dispatch(addNoticeToast({ error: ... | export const SUCCESS_TOAST_TIMEOUT = 5000;
export const FAILURE_TOAST_TIMEOUT = 30000;
| NOTICE: 'notice',
};
export const SUCCESS_TOAST_TIMEOUT = 5000;
export const FAILURE_TOAST_TIMEOUT = 30000;
export const TOAST_TIMEOUTS = {
[TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT,
}; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/helpers/constants.js |
NOTICE: 'notice',
};
export const TOAST_TIMEOUTS = {
[TOAST_TYPES.SUCCESS]: 5000,
[TOAST_TYPES.ERROR]: 30000,
[TOAST_TYPES.NOTICE]: 30000,
};
| </s> remove dispatch(addNoticeToast({ error: 'update_failed' }));
</s> add const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
};
dispatch(addNoticeToast({ error... | [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, | NOTICE: 'notice',
};
export const TOAST_TIMEOUTS = {
[TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT,
[TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT,
[TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT,
[TOAS... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/helpers/constants.js |
id: nanoid(),
message,
type: TOAST_TYPES.ERROR,
};
const newState = { ...state, notices: [...state.notices, errorToast] };
| </s> remove dispatch(addNoticeToast({ error: 'update_failed' }));
</s> add const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
};
dispatch(addNoticeToast({ error... | options: payload.options, | id: nanoid(),
message,
options: payload.options,
type: TOAST_TYPES.ERROR,
};
const newState = { ...state, notices: [...state.notices, errorToast] }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/reducers/toasts.js |
id: nanoid(),
message: payload.error.toString(),
type: TOAST_TYPES.NOTICE,
};
const newState = { ...state, notices: [...state.notices, noticeToast] };
return newState;
},
| </s> remove dispatch(addNoticeToast({ error: 'update_failed' }));
</s> add const options = {
components: {
a: <a href={GETTING_STARTED_LINK} target="_blank"
rel="noopener noreferrer" />,
},
};
dispatch(addNoticeToast({ error... | options: payload.options, | id: nanoid(),
message: payload.error.toString(),
options: payload.options,
type: TOAST_TYPES.NOTICE,
};
const newState = { ...state, notices: [...state.notices, noticeToast] };
return newState;
}, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: Add link to 'update_failed' error toast
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c259... | https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2 | client/src/reducers/toasts.js |
TLSAllowUnencryptedDOH bool
TLSv12Roots *x509.CertPool // list of root CAs for TLSv1.2
// Called when the configuration is changed by HTTP request
ConfigModified func()
// Register an HTTP handler
| </s> | TLSCiphers []uint16 // list of TLS ciphers to use | TLSAllowUnencryptedDOH bool
TLSv12Roots *x509.CertPool // list of root CAs for TLSv1.2
TLSCiphers []uint16 // list of TLS ciphers to use
// Called when the configuration is changed by HTTP request
ConfigModified func()
// Register an HTTP handler | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | dnsforward/dnsforward.go |
}
upstream.RootCAs = s.conf.TLSv12Roots
if len(proxyConfig.Upstreams) == 0 {
log.Fatal("len(proxyConfig.Upstreams) == 0")
}
if !webRegistered && s.conf.HTTPRegister != nil {
| </s> | upstream.CipherSuites = s.conf.TLSCiphers | }
upstream.RootCAs = s.conf.TLSv12Roots
upstream.CipherSuites = s.conf.TLSCiphers
if len(proxyConfig.Upstreams) == 0 {
log.Fatal("len(proxyConfig.Upstreams) == 0")
}
if !webRegistered && s.conf.HTTPRegister != nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | dnsforward/dnsforward.go |
}
newconfig.TLSv12Roots = Context.tlsRoots
newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
newconfig.FilterHandler = applyAdditionalFiltering
newconfig.GetUpstreamsByClient = getUpstreamsByClient
return newconfig
| </s> | newconfig.TLSCiphers = Context.tlsCiphers | }
newconfig.TLSv12Roots = Context.tlsRoots
newconfig.TLSCiphers = Context.tlsCiphers
newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
newconfig.FilterHandler = applyAdditionalFiltering
newconfig.GetUpstreamsByClient = getUpstreamsByClient
return newconfig | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | home/dns.go |
disableUpdate bool // If set, don't check for updates
controlLock sync.Mutex
tlsRoots *x509.CertPool // list of root CAs for TLSv1.2
transport *http.Transport
client *http.Client
appSignalChannel chan os.Signal // Channel for receiving OS signals by the console app
... | </s> | tlsCiphers []uint16 // list of TLS ciphers to use | disableUpdate bool // If set, don't check for updates
controlLock sync.Mutex
tlsRoots *x509.CertPool // list of root CAs for TLSv1.2
tlsCiphers []uint16 // list of TLS ciphers to use
transport *http.Transport
client *http.Client
appSignalChannel chan os.... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | home/home.go |
initConfig()
Context.tlsRoots = util.LoadSystemRootCAs()
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,
TLSClientConfig: &tls.Config{
| </s> | Context.tlsCiphers = util.InitTLSCiphers() | initConfig()
Context.tlsRoots = util.LoadSystemRootCAs()
Context.tlsCiphers = util.InitTLSCiphers()
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,
TLSClientConfig: &tls.Config{ | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | home/home.go |
MinVersion: tls.VersionTLS12,
RootCAs: Context.tlsRoots,
},
}
printHTTPAddresses("https")
err := w.httpsServer.server.ListenAndServeTLS("", "")
if err != http.ErrServerClosed {
| </s> | CipherSuites: Context.tlsCiphers, | MinVersion: tls.VersionTLS12,
RootCAs: Context.tlsRoots,
CipherSuites: Context.tlsCiphers,
},
}
printHTTPAddresses("https")
err := w.httpsServer.server.ListenAndServeTLS("", "")
if err != http.ErrServerClosed { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | home/web.go |
package util
import (
"crypto/x509"
"io/ioutil"
"os"
"runtime"
| </s> | "crypto/tls" | package util
import (
"crypto/tls"
"crypto/x509"
"io/ioutil"
"os"
"runtime" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | util/tls.go |
"runtime"
"github.com/AdguardTeam/golibs/log"
)
// LoadSystemRootCAs - load root CAs from the system
// Return the x509 certificate pool object
| </s> | "golang.org/x/sys/cpu" | "runtime"
"github.com/AdguardTeam/golibs/log"
"golang.org/x/sys/cpu"
)
// LoadSystemRootCAs - load root CAs from the system
// Return the x509 certificate pool object | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Merge: + DNS, Web: use only secure TLSv1.2 ciphers
Close #1384
Squashed commit of the following:
commit cd90abcce573a8e930446ba153565e553e6b81d5
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Mar 20 19:17:53 2020 +0300
minor
commit a1914c5f41425e82cdedc9716bce84470afab65b
Merge: 72c53673 c8285c41
Author... | https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c | util/tls.go |
go 1.18
require (
github.com/AdguardTeam/dnsproxy v0.43.1
github.com/AdguardTeam/golibs v0.10.9
github.com/AdguardTeam/urlfilter v0.16.0
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.3
github.com/digineo/go-ipset/v2 v2.2.1
| </s> remove github.com/AdguardTeam/dnsproxy v0.43.1 h1:E777KfQAi+VurOoWEdGQ5iqjSOOAzzbTfLOEzj8heCs=
github.com/AdguardTeam/dnsproxy v0.43.1/go.mod h1:JUGTm5dmlll47JltztsT0N//pVJjdg6zu0SNeUeaA7g=
</s> add github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE=
github.com/AdguardTeam/dnsp... | github.com/AdguardTeam/dnsproxy v0.44.0 |
go 1.18
require (
github.com/AdguardTeam/dnsproxy v0.44.0
github.com/AdguardTeam/golibs v0.10.9
github.com/AdguardTeam/urlfilter v0.16.0
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.3
github.com/digineo/go-ipset/v2 v2.2.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.mod |
github.com/miekg/dns v1.1.50
github.com/stretchr/testify v1.7.1
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
golang.org/x/sy... | </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
golang.org/x/sys v0.0.0-20220731174439-a90be440212d
</s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqC... | golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 | github.com/miekg/dns v1.1.50
github.com/stretchr/testify v1.7.1
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
golang.org/x/sys ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.mod |
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
golang.org/x/sys v0.0.0-20220731174439-a90be440212d
gopkg.in/natefinch/lumberjack.... | </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
</s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyH... | golang.org/x/net v0.0.0-20220812174116-3211cb980234
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 | github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
golang.org/x/net v0.0.0-20220812174116-3211cb980234
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2
golang.org/x/net v0.0.0-202208121741... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.mod |
github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect
github.com/mdlayher/... | </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 h1:7m/WlWcSROrcK5NxuXaxYD32BZqe/LEEnBrWcH/cOqQ=
</s> add </s> remove golang.org/x/net v0.... | github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect | github.com/josharian/native v1.0.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
github.com/mdlayher/packet v1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.mod |
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/sync v0.0.0-2022... | </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect
</s> add github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4... | golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect | github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
golang.org/x/sync v0.0.0-202207... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.mod |
dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mo... | </s> remove github.com/AdguardTeam/dnsproxy v0.43.1
</s> add github.com/AdguardTeam/dnsproxy v0.44.0 </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyf... | github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE=
github.com/AdguardTeam/dnsproxy v0.44.0/go.mod h1:HsxYYW/bC8uo+4eX9pRW21hFD6gWZdrvcfBb1R6/AzU= | dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.sum |
github.com/marten-seemann/qtls-go1-17 v0.1.2 h1:JADBlm0LYiVbuSySCHeY863dNkcpMmDR7s0bLKJeYlQ=
github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/... | </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect
</s> add github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect </s> remove golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80=
golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:o... | github.com/marten-seemann/qtls-go1-17 v0.1.2 h1:JADBlm0LYiVbuSySCHeY863dNkcpMmDR7s0bLKJeYlQ=
github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.sum | |
github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-s... | </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 h1:7m/WlWcSROrcK5NxuXaxYD32BZqe/LEEnBrWcH/cOqQ=
</s> add </s> remove github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect
</s> add github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect </s> remove golang.org/x/sys v0.0.0-20220731174439-a... | github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= | github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-s... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.sum |
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rL... | </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
</s> add golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
golang.org/x/sys v0.0.0-20220731174439-a90be440212d
</s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234
gola... | golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c=
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= | golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rL... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.sum |
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod... | </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 h1:UreQrH7DbFXSi9ZFox6FNT3WBooWmdANpU+IfkT1T4I=
golang.org/x/net v0.0.0-20220728211354-c7608... | golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.sum |
golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA... | </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
golang.org/x/sys v0.0.0-20220731174439-a90be440212d
</s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZyk... | golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= | golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.sum |
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTd... | </s> remove golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
golang.org/x/sys v0.0.0-20220731174439-a90be440212d
</s> add golang.org/x/net v0.0.0-20220812174116-3211cb980234
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 </s> remove golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
</s> add golang.... | golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8=
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTd... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: upd-dnsproxy
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63 | go.sum |
"object-assign": "^4.1.1",
"prop-types": "^15.6.0"
}
},
"react-fast-compare": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
"integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+3... | </s> remove "react-side-effect": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz",
"integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==",
"requires": {
"shallowequal... | "object-assign": "^4.1.1",
"prop-types": "^15.6.0"
}
},
"react-i18next": {
"version": "8.3.8",
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-8.3.8.tgz",
"integrity": "sha512-ZcSpakSBcDxPJkl34fv/SI0TaoTDvVDrk4WpDF+WEl... | [
"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"
] | + client: add meta tag to index.html | https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13 | client/package-lock.json | |
"requires": {
"prop-types": "^15.6.0"
}
},
"react-side-effect": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz",
"integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GP... | </s> remove "react-fast-compare": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
"integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw=="
},
"react-helmet": {
"ver... | "requires": {
"prop-types": "^15.6.0"
}
},
"react-table": {
"version": "6.10.3",
"resolved": "https://registry.npmjs.org/react-table/-/react-table-6.10.3.tgz",
"integrity": "sha512-sVlq2/rxVaQJywGD95+qGiMr/SMHFIFnXdx619BLOWE/Os5FOGtV6pQJNAjZixbQZiOu7... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: add meta tag to index.html | https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13 | client/package-lock.json | |
"inherits": "^2.0.1",
"safe-buffer": "^5.0.1"
}
},
"shallowequal": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
"integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVx... | </s> remove "react-side-effect": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz",
"integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==",
"requires": {
"shallowequal... | "inherits": "^2.0.1",
"safe-buffer": "^5.0.1"
}
},
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"dev": true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: add meta tag to index.html | https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13 | client/package-lock.json | |
"prop-types": "^15.7.2",
"react": "^16.4.0",
"react-click-outside": "^3.0.1",
"react-dom": "^16.4.0",
"react-helmet": "^5.2.1",
"react-i18next": "^8.2.0",
"react-modal": "^3.4.5",
"react-redux": "^5.0.7",
"react-redux-loading-bar": "^4.0.7",
"react-router-dom"... | </s> remove "react-fast-compare": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
"integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw=="
},
"react-helmet": {
"ver... | "prop-types": "^15.7.2",
"react": "^16.4.0",
"react-click-outside": "^3.0.1",
"react-dom": "^16.4.0",
"react-i18next": "^8.2.0",
"react-modal": "^3.4.5",
"react-redux": "^5.0.7",
"react-redux-loading-bar": "^4.0.7",
"react-router-dom": "^4.2.2", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: add meta tag to index.html | https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13 | client/package.json | |
import escapeRegExp from 'lodash/escapeRegExp';
import endsWith from 'lodash/endsWith';
import { Trans, withNamespaces } from 'react-i18next';
import { HashLink as Link } from 'react-router-hash-link';
import { Helmet } from 'react-helmet';
import {
formatTime,
formatDateTime,
} from '../..... | </s> remove "react-side-effect": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz",
"integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==",
"requires": {
"shallowequal... | import escapeRegExp from 'lodash/escapeRegExp';
import endsWith from 'lodash/endsWith';
import { Trans, withNamespaces } from 'react-i18next';
import { HashLink as Link } from 'react-router-hash-link';
import {
formatTime,
formatDateTime,
} from '../../helpers/helpers'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: add meta tag to index.html | https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13 | client/src/components/Logs/index.js | |
);
return (
<Fragment>
<Helmet>
<meta httpEquiv="x-dns-prefetch-control" content="off" />
</Helmet>
<PageTitle title={t('query_log')}>{refreshButton}</PageTitle>
{enabled && processingGetCo... | </s> remove import { Helmet } from 'react-helmet';
</s> add </s> remove "react-helmet": "^5.2.1",
</s> add </s> remove "shallowequal": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
"integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7... | );
return (
<Fragment>
<PageTitle title={t('query_log')}>{refreshButton}</PageTitle>
{enabled && processingGetConfig && <Loading />}
{enabled && !processingGetConfig && (
<Fragment>
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: add meta tag to index.html | https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13 | client/src/components/Logs/index.js | |
export const getIpList = (interfaces) => Object.values(interfaces)
.reduce((acc, curr) => acc.concat(curr.ip_addresses), [])
.sort();
export const getDnsAddress = (ip, port = '') => {
const isStandardDnsPort = port === STANDARD_DNS_PORT;
let address = ip;
if (port) {
if... | </s> remove export const getWebAddress = (ip, port = '') => {
</s> add export const getWebAddress = (ip, port = 0) => { </s> remove * @param value {string}
</s> add * @param value {string|number} | export const getDnsAddress = (ip, port = 0) => { | export const getIpList = (interfaces) => Object.values(interfaces)
.reduce((acc, curr) => acc.concat(curr.ip_addresses), [])
.sort();
export const getDnsAddress = (ip, port = 0) => {
const isStandardDnsPort = port === STANDARD_DNS_PORT;
let address = ip;
if (port) {
if (i... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix some typing problems
- Using '' as default value is confusing when the function expects a number
as parameter
- `validateRequiredValue` can take a number as well as a string as first
parameter | https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d | client/src/helpers/helpers.js |
return address;
};
export const getWebAddress = (ip, port = '') => {
const isStandardWebPort = port === STANDARD_WEB_PORT;
let address = `http://${ip}`;
if (port && !isStandardWebPort) {
if (ip.includes(':') && !ip.includes('[')) {
| </s> remove export const getDnsAddress = (ip, port = '') => {
</s> add export const getDnsAddress = (ip, port = 0) => { </s> remove * @param value {string}
</s> add * @param value {string|number} | export const getWebAddress = (ip, port = 0) => { |
return address;
};
export const getWebAddress = (ip, port = 0) => {
const isStandardWebPort = port === STANDARD_WEB_PORT;
let address = `http://${ip}`;
if (port && !isStandardWebPort) {
if (ip.includes(':') && !ip.includes('[')) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix some typing problems
- Using '' as default value is confusing when the function expects a number
as parameter
- `validateRequiredValue` can take a number as well as a string as first
parameter | https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d | client/src/helpers/helpers.js |
// Validation functions
// https://redux-form.com/8.3.0/examples/fieldlevelvalidation/
// If the value is valid, the validation function should return undefined.
/**
* @param value {string}
* @returns {undefined|string}
*/
export const validateRequiredValue = (value) => {
const formattedValue =... | </s> remove export const getWebAddress = (ip, port = '') => {
</s> add export const getWebAddress = (ip, port = 0) => { </s> remove export const getDnsAddress = (ip, port = '') => {
</s> add export const getDnsAddress = (ip, port = 0) => { | * @param value {string|number} | // Validation functions
// https://redux-form.com/8.3.0/examples/fieldlevelvalidation/
// If the value is valid, the validation function should return undefined.
/**
* @param value {string|number}
* @returns {undefined|string}
*/
export const validateRequiredValue = (value) => {
const formattedVa... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix some typing problems
- Using '' as default value is confusing when the function expects a number
as parameter
- `validateRequiredValue` can take a number as well as a string as first
parameter | https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d | client/src/helpers/validators.js |
Rewrites []RewriteEntry `yaml:"rewrites"`
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"`
// Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"`
| </s> remove
// Names of services to block (globally).
// Per-client settings can override this configuration.
BlockedServices []string `yaml:"blocked_services"`
</s> add </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) | // Names of services to block (globally).
// Per-client settings can override this configuration.
BlockedServices []string `yaml:"blocked_services"`
|
Rewrites []RewriteEntry `yaml:"rewrites"`
// Names of services to block (globally).
// Per-client settings can override this configuration.
BlockedServices []string `yaml:"blocked_services"`
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"`
// Register... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | dnsfilter/dnsfilter.go |
func (d *Dnsfilter) WriteDiskConfig(c *Config) {
d.confLock.Lock()
*c = d.Config
c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
d.confLock.Unlock()
}
// SetFilters - set new filters (synchronously or asynchronously)
// When filters are set asynchronously, the old filters continue working until t... | </s> remove
// Names of services to block (globally).
// Per-client settings can override this configuration.
BlockedServices []string `yaml:"blocked_services"`
</s> add </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) </s> re... | // BlockedServices | func (d *Dnsfilter) WriteDiskConfig(c *Config) {
d.confLock.Lock()
*c = d.Config
c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
// BlockedServices
d.confLock.Unlock()
}
// SetFilters - set new filters (synchronously or asynchronously)
// When filters are set asynchronously, the old filters cont... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | dnsfilter/dnsfilter.go |
d.Config = *c
d.prepareRewrites()
}
if blockFilters != nil {
err := d.initFiltering(nil, blockFilters)
if err != nil {
log.Error("Can't initialize filtering subsystem: %s", err)
d.Close()
return nil
| </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) </s> remove bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
... | bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
bsvcs = append(bsvcs, s)
}
d.BlockedServices = bsvcs
initBlockedServices()
| d.Config = *c
d.prepareRewrites()
}
bsvcs := []string{}
for _, s := range d.BlockedServices {
if !BlockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
bsvcs = append(bsvcs, s)
}
d.BlockedServices = bsvcs
initBlockedServices()
if blockFilters != nil {
... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | dnsfilter/dnsfilter.go |
d.registerSecurityHandlers()
d.registerRewritesHandlers()
}
}
//
| </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) </s> remove if !blockedSvcKnown(s) {
</s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedS... | d.registerBlockedServicesHandlers() | d.registerSecurityHandlers()
d.registerRewritesHandlers()
d.registerBlockedServicesHandlers()
}
}
// | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | dnsfilter/dnsfilter.go |
"sync"
"time"
"github.com/AdguardTeam/AdGuardHome/dhcpd"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/utils"
| </s> remove "github.com/AdguardTeam/AdGuardHome/util"
</s> add </s> remove initServices()
</s> add </s> remove ApplyBlockedServices(setts, c.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices)
... | "github.com/AdguardTeam/AdGuardHome/dnsfilter" | "sync"
"time"
"github.com/AdguardTeam/AdGuardHome/dhcpd"
"github.com/AdguardTeam/AdGuardHome/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/utils" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/clients.go |
Upstreams: cy.Upstreams,
}
for _, s := range cy.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("Clients: skipping unknown blocked-service '%s'", s)
continue
}
cli.BlockedServices = append(cli.BlockedServices, s)
}
| </s> remove bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
bsvcs = append(bsvcs, s)
}
config.DNS.BlockedServices = bsvcs
</s> add </s> remove ApplyBlockedServices(setts, c.BlockedServices)
... | if !dnsfilter.BlockedSvcKnown(s) { | Upstreams: cy.Upstreams,
}
for _, s := range cy.BlockedServices {
if !dnsfilter.BlockedSvcKnown(s) {
log.Debug("Clients: skipping unknown blocked-service '%s'", s)
continue
}
cli.BlockedServices = append(cli.BlockedServices, s)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/clients.go |
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
DnsfilterConf dnsfilter.Config `yaml:",inline"`
// Names... | </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) |
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
DnsfilterConf dnsfilter.Config `yaml:",inline"`
}
t... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/config.go | |
log.Error("Couldn't parse config file: %s", err)
return err
}
bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
bsvcs = append(bsvcs, s)
}
config.DNS.BlockedServices... | </s> remove if !blockedSvcKnown(s) {
</s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) </s> remove ApplyBlockedServices(setts, c.BlockedServices)
</s> add Context.dnsFilter.Ap... | log.Error("Couldn't parse config file: %s", err)
return err
}
if !checkFiltersUpdateIntervalHours(config.DNS.FiltersUpdateIntervalHours) {
config.DNS.FiltersUpdateIntervalHours = 24
}
status := tlsConfigStatus{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/config.go | |
"net/url"
"strconv"
"strings"
"github.com/AdguardTeam/AdGuardHome/util"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/golibs/log"
"github.com/NYTimes/gziphandler"
)
| </s> remove initServices()
</s> add </s> remove ApplyBlockedServices(setts, c.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) | "net/url"
"strconv"
"strings"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/golibs/log"
"github.com/NYTimes/gziphandler"
)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/control.go | |
"strconv"
"strings"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/golibs/log"
"github.com/NYTimes/gziphandler"
)
// ----------------
| </s> remove "github.com/AdguardTeam/AdGuardHome/util"
</s> add </s> remove
// Names of services to block (globally).
// Per-client settings can override this configuration.
BlockedServices []string `yaml:"blocked_services"`
</s> add | "github.com/AdguardTeam/AdGuardHome/util" | "strconv"
"strings"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/AdGuardHome/util"
"github.com/AdguardTeam/golibs/log"
"github.com/NYTimes/gziphandler"
)
// ---------------- | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/control.go |
httpRegister("GET", "/control/profile", handleGetProfile)
RegisterTLSHandlers()
RegisterBlockedServicesHandlers()
RegisterAuthHandlers()
http.HandleFunc("/dns-query", postInstall(handleDOH))
}
| </s> remove if !blockedSvcKnown(s) {
</s> add if !dnsfilter.BlockedSvcKnown(s) { </s> remove bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
bsvcs = append(bsvcs, s)
}
config.DNS.BlockedSe... |
httpRegister("GET", "/control/profile", handleGetProfile)
RegisterTLSHandlers()
RegisterAuthHandlers()
http.HandleFunc("/dns-query", postInstall(handleDOH))
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/control.go | |
host := q.Get("name")
setts := Context.dnsFilter.GetConfig()
setts.FilteringEnabled = true
ApplyBlockedServices(&setts, config.DNS.BlockedServices)
result, err := Context.dnsFilter.CheckHost(host, dns.TypeA, &setts)
if err != nil {
httpError(w, http.StatusInternalServerError, "couldn't apply fi... | </s> remove bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
bsvcs = append(bsvcs, s)
}
config.DNS.BlockedServices = bsvcs
</s> add </s> remove ApplyBlockedServices(setts, config.DNS.BlockedSe... | Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) | host := q.Get("name")
setts := Context.dnsFilter.GetConfig()
setts.FilteringEnabled = true
Context.dnsFilter.ApplyBlockedServices(&setts, nil, true)
result, err := Context.dnsFilter.CheckHost(host, dns.TypeA, &setts)
if err != nil {
httpError(w, http.StatusInternalServerError, "couldn't apply fil... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/control_filtering.go |
}
// If a client has his own settings, apply them
func applyAdditionalFiltering(clientAddr string, setts *dnsfilter.RequestFilteringSettings) {
ApplyBlockedServices(setts, config.DNS.BlockedServices)
if len(clientAddr) == 0 {
return
}
| </s> remove ApplyBlockedServices(&setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(&setts, nil, true) </s> remove ApplyBlockedServices(setts, c.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) </s> remove bsvcs := []string{}
fo... | Context.dnsFilter.ApplyBlockedServices(setts, nil, true) | }
// If a client has his own settings, apply them
func applyAdditionalFiltering(clientAddr string, setts *dnsfilter.RequestFilteringSettings) {
Context.dnsFilter.ApplyBlockedServices(setts, nil, true)
if len(clientAddr) == 0 {
return
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/dns.go |
log.Debug("Using settings for client with IP %s", clientAddr)
if c.UseOwnBlockedServices {
ApplyBlockedServices(setts, c.BlockedServices)
}
setts.ClientTags = c.Tags
if !c.UseOwnSettings {
| </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices)
</s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) </s> remove bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
... | Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false) |
log.Debug("Using settings for client with IP %s", clientAddr)
if c.UseOwnBlockedServices {
Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)
}
setts.ClientTags = c.Tags
if !c.UseOwnSettings { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/dns.go |
requireAdminRights()
}
initConfig()
initServices()
Context.tlsRoots = util.LoadSystemRootCAs()
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,
| </s> remove bsvcs := []string{}
for _, s := range config.DNS.BlockedServices {
if !blockedSvcKnown(s) {
log.Debug("skipping unknown blocked-service '%s'", s)
continue
}
bsvcs = append(bsvcs, s)
}
config.DNS.BlockedServices = bsvcs
</s> add </s> remove if !blockedSvcKnown(s) {
</s> add if !dnsf... | requireAdminRights()
}
initConfig()
Context.tlsRoots = util.LoadSystemRootCAs()
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * refactor: move blocked-services functions to dnsfilter | https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014 | home/home.go | |
log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err)
return Result{}, err
}
res.IP = addrs[0]
// The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil ... | </s> remove if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len {
</s> add if ipv4 := i.To4(); ipv4 != nil { | log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err)
return Result{}, err
}
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len {
res.IP = ipv4
break
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - dnsfilter: fix safesearch issue #268 | https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911 | dnsfilter/dnsfilter.go | |
res.IP = addrs[0]
// The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len {
res.IP = ipv4
break
}
}
| </s> remove res.IP = addrs[0]
// The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix
</s> add | if ipv4 := i.To4(); ipv4 != nil { |
res.IP = addrs[0]
// The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix
for _, i := range addrs {
if ipv4 := i.To4(); ipv4 != nil {
res.IP = ipv4
break
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - dnsfilter: fix safesearch issue #268 | https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911 | dnsfilter/dnsfilter.go |
break
}
}
// Cache result
err = safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
return res, nil
| </s> remove if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len {
</s> add if ipv4 := i.To4(); ipv4 != nil { </s> remove res.IP = addrs[0]
// The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix
</s> add | if len(res.IP) == 0 {
return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost)
}
| break
}
}
if len(res.IP) == 0 {
return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost)
}
// Cache result
err = safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
return res, nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - dnsfilter: fix safesearch issue #268 | https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911 | dnsfilter/dnsfilter.go |
rules: []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"},
}, {
name: "youtube",
rules: []string{
"||youtube.com^",
"||ytimg.com^",
"||youtu.be^",
"||googlevideo.com^",
"||youtubei.googleapis.com^",
"||youtube-nocookie.com^",
"||youtube",
},
| </s> remove "||youtubei.googleapis.com^",
"||youtube-nocookie.com^",
</s> add "||wide-youtube.l.google.com^",
"||youtu.be^", | rules: []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"},
}, {
name: "youtube",
rules: []string{
"||googlevideo.com^",
"||youtubei.googleapis.com^",
"||youtube-nocookie.com^",
"||youtube",
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 4755-youtube-domain
Updates #4755.
Squashed commit of the following:
commit cb0ab8b26f6f277ef76ee3492c99870cbfc24666
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 28 17:21:02 2022 +0300
filtering: add another youtube domain | https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192 | internal/filtering/blocked.go | |
"||youtube.com^",
"||ytimg.com^",
"||youtu.be^",
"||googlevideo.com^",
"||youtubei.googleapis.com^",
"||youtube-nocookie.com^",
"||youtube",
},
}, {
name: "twitch",
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
| </s> remove "||youtube.com^",
"||ytimg.com^",
"||youtu.be^",
</s> add | "||wide-youtube.l.google.com^",
"||youtu.be^", | "||youtube.com^",
"||ytimg.com^",
"||youtu.be^",
"||googlevideo.com^",
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
},
}, {
name: "twitch",
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.n... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 4755-youtube-domain
Updates #4755.
Squashed commit of the following:
commit cb0ab8b26f6f277ef76ee3492c99870cbfc24666
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 28 17:21:02 2022 +0300
filtering: add another youtube domain | https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192 | internal/filtering/blocked.go |
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
},
}, {
name: "twitch",
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
}, {
| </s> remove "||youtube.com^",
"||ytimg.com^",
"||youtu.be^",
</s> add </s> remove "||youtubei.googleapis.com^",
"||youtube-nocookie.com^",
</s> add "||wide-youtube.l.google.com^",
"||youtu.be^", | "||youtube-nocookie.com^",
"||youtube.com^",
"||youtubei.googleapis.com^",
"||ytimg.com^", | "||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
"||youtube-nocookie.com^",
"||youtube.com^",
"||youtubei.googleapis.com^",
"||ytimg.com^",
},
}, {
name: "twitch",
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
}, { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 4755-youtube-domain
Updates #4755.
Squashed commit of the following:
commit cb0ab8b26f6f277ef76ee3492c99870cbfc24666
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 28 17:21:02 2022 +0300
filtering: add another youtube domain | https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192 | internal/filtering/blocked.go |
return ok
}
// Search for a client by IP
func clientFind(ip string) (Client, bool) {
clients.lock.Lock()
defer clients.lock.Unlock()
c, ok := clients.ipIndex[ip]
if ok {
| </s> remove return *c, true
</s> add return c, true </s> remove if !ok || !c.UseOwnSettings {
</s> add if !ok || c == nil || !c.UseOwnSettings { </s> remove setts.ParentalEnabled = c.UseOwnSettings
</s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove return Client{}, false
</s> add return nil, f... | func clientFind(ip string) (*Client, bool) { | return ok
}
// Search for a client by IP
func clientFind(ip string) (*Client, bool) {
clients.lock.Lock()
defer clients.lock.Unlock()
c, ok := clients.ipIndex[ip]
if ok { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | clients.go |
defer clients.lock.Unlock()
c, ok := clients.ipIndex[ip]
if ok {
return *c, true
}
for _, c = range clients.list {
if len(c.MAC) != 0 {
mac, err := net.ParseMAC(c.MAC)
| </s> remove func clientFind(ip string) (Client, bool) {
</s> add func clientFind(ip string) (*Client, bool) { </s> remove return *c, true
</s> add return c, true </s> remove if !ok || !c.UseOwnSettings {
</s> add if !ok || c == nil || !c.UseOwnSettings { </s> remove url := fmt.Sprintf(defaultParentalURL,... | return c, true | defer clients.lock.Unlock()
c, ok := clients.ipIndex[ip]
if ok {
return c, true
}
for _, c = range clients.list {
if len(c.MAC) != 0 {
mac, err := net.ParseMAC(c.MAC) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | clients.go |
if ipAddr == nil {
continue
}
if ip == ipAddr.String() {
return *c, true
}
}
}
return Client{}, false
| </s> remove return Client{}, false
</s> add return nil, false </s> remove return *c, true
</s> add return c, true </s> remove if !ok || !c.UseOwnSettings {
</s> add if !ok || c == nil || !c.UseOwnSettings { </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSe... | return c, true | if ipAddr == nil {
continue
}
if ip == ipAddr.String() {
return c, true
}
}
}
return Client{}, false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | clients.go |
}
}
}
return Client{}, false
}
// Check if Client object's fields are correct
func clientCheck(c *Client) error {
if len(c.Name) == 0 {
| </s> remove return *c, true
</s> add return c, true </s> remove go l.flushLogBuffer(false)
</s> add go l.flushLogBuffer(false) // nolint </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity)
</s> add sensitivity := d.ParentalSensitivity
if se... | return nil, false | }
}
}
return nil, false
}
// Check if Client object's fields are correct
func clientCheck(c *Client) error {
if len(c.Name) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | clients.go |
// If a client has his own settings, apply them
func applyClientSettings(clientAddr string, setts *dnsfilter.RequestFilteringSettings) {
c, ok := clientFind(clientAddr)
if !ok || !c.UseOwnSettings {
return
}
log.Debug("Using settings for client with IP %s", clientAddr)
setts.FilteringEnable... | </s> remove setts.ParentalEnabled = c.UseOwnSettings
</s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove func clientFind(ip string) (Client, bool) {
</s> add func clientFind(ip string) (*Client, bool) { </s> remove return *c, true
</s> add return c, true </s> remove url := fmt.Sprintf(defaultParen... | if !ok || c == nil || !c.UseOwnSettings { |
// If a client has his own settings, apply them
func applyClientSettings(clientAddr string, setts *dnsfilter.RequestFilteringSettings) {
c, ok := clientFind(clientAddr)
if !ok || c == nil || !c.UseOwnSettings {
return
}
log.Debug("Using settings for client with IP %s", clientAddr)
setts.Filte... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | dns.go |
log.Debug("Using settings for client with IP %s", clientAddr)
setts.FilteringEnabled = c.FilteringEnabled
setts.SafeSearchEnabled = c.SafeSearchEnabled
setts.SafeBrowsingEnabled = c.SafeBrowsingEnabled
setts.ParentalEnabled = c.UseOwnSettings
}
func startDNSServer() error {
if isRunning() {
... | </s> remove if !ok || !c.UseOwnSettings {
</s> add if !ok || c == nil || !c.UseOwnSettings { </s> remove go l.flushLogBuffer(false)
</s> add go l.flushLogBuffer(false) // nolint </s> remove return *c, true
</s> add return c, true </s> remove func clientFind(ip string) (Client, bool) {
</s> add func client... | setts.ParentalEnabled = c.ParentalEnabled | log.Debug("Using settings for client with IP %s", clientAddr)
setts.FilteringEnabled = c.FilteringEnabled
setts.SafeSearchEnabled = c.SafeSearchEnabled
setts.SafeBrowsingEnabled = c.SafeBrowsingEnabled
setts.ParentalEnabled = c.ParentalEnabled
}
func startDNSServer() error {
if isRunning() {
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | dns.go |
const defaultSafebrowsingServer = "sb.adtidy.org"
const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const maxDialCacheSize = 2 // the n... | </s> remove setts.ParentalEnabled = c.UseOwnSettings
</s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove if !ok || !c.UseOwnSettings {
</s> add if !ok || c == nil || !c.UseOwnSettings { </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity)
</s... | const defaultParentalSensitivity = 13 // use "TEEN" by default
const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control | const defaultSafebrowsingServer = "sb.adtidy.org"
const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s"
const defaultParentalServer = "pctrl.adguard.com"
const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d"
const defaultParentalSensitivity = 13... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | dnsfilter/dnsfilter.go |
schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity)
return url
}
handleBody := func(body []byte, hashes map[string]bool) (Result, error) {
// parse json
var m []struct {
| </s> remove return *c, true
</s> add return c, true </s> remove return Client{}, false
</s> add return nil, false </s> remove func clientFind(ip string) (Client, bool) {
</s> add func clientFind(ip string) (*Client, bool) { </s> remove return *c, true
</s> add return c, true </s> remove if !ok || !c.... | sensitivity := d.ParentalSensitivity
if sensitivity == 0 {
sensitivity = defaultParentalSensitivity
}
url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity) | schema := "https"
if d.UsePlainHTTP {
schema = "http"
}
sensitivity := d.ParentalSensitivity
if sensitivity == 0 {
sensitivity = defaultParentalSensitivity
}
url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, sensitivity)
return url
}
handleBody := func(bod... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | dnsfilter/dnsfilter.go |
// if buffer needs to be flushed to disk, do it now
if needFlush {
// write to file
// do it in separate goroutine -- we are stalling DNS response this whole time
go l.flushLogBuffer(false)
}
return &entry
}
| </s> remove setts.ParentalEnabled = c.UseOwnSettings
</s> add setts.ParentalEnabled = c.ParentalEnabled </s> remove return Client{}, false
</s> add return nil, false </s> remove url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity)
</s> add sensitivity := d.Parent... | go l.flushLogBuffer(false) // nolint | // if buffer needs to be flushed to disk, do it now
if needFlush {
// write to file
// do it in separate goroutine -- we are stalling DNS response this whole time
go l.flushLogBuffer(false) // nolint
}
return &entry
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix #727 - use default parental sensitivity when it's not set | https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383 | dnsforward/querylog.go |
return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
case dnsfilter.FilteredParental:
return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
default:
if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
if s.conf.BlockingMode == "null_ip" {
switch m.Question[0]... | </s> remove if !(bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") {
</s> add if !(bm == "default" || bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") { | return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
case dnsfilter.FilteredParental:
return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
default:
if s.conf.BlockingMode == "null_ip" {
switch m.Question[0].Qtype {
case dns.TypeA:
return s.genARecord(m, []byte{0, 0, 0, 0}... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * DNS: nxdomain: don't return IP address for a blocked domain
Don't return IP address for a blocked domain
when blocking mode is "nxdomain". | https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d | dnsforward/dnsforward.go | |
return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
}
}
if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
return s.genNXDomain(m)
| </s> remove if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
</s> add </s> remove if !(bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") {
</s> add if !(bm == "default" || bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") { | } else if s.conf.BlockingMode == "nxdomain" {
return s.genNXDomain(m) | return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
}
} else if s.conf.BlockingMode == "nxdomain" {
return s.genNXDomain(m)
}
if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
return s.genNXDomain(m) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * DNS: nxdomain: don't return IP address for a blocked domain
Don't return IP address for a blocked domain
when blocking mode is "nxdomain". | https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d | dnsforward/dnsforward.go |
} else if s.conf.BlockingMode == "nxdomain" {
return s.genNXDomain(m)
}
return s.genNXDomain(m)
}
}
| </s> remove if !(bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") {
</s> add if !(bm == "default" || bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") { </s> remove if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
</s> add | if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
} | } else if s.conf.BlockingMode == "nxdomain" {
return s.genNXDomain(m)
}
if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
return s.genNXDomain(m)
}
}
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | * DNS: nxdomain: don't return IP address for a blocked domain
Don't return IP address for a blocked domain
when blocking mode is "nxdomain". | https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d | dnsforward/dnsforward.go |
}
func checkBlockingMode(req dnsConfigJSON) bool {
bm := req.BlockingMode
if !(bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") {
return false
}
if bm == "custom_ip" {
ip := net.ParseIP(req.BlockingIPv4)
| </s> remove if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
</s> add | if !(bm == "default" || bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") { | }
func checkBlockingMode(req dnsConfigJSON) bool {
bm := req.BlockingMode
if !(bm == "default" || bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") {
return false
}
if bm == "custom_ip" {
ip := net.ParseIP(req.BlockingIPv4) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * DNS: nxdomain: don't return IP address for a blocked domain
Don't return IP address for a blocked domain
when blocking mode is "nxdomain". | https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d | dnsforward/dnsforward_http.go |
blocking_mode:
type: "string"
enum:
- "nxdomain"
- "null_ip"
- "custom_ip"
blocking_ipv4:
type: "string"
blocking_ipv6:
| </s> remove if !(bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") {
</s> add if !(bm == "default" || bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") { </s> remove if result.IP != nil {
return s.genResponseWithIP(m, result.IP)
}
</s> add | - "default" | blocking_mode:
type: "string"
enum:
- "default"
- "nxdomain"
- "null_ip"
- "custom_ip"
blocking_ipv4:
type: "string"
blocking_ipv6: | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * DNS: nxdomain: don't return IP address for a blocked domain
Don't return IP address for a blocked domain
when blocking mode is "nxdomain". | https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d | openapi/openapi.yaml |
Port: 53,
FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, // whether or not use filter lists
BlockedResponseTTL: 10, // in seconds
QueryLogEnabled: true,
Ratelimit: 20,
... | </s> | BlockingMode: "nxdomain", // mode how to answer filtered requests | Port: 53,
FilteringConfig: dnsforward.FilteringConfig{
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, //... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward, config: add unspecified IP blocking option
* dnsforward: prioritize host files over null filter
* dnsforward, config: adjust setting variable to blocking_mode
* dnsforward: use net.IPv4zero for null IP | https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3 | config.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
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
QueryLogEnable... | </s> | BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests | ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockedRespon... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward, config: add unspecified IP blocking option
* dnsforward: prioritize host files over null filter
* dnsforward, config: adjust setting variable to blocking_mode
* dnsforward: use net.IPv4zero for null IP | https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3 | dnsforward/dnsforward.go |
return s.genARecord(m, result.IP)
}
return s.genNXDomain(m)
}
}
func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg {
| </s> | if s.BlockingMode == "null_ip" {
return s.genARecord(m, net.IPv4zero)
}
| return s.genARecord(m, result.IP)
}
if s.BlockingMode == "null_ip" {
return s.genARecord(m, net.IPv4zero)
}
return s.genNXDomain(m)
}
}
func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward, config: add unspecified IP blocking option
* dnsforward: prioritize host files over null filter
* dnsforward, config: adjust setting variable to blocking_mode
* dnsforward: use net.IPv4zero for null IP | https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3 | dnsforward/dnsforward.go |
module github.com/AdguardTeam/AdGuardHome
require (
github.com/AdguardTeam/dnsproxy v0.9.10
github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-test/deep v1... | </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4
</s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 h1:q364WlTvC+CS8kJbMy7TCyt4Niqixxw584MQJtCGhJU=
github.com/AdguardTeam/dnsproxy v0.9.10/go.mod h1:IqBhopgNpzB168kMurbjXf86dn50... | github.com/AdguardTeam/dnsproxy v0.9.11 | module github.com/AdguardTeam/AdGuardHome
require (
github.com/AdguardTeam/dnsproxy v0.9.11
github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-test/deep v1.0... | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | go.mod -- update dnsproxy to v0.9.11 and it's dependencies | https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e | go.mod |
github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-test/deep v1.0.1
github.com/gobuffalo/packr v1.19.0
github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4
github.com/joomcode/errorx v0.1.0
github.com/kardianos/osext v0.0.0-20... | </s> remove github.com/AdguardTeam/dnsproxy v0.9.10
</s> add github.com/AdguardTeam/dnsproxy v0.9.11 </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 h1:FMAReGTEDNr4AdbScv/PqzjMQUpkkVHiF/t8sDHQQVQ=
github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3G... | github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 | github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-test/deep v1.0.1
github.com/gobuffalo/packr v1.19.0
github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24
github.com/joomcode/errorx v0.1.0
github.com/kardianos/osext v0.0.0-2017... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | go.mod -- update dnsproxy to v0.9.11 and it's dependencies | https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e | go.mod |
github.com/shirou/gopsutil v2.18.10+incompatible
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
github.com/stretchr/testify v1.2.2
go.uber.org/goleak v0.10.0
golang.org/x/net v0.0.0-20181220203305-927f97764cc3
golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb
gopkg.in/asaske... | </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM=
golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30=
g... | golang.org/x/net v0.0.0-20190119204137-ed066c81e75e
golang.org/x/sys v0.0.0-20190122071731-054c452bb702 | github.com/shirou/gopsutil v2.18.10+incompatible
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
github.com/stretchr/testify v1.2.2
go.uber.org/goleak v0.10.0
golang.org/x/net v0.0.0-20190119204137-ed066c81e75e
golang.org/x/sys v0.0.0-20190122071731-054c452bb702
golang.org/x/net v0.0... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | go.mod -- update dnsproxy to v0.9.11 and it's dependencies | https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e | go.mod |
github.com/AdguardTeam/dnsproxy v0.9.10 h1:q364WlTvC+CS8kJbMy7TCyt4Niqixxw584MQJtCGhJU=
github.com/AdguardTeam/dnsproxy v0.9.10/go.mod h1:IqBhopgNpzB168kMurbjXf86dn50geasBIuGVxY63j0=
github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY=
github.com/StackE... | </s> remove github.com/ameshkov/dnscrypt v1.0.4 h1:vtwHm5m4R2dhcCx23wiI+gNBoy7qm4h7+kZ4Pucw/vE=
github.com/ameshkov/dnscrypt v1.0.4/go.mod h1:hVW52S6r0QvUpIwsyfZ1ifYYpfGu5pewD3pl7afMJcQ=
</s> add github.com/ameshkov/dnscrypt v1.0.6 h1:55wfnNF8c4E3JXDNlwPl2Pbs7UPPIh+kI6KK3THqYS0=
github.com/ameshkov/dnscrypt v1.0.6/go.... | github.com/AdguardTeam/dnsproxy v0.9.11 h1:1rsXJTHUqwxTLaGMUD2NrzHw2j88Nk9EhTX6EgmdVlM=
github.com/AdguardTeam/dnsproxy v0.9.11/go.mod h1:JAmwpTphfUBBw6TIOFGxL49/oSl+J97kaRW8viqXNe8= | github.com/AdguardTeam/dnsproxy v0.9.11 h1:1rsXJTHUqwxTLaGMUD2NrzHw2j88Nk9EhTX6EgmdVlM=
github.com/AdguardTeam/dnsproxy v0.9.11/go.mod h1:JAmwpTphfUBBw6TIOFGxL49/oSl+J97kaRW8viqXNe8=
github.com/AdguardTeam/dnsproxy v0.9.11 h1:1rsXJTHUqwxTLaGMUD2NrzHw2j88Nk9EhTX6EgmdVlM=
github.com/AdguardTeam/dnsproxy v0.9.11/go.mod h1... | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | go.mod -- update dnsproxy to v0.9.11 and it's dependencies | https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e | go.sum |
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRa... | </s> remove github.com/AdguardTeam/dnsproxy v0.9.10 h1:q364WlTvC+CS8kJbMy7TCyt4Niqixxw584MQJtCGhJU=
github.com/AdguardTeam/dnsproxy v0.9.10/go.mod h1:IqBhopgNpzB168kMurbjXf86dn50geasBIuGVxY63j0=
</s> add github.com/AdguardTeam/dnsproxy v0.9.11 h1:1rsXJTHUqwxTLaGMUD2NrzHw2j88Nk9EhTX6EgmdVlM=
github.com/AdguardTeam/dnsp... | github.com/ameshkov/dnscrypt v1.0.6 h1:55wfnNF8c4E3JXDNlwPl2Pbs7UPPIh+kI6KK3THqYS0=
github.com/ameshkov/dnscrypt v1.0.6/go.mod h1:ZvT9LaNaJfDNXKIbkYFf24HUgHuQR6MNT6nwVvN4jMQ= | github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRa... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | go.mod -- update dnsproxy to v0.9.11 and it's dependencies | https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e | go.sum |
github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264 h1:roWyi0eEdiFreSqW9V1wT9pNOVzrpo2NWsxja53slX0=
github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
github.com/gobuffalo/packr v1.19.0 h1:3UDmBDxesCOPF8iZdMDBBWKfkBoYujIMIZePnobqIUI=
gi... | </s> remove github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4
</s> add github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 </s> remove github.com/AdguardTeam/dnsproxy v0.9.10
</s> add github.com/AdguardTeam/dnsproxy v0.9.11 </s> remove golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFn... | github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24 h1:yyDtaSMcAZdm1I6uL8YLghpWiJljfBHs8NC/P86PYQk=
github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24/go.mod h1:H6Ev6svFxUVPFThxLtdnFfcE9e3GWufpfmcVFpqV6HM= | github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264 h1:roWyi0eEdiFreSqW9V1wT9pNOVzrpo2NWsxja53slX0=
github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
github.com/gobuffalo/packr v1.19.0 h1:3UDmBDxesCOPF8iZdMDBBWKfkBoYujIMIZePnobqIUI=
gi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | go.mod -- update dnsproxy to v0.9.11 and it's dependencies | https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e | go.sum |
go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net ... | </s> remove golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 h1:gT0Y6H7hbVPUtvtk0YGxMXPgN+p8fYlqWkgJeUCZcaQ=
golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
g... | golang.org/x/crypto v0.0.0-20190122013713-64072686203f h1:u1CmMhe3a44hy8VIgpInORnI01UVaUYheqR7x9BxT3c=
golang.org/x/crypto v0.0.0-20190122013713-64072686203f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | go.mod -- update dnsproxy to v0.9.11 and it's dependencies | https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e | go.sum |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.