docstring_tokens
stringlengths
18
16.9k
code_tokens
stringlengths
75
1.81M
html_url
stringlengths
74
116
file_name
stringlengths
3
311
keep keep keep keep replace keep keep keep keep keep
<mask> os.Chtimes(filter.Path(), mtime, mtime) <mask> filter.LastUpdated = mtime <mask> } <mask> } <mask> config.Unlock() <mask> <mask> if updateCount > 0 && isRunning() { <mask> err := reconfigureDNSServer() <mask> if err != nil { <mask> msg := fmt.Sprintf("SHOULD NOT HAPPEN: cannot reconf...
https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a
filter.go
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> } <mask> } <mask> }, <mask> "react-i18next": { <mask> "version": "11.4.0", <mask> "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz", <mask> "integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjK...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/package-lock.json
keep keep keep keep replace keep keep keep keep keep
<mask> "query-string": "^6.13.1", <mask> "react": "^16.13.1", <mask> "react-click-outside": "^3.0.1", <mask> "react-dom": "^16.13.1", <mask> "react-i18next": "^11.4.0", <mask> "react-modal": "^3.11.2", <mask> "react-popper-tooltip": "^2.11.1", <mask> ...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/package.json
keep keep keep keep replace keep keep keep keep keep
<mask> "down": "Down", <mask> "fix": "Fix", <mask> "dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.", <mask> "update_now": "Update now", <mask> "update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#upd...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/__locales/en.json
keep keep keep add keep keep keep keep
<mask> import axios from 'axios'; <mask> <mask> import endsWith from 'lodash/endsWith'; <mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import { splitByNewLine, sortClients } from '../helpers/helpers'; <mask> import { <mask> BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_N...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/actions/index.js
keep keep keep keep replace keep keep keep keep keep
<mask> import endsWith from 'lodash/endsWith'; <mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import { splitByNewLine, sortClients } from '../helpers/helpers'; <mask> import { <mask> BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, <mask> } from '../helpers/constants'; ...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/actions/index.js
keep keep keep keep replace keep keep keep keep keep
<mask> const { dnsVersion } = getState().dashboard; <mask> <mask> dispatch(getUpdateRequest()); <mask> const handleRequestError = () => { <mask> dispatch(addNoticeToast({ error: 'update_failed' })); <mask> dispatch(getUpdateFailure()); <mask> }; <mask> <mask> const handleR...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/actions/index.js
keep keep replace keep keep keep keep keep
<mask> import React, { useEffect, useState } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { useTranslation } from 'react-i18next'; <mask> import { useDispatch } from 'react-redux'; <mask> import { TOAST_TIMEOUTS } from '../../helpers/constants'; <mask> import { removeToast } from '../../...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/components/Toasts/Toast.js
keep keep keep add keep keep keep keep keep
<mask> const Toast = ({ <mask> id, <mask> message, <mask> type, <mask> }) => { <mask> const dispatch = useDispatch(); <mask> const [timerId, setTimerId] = useState(null); <mask> <mask> const clearRemoveToastTimeout = () => clearTimeout(timerId); </s> - client: Add link to 'update_fail...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/components/Toasts/Toast.js
keep keep keep keep replace keep keep keep keep keep
<mask> id, <mask> message, <mask> type, <mask> }) => { <mask> const { t } = useTranslation(); <mask> const dispatch = useDispatch(); <mask> const [timerId, setTimerId] = useState(null); <mask> <mask> const clearRemoveToastTimeout = () => clearTimeout(timerId); <mask> const rem...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/components/Toasts/Toast.js
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> return <div className={`toast toast--${type}`} <mask> onMouseOver={clearRemoveToastTimeout} <mask> onMouseOut={setRemoveToastTimeout}> <mask> <p className="toast__content">{t(message)}</p> <mask> <button className="toast__dismiss" onClick={removeC...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/components/Toasts/Toast.js
keep keep keep add keep keep keep
<mask> Toast.propTypes = { <mask> id: PropTypes.string.isRequired, <mask> message: PropTypes.string.isRequired, <mask> type: PropTypes.string.isRequired, <mask> }; <mask> <mask> export default Toast; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the followi...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/components/Toasts/Toast.js
keep keep keep add keep keep keep keep keep keep
<mask> <mask> export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html'; <mask> export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse'; <mask> <mask> export const ADDRESS_IN_USE_TEXT = 'address already in use'; <mask> <mask> export const INSTALL_FIRST_...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/helpers/constants.js
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> export const DEBOUNCE_TIMEOUT = 300; <mask> export const DEBOUNCE_FILTER_TIMEOUT = 500; <mask> export const CHECK_TIMEOUT = 1000; <mask> export const SUCCESS_TOAST_TIMEOUT = 5000; <mask> export const FAILURE_TOAST_TIMEOUT = 30000; <mask> export const HIDE_TOOLTIP_DELAY = 300; <mask> export const ...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/helpers/constants.js
keep keep add keep keep keep keep keep
<mask> NOTICE: 'notice', <mask> }; <mask> <mask> export const TOAST_TIMEOUTS = { <mask> [TOAST_TYPES.SUCCESS]: SUCCESS_TOAST_TIMEOUT, <mask> [TOAST_TYPES.ERROR]: FAILURE_TOAST_TIMEOUT, <mask> [TOAST_TYPES.NOTICE]: FAILURE_TOAST_TIMEOUT, <mask> }; </s> - client: Add link to 'update_failed' erro...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/helpers/constants.js
keep keep keep keep replace replace replace keep
<mask> NOTICE: 'notice', <mask> }; <mask> <mask> export const TOAST_TIMEOUTS = { <mask> [TOAST_TYPES.SUCCESS]: 5000, <mask> [TOAST_TYPES.ERROR]: 30000, <mask> [TOAST_TYPES.NOTICE]: 30000, <mask> }; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the foll...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/helpers/constants.js
keep add keep keep keep keep
<mask> id: nanoid(), <mask> message, <mask> type: TOAST_TYPES.ERROR, <mask> }; <mask> <mask> const newState = { ...state, notices: [...state.notices, errorToast] }; </s> - client: Add link to 'update_failed' error toast Close #2062 Squashed commit of the fol...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/reducers/toasts.js
keep add keep keep keep keep keep keep
<mask> id: nanoid(), <mask> message: payload.error.toString(), <mask> type: TOAST_TYPES.NOTICE, <mask> }; <mask> <mask> const newState = { ...state, notices: [...state.notices, noticeToast] }; <mask> return newState; <mask> }, </s> - client: Add ...
https://github.com/AdguardTeam/AdGuardHome/commit/06594bde8f70c5bbf04b03a3e1c9ad99539787e2
client/src/reducers/toasts.js
keep keep add keep keep keep keep keep
<mask> TLSAllowUnencryptedDOH bool <mask> <mask> TLSv12Roots *x509.CertPool // list of root CAs for TLSv1.2 <mask> <mask> // Called when the configuration is changed by HTTP request <mask> ConfigModified func() <mask> <mask> // Register an HTTP handler </s> Merge: + DNS, Web: use only secure TLSv1.2 ci...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
dnsforward/dnsforward.go
keep add keep keep keep keep keep keep
<mask> } <mask> upstream.RootCAs = s.conf.TLSv12Roots <mask> <mask> if len(proxyConfig.Upstreams) == 0 { <mask> log.Fatal("len(proxyConfig.Upstreams) == 0") <mask> } <mask> <mask> if !webRegistered && s.conf.HTTPRegister != nil { </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squ...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
dnsforward/dnsforward.go
keep add keep keep keep keep keep
<mask> } <mask> newconfig.TLSv12Roots = Context.tlsRoots <mask> newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH <mask> <mask> newconfig.FilterHandler = applyAdditionalFiltering <mask> newconfig.GetUpstreamsByClient = getUpstreamsByClient <mask> return newconfig </s> Merge: + DNS, Web: use ...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
home/dns.go
keep keep add keep keep keep keep
<mask> disableUpdate bool // If set, don't check for updates <mask> controlLock sync.Mutex <mask> tlsRoots *x509.CertPool // list of root CAs for TLSv1.2 <mask> transport *http.Transport <mask> client *http.Client <mask> appSignalChannel chan os.Signal // Channel for recei...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
home/home.go
keep keep add keep keep keep keep
<mask> initConfig() <mask> <mask> Context.tlsRoots = util.LoadSystemRootCAs() <mask> Context.transport = &http.Transport{ <mask> DialContext: customDialContext, <mask> Proxy: getHTTPProxy, <mask> TLSClientConfig: &tls.Config{ </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 S...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
home/home.go
keep add keep keep keep keep keep keep
<mask> MinVersion: tls.VersionTLS12, <mask> RootCAs: Context.tlsRoots, <mask> }, <mask> } <mask> <mask> printHTTPAddresses("https") <mask> err := w.httpsServer.server.ListenAndServeTLS("", "") <mask> if err != http.ErrServerClosed { </s> Merge: + DNS, Web: use only secure TLSv1.2 cip...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
home/web.go
keep keep add keep keep keep keep
<mask> package util <mask> <mask> import ( <mask> "crypto/x509" <mask> "io/ioutil" <mask> "os" <mask> "runtime" </s> 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> D...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
util/tls.go
keep keep add keep keep keep keep
<mask> "runtime" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> // LoadSystemRootCAs - load root CAs from the system <mask> // Return the x509 certificate pool object </s> Merge: + DNS, Web: use only secure TLSv1.2 ciphers Close #1384 Squashed commit of the following: commit cd90...
https://github.com/AdguardTeam/AdGuardHome/commit/06b3378fd778dc71672e1172f3ab5e9a635cf95c
util/tls.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> go 1.18 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.43.1 <mask> github.com/AdguardTeam/golibs v0.10.9 <mask> github.com/AdguardTeam/urlfilter v0.16.0 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.3 <mask> github.com/digineo...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.mod
keep replace keep replace replace
<mask> go.etcd.io/bbolt v1.3.6 <mask> golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa <mask> golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e <mask> golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 <mask> golang.org/x/sys v0.0.0-20220731174439-a90be440212d </s> Pull request: upd-dnsproxy Merge ...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.mod
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/josharian/native v1.0.0 // indirect <mask> github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect <mask> github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect <mask> github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // in...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.mod
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/pkg/errors v0.9.1 // indirect <mask> github.com/pmezard/go-difflib v1.0.0 // indirect <mask> github.com/stretchr/objx v0.1.1 // indirect <mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect <mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect <...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.mod
keep keep keep keep replace replace keep keep keep keep keep
<mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= <mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= <mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.2 h1:JADBlm0LYiVbuSySCHeY863dNkcpMmDR7s0bLKJeYlQ= <mask> github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM= <mask> gi...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.sum
keep keep keep add keep keep keep keep keep keep
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM= <mask> github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= <m...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= <mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNh...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= <mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= <mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= ...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= <mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= <mask> golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4U...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5...
https://github.com/AdguardTeam/AdGuardHome/commit/06e4658da9e9c31df369804d29f1165ec0fe7d63
go.sum
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
<mask> "object-assign": "^4.1.1", <mask> "prop-types": "^15.6.0" <mask> } <mask> }, <mask> "react-fast-compare": { <mask> "version": "2.0.4", <mask> "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", <mask> "integrity": "sh...
https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13
client/package-lock.json
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> "requires": { <mask> "prop-types": "^15.6.0" <mask> } <mask> }, <mask> "react-side-effect": { <mask> "version": "1.2.0", <mask> "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", <mask> "integrity": "sha512-v1ht1aHg5k/th...
https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13
client/package-lock.json
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
<mask> "inherits": "^2.0.1", <mask> "safe-buffer": "^5.0.1" <mask> } <mask> }, <mask> "shallowequal": { <mask> "version": "1.1.0", <mask> "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", <mask> "integrity": "sha512-y0m1JoUZSlPAjXVtPP...
https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13
client/package-lock.json
keep keep keep keep replace keep keep keep keep keep
<mask> "prop-types": "^15.7.2", <mask> "react": "^16.4.0", <mask> "react-click-outside": "^3.0.1", <mask> "react-dom": "^16.4.0", <mask> "react-helmet": "^5.2.1", <mask> "react-i18next": "^8.2.0", <mask> "react-modal": "^3.4.5", <mask> "react-redux": "^5.0.7", <mask> "react-...
https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13
client/package.json
keep keep keep keep replace keep keep keep keep keep
<mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import endsWith from 'lodash/endsWith'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import { HashLink as Link } from 'react-router-hash-link'; <mask> import { Helmet } from 'react-helmet'; <mask> <mask> import { <mask> f...
https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13
client/src/components/Logs/index.js
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> ); <mask> <mask> return ( <mask> <Fragment> <mask> <Helmet> <mask> <meta httpEquiv="x-dns-prefetch-control" content="off" /> <mask> </Helmet> <mask> <PageTitle title={t('query_log')}>{refreshButton}</PageTitl...
https://github.com/AdguardTeam/AdGuardHome/commit/073643537612437430c7035cda679a758ca94d13
client/src/components/Logs/index.js
keep keep keep keep replace keep keep keep keep keep
<mask> export const getIpList = (interfaces) => Object.values(interfaces) <mask> .reduce((acc, curr) => acc.concat(curr.ip_addresses), []) <mask> .sort(); <mask> <mask> export const getDnsAddress = (ip, port = '') => { <mask> const isStandardDnsPort = port === STANDARD_DNS_PORT; <mask> let addre...
https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d
client/src/helpers/helpers.js
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> return address; <mask> }; <mask> <mask> export const getWebAddress = (ip, port = '') => { <mask> const isStandardWebPort = port === STANDARD_WEB_PORT; <mask> let address = `http://${ip}`; <mask> <mask> if (port && !isStandardWebPort) { <mask> if (ip.includes(':') && !i...
https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d
client/src/helpers/helpers.js
keep keep keep keep replace keep keep keep keep keep
<mask> // Validation functions <mask> // https://redux-form.com/8.3.0/examples/fieldlevelvalidation/ <mask> // If the value is valid, the validation function should return undefined. <mask> /** <mask> * @param value {string} <mask> * @returns {undefined|string} <mask> */ <mask> export const validateRequiredV...
https://github.com/AdguardTeam/AdGuardHome/commit/07497beb78d4711e8d0c4da83ce52ad15cc7e51d
client/src/helpers/validators.js
keep keep add keep keep keep keep keep
<mask> <mask> Rewrites []RewriteEntry `yaml:"rewrites"` <mask> <mask> // Called when the configuration is changed by HTTP request <mask> ConfigModified func() `yaml:"-"` <mask> <mask> // Register an HTTP handler <mask> HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
dnsfilter/dnsfilter.go
keep keep keep add keep keep keep keep keep
<mask> func (d *Dnsfilter) WriteDiskConfig(c *Config) { <mask> d.confLock.Lock() <mask> *c = d.Config <mask> c.Rewrites = rewriteArrayDup(d.Config.Rewrites) <mask> d.confLock.Unlock() <mask> } <mask> <mask> // SetFilters - set new filters (synchronously or asynchronously) <mask> // When filters are set as...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
dnsfilter/dnsfilter.go
keep keep keep add keep keep keep keep keep keep
<mask> d.Config = *c <mask> d.prepareRewrites() <mask> } <mask> <mask> if blockFilters != nil { <mask> err := d.initFiltering(nil, blockFilters) <mask> if err != nil { <mask> log.Error("Can't initialize filtering subsystem: %s", err) <mask> d.Close() <mask> return nil </s> * refactor: mov...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
dnsfilter/dnsfilter.go
keep add keep keep keep keep
<mask> d.registerSecurityHandlers() <mask> d.registerRewritesHandlers() <mask> } <mask> } <mask> <mask> // </s> * refactor: move blocked-services functions to dnsfilter </s> remove ApplyBlockedServices(setts, config.DNS.BlockedServices) </s> add Context.dnsFilter.ApplyBlockedServices(setts, nil, true) <...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
dnsfilter/dnsfilter.go
keep keep keep add keep keep keep keep
<mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/golibs/utils" </s> * refactor: move blo...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/clients.go
keep keep keep keep replace keep keep keep keep keep
<mask> Upstreams: cy.Upstreams, <mask> } <mask> <mask> for _, s := range cy.BlockedServices { <mask> if !blockedSvcKnown(s) { <mask> log.Debug("Clients: skipping unknown blocked-service '%s'", s) <mask> continue <mask> } <mask> cli.BlockedServices = append(cli.BlockedServices, s) <mas...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/clients.go
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> <mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists <mask> FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours) <mask> DnsfilterConf dnsfilter.Config `yaml:"...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/config.go
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> log.Error("Couldn't parse config file: %s", err) <mask> return err <mask> } <mask> <mask> bsvcs := []string{} <mask> for _, s := range config.DNS.BlockedServices { <mask> if !blockedSvcKnown(s) { <mask> log.Debug("skipping unknown blocked-service '%s'", s) <mask> continue <mask> } <m...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/config.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> "net/url" <mask> "strconv" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/util" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/NYTimes/gziphandler" <mask> ) <mask> </s> * refactor: move blocked-...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/control.go
keep keep keep add keep keep keep keep keep
<mask> "strconv" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/NYTimes/gziphandler" <mask> ) <mask> <mask> // ---------------- </s> * refactor: move blocked-services functions to dnsfilter </s> remove "githu...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/control.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> httpRegister("GET", "/control/profile", handleGetProfile) <mask> <mask> RegisterTLSHandlers() <mask> RegisterBlockedServicesHandlers() <mask> RegisterAuthHandlers() <mask> <mask> http.HandleFunc("/dns-query", postInstall(handleDOH)) <mask> } <mask> </s> * refactor: move blocked-service...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/control.go
keep keep keep keep replace keep keep keep keep keep
<mask> host := q.Get("name") <mask> <mask> setts := Context.dnsFilter.GetConfig() <mask> setts.FilteringEnabled = true <mask> ApplyBlockedServices(&setts, config.DNS.BlockedServices) <mask> result, err := Context.dnsFilter.CheckHost(host, dns.TypeA, &setts) <mask> if err != nil { <mask> httpError(w, ht...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/control_filtering.go
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> // If a client has his own settings, apply them <mask> func applyAdditionalFiltering(clientAddr string, setts *dnsfilter.RequestFilteringSettings) { <mask> ApplyBlockedServices(setts, config.DNS.BlockedServices) <mask> <mask> if len(clientAddr) == 0 { <mask> return <mask> } <mask...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/dns.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> log.Debug("Using settings for client with IP %s", clientAddr) <mask> <mask> if c.UseOwnBlockedServices { <mask> ApplyBlockedServices(setts, c.BlockedServices) <mask> } <mask> <mask> setts.ClientTags = c.Tags <mask> <mask> if !c.UseOwnSettings { </s> * refactor: move blocked-services ...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/dns.go
keep keep keep keep replace keep keep keep keep keep
<mask> requireAdminRights() <mask> } <mask> <mask> initConfig() <mask> initServices() <mask> <mask> Context.tlsRoots = util.LoadSystemRootCAs() <mask> Context.transport = &http.Transport{ <mask> DialContext: customDialContext, <mask> Proxy: getHTTPProxy, </s> * refactor: move blocked-servi...
https://github.com/AdguardTeam/AdGuardHome/commit/0789e4b20dea132f5d66ee18f7d1fbd05c10b014
home/home.go
keep keep replace replace keep replace keep keep keep
<mask> } <mask> <mask> res.IP = addrs[0] <mask> // The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix <mask> for _, i := range addrs { <mask> if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len { <mask> res.IP = ipv4 <mask> break <mask> } </s> - dnsfilter:...
https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911
dnsfilter/dnsfilter.go
keep keep keep add keep keep keep keep keep keep
<mask> break <mask> } <mask> } <mask> <mask> // Cache result <mask> err = safeSearchCache.Set(host, res) <mask> if err != nil { <mask> return Result{}, nil <mask> } <mask> return res, nil </s> - dnsfilter: fix safesearch issue #268 </s> remove if ipv4 := i.To4(); ipv4 != nil && len(i) == net....
https://github.com/AdguardTeam/AdGuardHome/commit/0794704f740db3c6ab73ee4d6287dc6f40ec4911
dnsfilter/dnsfilter.go
keep keep replace replace replace keep replace replace keep keep keep keep
<mask> name: "youtube", <mask> rules: []string{ <mask> "||youtube.com^", <mask> "||ytimg.com^", <mask> "||youtu.be^", <mask> "||googlevideo.com^", <mask> "||youtubei.googleapis.com^", <mask> "||youtube-nocookie.com^", <mask> "||youtube", <mask> }, <mask> }, { <mask> name: "twitch", </s> ...
https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192
internal/filtering/blocked.go
keep keep add keep keep keep keep keep
<mask> "||wide-youtube.l.google.com^", <mask> "||youtu.be^", <mask> "||youtube", <mask> }, <mask> }, { <mask> name: "twitch", <mask> rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"}, <mask> }, { </s> Pull request: 4755-youtube-domain Updates #4755. Squashed commit...
https://github.com/AdguardTeam/AdGuardHome/commit/07d48af10c50808c3183b779ba193487cd900192
internal/filtering/blocked.go
keep keep keep keep replace keep keep keep keep keep
<mask> return ok <mask> } <mask> <mask> // Search for a client by IP <mask> func clientFind(ip string) (Client, bool) { <mask> clients.lock.Lock() <mask> defer clients.lock.Unlock() <mask> <mask> c, ok := clients.ipIndex[ip] <mask> if ok { </s> Fix #727 - use default parental sensitivity when it's not...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
clients.go
keep keep keep keep replace keep keep keep keep keep
<mask> defer clients.lock.Unlock() <mask> <mask> c, ok := clients.ipIndex[ip] <mask> if ok { <mask> return *c, true <mask> } <mask> <mask> for _, c = range clients.list { <mask> if len(c.MAC) != 0 { <mask> mac, err := net.ParseMAC(c.MAC) </s> Fix #727 - use default parental sensitivity when it'...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
clients.go
keep replace keep keep keep keep replace keep keep keep keep
<mask> if ip == ipAddr.String() { <mask> return *c, true <mask> } <mask> } <mask> } <mask> <mask> return Client{}, false <mask> } <mask> <mask> // Check if Client object's fields are correct <mask> func clientCheck(c *Client) error { </s> Fix #727 - use default parental sensitivity when it's...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
clients.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> // If a client has his own settings, apply them <mask> func applyClientSettings(clientAddr string, setts *dnsfilter.RequestFilteringSettings) { <mask> c, ok := clientFind(clientAddr) <mask> if !ok || !c.UseOwnSettings { <mask> return <mask> } <mask> <mask> log.Debug("Using settings for cl...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
dns.go
keep keep keep keep replace keep keep keep keep keep
<mask> log.Debug("Using settings for client with IP %s", clientAddr) <mask> setts.FilteringEnabled = c.FilteringEnabled <mask> setts.SafeSearchEnabled = c.SafeSearchEnabled <mask> setts.SafeBrowsingEnabled = c.SafeBrowsingEnabled <mask> setts.ParentalEnabled = c.UseOwnSettings <mask> } <mask> <mask> func ...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
dns.go
keep keep keep keep replace keep keep keep keep keep
<mask> const defaultSafebrowsingServer = "sb.adtidy.org" <mask> const defaultSafebrowsingURL = "%s://%s/safebrowsing-lookup-hash.html?prefixes=%s" <mask> const defaultParentalServer = "pctrl.adguard.com" <mask> const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d" <mask> const...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
dnsfilter/dnsfilter.go
keep keep keep keep replace keep keep keep keep keep
<mask> schema := "https" <mask> if d.UsePlainHTTP { <mask> schema = "http" <mask> } <mask> url := fmt.Sprintf(defaultParentalURL, schema, d.parentalServer, hashparam, d.ParentalSensitivity) <mask> return url <mask> } <mask> handleBody := func(body []byte, hashes map[string]bool) (Result, error) {...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
dnsfilter/dnsfilter.go
keep keep keep keep replace keep keep keep keep keep
<mask> // if buffer needs to be flushed to disk, do it now <mask> if needFlush { <mask> // write to file <mask> // do it in separate goroutine -- we are stalling DNS response this whole time <mask> go l.flushLogBuffer(false) <mask> } <mask> <mask> return &entry <mask> } <mask> </s> Fix #727 - use...
https://github.com/AdguardTeam/AdGuardHome/commit/07db927246cd6913f9dd05c1a5c6adc413306383
dnsforward/querylog.go
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d) <mask> case dnsfilter.FilteredParental: <mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d) <mask> default: <mask> if result.IP != nil { <mask> return s.genResponseWithIP(m, result.IP) <mask> } <mask> <mask> if s.conf...
https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d
dnsforward/dnsforward.go
keep add keep keep keep keep keep keep
<mask> return s.genAAAARecord(m, s.conf.BlockingIPAddrv6) <mask> } <mask> } <mask> <mask> if result.IP != nil { <mask> return s.genResponseWithIP(m, result.IP) <mask> } <mask> return s.genNXDomain(m) </s> * DNS: nxdomain: don't return IP address for a blocked domain Don't return IP address ...
https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d
dnsforward/dnsforward.go
keep keep keep add keep keep keep keep
<mask> } else if s.conf.BlockingMode == "nxdomain" { <mask> return s.genNXDomain(m) <mask> } <mask> <mask> return s.genNXDomain(m) <mask> } <mask> } <mask> </s> * DNS: nxdomain: don't return IP address for a blocked domain Don't return IP address for a blocked domain when blocking mode is "nxdoma...
https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d
dnsforward/dnsforward.go
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> func checkBlockingMode(req dnsConfigJSON) bool { <mask> bm := req.BlockingMode <mask> if !(bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") { <mask> return false <mask> } <mask> <mask> if bm == "custom_ip" { <mask> ip := net.ParseIP(req.BlockingIPv4) </s> * DNS: nxdo...
https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d
dnsforward/dnsforward_http.go
keep keep add keep keep keep keep keep keep
<mask> blocking_mode: <mask> type: "string" <mask> enum: <mask> - "nxdomain" <mask> - "null_ip" <mask> - "custom_ip" <mask> blocking_ipv4: <mask> type: "string" <mask> blocking_ip...
https://github.com/AdguardTeam/AdGuardHome/commit/07ebcc2bf3bf4e4d3535f0d1d5191cbc82ba876d
openapi/openapi.yaml
keep keep keep add keep keep keep keep
<mask> Port: 53, <mask> FilteringConfig: dnsforward.FilteringConfig{ <mask> ProtectionEnabled: true, // whether or not use any of dnsfilter features <mask> FilteringEnabled: true, // whether or not use filter lists <mask> BlockedResponseTTL: 10, // in seconds <mask> QueryLogEnabled: tr...
https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3
config.go
keep add keep keep keep keep keep keep
<mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features <mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists <mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)...
https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3
dnsforward/dnsforward.go
keep keep add keep keep keep keep keep
<mask> return s.genARecord(m, result.IP) <mask> } <mask> <mask> return s.genNXDomain(m) <mask> } <mask> } <mask> <mask> func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg { </s> * dnsforward, config: add unspecified IP blocking option * dnsforward: prioritize host files over null filter *...
https://github.com/AdguardTeam/AdGuardHome/commit/07ffcbec3dfb58f0df22b9c842231135653fa4a3
dnsforward/dnsforward.go
keep keep keep replace keep keep keep keep keep
<mask> module github.com/AdguardTeam/AdGuardHome <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.9.10 <mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect <mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7 <mask> github.com/go-ole/go-ole v1.2.1...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.mod
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7 <mask> github.com/go-ole/go-ole v1.2.1 // indirect <mask> github.com/go-test/deep v1.0.1 <mask> github.com/gobuffalo/packr v1.19.0 <mask> github.com/hmage/golibs v0.0.0-20181229160906-c8491df0bfc4 <mask> github.com/joomcode/errorx v0.1.0 <m...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.mod
keep keep keep keep replace replace keep keep keep
<mask> github.com/shirou/gopsutil v2.18.10+incompatible <mask> github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect <mask> github.com/stretchr/testify v1.2.2 <mask> go.uber.org/goleak v0.10.0 <mask> golang.org/x/net v0.0.0-20181220203305-927f97764cc3 <mask> golang.org/x/sys v0.0.0-2018122814...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.mod
replace replace keep keep keep keep keep
<mask> github.com/AdguardTeam/dnsproxy v0.9.10 h1:q364WlTvC+CS8kJbMy7TCyt4Niqixxw584MQJtCGhJU= <mask> github.com/AdguardTeam/dnsproxy v0.9.10/go.mod h1:IqBhopgNpzB168kMurbjXf86dn50geasBIuGVxY63j0= <mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY= ...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQB...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264 h1:roWyi0eEdiFreSqW9V1wT9pNOVzrpo2NWsxja53slX0= <mask> github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= <mask> github.com/gobuffalo/packr v1.19.0 h1:3UDmBDxesCOPF8iZdMDBBWKfkBoYujI...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.sum
keep keep add keep keep keep keep keep keep
<mask> go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI= <mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= <mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.sum
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI= <mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= <mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.sum
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= <mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker...
https://github.com/AdguardTeam/AdGuardHome/commit/0820983d81d3317640b04072679858c1a54bcb9e
go.sum
keep keep keep add keep keep keep keep keep keep
<mask> "strings" <mask> "sync/atomic" <mask> "time" <mask> <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/AdguardTeam/urlfilter" <mask> "github.com/bluele/gcache" <mask> "github.com/miekg/dns" <mask> "golang.org/x/net/publicsuffix" </...
https://github.com/AdguardTeam/AdGuardHome/commit/082354204b6400275854bb37708328ea62da7ed5
dnsfilter/dnsfilter.go
keep keep keep replace replace keep keep keep keep replace replace replace keep keep keep
<mask> return nil, e <mask> } <mask> <mask> var firstErr error <mask> firstErr = nil <mask> for _, a := range addrs { <mask> addr = fmt.Sprintf("%s:%s", a.String(), port) <mask> con, err := dialer.DialContext(ctx, network, addr) <mask> if err != nil { <mask> if firstErr == nil { <mas...
https://github.com/AdguardTeam/AdGuardHome/commit/082354204b6400275854bb37708328ea62da7ed5
dnsfilter/dnsfilter.go
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> return con, err <mask> } <mask> return nil, firstErr <mask> } <mask> } <mask> <mask> // New creates properly initialized DNS Filter that is ready to be used <mask> func New(c *Config, filters map[int]string) *Dnsfilter { </s> Fix #831 This commit fixes panic when customDi...
https://github.com/AdguardTeam/AdGuardHome/commit/082354204b6400275854bb37708328ea62da7ed5
dnsfilter/dnsfilter.go
keep keep keep add keep keep keep keep keep keep
<mask> tlsConfigStatus `yaml:"-" json:",inline"` <mask> } <mask> <mask> // initialize to default values, will be changed later when reading config or parsing command line <mask> var config = configuration{ <mask> ourConfigFilename: "AdGuardHome.yaml", <mask> BindPort: 3000, <mask> BindHost: ...
https://github.com/AdguardTeam/AdGuardHome/commit/082354204b6400275854bb37708328ea62da7ed5
home/config.go
keep keep replace replace keep keep keep keep replace replace replace keep
<mask> } <mask> <mask> var firstErr error <mask> firstErr = nil <mask> for _, a := range addrs { <mask> addr = net.JoinHostPort(a.String(), port) <mask> con, err := dialer.DialContext(ctx, network, addr) <mask> if err != nil { <mask> if firstErr == nil { <mask> firstErr = err <mask> } <...
https://github.com/AdguardTeam/AdGuardHome/commit/082354204b6400275854bb37708328ea62da7ed5
home/helpers.go
keep keep keep keep replace keep keep keep keep keep
<mask> continue <mask> } <mask> return con, err <mask> } <mask> return nil, firstErr <mask> } <mask> <mask> // check if error is "address already in use" <mask> func errorIsAddrInUse(err error) bool { <mask> errOpError, ok := err.(*net.OpError) </s> Fix #831 This commit fixes panic when customDia...
https://github.com/AdguardTeam/AdGuardHome/commit/082354204b6400275854bb37708328ea62da7ed5
home/helpers.go
keep keep add keep keep keep keep keep
<mask> "encryption_issuer": "Issuer", <mask> "encryption_hostnames": "Hostnames", <mask> "encryption_reset": "Are you sure you want to reset encryption settings?", <mask> "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.", <mask> "topli...
https://github.com/AdguardTeam/AdGuardHome/commit/08282dc4d9958d8a2ac6163d6d0921517ec45f92
client/src/__locales/en.json
keep keep keep add keep keep keep keep keep keep
<mask> || !valid_key <mask> || !valid_cert <mask> || !valid_pair; <mask> <mask> return ( <mask> <form onSubmit={handleSubmit}> <mask> <div className="row"> <mask> <div className="col-12"> <mask> <div className="form__group for...
https://github.com/AdguardTeam/AdGuardHome/commit/08282dc4d9958d8a2ac6163d6d0921517ec45f92
client/src/components/Settings/Encryption/Form.js
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
<mask> <KeyStatus validKey={valid_key} keyType={key_type} /> <mask> )} <mask> </div> <mask> </div> <mask> {warning_validation && ( <mask> <div className="col-12"> <mask> ...
https://github.com/AdguardTeam/AdGuardHome/commit/08282dc4d9958d8a2ac6163d6d0921517ec45f92
client/src/components/Settings/Encryption/Form.js
keep keep add keep keep keep keep keep
<mask> return nil <mask> } <mask> <mask> // parseCertChain parses the certificate chain from raw data, and returns it. <mask> // If ok is true, the returned error, if any, is not critical. <mask> func parseCertChain(chain []byte) (parsedCerts []*x509.Certificate, ok bool, err error) { <mask> log.Debug("tls: g...
https://github.com/AdguardTeam/AdGuardHome/commit/08282dc4d9958d8a2ac6163d6d0921517ec45f92
internal/home/tls.go