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 replace replace replace replace replace keep keep keep keep keep | <mask> log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
<mask> return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
<mask> }
<mask>
<mask> contentType := strings.ToLower(resp.Header.Get("content-type"))
<mask> if !strings.HasPrefix(contentType, "text/plain") {
<mask> log.Printf("Non-text response %s from %s, skipping", contentType, filter.URL)
<mask> return false, fmt.Errorf("non-text response %s", contentType)
<mask> }
<mask>
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
<mask> return false, err
<mask> }
</s> * filter update: ensure filter data is text (but not html)
stop checking Content-Type HTTP header </s> add if !isPrintableText(body[:4096]) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(body[:4096]))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
</s> add // Allows printable UTF-8 text with CR, LF, TAB characters
func isPrintableText(data []byte) bool {
for _, c := range data {
if (c >= ' ' && c != 0x7f) || c == '\n' || c == '\r' || c == '\t' {
continue
}
return false
}
return true
}
| https://github.com/AdguardTeam/AdGuardHome/commit/b078b82a89940bd96c7e9157c2f5c758224a72ae | home/filter.go |
keep keep add keep keep keep keep keep | <mask> return false, nil
<mask> }
<mask>
<mask> // Extract filter name and count number of rules
<mask> rulesCount, filterName := parseFilterContents(body)
<mask> log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
<mask> if filterName != "" {
<mask> filter.Name = filterName
</s> * filter update: ensure filter data is text (but not html)
stop checking Content-Type HTTP header </s> add // Allows printable UTF-8 text with CR, LF, TAB characters
func isPrintableText(data []byte) bool {
for _, c := range data {
if (c >= ' ' && c != 0x7f) || c == '\n' || c == '\r' || c == '\t' {
continue
}
return false
}
return true
}
</s> remove contentType := strings.ToLower(resp.Header.Get("content-type"))
if !strings.HasPrefix(contentType, "text/plain") {
log.Printf("Non-text response %s from %s, skipping", contentType, filter.URL)
return false, fmt.Errorf("non-text response %s", contentType)
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b078b82a89940bd96c7e9157c2f5c758224a72ae | home/filter.go |
keep keep keep add keep keep keep keep keep | <mask> "babel-preset-stage-2": "^6.24.1",
<mask> "babel-runtime": "6.26.0",
<mask> "clean-webpack-plugin": "^0.1.19",
<mask> "compression-webpack-plugin": "^1.1.11",
<mask> "css-loader": "^0.28.11",
<mask> "eslint": "^4.19.1",
<mask> "eslint-config-airbnb-base": "^12.1.0",
<mask> "eslint-config-react-app": "^2.1.0",
<mask> "eslint-loader": "1.9.0",
</s> - client: load favicon from local server
Closes #625 </s> add new CopyPlugin([
{ from: FAVICON_PATH, to: PUBLIC_PATH },
]), </s> add const FAVICON_PATH = path.resolve(RESOURCES_PATH, 'public/favicon.ico'); </s> add const CopyPlugin = require('copy-webpack-plugin'); | https://github.com/AdguardTeam/AdGuardHome/commit/b1f707d18cf6ce63fe1ed56efbd18d4f614d0543 | client/package.json |
keep add keep keep keep keep | <mask> const flexBugsFixes = require('postcss-flexbugs-fixes');
<mask> const CleanWebpackPlugin = require('clean-webpack-plugin');
<mask>
<mask> const RESOURCES_PATH = path.resolve(__dirname);
<mask> const ENTRY_REACT = path.resolve(RESOURCES_PATH, 'src/index.js');
<mask> const ENTRY_INSTALL = path.resolve(RESOURCES_PATH, 'src/install/index.js');
</s> - client: load favicon from local server
Closes #625 </s> add const FAVICON_PATH = path.resolve(RESOURCES_PATH, 'public/favicon.ico'); </s> add new CopyPlugin([
{ from: FAVICON_PATH, to: PUBLIC_PATH },
]), </s> add "copy-webpack-plugin": "^4.6.0", | https://github.com/AdguardTeam/AdGuardHome/commit/b1f707d18cf6ce63fe1ed56efbd18d4f614d0543 | client/webpack.common.js |
keep keep add keep keep keep keep keep keep | <mask> const ENTRY_INSTALL = path.resolve(RESOURCES_PATH, 'src/install/index.js');
<mask> const HTML_PATH = path.resolve(RESOURCES_PATH, 'public/index.html');
<mask> const HTML_INSTALL_PATH = path.resolve(RESOURCES_PATH, 'public/install.html');
<mask>
<mask> const PUBLIC_PATH = path.resolve(__dirname, '../build/static');
<mask>
<mask> const config = {
<mask> target: 'web',
<mask> context: RESOURCES_PATH,
</s> - client: load favicon from local server
Closes #625 </s> add const CopyPlugin = require('copy-webpack-plugin'); </s> add new CopyPlugin([
{ from: FAVICON_PATH, to: PUBLIC_PATH },
]), </s> add "copy-webpack-plugin": "^4.6.0", | https://github.com/AdguardTeam/AdGuardHome/commit/b1f707d18cf6ce63fe1ed56efbd18d4f614d0543 | client/webpack.common.js |
keep keep add keep keep keep keep | <mask> new ExtractTextPlugin({
<mask> filename: '[name].[contenthash].css',
<mask> }),
<mask> ],
<mask> };
<mask>
<mask> module.exports = config;
</s> - client: load favicon from local server
Closes #625 </s> add const CopyPlugin = require('copy-webpack-plugin'); </s> add const FAVICON_PATH = path.resolve(RESOURCES_PATH, 'public/favicon.ico'); </s> add "copy-webpack-plugin": "^4.6.0", | https://github.com/AdguardTeam/AdGuardHome/commit/b1f707d18cf6ce63fe1ed56efbd18d4f614d0543 | client/webpack.common.js |
keep keep add keep keep keep keep keep | <mask> github.com/google/renameio v1.0.1
<mask> github.com/google/uuid v1.3.0
<mask> github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8
<mask> github.com/kardianos/service v1.2.2
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.7.1
<mask> github.com/mdlayher/packet v1.1.1
<mask> github.com/miekg/dns v1.1.53
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
</s> add github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 h1:elKwZS1OcdQ0WwEDBeqxKwb7WB62QX8bvZ/FJnVXIfk=
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86/go.mod h1:aFAMtuldEgx/4q7iSGazk22+IcgvtiC+HIimFO9XlS8= </s> remove github.com/josharian/native v1.1.0 // indirect
</s> add </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> remove err = binary.Read(buf, aghos.NativeEndian, &dateToken)
</s> add err = binary.Read(buf, native.Endian, &dateToken) | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> go.etcd.io/bbolt v1.3.7
<mask> golang.org/x/crypto v0.7.0
<mask> golang.org/x/exp v0.0.0-20230321023759-10a507213a29
<mask> golang.org/x/net v0.8.0
<mask> golang.org/x/sys v0.6.0
<mask> gopkg.in/natefinch/lumberjack.v2 v2.2.1
<mask> gopkg.in/yaml.v3 v3.0.1
<mask> howett.net/plist v1.0.0
<mask> )
<mask>
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> add "github.com/josharian/native" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
<mask> github.com/golang/mock v1.6.0 // indirect
<mask> github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
<mask> github.com/josharian/native v1.1.0 // indirect
<mask> github.com/mdlayher/raw v0.1.0 // indirect
<mask> github.com/mdlayher/socket v0.4.0 // indirect
<mask> github.com/onsi/ginkgo/v2 v2.9.2 // indirect
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pierrec/lz4/v4 v4.1.17 // indirect
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> add "github.com/josharian/native" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
</s> add github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 h1:elKwZS1OcdQ0WwEDBeqxKwb7WB62QX8bvZ/FJnVXIfk=
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86/go.mod h1:aFAMtuldEgx/4q7iSGazk22+IcgvtiC+HIimFO9XlS8= </s> add github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8/go.mod h1:m5WMe03WCvWcXjRnhvaAbAAXdCnu20J5P+mmH44ZzpE=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
<mask> github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
<mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> add github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 </s> remove github.com/josharian/native v1.1.0 // indirect
</s> add </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> remove err = binary.Read(buf, aghos.NativeEndian, &dateToken)
</s> add err = binary.Read(buf, native.Endian, &dateToken) | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/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-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
<mask> golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove golang.org/x/sys v0.6.0
</s> add golang.org/x/sys v0.7.0 </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> remove err = binary.Read(buf, aghos.NativeEndian, &dateToken)
</s> add err = binary.Read(buf, native.Endian, &dateToken) </s> add "github.com/josharian/native" | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> "os"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // GLMode - enable GL-Inet compatibility mode
<mask> var GLMode bool
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> add "github.com/josharian/native" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> remove github.com/josharian/native v1.1.0 // indirect
</s> add </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> remove golang.org/x/sys v0.6.0
</s> add golang.org/x/sys v0.7.0 </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | internal/home/authglinet.go |
keep add keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // GLMode - enable GL-Inet compatibility mode
<mask> var GLMode bool
<mask>
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove github.com/josharian/native v1.1.0 // indirect
</s> add </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> remove golang.org/x/sys v0.6.0
</s> add golang.org/x/sys v0.7.0 </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | internal/home/authglinet.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> buf := bytes.NewBuffer(bs)
<mask>
<mask> err = binary.Read(buf, aghos.NativeEndian, &dateToken)
<mask> if err != nil {
<mask> log.Error("decoding token: %s", err)
<mask>
<mask> return 0
<mask> }
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> add "github.com/josharian/native" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | internal/home/authglinet.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "os"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestAuthGL(t *testing.T) {
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove err = binary.Read(buf, aghos.NativeEndian, &dateToken)
</s> add err = binary.Read(buf, native.Endian, &dateToken) </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> add "github.com/josharian/native" </s> remove golang.org/x/sys v0.6.0
</s> add golang.org/x/sys v0.7.0 </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | internal/home/authglinet_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> t.Cleanup(func() { GLMode = false })
<mask> glFilePrefix = dir + "/gl_token_"
<mask>
<mask> data := make([]byte, 4)
<mask> aghos.NativeEndian.PutUint32(data, 1)
<mask>
<mask> require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> assert.False(t, glCheckToken("test"))
<mask>
<mask> data = make([]byte, 4)
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
</s> add native.Endian.PutUint32(data, uint32(time.Now().UTC().Unix()+60)) </s> remove err = binary.Read(buf, aghos.NativeEndian, &dateToken)
</s> add err = binary.Read(buf, native.Endian, &dateToken) </s> add "github.com/josharian/native" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | internal/home/authglinet_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> assert.False(t, glCheckToken("test"))
<mask>
<mask> data = make([]byte, 4)
<mask> aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
<mask>
<mask> require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> r, _ := http.NewRequest(http.MethodGet, "http://localhost/", nil)
<mask> r.AddCookie(&http.Cookie{Name: glCookieName, Value: "test"})
<mask> assert.True(t, glProcessCookie(r))
</s> Pull request 1816: 5704-rm-endian
Updates #5704.
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian </s> remove aghos.NativeEndian.PutUint32(data, 1)
</s> add native.Endian.PutUint32(data, 1) </s> remove err = binary.Read(buf, aghos.NativeEndian, &dateToken)
</s> add err = binary.Read(buf, native.Endian, &dateToken) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add "github.com/josharian/native" </s> add "github.com/josharian/native" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/aghos"
</s> add </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/b23ea0a690e8f5b892e34ac38111efae732e77d3 | internal/home/authglinet_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> go 1.15
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.37.4
<mask> github.com/AdguardTeam/golibs v0.4.5
<mask> github.com/AdguardTeam/urlfilter v0.14.5
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.1.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/fsnotify/fsnotify v1.4.9
</s> Pull request: all: add us to logs
Merge in DNS/adguard-home from imp-logs to master
Squashed commit of the following:
commit b463825196625f59b19977920f828f57e4b87f0d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 18 14:08:24 2021 +0300
all: add us to logs </s> remove github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U=
github.com/AdguardTeam/golibs v0.4.5/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
</s> add github.com/AdguardTeam/golibs v0.5.0 h1:qwhEKjDrT0UcwDnHrNU2Yg/DLR9b/GsUncnXYW6VzAU=
github.com/AdguardTeam/golibs v0.5.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= </s> add // Make sure that we see the microseconds in logs, as networking stuff
// can happen pretty quickly.
log.SetFlags(log.LstdFlags | log.Lmicroseconds)
| https://github.com/AdguardTeam/AdGuardHome/commit/b2e3e4d0886c58dddad2251e9352d704043d3910 | go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.37.4/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U=
<mask> github.com/AdguardTeam/golibs v0.4.5/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.14.5 h1:WyF0hg0MwKevsqNPkoaZFH8f5WRi/yuy/7qePtYt5Ts=
<mask> github.com/AdguardTeam/urlfilter v0.14.5/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U=
<mask> github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
</s> Pull request: all: add us to logs
Merge in DNS/adguard-home from imp-logs to master
Squashed commit of the following:
commit b463825196625f59b19977920f828f57e4b87f0d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 18 14:08:24 2021 +0300
all: add us to logs </s> remove github.com/AdguardTeam/golibs v0.4.5
</s> add github.com/AdguardTeam/golibs v0.5.0 </s> add // Make sure that we see the microseconds in logs, as networking stuff
// can happen pretty quickly.
log.SetFlags(log.LstdFlags | log.Lmicroseconds)
| https://github.com/AdguardTeam/AdGuardHome/commit/b2e3e4d0886c58dddad2251e9352d704043d3910 | go.sum |
keep add keep keep keep keep keep | <mask> }
<mask>
<mask> if args.runningAsService && ls.LogFile == "" && runtime.GOOS == "windows" {
<mask> // When running as a Windows service, use eventlog by default if nothing else is configured
<mask> // Otherwise, we'll simply loose the log output
<mask> ls.LogFile = configSyslog
<mask> }
</s> Pull request: all: add us to logs
Merge in DNS/adguard-home from imp-logs to master
Squashed commit of the following:
commit b463825196625f59b19977920f828f57e4b87f0d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 18 14:08:24 2021 +0300
all: add us to logs </s> remove github.com/AdguardTeam/golibs v0.4.5 h1:RRA9ZsmbJEN4OllAx0BcfvSbRBxxpWluJijBYmtp13U=
github.com/AdguardTeam/golibs v0.4.5/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
</s> add github.com/AdguardTeam/golibs v0.5.0 h1:qwhEKjDrT0UcwDnHrNU2Yg/DLR9b/GsUncnXYW6VzAU=
github.com/AdguardTeam/golibs v0.5.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= </s> remove github.com/AdguardTeam/golibs v0.4.5
</s> add github.com/AdguardTeam/golibs v0.5.0 | https://github.com/AdguardTeam/AdGuardHome/commit/b2e3e4d0886c58dddad2251e9352d704043d3910 | internal/home/home.go |
keep keep keep add keep keep keep keep keep | <mask> "example_comment_hash": "# Also a comment",
<mask> "example_upstream_regular": "regular DNS (over UDP)",
<mask> "example_upstream_dot": "encrypted <a href='https:\/\/en.wikipedia.org\/wiki\/DNS_over_TLS' target='_blank'>DNS-over-TLS<\/a>",
<mask> "example_upstream_doh": "encrypted <a href='https:\/\/en.wikipedia.org\/wiki\/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS<\/a>",
<mask> "example_upstream_tcp": "regular DNS (over TCP)",
<mask> "all_filters_up_to_date_toast": "All filters are already up-to-date",
<mask> "updated_upstream_dns_toast": "Updated the upstream DNS servers",
<mask> "dns_test_ok_toast": "Specified DNS servers are working correctly",
<mask> "dns_test_not_ok_toast": "Server \"{{key}}\": could not be used, please check that you've written it correctly",
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> add 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= </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= </s> add 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:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f h1:vOaSvI9B3wqzV1g8raDeVzRJnq5RHQxsz0MVXudxdNU=
github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f/go.mod h1:EC7Z1GguyEEwhuLXrcgkRTE3GdyPDSWq2OXefhydGWo= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | client/src/__locales/en.json |
keep add keep keep keep keep keep keep | <mask> <code>tcp://1.1.1.1</code> - { t('example_upstream_tcp') }
<mask> </li>
<mask> </ol>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> );
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> add case "sdns":
stamp, err := dnsstamps.NewServerStampFromString(address)
if err != nil {
return nil, errorx.Decorate(err, "Failed to parse %s", address)
}
switch stamp.Proto {
case dnsstamps.StampProtoTypeDNSCrypt:
return &dnsCrypt{boot: toBoot(url.String(), bootstrap)}, nil
case dnsstamps.StampProtoTypeDoH:
return AddressToUpstream(fmt.Sprintf("https://%s%s", stamp.ProviderName, stamp.Path), bootstrap)
}
return nil, fmt.Errorf("Unsupported protocol %v in %s", stamp.Proto, address) </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> add 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= </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | client/src/components/Settings/Upstream.js |
keep keep keep add keep keep keep keep keep keep | <mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const defaultTimeout = time.Second * 10
<mask>
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
</s> add golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> add 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= </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | dnsforward/upstream.go |
keep keep add keep keep keep keep keep | <mask> return nil, errorx.Decorate(err, "Failed to parse %s", address)
<mask> }
<mask> switch url.Scheme {
<mask> case "dns":
<mask> if url.Port() == "" {
<mask> url.Host += ":53"
<mask> }
<mask> return &plainDNS{boot: toBoot(url.Host, bootstrap)}, nil
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> add <li>
<code>sdns://...</code> - <span dangerouslySetInnerHTML={{ __html: t('example_upstream_sdns') }} />
</li> </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> add 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= </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | dnsforward/upstream.go |
keep keep add keep keep keep keep keep | <mask>
<mask> require (
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6
<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
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> remove github.com/miekg/dns v1.0.15
</s> add github.com/miekg/dns v1.1.1 </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 </s> add 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:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f h1:vOaSvI9B3wqzV1g8raDeVzRJnq5RHQxsz0MVXudxdNU=
github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f/go.mod h1:EC7Z1GguyEEwhuLXrcgkRTE3GdyPDSWq2OXefhydGWo= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
</s> add golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.mod |
keep keep add keep keep keep keep | <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/joomcode/errorx v0.1.0
<mask> github.com/miekg/dns v1.1.1
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible
<mask> github.com/shirou/gopsutil v2.18.10+incompatible
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> remove github.com/miekg/dns v1.0.15
</s> add github.com/miekg/dns v1.1.1 </s> add github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
</s> add golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.mod |
keep replace keep keep keep keep replace replace replace | <mask> github.com/joomcode/errorx v0.1.0
<mask> github.com/miekg/dns v1.0.15
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible
<mask> github.com/shirou/gopsutil v2.18.10+incompatible
<mask> github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
<mask> go.uber.org/goleak v0.10.0
<mask> golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849
<mask> golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> add 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= </s> add github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.mod |
keep add keep keep keep keep | <mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7 h1:NpQ+gkFOH27AyDypSCJ/LdsIi/b4rdnEb1N5+IpFfYs=
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7/go.mod h1:8c4/i2VlovMO2gBnHGQPN5EJw+H0lx1u/5p+cgsXtCk=
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> add github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> add 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= </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.sum |
keep keep keep add keep keep keep keep keep keep | <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:3UDmBDxesCOPF8iZdMDBBWKfkBoYujIMIZePnobqIUI=
<mask> github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
<mask> github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
<mask> github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
<mask> github.com/joomcode/errorx v0.1.0 h1:QmJMiI1DE1UFje2aI1ZWO/VMT5a32qBoXUclGOt8vsc=
<mask> github.com/joomcode/errorx v0.1.0/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
<mask> github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4 h1:Mlji5gkcpzkqTROyE4ZxZ8hN7osunMb2RuGVrbvMvCc=
<mask> github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 </s> remove github.com/miekg/dns v1.0.15
</s> add github.com/miekg/dns v1.1.1 </s> add github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/joomcode/errorx v0.1.0 h1:QmJMiI1DE1UFje2aI1ZWO/VMT5a32qBoXUclGOt8vsc=
<mask> github.com/joomcode/errorx v0.1.0/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
<mask> github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4 h1:Mlji5gkcpzkqTROyE4ZxZ8hN7osunMb2RuGVrbvMvCc=
<mask> github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
<mask> github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
<mask> github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
<mask> github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
<mask> github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= </s> remove github.com/miekg/dns v1.0.15
</s> add github.com/miekg/dns v1.1.1 </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
</s> add golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.sum |
keep keep keep replace replace keep replace replace keep keep keep | <mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> go.uber.org/goleak v0.10.0 h1:G3eWbSNIskeRqtsN/1uI5B+eP73y3JUuBsv9AZjehb4=
<mask> go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
<mask> golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
<mask> golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> remove golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
</s> add golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 </s> remove github.com/miekg/dns v1.0.15
</s> add github.com/miekg/dns v1.1.1 </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
<mask> golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> gopkg.in/asaskevich/govalidator.v4 v4.0.0-20160518190739-766470278477 h1:5xUJw+lg4zao9W4HIDzlFbMYgSgtvNVHh00MEHvbGpQ=
<mask> gopkg.in/asaskevich/govalidator.v4 v4.0.0-20160518190739-766470278477/go.mod h1:QDV1vrFSrowdoOba0UM8VJPUZONT7dnfdLsM+GG53Z8=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
</s> Fix #284
Added DNSCrypt upstreams support
Added DNS Stamps support </s> remove golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
</s> add golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
golang.org/x/net v0.0.0-20181213202711-891ebc4b82d6 </s> remove github.com/miekg/dns v1.0.15 h1:9+UupePBQCG6zf1q/bGmTO1vumoG13jsrbWOSX1W6Tw=
github.com/miekg/dns v1.0.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> add github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86 h1:Olj4M6T1omUfx7yTTcnhLf4xo6gYMmRHSJIfeA1NZy0=
github.com/jedisct1/go-dnsstamps v0.0.0-20180418170050-1e4999280f86/go.mod h1:j/ONpSHHmPgDwmFKXg9vhQvIjADe/ft1X4a3TVOmp9g=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a h1:2nyBWKszM41RO/gt5ElUXigAFiRgJ9KifHDlWOlw0lc=
github.com/jedisct1/xsecretbox v0.0.0-20180508184500-7a679c0bcd9a/go.mod h1:YlN58h704uRFD0BwsEGTq+7Wx+WG2i7P49bc+HwHyAY= </s> add 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:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f h1:vOaSvI9B3wqzV1g8raDeVzRJnq5RHQxsz0MVXudxdNU=
github.com/ameshkov/dnscrypt v0.0.0-20181217090431-1215bb8b150f/go.mod h1:EC7Z1GguyEEwhuLXrcgkRTE3GdyPDSWq2OXefhydGWo= | https://github.com/AdguardTeam/AdGuardHome/commit/b30b6b1d66c69f37cd97725f18d797a7ff2395d2 | go.sum |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> r, _ = d.CheckHost("facebook.com", dns.TypeA, &setts)
<mask> assert.True(t, r.IsFiltered && r.Reason == FilteredBlockedService)
<mask> }
<mask>
<mask> func TestRewrites(t *testing.T) {
<mask> d := Dnsfilter{}
<mask> // CNAME, A, AAAA
<mask> d.Rewrites = []RewriteEntry{
<mask> RewriteEntry{"somecname", "somehost.com", 0, nil},
<mask> RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
<mask>
<mask> RewriteEntry{"host.com", "1.2.3.4", 0, nil},
<mask> RewriteEntry{"host.com", "1.2.3.5", 0, nil},
<mask> RewriteEntry{"host.com", "1:2:3::4", 0, nil},
<mask> RewriteEntry{"www.host.com", "host.com", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r := d.processRewrites("host2.com")
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
<mask>
<mask> r = d.processRewrites("www.host.com")
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.True(t, len(r.IPList) == 3)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask> assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
<mask> assert.True(t, r.IPList[2].Equal(net.ParseIP("1:2:3::4")))
<mask>
<mask> // wildcard
<mask> d.Rewrites = []RewriteEntry{
<mask> RewriteEntry{"host.com", "1.2.3.4", 0, nil},
<mask> RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("host.com")
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> r = d.processRewrites("www.host.com")
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
<mask>
<mask> r = d.processRewrites("www.host2.com")
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
<mask>
<mask> // override a wildcard
<mask> d.Rewrites = []RewriteEntry{
<mask> RewriteEntry{"a.host.com", "1.2.3.4", 0, nil},
<mask> RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("a.host.com")
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // wildcard + CNAME
<mask> d.Rewrites = []RewriteEntry{
<mask> RewriteEntry{"host.com", "1.2.3.4", 0, nil},
<mask> RewriteEntry{"*.host.com", "host.com", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("www.host.com")
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // 2 CNAMEs
<mask> d.Rewrites = []RewriteEntry{
<mask> RewriteEntry{"b.host.com", "a.host.com", 0, nil},
<mask> RewriteEntry{"a.host.com", "host.com", 0, nil},
<mask> RewriteEntry{"host.com", "1.2.3.4", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("b.host.com")
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // 2 CNAMEs + wildcard
<mask> d.Rewrites = []RewriteEntry{
<mask> RewriteEntry{"b.host.com", "a.host.com", 0, nil},
<mask> RewriteEntry{"a.host.com", "x.somehost.com", 0, nil},
<mask> RewriteEntry{"*.somehost.com", "1.2.3.4", 0, nil},
<mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("b.host.com")
<mask> assert.Equal(t, ReasonRewrite, r.Reason)
<mask> assert.Equal(t, "x.somehost.com", r.CanonName)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask> }
<mask>
<mask> func prepareTestDir() string {
<mask> const dir = "./agh-test"
<mask> _ = os.RemoveAll(dir)
<mask> _ = os.MkdirAll(dir, 0755)
<mask> return dir
</s> + rewrites: support deeper level wildcards - select the more specific one </s> add // If matched by several wildcards, select the more specific one </s> remove // Priority: CNAME, A/AAAA; exact, wildcard.
</s> add // Priority:
// . CNAME > A/AAAA;
// . exact > wildcard;
// . higher level wildcard > lower level wildcard </s> remove return i < j
</s> add // both are wildcards
return len(a[i].Domain) > len(a[j].Domain) </s> remove if isWildcard(a[i].Domain) && !isWildcard(a[j].Domain) {
return false
} else if !isWildcard(a[i].Domain) && isWildcard(a[j].Domain) {
return true
</s> add if isWildcard(a[i].Domain) {
if !isWildcard(a[j].Domain) {
return false
}
} else {
if isWildcard(a[j].Domain) {
return true
} </s> add } else {
rr = rr[:1] | https://github.com/AdguardTeam/AdGuardHome/commit/b33653ec48a613df24d1768aab56a5c505affd33 | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func (a rewritesArray) Len() int { return len(a) }
<mask>
<mask> func (a rewritesArray) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
<mask>
<mask> // Priority: CNAME, A/AAAA; exact, wildcard.
<mask> func (a rewritesArray) Less(i, j int) bool {
<mask> if a[i].Type == dns.TypeCNAME && a[j].Type != dns.TypeCNAME {
<mask> return false
<mask> } else if a[i].Type != dns.TypeCNAME && a[j].Type == dns.TypeCNAME {
<mask> return true
</s> + rewrites: support deeper level wildcards - select the more specific one </s> remove if isWildcard(a[i].Domain) && !isWildcard(a[j].Domain) {
return false
} else if !isWildcard(a[i].Domain) && isWildcard(a[j].Domain) {
return true
</s> add if isWildcard(a[i].Domain) {
if !isWildcard(a[j].Domain) {
return false
}
} else {
if isWildcard(a[j].Domain) {
return true
} </s> remove return i < j
</s> add // both are wildcards
return len(a[i].Domain) > len(a[j].Domain) </s> add // If matched by several wildcards, select the more specific one </s> add } else {
rr = rr[:1] </s> remove func TestRewrites(t *testing.T) {
d := Dnsfilter{}
// CNAME, A, AAAA
d.Rewrites = []RewriteEntry{
RewriteEntry{"somecname", "somehost.com", 0, nil},
RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"host.com", "1.2.3.5", 0, nil},
RewriteEntry{"host.com", "1:2:3::4", 0, nil},
RewriteEntry{"www.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r := d.processRewrites("host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 3)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
assert.True(t, r.IPList[2].Equal(net.ParseIP("1:2:3::4")))
// wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
r = d.processRewrites("www.host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
// override a wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"a.host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("a.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// wildcard + CNAME
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "host.com", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs + wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "x.somehost.com", 0, nil},
RewriteEntry{"*.somehost.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "x.somehost.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b33653ec48a613df24d1768aab56a5c505affd33 | dnsfilter/rewrites.go |
keep keep keep replace replace replace replace keep keep replace keep keep | <mask> return true
<mask> }
<mask>
<mask> if isWildcard(a[i].Domain) && !isWildcard(a[j].Domain) {
<mask> return false
<mask> } else if !isWildcard(a[i].Domain) && isWildcard(a[j].Domain) {
<mask> return true
<mask> }
<mask>
<mask> return i < j
<mask> }
<mask>
</s> + rewrites: support deeper level wildcards - select the more specific one </s> remove // Priority: CNAME, A/AAAA; exact, wildcard.
</s> add // Priority:
// . CNAME > A/AAAA;
// . exact > wildcard;
// . higher level wildcard > lower level wildcard </s> add } else {
rr = rr[:1] </s> add // If matched by several wildcards, select the more specific one </s> remove func TestRewrites(t *testing.T) {
d := Dnsfilter{}
// CNAME, A, AAAA
d.Rewrites = []RewriteEntry{
RewriteEntry{"somecname", "somehost.com", 0, nil},
RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"host.com", "1.2.3.5", 0, nil},
RewriteEntry{"host.com", "1:2:3::4", 0, nil},
RewriteEntry{"www.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r := d.processRewrites("host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 3)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
assert.True(t, r.IPList[2].Equal(net.ParseIP("1:2:3::4")))
// wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
r = d.processRewrites("www.host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
// override a wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"a.host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("a.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// wildcard + CNAME
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "host.com", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs + wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "x.somehost.com", 0, nil},
RewriteEntry{"*.somehost.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "x.somehost.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b33653ec48a613df24d1768aab56a5c505affd33 | dnsfilter/rewrites.go |
keep keep add keep keep keep keep keep keep | <mask> // Get the list of matched rewrite entries.
<mask> // Priority: CNAME, A/AAAA; exact, wildcard.
<mask> // If matched exactly, don't return wildcard entries.
<mask> func findRewrites(a []RewriteEntry, host string) []RewriteEntry {
<mask> rr := rewritesArray{}
<mask> for _, r := range a {
<mask> if r.Domain != host {
<mask> if !matchDomainWildcard(host, r.Domain) {
<mask> continue
</s> + rewrites: support deeper level wildcards - select the more specific one </s> remove // Priority: CNAME, A/AAAA; exact, wildcard.
</s> add // Priority:
// . CNAME > A/AAAA;
// . exact > wildcard;
// . higher level wildcard > lower level wildcard </s> remove return i < j
</s> add // both are wildcards
return len(a[i].Domain) > len(a[j].Domain) </s> remove if isWildcard(a[i].Domain) && !isWildcard(a[j].Domain) {
return false
} else if !isWildcard(a[i].Domain) && isWildcard(a[j].Domain) {
return true
</s> add if isWildcard(a[i].Domain) {
if !isWildcard(a[j].Domain) {
return false
}
} else {
if isWildcard(a[j].Domain) {
return true
} </s> remove func TestRewrites(t *testing.T) {
d := Dnsfilter{}
// CNAME, A, AAAA
d.Rewrites = []RewriteEntry{
RewriteEntry{"somecname", "somehost.com", 0, nil},
RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"host.com", "1.2.3.5", 0, nil},
RewriteEntry{"host.com", "1:2:3::4", 0, nil},
RewriteEntry{"www.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r := d.processRewrites("host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 3)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
assert.True(t, r.IPList[2].Equal(net.ParseIP("1:2:3::4")))
// wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
r = d.processRewrites("www.host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
// override a wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"a.host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("a.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// wildcard + CNAME
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "host.com", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs + wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "x.somehost.com", 0, nil},
RewriteEntry{"*.somehost.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "x.somehost.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
}
</s> add </s> add } else {
rr = rr[:1] | https://github.com/AdguardTeam/AdGuardHome/commit/b33653ec48a613df24d1768aab56a5c505affd33 | dnsfilter/rewrites.go |
keep keep add keep keep keep keep keep | <mask> break
<mask> }
<mask> }
<mask> }
<mask>
<mask> return rr
<mask> }
<mask>
</s> + rewrites: support deeper level wildcards - select the more specific one </s> remove if isWildcard(a[i].Domain) && !isWildcard(a[j].Domain) {
return false
} else if !isWildcard(a[i].Domain) && isWildcard(a[j].Domain) {
return true
</s> add if isWildcard(a[i].Domain) {
if !isWildcard(a[j].Domain) {
return false
}
} else {
if isWildcard(a[j].Domain) {
return true
} </s> remove return i < j
</s> add // both are wildcards
return len(a[i].Domain) > len(a[j].Domain) </s> remove // Priority: CNAME, A/AAAA; exact, wildcard.
</s> add // Priority:
// . CNAME > A/AAAA;
// . exact > wildcard;
// . higher level wildcard > lower level wildcard </s> remove func TestRewrites(t *testing.T) {
d := Dnsfilter{}
// CNAME, A, AAAA
d.Rewrites = []RewriteEntry{
RewriteEntry{"somecname", "somehost.com", 0, nil},
RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"host.com", "1.2.3.5", 0, nil},
RewriteEntry{"host.com", "1:2:3::4", 0, nil},
RewriteEntry{"www.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r := d.processRewrites("host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 3)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
assert.True(t, r.IPList[2].Equal(net.ParseIP("1:2:3::4")))
// wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
r = d.processRewrites("www.host2.com")
assert.Equal(t, NotFilteredNotFound, r.Reason)
// override a wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"a.host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("a.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// wildcard + CNAME
d.Rewrites = []RewriteEntry{
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
RewriteEntry{"*.host.com", "host.com", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("www.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "host.com", 0, nil},
RewriteEntry{"host.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "host.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
// 2 CNAMEs + wildcard
d.Rewrites = []RewriteEntry{
RewriteEntry{"b.host.com", "a.host.com", 0, nil},
RewriteEntry{"a.host.com", "x.somehost.com", 0, nil},
RewriteEntry{"*.somehost.com", "1.2.3.4", 0, nil},
}
d.prepareRewrites()
r = d.processRewrites("b.host.com")
assert.Equal(t, ReasonRewrite, r.Reason)
assert.Equal(t, "x.somehost.com", r.CanonName)
assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
}
</s> add </s> add // If matched by several wildcards, select the more specific one | https://github.com/AdguardTeam/AdGuardHome/commit/b33653ec48a613df24d1768aab56a5c505affd33 | dnsfilter/rewrites.go |
keep keep keep add keep keep keep keep | <mask>
<mask> // configure log level and output
<mask> configureLogger(args)
<mask>
<mask> // print the first message after logger is configured
<mask> log.Println(version())
<mask> log.Debug("Current working directory is %s", Context.workDir)
<mask> if args.runningAsService {
</s> * (global): added --no-mem-optimization flag
This commit adds a new command-line argument that disables memory
optimizations AGH is using. These memory optimizations might be
necessary on low-memory devices, but they aren't free and there's a
performance hit (see #2044). Now they can be disabled - just pass
--no-mem-optimization when you run AGH or when you install the service
-- ./AdGuardHome -s install --no-mem-optimization
Closes: #2044 </s> remove
// memoryUsage implements a couple of not really beautiful hacks which purpose is to
// make OS reclaim the memory freed by AdGuard Home as soon as possible.
func memoryUsage() {
debug.SetGCPercent(10)
// madvdontneed: setting madvdontneed=1 will use MADV_DONTNEED
// instead of MADV_FREE on Linux when returning memory to the
// kernel. This is less efficient, but causes RSS numbers to drop
// more quickly.
_ = os.Setenv("GODEBUG", "madvdontneed=1")
// periodically call "debug.FreeOSMemory" so
// that the OS could reclaim the free memory
go func() {
ticker := time.NewTicker(15 * time.Second)
for {
select {
case t := <-ticker.C:
t.Second()
debug.FreeOSMemory()
}
}
}()
}
</s> add </s> remove memoryUsage()
</s> add </s> remove glinetMode bool // Activate GL-Inet mode
</s> add // disableMemoryOptimization - disables memory optimization hacks
// see memoryUsage() function for the details
disableMemoryOptimization bool
glinetMode bool // Activate GL-Inet compatibility mode </s> remove "os"
"runtime/debug"
"time"
</s> add </s> add var disableMemoryOptimizationArg = arg{
"Disable memory optimization",
"no-mem-optimization", "",
nil, func(o options) (options, error) { o.disableMemoryOptimization = true; return o, nil }, nil,
func(o options) []string { return boolSliceOrNil(o.disableMemoryOptimization) },
}
</s> add disableMemoryOptimizationArg, | https://github.com/AdguardTeam/AdGuardHome/commit/b3a68bb806dd16228398a64e66ef08b891cb3f30 | home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // runningAsService flag is set to true when options are passed from the service runner
<mask> runningAsService bool
<mask>
<mask> glinetMode bool // Activate GL-Inet mode
<mask> }
<mask>
<mask> // functions used for their side-effects
<mask> type effect func() error
<mask>
</s> * (global): added --no-mem-optimization flag
This commit adds a new command-line argument that disables memory
optimizations AGH is using. These memory optimizations might be
necessary on low-memory devices, but they aren't free and there's a
performance hit (see #2044). Now they can be disabled - just pass
--no-mem-optimization when you run AGH or when you install the service
-- ./AdGuardHome -s install --no-mem-optimization
Closes: #2044 </s> remove
// memoryUsage implements a couple of not really beautiful hacks which purpose is to
// make OS reclaim the memory freed by AdGuard Home as soon as possible.
func memoryUsage() {
debug.SetGCPercent(10)
// madvdontneed: setting madvdontneed=1 will use MADV_DONTNEED
// instead of MADV_FREE on Linux when returning memory to the
// kernel. This is less efficient, but causes RSS numbers to drop
// more quickly.
_ = os.Setenv("GODEBUG", "madvdontneed=1")
// periodically call "debug.FreeOSMemory" so
// that the OS could reclaim the free memory
go func() {
ticker := time.NewTicker(15 * time.Second)
for {
select {
case t := <-ticker.C:
t.Second()
debug.FreeOSMemory()
}
}
}()
}
</s> add </s> remove memoryUsage()
</s> add </s> add // Go memory hacks
memoryUsage(args)
</s> remove "os"
"runtime/debug"
"time"
</s> add </s> add disableMemoryOptimizationArg, </s> add var disableMemoryOptimizationArg = arg{
"Disable memory optimization",
"no-mem-optimization", "",
nil, func(o options) (options, error) { o.disableMemoryOptimization = true; return o, nil }, nil,
func(o options) []string { return boolSliceOrNil(o.disableMemoryOptimization) },
}
| https://github.com/AdguardTeam/AdGuardHome/commit/b3a68bb806dd16228398a64e66ef08b891cb3f30 | home/options.go |
keep add keep keep keep keep | <mask> }
<mask>
<mask> var verboseArg = arg{
<mask> "Enable verbose output",
<mask> "verbose", "v",
<mask> nil, func(o options) (options, error) { o.verbose = true; return o, nil }, nil,
</s> * (global): added --no-mem-optimization flag
This commit adds a new command-line argument that disables memory
optimizations AGH is using. These memory optimizations might be
necessary on low-memory devices, but they aren't free and there's a
performance hit (see #2044). Now they can be disabled - just pass
--no-mem-optimization when you run AGH or when you install the service
-- ./AdGuardHome -s install --no-mem-optimization
Closes: #2044 </s> remove memoryUsage()
</s> add </s> remove
// memoryUsage implements a couple of not really beautiful hacks which purpose is to
// make OS reclaim the memory freed by AdGuard Home as soon as possible.
func memoryUsage() {
debug.SetGCPercent(10)
// madvdontneed: setting madvdontneed=1 will use MADV_DONTNEED
// instead of MADV_FREE on Linux when returning memory to the
// kernel. This is less efficient, but causes RSS numbers to drop
// more quickly.
_ = os.Setenv("GODEBUG", "madvdontneed=1")
// periodically call "debug.FreeOSMemory" so
// that the OS could reclaim the free memory
go func() {
ticker := time.NewTicker(15 * time.Second)
for {
select {
case t := <-ticker.C:
t.Second()
debug.FreeOSMemory()
}
}
}()
}
</s> add </s> remove "os"
"runtime/debug"
"time"
</s> add </s> add disableMemoryOptimizationArg, </s> add // Go memory hacks
memoryUsage(args)
</s> remove glinetMode bool // Activate GL-Inet mode
</s> add // disableMemoryOptimization - disables memory optimization hacks
// see memoryUsage() function for the details
disableMemoryOptimization bool
glinetMode bool // Activate GL-Inet compatibility mode | https://github.com/AdguardTeam/AdGuardHome/commit/b3a68bb806dd16228398a64e66ef08b891cb3f30 | home/options.go |
keep keep keep add keep keep keep keep keep keep | <mask> logfileArg,
<mask> pidfileArg,
<mask> checkConfigArg,
<mask> noCheckUpdateArg,
<mask> verboseArg,
<mask> glinetArg,
<mask> versionArg,
<mask> helpArg,
<mask> }
<mask> }
</s> * (global): added --no-mem-optimization flag
This commit adds a new command-line argument that disables memory
optimizations AGH is using. These memory optimizations might be
necessary on low-memory devices, but they aren't free and there's a
performance hit (see #2044). Now they can be disabled - just pass
--no-mem-optimization when you run AGH or when you install the service
-- ./AdGuardHome -s install --no-mem-optimization
Closes: #2044 </s> remove
// memoryUsage implements a couple of not really beautiful hacks which purpose is to
// make OS reclaim the memory freed by AdGuard Home as soon as possible.
func memoryUsage() {
debug.SetGCPercent(10)
// madvdontneed: setting madvdontneed=1 will use MADV_DONTNEED
// instead of MADV_FREE on Linux when returning memory to the
// kernel. This is less efficient, but causes RSS numbers to drop
// more quickly.
_ = os.Setenv("GODEBUG", "madvdontneed=1")
// periodically call "debug.FreeOSMemory" so
// that the OS could reclaim the free memory
go func() {
ticker := time.NewTicker(15 * time.Second)
for {
select {
case t := <-ticker.C:
t.Second()
debug.FreeOSMemory()
}
}
}()
}
</s> add </s> add var disableMemoryOptimizationArg = arg{
"Disable memory optimization",
"no-mem-optimization", "",
nil, func(o options) (options, error) { o.disableMemoryOptimization = true; return o, nil }, nil,
func(o options) []string { return boolSliceOrNil(o.disableMemoryOptimization) },
}
</s> remove memoryUsage()
</s> add </s> remove glinetMode bool // Activate GL-Inet mode
</s> add // disableMemoryOptimization - disables memory optimization hacks
// see memoryUsage() function for the details
disableMemoryOptimization bool
glinetMode bool // Activate GL-Inet compatibility mode </s> remove "os"
"runtime/debug"
"time"
</s> add </s> add // Go memory hacks
memoryUsage(args)
| https://github.com/AdguardTeam/AdGuardHome/commit/b3a68bb806dd16228398a64e66ef08b891cb3f30 | home/options.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> //go:generate packr -z
<mask> package main
<mask>
<mask> import (
<mask> "os"
<mask> "runtime/debug"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/home"
<mask> )
<mask>
<mask> // version will be set through ldflags, contains current version
<mask> var version = "undefined"
</s> * (global): added --no-mem-optimization flag
This commit adds a new command-line argument that disables memory
optimizations AGH is using. These memory optimizations might be
necessary on low-memory devices, but they aren't free and there's a
performance hit (see #2044). Now they can be disabled - just pass
--no-mem-optimization when you run AGH or when you install the service
-- ./AdGuardHome -s install --no-mem-optimization
Closes: #2044 </s> remove memoryUsage()
</s> add </s> remove
// memoryUsage implements a couple of not really beautiful hacks which purpose is to
// make OS reclaim the memory freed by AdGuard Home as soon as possible.
func memoryUsage() {
debug.SetGCPercent(10)
// madvdontneed: setting madvdontneed=1 will use MADV_DONTNEED
// instead of MADV_FREE on Linux when returning memory to the
// kernel. This is less efficient, but causes RSS numbers to drop
// more quickly.
_ = os.Setenv("GODEBUG", "madvdontneed=1")
// periodically call "debug.FreeOSMemory" so
// that the OS could reclaim the free memory
go func() {
ticker := time.NewTicker(15 * time.Second)
for {
select {
case t := <-ticker.C:
t.Second()
debug.FreeOSMemory()
}
}
}()
}
</s> add </s> add var disableMemoryOptimizationArg = arg{
"Disable memory optimization",
"no-mem-optimization", "",
nil, func(o options) (options, error) { o.disableMemoryOptimization = true; return o, nil }, nil,
func(o options) []string { return boolSliceOrNil(o.disableMemoryOptimization) },
}
</s> remove glinetMode bool // Activate GL-Inet mode
</s> add // disableMemoryOptimization - disables memory optimization hacks
// see memoryUsage() function for the details
disableMemoryOptimization bool
glinetMode bool // Activate GL-Inet compatibility mode </s> add // Go memory hacks
memoryUsage(args)
</s> add disableMemoryOptimizationArg, | https://github.com/AdguardTeam/AdGuardHome/commit/b3a68bb806dd16228398a64e66ef08b891cb3f30 | main.go |
keep keep keep keep replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask> // GOARM value - set via ldflags
<mask> var goarm = ""
<mask>
<mask> func main() {
<mask> memoryUsage()
<mask>
<mask> home.Main(version, channel, goarm)
<mask> }
<mask>
<mask> // memoryUsage implements a couple of not really beautiful hacks which purpose is to
<mask> // make OS reclaim the memory freed by AdGuard Home as soon as possible.
<mask> func memoryUsage() {
<mask> debug.SetGCPercent(10)
<mask>
<mask> // madvdontneed: setting madvdontneed=1 will use MADV_DONTNEED
<mask> // instead of MADV_FREE on Linux when returning memory to the
<mask> // kernel. This is less efficient, but causes RSS numbers to drop
<mask> // more quickly.
<mask> _ = os.Setenv("GODEBUG", "madvdontneed=1")
<mask>
<mask> // periodically call "debug.FreeOSMemory" so
<mask> // that the OS could reclaim the free memory
<mask> go func() {
<mask> ticker := time.NewTicker(15 * time.Second)
<mask> for {
<mask> select {
<mask> case t := <-ticker.C:
<mask> t.Second()
<mask> debug.FreeOSMemory()
<mask> }
<mask> }
<mask> }()
<mask> }
</s> * (global): added --no-mem-optimization flag
This commit adds a new command-line argument that disables memory
optimizations AGH is using. These memory optimizations might be
necessary on low-memory devices, but they aren't free and there's a
performance hit (see #2044). Now they can be disabled - just pass
--no-mem-optimization when you run AGH or when you install the service
-- ./AdGuardHome -s install --no-mem-optimization
Closes: #2044 </s> remove glinetMode bool // Activate GL-Inet mode
</s> add // disableMemoryOptimization - disables memory optimization hacks
// see memoryUsage() function for the details
disableMemoryOptimization bool
glinetMode bool // Activate GL-Inet compatibility mode </s> add // Go memory hacks
memoryUsage(args)
</s> add var disableMemoryOptimizationArg = arg{
"Disable memory optimization",
"no-mem-optimization", "",
nil, func(o options) (options, error) { o.disableMemoryOptimization = true; return o, nil }, nil,
func(o options) []string { return boolSliceOrNil(o.disableMemoryOptimization) },
}
</s> remove "os"
"runtime/debug"
"time"
</s> add </s> add disableMemoryOptimizationArg, | https://github.com/AdguardTeam/AdGuardHome/commit/b3a68bb806dd16228398a64e66ef08b891cb3f30 | main.go |
keep keep add keep keep keep keep keep keep | <mask>
<mask> import { normalizeHistory, normalizeFilteringStatus, normalizeLogs, normalizeTextarea, sortClients } from '../helpers/helpers';
<mask> import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
<mask> import Api from '../api/Api';
<mask>
<mask> const apiClient = new Api();
<mask>
<mask> export const addErrorToast = createAction('ADD_ERROR_TOAST');
<mask> export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
</s> - client: request tls status on app load </s> remove const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
</s> add const { validateTlsConfig, encryption } = this.props; </s> add dispatch(getTlsStatus()); | https://github.com/AdguardTeam/AdGuardHome/commit/b3c2b3a21bc79025bfdf2d829e371d5283815c71 | client/src/actions/index.js |
keep add keep keep keep keep keep | <mask> dispatch(getClients());
<mask> dispatch(getTopStats());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(initSettingsFailure());
<mask> }
<mask> };
</s> - client: request tls status on app load </s> remove const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
</s> add const { validateTlsConfig, encryption } = this.props; </s> add import { getTlsStatus } from './encryption'; | https://github.com/AdguardTeam/AdGuardHome/commit/b3c2b3a21bc79025bfdf2d829e371d5283815c71 | client/src/actions/index.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> import Loading from '../../ui/Loading';
<mask>
<mask> class Encryption extends Component {
<mask> componentDidMount() {
<mask> const { getTlsStatus, validateTlsConfig, encryption } = this.props;
<mask>
<mask> getTlsStatus();
<mask>
<mask> if (encryption.enabled) {
<mask> validateTlsConfig(encryption);
<mask> }
<mask> }
</s> - client: request tls status on app load </s> add import { getTlsStatus } from './encryption'; </s> add dispatch(getTlsStatus()); | https://github.com/AdguardTeam/AdGuardHome/commit/b3c2b3a21bc79025bfdf2d829e371d5283815c71 | client/src/components/Settings/Encryption/index.js |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> func (clients *clientsContainer) AddHost(ip, host string, source clientSource) (bool, error) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> // check existing clients first
<mask> _, ok := clients.findByIP(ip)
<mask> if ok {
<mask> return false, nil
<mask> }
<mask>
<mask> // check auto-clients index
<mask> ch, ok := clients.ipHost[ip]
<mask> if ok && ch.Source > source {
<mask> return false, nil
<mask> } else if ok {
</s> * clients: manual clients don't exclude auto-clients anymore </s> remove func TestClientsAddExistingHost(t *testing.T) {
</s> add func TestClientsAddExisting(t *testing.T) { </s> remove assert.False(t, ok)
</s> add assert.True(t, ok) </s> remove // try adding a duplicate by IP
</s> add // add an auto-client with the same IP - it's allowed </s> remove // don't allow duplicates by CIDR
ok, err = clients.AddHost("2.2.2.2", "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the IP from the client1's IP range
c = Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok) </s> remove // try adding a duplicate IP which for a Mac-based client
ok, err = clients.AddHost(testIP, "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the same IP as for a client with MAC
c = Client{
IDs: []string{testIP},
Name: "client2",
}
ok, err = clients.Add(c)
assert.True(t, ok) | https://github.com/AdguardTeam/AdGuardHome/commit/b3ddae7f856ec4e798e7a0595ba1644b4b96e873 | home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.True(t, clients.ipHost["1.1.1.2"] == nil)
<mask> _ = clients.Del("client1")
<mask> }
<mask>
<mask> func TestClientsAddExistingHost(t *testing.T) {
<mask> var c Client
<mask> clients := clientsContainer{}
<mask> clients.testing = true
<mask> clients.Init(nil, nil)
<mask>
</s> * clients: manual clients don't exclude auto-clients anymore </s> remove // check existing clients first
_, ok := clients.findByIP(ip)
if ok {
return false, nil
}
</s> add </s> remove // don't allow duplicates by CIDR
ok, err = clients.AddHost("2.2.2.2", "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the IP from the client1's IP range
c = Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok) </s> remove // try adding a duplicate IP which for a Mac-based client
ok, err = clients.AddHost(testIP, "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the same IP as for a client with MAC
c = Client{
IDs: []string{testIP},
Name: "client2",
}
ok, err = clients.Add(c)
assert.True(t, ok) </s> remove assert.False(t, ok)
</s> add assert.True(t, ok) </s> remove // try adding a duplicate by IP
</s> add // add an auto-client with the same IP - it's allowed | https://github.com/AdguardTeam/AdGuardHome/commit/b3ddae7f856ec4e798e7a0595ba1644b4b96e873 | home/clients_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> ok, err := clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // try adding a duplicate by IP
<mask> ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // now some more complicated stuff
</s> * clients: manual clients don't exclude auto-clients anymore </s> remove assert.False(t, ok)
</s> add assert.True(t, ok) </s> remove // don't allow duplicates by CIDR
ok, err = clients.AddHost("2.2.2.2", "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the IP from the client1's IP range
c = Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok) </s> remove // try adding a duplicate IP which for a Mac-based client
ok, err = clients.AddHost(testIP, "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the same IP as for a client with MAC
c = Client{
IDs: []string{testIP},
Name: "client2",
}
ok, err = clients.Add(c)
assert.True(t, ok) </s> remove func TestClientsAddExistingHost(t *testing.T) {
</s> add func TestClientsAddExisting(t *testing.T) { </s> remove // check existing clients first
_, ok := clients.findByIP(ip)
if ok {
return false, nil
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b3ddae7f856ec4e798e7a0595ba1644b4b96e873 | home/clients_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Nil(t, err)
<mask>
<mask> // try adding a duplicate by IP
<mask> ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // now some more complicated stuff
<mask> // first, init a DHCP server with a single static lease
<mask> config := dhcpd.ServerConfig{
</s> * clients: manual clients don't exclude auto-clients anymore </s> remove // try adding a duplicate by IP
</s> add // add an auto-client with the same IP - it's allowed </s> remove // try adding a duplicate IP which for a Mac-based client
ok, err = clients.AddHost(testIP, "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the same IP as for a client with MAC
c = Client{
IDs: []string{testIP},
Name: "client2",
}
ok, err = clients.Add(c)
assert.True(t, ok) </s> remove // don't allow duplicates by CIDR
ok, err = clients.AddHost("2.2.2.2", "test", ClientSourceRDNS)
assert.False(t, ok)
</s> add // add a new client with the IP from the client1's IP range
c = Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok) </s> remove // check existing clients first
_, ok := clients.findByIP(ip)
if ok {
return false, nil
}
</s> add </s> remove func TestClientsAddExistingHost(t *testing.T) {
</s> add func TestClientsAddExisting(t *testing.T) { | https://github.com/AdguardTeam/AdGuardHome/commit/b3ddae7f856ec4e798e7a0595ba1644b4b96e873 | home/clients_test.go |
keep keep keep keep replace replace replace keep keep replace replace replace | <mask> Expiry: time.Now().Add(time.Hour),
<mask> })
<mask> assert.Nil(t, err)
<mask>
<mask> // try adding a duplicate IP which for a Mac-based client
<mask> ok, err = clients.AddHost(testIP, "test", ClientSourceRDNS)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // don't allow duplicates by CIDR
<mask> ok, err = clients.AddHost("2.2.2.2", "test", ClientSourceRDNS)
<mask> assert.False(t, ok)
</s> * clients: manual clients don't exclude auto-clients anymore </s> remove // try adding a duplicate by IP
</s> add // add an auto-client with the same IP - it's allowed </s> remove assert.False(t, ok)
</s> add assert.True(t, ok) </s> remove func TestClientsAddExistingHost(t *testing.T) {
</s> add func TestClientsAddExisting(t *testing.T) { </s> remove // check existing clients first
_, ok := clients.findByIP(ip)
if ok {
return false, nil
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b3ddae7f856ec4e798e7a0595ba1644b4b96e873 | home/clients_test.go |
keep replace keep keep keep keep replace keep keep | <mask> import (
<mask> "bufio"
<mask> "context"
<mask> "crypto/tls"
<mask> "crypto/x509"
<mask> "fmt"
<mask> "io"
<mask> "io/ioutil"
<mask> "net"
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove "os/exec"
</s> add </s> add msg := fmt.Sprintf(`AdGuard failed to bind to port 53 due to %v
Please note, that this is crucial for a DNS server to be able to use that port.`, err)
log.Info(msg) </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> remove } else {
log.Error("This is the first launch of AdGuard Home. You must run it as root.")
</s> add // We should check if AdGuard Home is able to bind to port 53
ok, err := util.CanBindPort(53) | https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep replace keep keep keep keep replace keep keep keep keep | <mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "os/exec"
<mask> "os/signal"
<mask> "path/filepath"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
<mask> "syscall"
<mask> "time"
<mask>
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove "io"
</s> add </s> add msg := fmt.Sprintf(`AdGuard failed to bind to port 53 due to %v
Please note, that this is crucial for a DNS server to be able to use that port.`, err)
log.Info(msg) </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> remove } else {
log.Error("This is the first launch of AdGuard Home. You must run it as root.")
</s> add // We should check if AdGuard Home is able to bind to port 53
ok, err := util.CanBindPort(53) | https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> Context.firstRun = detectFirstRun()
<mask> if Context.firstRun {
<mask> log.Info("This is the first time AdGuard Home is launched")
<mask> requireAdminRights()
<mask> }
<mask>
<mask> initConfig()
<mask>
<mask> Context.tlsRoots = util.LoadSystemRootCAs()
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> remove } else {
log.Error("This is the first launch of AdGuard Home. You must run it as root.")
</s> add // We should check if AdGuard Home is able to bind to port 53
ok, err := util.CanBindPort(53) </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> remove func requireAdminRights() {
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> add func checkPermissions() {
log.Info("Checking if AdGuard Home has necessary permissions") </s> add } </s> add // On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
| https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> // Check if the current user has root (administrator) rights
<mask> // and if not, ask and try to run as root
<mask> func requireAdminRights() {
<mask> admin, _ := util.HaveAdminRights()
<mask> if //noinspection ALL
<mask> admin || isdelve.Enabled {
<mask> // Don't forget that for this to work you need to add "delve" tag explicitly
<mask> // https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
<mask> return
<mask> }
<mask>
<mask> if runtime.GOOS == "windows" {
<mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.")
<mask>
<mask> } else {
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> add // On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> remove } else {
log.Error("This is the first launch of AdGuard Home. You must run it as root.")
</s> add // We should check if AdGuard Home is able to bind to port 53
ok, err := util.CanBindPort(53) </s> add } </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> add msg := fmt.Sprintf(`AdGuard failed to bind to port 53 due to %v
Please note, that this is crucial for a DNS server to be able to use that port.`, err)
log.Info(msg) | https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep add keep keep keep keep | <mask>
<mask> if runtime.GOOS == "windows" {
<mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.")
<mask> }
<mask>
<mask> // We should check if AdGuard Home is able to bind to port 53
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove } else {
log.Error("This is the first launch of AdGuard Home. You must run it as root.")
</s> add // We should check if AdGuard Home is able to bind to port 53
ok, err := util.CanBindPort(53) </s> add } </s> remove func requireAdminRights() {
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> add func checkPermissions() {
log.Info("Checking if AdGuard Home has necessary permissions") </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> remove requireAdminRights()
</s> add checkPermissions() | https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep add keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.")
<mask>
<mask> // We should check if AdGuard Home is able to bind to port 53
<mask> ok, err := util.CanBindPort(53)
<mask>
<mask> if ok {
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove } else {
log.Error("This is the first launch of AdGuard Home. You must run it as root.")
</s> add // We should check if AdGuard Home is able to bind to port 53
ok, err := util.CanBindPort(53) </s> add // On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> remove func requireAdminRights() {
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> add func checkPermissions() {
log.Info("Checking if AdGuard Home has necessary permissions") </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> remove requireAdminRights()
</s> add checkPermissions() | https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> if runtime.GOOS == "windows" {
<mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.")
<mask>
<mask> } else {
<mask> log.Error("This is the first launch of AdGuard Home. You must run it as root.")
<mask>
<mask> _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
<mask> stdin := bufio.NewReader(os.Stdin)
<mask> buf, _ := stdin.ReadString('\n')
<mask> buf = strings.TrimSpace(buf)
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> remove func requireAdminRights() {
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> add func checkPermissions() {
log.Info("Checking if AdGuard Home has necessary permissions") </s> add // On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> add } </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> remove requireAdminRights()
</s> add checkPermissions() | https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep replace replace replace replace replace replace replace keep replace replace replace replace replace replace keep | <mask> } else {
<mask> log.Error("This is the first launch of AdGuard Home. You must run it as root.")
<mask>
<mask> _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
<mask> stdin := bufio.NewReader(os.Stdin)
<mask> buf, _ := stdin.ReadString('\n')
<mask> buf = strings.TrimSpace(buf)
<mask> if buf != "y" {
<mask> os.Exit(1)
<mask> }
<mask>
<mask> cmd := exec.Command("sudo", os.Args...)
<mask> cmd.Stdin = os.Stdin
<mask> cmd.Stdout = os.Stdout
<mask> cmd.Stderr = os.Stderr
<mask> _ = cmd.Run()
<mask> os.Exit(1)
<mask> }
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove } else {
log.Error("This is the first launch of AdGuard Home. You must run it as root.")
</s> add // We should check if AdGuard Home is able to bind to port 53
ok, err := util.CanBindPort(53) </s> remove requireAdminRights()
</s> add checkPermissions() </s> remove func requireAdminRights() {
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> add func checkPermissions() {
log.Info("Checking if AdGuard Home has necessary permissions") </s> add } </s> add // On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
| https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep add keep keep keep keep | <mask> log.Fatal(msg)
<mask> }
<mask> }
<mask> }
<mask> }
<mask>
<mask> // Write PID to a file
<mask> func writePIDFile(fn string) bool {
</s> *(home): do not require root privileges on the first run
Instead of requiring root privileges, we now check if AdGuard Home can
bind to privileged ports. If it cannot, we suggest either running it
with root privileges or grant CAP_NET_BIND_SERVICE capability. Please
note, that on Windows we still require root access.
Closes: #1699 </s> remove cmd := exec.Command("sudo", os.Args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
_ = cmd.Run()
os.Exit(1)
</s> add if opErr, ok := err.(*net.OpError); ok {
if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
if errno, ok := sysErr.Err.(syscall.Errno); ok && errno == syscall.EACCES {
msg := `Permission check failed.
AdGuard Home is not allowed to bind to privileged ports (for instance, port 53).
Please note, that this is crucial for a server to be able to use privileged ports.
You have two options:
1. Run AdGuard Home with root privileges
2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
log.Fatal(msg)
}
} </s> remove func requireAdminRights() {
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> add func checkPermissions() {
log.Info("Checking if AdGuard Home has necessary permissions") </s> add } </s> remove _, _ = io.WriteString(os.Stdout, "Do you want to start AdGuard Home as root user? [y/n] ")
stdin := bufio.NewReader(os.Stdin)
buf, _ := stdin.ReadString('\n')
buf = strings.TrimSpace(buf)
if buf != "y" {
os.Exit(1)
}
</s> add if ok {
log.Info("AdGuard Home can bind to port 53")
return
} </s> add // On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
</s> remove requireAdminRights()
</s> add checkPermissions() | https://github.com/AdguardTeam/AdGuardHome/commit/b43223d30226f70b4616c71429f93a38e89cb163 | home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // RegisterAuthHandlers - register handlers
<mask> func RegisterAuthHandlers() {
<mask> http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
<mask> httpRegister("GET", "/control/logout", handleLogout)
<mask> }
<mask>
<mask> func parseCookie(cookie string) string {
<mask> pairs := strings.Split(cookie, ";")
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove http.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
http.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot))
</s> add Context.mux.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
Context.mux.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot)) </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add </s> remove http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> add Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box))) </s> remove http.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler)))))
</s> add Context.mux.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler))))) </s> add Context.mux = http.NewServeMux() | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/auth.go |
keep keep replace keep keep keep keep replace replace | <mask> httpRegister(http.MethodPost, "/control/i18n/change_language", handleI18nChangeLanguage)
<mask> httpRegister(http.MethodGet, "/control/i18n/current_language", handleI18nCurrentLanguage)
<mask> http.HandleFunc("/control/version.json", postInstall(optionalAuth(handleGetVersionJSON)))
<mask> httpRegister(http.MethodPost, "/control/update", handleUpdate)
<mask> httpRegister(http.MethodGet, "/control/profile", handleGetProfile)
<mask>
<mask> // No auth is necessary for DOH/DOT configurations
<mask> http.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
<mask> http.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot))
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add // ReadTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadTimeout time.Duration
// ReadHeaderTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadHeaderTimeout time.Duration
// WriteTimeout is an option to pass to http.Server for setting an
// appropriate field.
WriteTimeout time.Duration </s> remove http.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler)))))
</s> add Context.mux.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler))))) </s> add const (
// ReadTimeout is the maximum duration for reading the entire request,
// including the body.
ReadTimeout = 10 * time.Second
// ReadHeaderTimeout is the amount of time allowed to read request
// headers.
ReadHeaderTimeout = 10 * time.Second
// WriteTimeout is the maximum duration before timing out writes of the
// response.
WriteTimeout = 10 * time.Second
)
</s> add // mux is our custom http.ServeMux.
mux *http.ServeMux
</s> remove http.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box))))) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/control.go |
keep keep replace keep keep keep replace | <mask> if len(method) == 0 {
<mask> // "/dns-query" handler doesn't need auth, gzip and isn't restricted by 1 HTTP method
<mask> http.HandleFunc(url, postInstall(handler))
<mask> return
<mask> }
<mask>
<mask> http.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler)))))
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove http.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
http.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot))
</s> add Context.mux.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
Context.mux.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot)) </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add </s> remove http.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box))))) </s> add ReadTimeout: ReadTimeout,
ReadHeaderTimeout: ReadHeaderTimeout,
WriteTimeout: WriteTimeout, </s> remove http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> add Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box))) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/control.go |
keep keep keep keep replace replace replace keep | <mask> }
<mask> }
<mask>
<mask> func (web *Web) registerInstallHandlers() {
<mask> http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(web.handleInstallGetAddresses)))
<mask> http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(web.handleInstallCheckConfig)))
<mask> http.HandleFunc("/control/install/configure", preInstall(ensurePOST(web.handleInstallConfigure)))
<mask> }
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add Context.mux = http.NewServeMux() </s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) </s> add ReadTimeout: ReadTimeout,
ReadHeaderTimeout: ReadHeaderTimeout,
WriteTimeout: WriteTimeout, </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/control_install.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func testStartFilterListener() net.Listener {
<mask> http.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
<mask> content := `||example.org^$third-party
<mask> # Inline comment example
<mask> ||example.com^$third-party
<mask> 0.0.0.0 example.com
<mask> `
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) </s> add const (
// ReadTimeout is the maximum duration for reading the entire request,
// including the body.
ReadTimeout = 10 * time.Second
// ReadHeaderTimeout is the amount of time allowed to read request
// headers.
ReadHeaderTimeout = 10 * time.Second
// WriteTimeout is the maximum duration before timing out writes of the
// response.
WriteTimeout = 10 * time.Second
)
</s> remove "strings"
</s> add </s> add Handler: Context.mux,
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/filter_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
<mask> go func() { _ = http.Serve(listener, nil) }()
<mask> return listener
<mask> }
<mask>
<mask> func TestFilters(t *testing.T) {
<mask> l := testStartFilterListener()
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add Handler: Context.mux,
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> remove ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(http.DefaultServeMux, filterPProf, limitRequestBody),
</s> add ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(Context.mux, limitRequestBody),
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> add ReadTimeout: ReadTimeout,
ReadHeaderTimeout: ReadHeaderTimeout,
WriteTimeout: WriteTimeout, </s> remove http.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
</s> add mux := http.NewServeMux()
mux.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) { </s> add Context.mux = http.NewServeMux() </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/filter_test.go |
keep keep add keep keep keep keep | <mask>
<mask> ipDetector *ipDetector
<mask>
<mask> // Runtime properties
<mask> // --
<mask>
<mask> configFilename string // Config filename (can be overridden via the command line arguments)
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add const (
// ReadTimeout is the maximum duration for reading the entire request,
// including the body.
ReadTimeout = 10 * time.Second
// ReadHeaderTimeout is the amount of time allowed to read request
// headers.
ReadHeaderTimeout = 10 * time.Second
// WriteTimeout is the maximum duration before timing out writes of the
// response.
WriteTimeout = 10 * time.Second
)
</s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add </s> remove http.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box))))) </s> remove http.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler)))))
</s> add Context.mux.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler))))) </s> add // ReadTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadTimeout time.Duration
// ReadHeaderTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadHeaderTimeout time.Duration
// WriteTimeout is an option to pass to http.Server for setting an
// appropriate field.
WriteTimeout time.Duration | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/home.go |
keep keep keep add keep keep keep keep | <mask> log.Info("Configuration file is OK")
<mask> os.Exit(0)
<mask> }
<mask> }
<mask> }
<mask>
<mask> func setupConfig(args options) {
<mask> config.DHCP.WorkDir = Context.workDir
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> add ReadTimeout: ReadTimeout,
ReadHeaderTimeout: ReadHeaderTimeout,
WriteTimeout: WriteTimeout, </s> remove http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(web.handleInstallGetAddresses)))
http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(web.handleInstallCheckConfig)))
http.HandleFunc("/control/install/configure", preInstall(ensurePOST(web.handleInstallConfigure)))
</s> add Context.mux.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(web.handleInstallGetAddresses)))
Context.mux.HandleFunc("/control/install/check_config", preInstall(ensurePOST(web.handleInstallCheckConfig)))
Context.mux.HandleFunc("/control/install/configure", preInstall(ensurePOST(web.handleInstallConfigure))) </s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) </s> remove http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> add Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box))) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/home.go |
keep keep add keep keep keep keep keep | <mask> firstRun: Context.firstRun,
<mask> BindHost: config.BindHost,
<mask> BindPort: config.BindPort,
<mask> }
<mask> Context.web = CreateWeb(&webConf)
<mask> if Context.web == nil {
<mask> log.Fatalf("Can't initialize Web module")
<mask> }
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> add Context.mux = http.NewServeMux() </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) </s> remove http.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
http.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot))
</s> add Context.mux.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
Context.mux.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot)) </s> remove http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(web.handleInstallGetAddresses)))
http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(web.handleInstallCheckConfig)))
http.HandleFunc("/control/install/configure", preInstall(ensurePOST(web.handleInstallConfigure)))
</s> add Context.mux.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(web.handleInstallGetAddresses)))
Context.mux.HandleFunc("/control/install/check_config", preInstall(ensurePOST(web.handleInstallCheckConfig)))
Context.mux.HandleFunc("/control/install/configure", preInstall(ensurePOST(web.handleInstallConfigure))) </s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> package home
<mask>
<mask> import (
<mask> "net/http"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add "time" </s> add const (
// ReadTimeout is the maximum duration for reading the entire request,
// including the body.
ReadTimeout = 10 * time.Second
// ReadHeaderTimeout is the amount of time allowed to read request
// headers.
ReadHeaderTimeout = 10 * time.Second
// WriteTimeout is the maximum duration before timing out writes of the
// response.
WriteTimeout = 10 * time.Second
)
</s> remove http.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
</s> add mux := http.NewServeMux()
mux.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) { </s> add Handler: Context.mux,
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> remove http.HandleFunc("/control/version.json", postInstall(optionalAuth(handleGetVersionJSON)))
</s> add Context.mux.HandleFunc("/control/version.json", postInstall(optionalAuth(handleGetVersionJSON))) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/middlewares.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask>
<mask> h.ServeHTTP(w, r)
<mask> })
<mask> }
<mask>
<mask> // TODO(a.garipov): We currently have to use this, because everything registers
<mask> // its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
<mask> // API initialization process and stop using the gosh darn http.DefaultServeMux
<mask> // for anything at all. Gosh darn global variables.
<mask> func filterPProf(h http.Handler) (filtered http.Handler) {
<mask> return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<mask> if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
<mask> http.NotFound(w, r)
<mask>
<mask> return
<mask> }
<mask>
<mask> h.ServeHTTP(w, r)
<mask> })
<mask> }
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove http.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler)))))
</s> add Context.mux.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler))))) </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) </s> remove http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> add Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box))) </s> remove http.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
</s> add mux := http.NewServeMux()
mux.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) { </s> remove http.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box))))) </s> remove ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(http.DefaultServeMux, filterPProf, limitRequestBody),
</s> add ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(Context.mux, limitRequestBody),
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/middlewares.go |
keep keep add keep keep keep keep | <mask> "net/http"
<mask> "strconv"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/NYTimes/gziphandler"
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove "strings"
</s> add </s> add Handler: Context.mux,
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> add // mux is our custom http.ServeMux.
mux *http.ServeMux
</s> remove http.HandleFunc("/control/version.json", postInstall(optionalAuth(handleGetVersionJSON)))
</s> add Context.mux.HandleFunc("/control/version.json", postInstall(optionalAuth(handleGetVersionJSON))) </s> remove http.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
http.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot))
</s> add Context.mux.HandleFunc("/apple/doh.mobileconfig", postInstall(handleMobileConfigDoh))
Context.mux.HandleFunc("/apple/dot.mobileconfig", postInstall(handleMobileConfigDot)) </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/web.go |
keep add keep keep keep keep keep | <mask> )
<mask>
<mask> type WebConfig struct {
<mask> firstRun bool
<mask> BindHost string
<mask> BindPort int
<mask> PortHTTPS int
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add // ReadTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadTimeout time.Duration
// ReadHeaderTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadHeaderTimeout time.Duration
// WriteTimeout is an option to pass to http.Server for setting an
// appropriate field.
WriteTimeout time.Duration </s> remove http.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
</s> add mux := http.NewServeMux()
mux.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) { </s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) </s> remove "strings"
</s> add </s> add // mux is our custom http.ServeMux.
mux *http.ServeMux
</s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/web.go |
keep add keep keep keep keep keep keep | <mask> BindPort int
<mask> PortHTTPS int
<mask> }
<mask>
<mask> // HTTPSServer - HTTPS Server
<mask> type HTTPSServer struct {
<mask> server *http.Server
<mask> cond *sync.Cond
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add const (
// ReadTimeout is the maximum duration for reading the entire request,
// including the body.
ReadTimeout = 10 * time.Second
// ReadHeaderTimeout is the amount of time allowed to read request
// headers.
ReadHeaderTimeout = 10 * time.Second
// WriteTimeout is the maximum duration before timing out writes of the
// response.
WriteTimeout = 10 * time.Second
)
</s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) </s> remove ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(http.DefaultServeMux, filterPProf, limitRequestBody),
</s> add ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(Context.mux, limitRequestBody),
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) </s> remove http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> add Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box))) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/web.go |
keep keep replace keep keep keep keep replace | <mask>
<mask> // if not configured, redirect / to /install.html, otherwise redirect /install.html to /
<mask> http.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
<mask>
<mask> // add handlers for /install paths, we only need them when we're not configured yet
<mask> if conf.firstRun {
<mask> log.Info("This is the first launch of AdGuard Home, redirecting everything to /install.html ")
<mask> http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(http.DefaultServeMux, filterPProf, limitRequestBody),
</s> add ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(Context.mux, limitRequestBody),
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> add const (
// ReadTimeout is the maximum duration for reading the entire request,
// including the body.
ReadTimeout = 10 * time.Second
// ReadHeaderTimeout is the amount of time allowed to read request
// headers.
ReadHeaderTimeout = 10 * time.Second
// WriteTimeout is the maximum duration before timing out writes of the
// response.
WriteTimeout = 10 * time.Second
)
</s> add // ReadTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadTimeout time.Duration
// ReadHeaderTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadHeaderTimeout time.Duration
// WriteTimeout is an option to pass to http.Server for setting an
// appropriate field.
WriteTimeout time.Duration </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add </s> remove http.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler)))))
</s> add Context.mux.Handle(url, postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(ensureHandler(method, handler))))) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/web.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask>
<mask> // we need to have new instance, because after Shutdown() the Server is not usable
<mask> address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
<mask> web.httpServer = &http.Server{
<mask> ErrorLog: web.errLogger,
<mask> Addr: address,
<mask> Handler: withMiddlewares(http.DefaultServeMux, filterPProf, limitRequestBody),
<mask> }
<mask> err := web.httpServer.ListenAndServe()
<mask> if err != http.ErrServerClosed {
<mask> cleanupAlways()
<mask> log.Fatal(err)
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> add Handler: Context.mux,
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> remove http.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box))))) </s> remove http.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> add Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box))) </s> remove
// TODO(a.garipov): We currently have to use this, because everything registers
// its HTTP handlers in http.DefaultServeMux. In the future, refactor our HTTP
// API initialization process and stop using the gosh darn http.DefaultServeMux
// for anything at all. Gosh darn global variables.
func filterPProf(h http.Handler) (filtered http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
http.NotFound(w, r)
return
}
h.ServeHTTP(w, r)
})
}
</s> add </s> add // ReadTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadTimeout time.Duration
// ReadHeaderTimeout is an option to pass to http.Server for setting an
// appropriate field.
ReadHeaderTimeout time.Duration
// WriteTimeout is an option to pass to http.Server for setting an
// appropriate field.
WriteTimeout time.Duration | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/web.go |
keep add keep keep keep keep keep | <mask> CipherSuites: Context.tlsCiphers,
<mask> },
<mask> }
<mask>
<mask> printHTTPAddresses("https")
<mask> err := web.httpsServer.server.ListenAndServeTLS("", "")
<mask> if err != http.ErrServerClosed {
</s> Pull request: 2343 http server
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343.
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one. </s> remove ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(http.DefaultServeMux, filterPProf, limitRequestBody),
</s> add ErrorLog: web.errLogger,
Addr: address,
Handler: withMiddlewares(Context.mux, limitRequestBody),
ReadTimeout: web.conf.ReadTimeout,
ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
WriteTimeout: web.conf.WriteTimeout, </s> remove go func() { _ = http.Serve(listener, nil) }()
</s> add go func() { _ = http.Serve(listener, mux) }() </s> remove http.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin)))
</s> add Context.mux.Handle("/control/login", postInstallHandler(ensureHandler("POST", handleLogin))) </s> remove http.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
</s> add mux := http.NewServeMux()
mux.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) { </s> add Context.mux = http.NewServeMux() </s> remove http.HandleFunc(url, postInstall(handler))
</s> add Context.mux.HandleFunc(url, postInstall(handler)) | https://github.com/AdguardTeam/AdGuardHome/commit/b4a35fa887737e737145edd5ce42dd7fdfea2ee4 | internal/home/web.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func (r Reason) Matched() bool {
<mask> return r != NotFilteredNotFound
<mask> }
<mask>
<mask> // CheckHost tries to match host against rules, then safebrowsing and parental if they are enabled
<mask> func (d *Dnsfilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
<mask> // sometimes DNS clients will try to resolve ".", which is a request to get root servers
<mask> if host == "" {
<mask> return Result{Reason: NotFilteredNotFound}, nil
<mask> }
</s> -(dnsfilter): match DNS response against filtering rules only
Supposedly, this will fix #1290 </s> remove res, err = s.filterResponse(d)
</s> add res, err = s.filterDNSResponse(d) </s> remove res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts) </s> remove func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/b4f41116093d3c07695898f4d298205d51908243 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> } else if res.Reason != dnsfilter.NotFilteredWhiteList {
<mask> origResp2 := d.Res
<mask> res, err = s.filterResponse(d)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> if res != nil {
<mask> origResp = origResp2 // matched by response
</s> -(dnsfilter): match DNS response against filtering rules only
Supposedly, this will fix #1290 </s> remove res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts) </s> remove // CheckHost tries to match host against rules, then safebrowsing and parental if they are enabled
</s> add // CheckHostRules tries to match the host against filtering rules only
func (d *Dnsfilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
return d.matchHost(host, qtype)
}
// CheckHost tries to match the host against filtering rules,
// then safebrowsing and parental if they are enabled </s> remove func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/b4f41116093d3c07695898f4d298205d51908243 | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
<mask> // If this is a match, we set a new response in d.Res and return.
<mask> func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) {
<mask> for _, a := range d.Res.Answer {
<mask> host := ""
<mask>
<mask> switch v := a.(type) {
<mask> case *dns.CNAME:
</s> -(dnsfilter): match DNS response against filtering rules only
Supposedly, this will fix #1290 </s> remove res, err = s.filterResponse(d)
</s> add res, err = s.filterDNSResponse(d) </s> remove res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts) </s> remove // CheckHost tries to match host against rules, then safebrowsing and parental if they are enabled
</s> add // CheckHostRules tries to match the host against filtering rules only
func (d *Dnsfilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
return d.matchHost(host, qtype)
}
// CheckHost tries to match the host against filtering rules,
// then safebrowsing and parental if they are enabled | https://github.com/AdguardTeam/AdGuardHome/commit/b4f41116093d3c07695898f4d298205d51908243 | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> s.RUnlock()
<mask> continue
<mask> }
<mask> setts := s.getClientRequestFilteringSettings(d)
<mask> res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
<mask> s.RUnlock()
<mask>
<mask> if err != nil {
<mask> return nil, err
<mask>
</s> -(dnsfilter): match DNS response against filtering rules only
Supposedly, this will fix #1290 </s> remove res, err = s.filterResponse(d)
</s> add res, err = s.filterDNSResponse(d) </s> remove // CheckHost tries to match host against rules, then safebrowsing and parental if they are enabled
</s> add // CheckHostRules tries to match the host against filtering rules only
func (d *Dnsfilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
return d.matchHost(host, qtype)
}
// CheckHost tries to match the host against filtering rules,
// then safebrowsing and parental if they are enabled </s> remove func (s *Server) filterResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(d *proxy.DNSContext) (*dnsfilter.Result, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/b4f41116093d3c07695898f4d298205d51908243 | dnsforward/dnsforward.go |
keep keep replace replace replace replace replace replace replace keep replace | <mask>
<mask> // Check for duplicates
<mask> config.RLock()
<mask> for i := range config.Filters {
<mask> if config.Filters[i].URL == f.URL {
<mask> config.RUnlock()
<mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
<mask> return
<mask> }
<mask> }
<mask> config.RUnlock()
</s> * control: refactor: move filter adding code to a separate function </s> remove config.Lock()
// Check for duplicates
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.Unlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
</s> add if !filterAdd(f) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return </s> remove config.Filters = append(config.Filters, f)
config.Unlock()
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b54f540f716d875c0fc7d49d0994e479b843be4e | control.go |
keep keep replace replace replace replace replace replace replace replace replace keep keep replace replace replace keep | <mask> // URL is deemed valid, append it to filters, update config, write new filter file and tell dns to reload it
<mask> // TODO: since we directly feed filters in-memory, revisit if writing configs is always necessary
<mask> config.Lock()
<mask>
<mask> // Check for duplicates
<mask> for i := range config.Filters {
<mask> if config.Filters[i].URL == f.URL {
<mask> config.Unlock()
<mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
<mask> return
<mask> }
<mask> }
<mask>
<mask> config.Filters = append(config.Filters, f)
<mask> config.Unlock()
<mask>
<mask> err = writeAllConfigs()
</s> * control: refactor: move filter adding code to a separate function </s> remove config.RLock()
for i := range config.Filters {
if config.Filters[i].URL == f.URL {
config.RUnlock()
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return
}
</s> add if filterExists(f.URL) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
return </s> remove config.RUnlock()
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/b54f540f716d875c0fc7d49d0994e479b843be4e | control.go |
keep keep add keep keep keep keep keep keep | <mask>
<mask> ipnet *net.IPNet // if interface name changes, this needs to be reset
<mask>
<mask> // leases
<mask> leases []*Lease
<mask> leaseStart net.IP // parsed from config RangeStart
<mask> leaseStop net.IP // parsed from config RangeEnd
<mask> leaseTime time.Duration // parsed from config LeaseDuration
<mask> leaseOptions dhcp4.Options // parsed from config GatewayIP and SubnetMask
</s> * DHCP: Stop(): wait until the worker is stopped </s> add // We've just closed the listening socket.
// Worker thread should exit right after it tries to read from the socket.
s.mutex.Lock()
for s.running {
s.cond.Wait()
}
s.mutex.Unlock()
</s> remove if err != nil {
</s> add if err != nil && !s.stopping { </s> add s.running = true </s> add s.cond = sync.NewCond(&s.mutex) </s> add s.running = false
s.cond.Signal() </s> add s.stopping = true
| https://github.com/AdguardTeam/AdGuardHome/commit/b5f0d48e7f7b403b86b87d125ae48c518485dc82 | dhcpd/dhcpd.go |
keep add keep keep keep keep | <mask>
<mask> s.conn = c
<mask>
<mask> s.running = true
<mask> go func() {
<mask> // operate on c instead of c.conn because c.conn can change over time
</s> * DHCP: Stop(): wait until the worker is stopped </s> add s.running = true </s> remove if err != nil {
</s> add if err != nil && !s.stopping { </s> add s.stopping = true
</s> add s.running = false
s.cond.Signal() </s> add // We've just closed the listening socket.
// Worker thread should exit right after it tries to read from the socket.
s.mutex.Lock()
for s.running {
s.cond.Wait()
}
s.mutex.Unlock()
</s> add cond *sync.Cond // Synchronize worker thread with main thread
mutex sync.Mutex // Mutex for 'cond'
running bool // Set if the worker thread is running
stopping bool // Set if the worker thread should be stopped
| https://github.com/AdguardTeam/AdGuardHome/commit/b5f0d48e7f7b403b86b87d125ae48c518485dc82 | dhcpd/dhcpd.go |
keep add keep keep keep keep | <mask> s.cond = sync.NewCond(&s.mutex)
<mask>
<mask> go func() {
<mask> // operate on c instead of c.conn because c.conn can change over time
<mask> err := dhcp4.Serve(c, s)
<mask> if err != nil && !s.stopping {
</s> * DHCP: Stop(): wait until the worker is stopped </s> remove if err != nil {
</s> add if err != nil && !s.stopping { </s> add s.cond = sync.NewCond(&s.mutex) </s> add s.stopping = true
</s> add // We've just closed the listening socket.
// Worker thread should exit right after it tries to read from the socket.
s.mutex.Lock()
for s.running {
s.cond.Wait()
}
s.mutex.Unlock()
</s> add s.running = false
s.cond.Signal() </s> add cond *sync.Cond // Synchronize worker thread with main thread
mutex sync.Mutex // Mutex for 'cond'
running bool // Set if the worker thread is running
stopping bool // Set if the worker thread should be stopped
| https://github.com/AdguardTeam/AdGuardHome/commit/b5f0d48e7f7b403b86b87d125ae48c518485dc82 | dhcpd/dhcpd.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go func() {
<mask> // operate on c instead of c.conn because c.conn can change over time
<mask> err := dhcp4.Serve(c, s)
<mask> if err != nil {
<mask> log.Printf("dhcp4.Serve() returned with error: %s", err)
<mask> }
<mask> c.Close() // in case Serve() exits for other reason than listening socket closure
<mask> }()
<mask>
</s> * DHCP: Stop(): wait until the worker is stopped </s> add s.running = false
s.cond.Signal() </s> add s.running = true </s> add s.cond = sync.NewCond(&s.mutex) </s> add s.stopping = true
</s> add // We've just closed the listening socket.
// Worker thread should exit right after it tries to read from the socket.
s.mutex.Lock()
for s.running {
s.cond.Wait()
}
s.mutex.Unlock()
</s> add cond *sync.Cond // Synchronize worker thread with main thread
mutex sync.Mutex // Mutex for 'cond'
running bool // Set if the worker thread is running
stopping bool // Set if the worker thread should be stopped
| https://github.com/AdguardTeam/AdGuardHome/commit/b5f0d48e7f7b403b86b87d125ae48c518485dc82 | dhcpd/dhcpd.go |
keep keep add keep keep keep keep keep | <mask> log.Printf("dhcp4.Serve() returned with error: %s", err)
<mask> }
<mask> c.Close() // in case Serve() exits for other reason than listening socket closure
<mask> }()
<mask>
<mask> return nil
<mask> }
<mask>
</s> * DHCP: Stop(): wait until the worker is stopped </s> remove if err != nil {
</s> add if err != nil && !s.stopping { </s> add // We've just closed the listening socket.
// Worker thread should exit right after it tries to read from the socket.
s.mutex.Lock()
for s.running {
s.cond.Wait()
}
s.mutex.Unlock()
</s> add s.stopping = true
</s> add cond *sync.Cond // Synchronize worker thread with main thread
mutex sync.Mutex // Mutex for 'cond'
running bool // Set if the worker thread is running
stopping bool // Set if the worker thread should be stopped
</s> add s.running = true </s> add s.cond = sync.NewCond(&s.mutex) | https://github.com/AdguardTeam/AdGuardHome/commit/b5f0d48e7f7b403b86b87d125ae48c518485dc82 | dhcpd/dhcpd.go |
keep add keep keep keep keep | <mask> return nil
<mask> }
<mask> err := s.closeConn()
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Couldn't close UDP listening socket")
<mask> }
</s> * DHCP: Stop(): wait until the worker is stopped </s> add // We've just closed the listening socket.
// Worker thread should exit right after it tries to read from the socket.
s.mutex.Lock()
for s.running {
s.cond.Wait()
}
s.mutex.Unlock()
</s> remove if err != nil {
</s> add if err != nil && !s.stopping { </s> add s.running = true </s> add s.running = false
s.cond.Signal() </s> add cond *sync.Cond // Synchronize worker thread with main thread
mutex sync.Mutex // Mutex for 'cond'
running bool // Set if the worker thread is running
stopping bool // Set if the worker thread should be stopped
</s> add s.cond = sync.NewCond(&s.mutex) | https://github.com/AdguardTeam/AdGuardHome/commit/b5f0d48e7f7b403b86b87d125ae48c518485dc82 | dhcpd/dhcpd.go |
keep keep add keep keep keep keep | <mask> return wrapErrPrint(err, "Couldn't close UDP listening socket")
<mask> }
<mask>
<mask> s.dbStore()
<mask> return nil
<mask> }
<mask>
</s> * DHCP: Stop(): wait until the worker is stopped </s> add s.stopping = true
</s> add s.running = false
s.cond.Signal() </s> remove if err != nil {
</s> add if err != nil && !s.stopping { </s> add s.running = true </s> add s.cond = sync.NewCond(&s.mutex) </s> add cond *sync.Cond // Synchronize worker thread with main thread
mutex sync.Mutex // Mutex for 'cond'
running bool // Set if the worker thread is running
stopping bool // Set if the worker thread should be stopped
| https://github.com/AdguardTeam/AdGuardHome/commit/b5f0d48e7f7b403b86b87d125ae48c518485dc82 | dhcpd/dhcpd.go |
keep keep replace keep keep keep keep keep keep keep keep replace | <mask>
<mask> onConfigModified()
<mask> if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
<mask> // download new filter and apply its rules
<mask> _, _ = refreshFilters(fj.Whitelist, true)
<mask> }
<mask> }
<mask>
<mask> onConfigModified()
<mask> if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
<mask> // download new filter and apply its rules
<mask> _, _ = refreshFilters(fj.Whitelist, true)
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> remove // In this case the periodic update task will try to download the file.
</s> add </s> add statusUpdateRequired = 0x10 </s> remove flags := FilterRefreshBlocklists
if whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFiltersIfNecessary(flags | FilterRefreshForce)
</s> add nUpdated, _ := refreshFiltersIfNecessary(flags) </s> add f.checksum = 0
f.RulesCount = 0 </s> remove resp.Updated, err = refreshFilters(req.White, false)
</s> add flags := FilterRefreshBlocklists
if req.White {
flags = FilterRefreshAllowlists
}
resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false) | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/control_filtering.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> Context.controlLock.Unlock()
<mask> resp.Updated, err = refreshFilters(req.White, false)
<mask> Context.controlLock.Lock()
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "%s", err)
<mask> return
<mask> }
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove flags := FilterRefreshBlocklists
if whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFiltersIfNecessary(flags | FilterRefreshForce)
</s> add nUpdated, _ := refreshFiltersIfNecessary(flags) </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> remove r |= statusURLChanged
</s> add r |= statusURLChanged | statusUpdateRequired </s> remove // In this case the periodic update task will try to download the file.
</s> add </s> add f.checksum = 0
f.RulesCount = 0 | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/control_filtering.go |
keep keep add keep keep keep keep keep | <mask> statusEnabledChanged = 2
<mask> statusURLChanged = 4
<mask> statusURLExists = 8
<mask> )
<mask>
<mask> // Update properties for a filter specified by its URL
<mask> // Return status* flags.
<mask> func filterSetProperties(url string, newf filter, whitelist bool) int {
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> remove r |= statusURLChanged
</s> add r |= statusURLChanged | statusUpdateRequired </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> add f.checksum = 0
f.RulesCount = 0 </s> remove // In this case the periodic update task will try to download the file.
</s> add </s> remove func refreshFilters(whitelist bool, important bool) (int, error) {
</s> add func refreshFilters(flags int, important bool) (int, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> f.URL, newf.Name, newf.URL, newf.Enabled)
<mask> f.Name = newf.Name
<mask>
<mask> if f.URL != newf.URL {
<mask> r |= statusURLChanged
<mask> if filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
<mask> }
<mask> f.URL = newf.URL
<mask> f.unload()
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> add f.checksum = 0
f.RulesCount = 0 </s> remove resp.Updated, err = refreshFilters(req.White, false)
</s> add flags := FilterRefreshBlocklists
if req.White {
flags = FilterRefreshAllowlists
}
resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false) </s> add statusUpdateRequired = 0x10 </s> add f.checksum = 0
f.RulesCount = 0
r |= statusUpdateRequired </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
keep add keep keep keep keep keep | <mask> f.unload()
<mask> f.LastUpdated = time.Time{}
<mask> }
<mask>
<mask> if f.Enabled != newf.Enabled {
<mask> r |= statusEnabledChanged
<mask> f.Enabled = newf.Enabled
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> add f.checksum = 0
f.RulesCount = 0
r |= statusUpdateRequired </s> remove r |= statusURLChanged
</s> add r |= statusURLChanged | statusUpdateRequired </s> remove // In this case the periodic update task will try to download the file.
</s> add </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove resp.Updated, err = refreshFilters(req.White, false)
</s> add flags := FilterRefreshBlocklists
if req.White {
flags = FilterRefreshAllowlists
}
resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false) </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> e := f.load()
<mask> if e != nil {
<mask> // This isn't a fatal error,
<mask> // because it may occur when someone removes the file from disk.
<mask> // In this case the periodic update task will try to download the file.
<mask> f.LastUpdated = time.Time{}
<mask> }
<mask> }
<mask> } else {
<mask> f.unload()
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> add f.checksum = 0
f.RulesCount = 0
r |= statusUpdateRequired </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> add f.checksum = 0
f.RulesCount = 0 </s> remove resp.Updated, err = refreshFilters(req.White, false)
</s> add flags := FilterRefreshBlocklists
if req.White {
flags = FilterRefreshAllowlists
}
resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false) </s> remove func refreshFilters(whitelist bool, important bool) (int, error) {
</s> add func refreshFilters(flags int, important bool) (int, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
keep add keep keep keep keep keep keep | <mask> // because it may occur when someone removes the file from disk.
<mask> f.LastUpdated = time.Time{}
<mask> }
<mask> }
<mask> } else {
<mask> f.unload()
<mask> }
<mask> }
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> remove // In this case the periodic update task will try to download the file.
</s> add </s> add f.checksum = 0
f.RulesCount = 0 </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> remove resp.Updated, err = refreshFilters(req.White, false)
</s> add flags := FilterRefreshBlocklists
if req.White {
flags = FilterRefreshAllowlists
}
resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false) </s> remove flags := FilterRefreshBlocklists
if whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFiltersIfNecessary(flags | FilterRefreshForce)
</s> add nUpdated, _ := refreshFiltersIfNecessary(flags) | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
keep add keep keep keep keep keep keep | <mask>
<mask> // Refresh filters
<mask> // important:
<mask> // TRUE: ignore the fact that we're currently updating the filters
<mask> func refreshFilters(flags int, important bool) (int, error) {
<mask> set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
<mask> if !important && !set {
<mask> return 0, fmt.Errorf("Filters update procedure is already running")
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> remove func refreshFilters(whitelist bool, important bool) (int, error) {
</s> add func refreshFilters(flags int, important bool) (int, error) { </s> remove flags := FilterRefreshBlocklists
if whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFiltersIfNecessary(flags | FilterRefreshForce)
</s> add nUpdated, _ := refreshFiltersIfNecessary(flags) </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> remove // In this case the periodic update task will try to download the file.
</s> add </s> add statusUpdateRequired = 0x10 | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // Refresh filters
<mask> // important:
<mask> // TRUE: ignore the fact that we're currently updating the filters
<mask> func refreshFilters(whitelist bool, important bool) (int, error) {
<mask> set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
<mask> if !important && !set {
<mask> return 0, fmt.Errorf("Filters update procedure is already running")
<mask> }
<mask>
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> add // flags: FilterRefresh* </s> remove flags := FilterRefreshBlocklists
if whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFiltersIfNecessary(flags | FilterRefreshForce)
</s> add nUpdated, _ := refreshFiltersIfNecessary(flags) </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> remove // In this case the periodic update task will try to download the file.
</s> add </s> add statusUpdateRequired = 0x10 | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> return 0, fmt.Errorf("Filters update procedure is already running")
<mask> }
<mask>
<mask> refreshLock.Lock()
<mask> flags := FilterRefreshBlocklists
<mask> if whitelist {
<mask> flags = FilterRefreshAllowlists
<mask> }
<mask> nUpdated, _ := refreshFiltersIfNecessary(flags | FilterRefreshForce)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> return nUpdated, nil
<mask> }
<mask>
</s> Merge: - filters: 'enable/disable filter' didn't work
Squashed commit of the following:
commit c4c616162b66f2e89932ac44253ff6bedb8692eb
Merge: 800740da 579177fc
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 19:14:27 2020 +0300
Merge remote-tracking branch 'origin/master' into apply-disable-filter
commit 800740dace018dbe58abc579c06f7c494cdd1c15
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:40:38 2020 +0300
improve logic
commit 2aab4fbe658de09cd4c1d0badc178e0ce9e60251
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Mar 11 18:23:14 2020 +0300
- filters: 'disable filter' didn't work </s> remove resp.Updated, err = refreshFilters(req.White, false)
</s> add flags := FilterRefreshBlocklists
if req.White {
flags = FilterRefreshAllowlists
}
resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false) </s> remove _, _ = refreshFilters(fj.Whitelist, true)
</s> add flags := FilterRefreshBlocklists
if fj.Whitelist {
flags = FilterRefreshAllowlists
}
nUpdated, _ := refreshFilters(flags, true)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
if restart {
enableFilters(true) </s> remove func refreshFilters(whitelist bool, important bool) (int, error) {
</s> add func refreshFilters(flags int, important bool) (int, error) { </s> add // flags: FilterRefresh* </s> remove if (status&(statusURLChanged|statusEnabledChanged)) != 0 && fj.Data.Enabled {
</s> add restart := false
if (status & statusEnabledChanged) != 0 {
// we must add or remove filter rules
restart = true
}
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled { </s> remove r |= statusURLChanged
</s> add r |= statusURLChanged | statusUpdateRequired | https://github.com/AdguardTeam/AdGuardHome/commit/b600d7b09d3f11b9f1635af67e0e7388cf62189c | home/filter.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.