docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
log.Error("parsing blocked service %q rule %q: %s", s.ID, text, err) | <mask> netRules := make([]*rules.NetworkRule, 0, len(s.rules))
<mask> for _, text := range s.rules {
<mask> rule, err := rules.NewNetworkRule(text, BlockedSvcsListID)
<mask> if err != nil {
<mask> log.Error("parsing blocked service %q rule %q: %s", s.name, text, err)
<mask>
<mask> continue
<mask> }
<mask>
<mask> netRules = append(netRules, rule)
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove for i, s := range servicesData {
netRules := make([]*rules.NetworkRule, 0, len(s.rules))
for _, text := range s.rules {
</s> add for i, s := range blockedServices {
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
for _, text := range s.Rules { </s> remove l := len(servicesData)
</s> add l := len(blockedServices) </s> remove serviceIDs[i] = s.name
serviceRules[s.name] = netRules
</s> add serviceIDs[i] = s.ID
serviceRules[s.ID] = netRules </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
serviceIDs[i] = s.ID
serviceRules[s.ID] = netRules | <mask>
<mask> netRules = append(netRules, rule)
<mask> }
<mask>
<mask> serviceIDs[i] = s.name
<mask> serviceRules[s.name] = netRules
<mask> }
<mask>
<mask> slices.Sort(serviceIDs)
<mask>
<mask> log.Debug("filtering: initialized %d services", l)
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. </s> remove log.Error("parsing blocked service %q rule %q: %s", s.name, text, err)
</s> add log.Error("parsing blocked service %q rule %q: %s", s.ID, text, err) </s> remove for i, s := range servicesData {
netRules := make([]*rules.NetworkRule, 0, len(s.rules))
for _, text := range s.rules {
</s> add for i, s := range blockedServices {
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
for _, text := range s.Rules { </s> remove l := len(servicesData)
</s> add l := len(blockedServices) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
// BlockedSvcKnown returns true if a blocked service ID is known. | <mask>
<mask> log.Debug("filtering: initialized %d services", l)
<mask> }
<mask>
<mask> // BlockedSvcKnown - return TRUE if a blocked service name is known
<mask> func BlockedSvcKnown(s string) (ok bool) {
<mask> _, ok = serviceRules[s]
<mask>
<mask> return ok
<mask> }
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove serviceIDs[i] = s.name
serviceRules[s.name] = netRules
</s> add serviceIDs[i] = s.ID
serviceRules[s.ID] = netRules </s> remove l := len(servicesData)
</s> add l := len(blockedServices) </s> remove for i, s := range servicesData {
netRules := make([]*rules.NetworkRule, 0, len(s.rules))
for _, text := range s.rules {
</s> add for i, s := range blockedServices {
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
for _, text := range s.Rules { </s> remove log.Error("parsing blocked service %q rule %q: %s", s.name, text, err)
</s> add log.Error("parsing blocked service %q rule %q: %s", s.ID, text, err) </s> remove // svc represents a single blocked service.
type svc struct {
name string
rules []string
}
// servicesData contains raw blocked service data.
//
// Keep in sync with:
// - client/src/helpers/constants.js
// - client/src/components/ui/Icons.js
var servicesData = []svc{{
name: "whatsapp",
rules: []string{
"||wa.me^",
"||whatsapp.com^",
"||whatsapp.net^",
},
}, {
name: "facebook",
rules: []string{
"||facebook.com^",
"||facebook.net^",
"||fbcdn.net^",
"||accountkit.com^",
"||fb.me^",
"||fb.com^",
"||fb.gg^",
"||fbsbx.com^",
"||fbwat.ch^",
"||messenger.com^",
"||facebookcorewwwi.onion^",
"||fbcdn.com^",
"||fb.watch^",
},
}, {
name: "twitter",
rules: []string{
"||t.co^",
"||twimg.com^",
"||twitter.com^",
"||twttr.com^",
},
}, {
name: "youtube",
rules: []string{
"||googlevideo.com^",
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
"||youtube-nocookie.com^",
"||youtube.com^",
"||youtubei.googleapis.com^",
"||youtubekids.com^",
"||ytimg.com^",
},
}, {
name: "twitch",
rules: []string{
"||jtvnw.net^",
"||ttvnw.net^",
"||twitch.tv^",
"||twitchcdn.net^",
},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{
"||snapchat.com^",
"||sc-cdn.net^",
"||snap-dev.net^",
"||snapkit.co",
"||snapads.com^",
"||impala-media-production.s3.amazonaws.com^",
},
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.gift",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{
"||edge-skype-com.s-0001.s-msedge.net^",
"||skype-edf.akadns.net^",
"||skype.com^",
"||skypeassets.com^",
"||skypedata.akadns.net^",
},
}, {
name: "vk",
rules: []string{
"||userapi.com^",
"||vk-cdn.net^",
"||vk.com^",
"||vkuservideo.net^",
},
}, {
name: "origin",
rules: []string{
"||accounts.ea.com^",
"||origin.com^",
"||signin.ea.com^",
},
}, {
name: "steam",
rules: []string{
"||steam.com^",
"||steampowered.com^",
"||steamcommunity.com^",
"||steamstatic.com^",
"||steamstore-a.akamaihd.net^",
"||steamcdn-a.akamaihd.net^",
},
}, {
name: "epic_games",
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
}, {
name: "reddit",
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
}, {
name: "mail_ru",
rules: []string{"||mail.ru^"},
}, {
name: "cloudflare",
rules: []string{
"||1.1.1.1^",
"||argotunnel.com^",
"||cloudflare-dns.com^",
"||cloudflare-ipfs.com^",
"||cloudflare-quic.com^",
"||cloudflare.cn^",
"||cloudflare.com^",
"||cloudflare.net^",
"||cloudflareaccess.com^",
"||cloudflareapps.com^",
"||cloudflarebolt.com^",
"||cloudflareclient.com^",
"||cloudflareinsights.com^",
"||cloudflareresolve.com^",
"||cloudflarestatus.com^",
"||cloudflarestream.com^",
"||cloudflarewarp.com^",
"||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^",
"||one.one^",
"||pages.dev^",
"||trycloudflare.com^",
"||videodelivery.net^",
"||warp.plus^",
"||workers.dev^",
},
}, {
name: "amazon",
rules: []string{
"||amazon.com^",
"||media-amazon.com^",
"||primevideo.com^",
"||amazontrust.com^",
"||images-amazon.com^",
"||ssl-images-amazon.com^",
"||amazonpay.com^",
"||amazonpay.in^",
"||amazon-adsystem.com^",
"||a2z.com^",
"||amazon.ae^",
"||amazon.ca^",
"||amazon.cn^",
"||amazon.de^",
"||amazon.es^",
"||amazon.fr^",
"||amazon.in^",
"||amazon.it^",
"||amazon.nl^",
"||amazon.com.au^",
"||amazon.com.br^",
"||amazon.co.jp^",
"||amazon.com.mx^",
"||amazon.com.tr^",
"||amazon.co.uk^",
"||createspace.com^",
"||aws",
},
}, {
name: "ebay",
rules: []string{
"||ebay.com^",
"||ebayimg.com^",
"||ebaystatic.com^",
"||ebaycdn.net^",
"||ebayinc.com^",
"||ebay.at^",
"||ebay.be^",
"||ebay.ca^",
"||ebay.ch^",
"||ebay.cn^",
"||ebay.de^",
"||ebay.es^",
"||ebay.fr^",
"||ebay.ie^",
"||ebay.in^",
"||ebay.it^",
"||ebay.ph^",
"||ebay.pl^",
"||ebay.nl^",
"||ebay.com.au^",
"||ebay.com.cn^",
"||ebay.com.hk^",
"||ebay.com.my^",
"||ebay.com.sg^",
"||ebay.co.uk^",
},
}, {
name: "tiktok",
rules: []string{
"||amemv.com^",
"||bdurl.com^",
"||bytecdn.cn^",
"||bytedance.map.fastly.net^",
"||bytedapm.com^",
"||byteimg.com^",
"||byteoversea.com^",
"||douyin.com^",
"||douyincdn.com^",
"||douyinpic.com^",
"||douyinstatic.com^",
"||douyinvod.com^",
"||ixigua.com^",
"||ixiguavideo.com^",
"||muscdn.com^",
"||musical.ly^",
"||pstatp.com^",
"||snssdk.com^",
"||tiktok.com^",
"||tiktokcdn.com^",
"||tiktokv.com^",
"||toutiao.com^",
"||toutiaocloud.com^",
"||toutiaocloud.net^",
"||toutiaovod.com^",
},
}, {
name: "vimeo",
rules: []string{
"*vod-adaptive.akamaized.net^",
"||vimeo.com^",
"||vimeocdn.com^",
},
}, {
name: "pinterest",
rules: []string{
"||pinimg.com^",
"||pinterest.*^",
},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com",
"||qqzaixian.com^",
"||qq-video.cdn-go.cn^",
"||url.cn^",
},
}, {
name: "wechat",
rules: []string{
"||wechat.com^",
"||weixin.qq.com.cn^",
"||weixin.qq.com^",
"||weixinbridge.com^",
"||wx.qq.com^",
},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{
"||weibo.cn^",
"||weibo.com^",
"||weibocdn.com^",
},
}, {
name: "9gag",
rules: []string{
"||9cache.com^",
"||9gag.com^",
},
}, {
name: "telegram",
rules: []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
},
}, {
name: "disneyplus",
rules: []string{
"||disney-plus.net^",
"||disney.playback.edge.bamgrid.com^",
"||disneynow.com^",
"||disneyplus.com^",
"||hotstar.com^",
"||media.dssott.com^",
"||star.playback.edge.bamgrid.com^",
"||starplus.com^",
},
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{
"/_spotify-connect._tcp.local/",
"||spotify.com^",
"||scdn.co^",
"||spotify.com.edgesuite.net^",
"||spotify.map.fastly.net^",
"||spotify.map.fastlylb.net^",
"||spotifycdn.net^",
"||audio-ak-spotify-com.akamaized.net^",
"||audio4-ak-spotify-com.akamaized.net^",
"||heads-ak-spotify-com.akamaized.net^",
"||heads4-ak-spotify-com.akamaized.net^",
},
}, {
name: "tinder",
rules: []string{
"||gotinder.com^",
"||tinder.com^",
"||tindersparks.com^",
},
}, {
name: "bilibili",
rules: []string{
"||b23.tv^",
"||biliapi.net^",
"||bilibili.com^",
"||bilicdn1.com^",
"||bilicdn2.com^",
"||biligame.com^",
"||bilivideo.cn^",
"||bilivideo.com^",
"||dreamcast.hk^",
"||hdslb.com^",
},
}}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
func (d *DNSFilter) handleBlockedServicesIDs(w http.ResponseWriter, r *http.Request) { | <mask> })
<mask> }
<mask> }
<mask>
<mask> func (d *DNSFilter) handleBlockedServicesAvailableServices(w http.ResponseWriter, r *http.Request) {
<mask> _ = aghhttp.WriteJSONResponse(w, r, serviceIDs)
<mask> }
<mask>
<mask> func (d *DNSFilter) handleBlockedServicesList(w http.ResponseWriter, r *http.Request) {
<mask> d.confLock.RLock()
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove l := len(servicesData)
</s> add l := len(blockedServices) </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. </s> remove }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error"><Trans>{error}</Trans></span>}
</Fragment>;
</s> add }) => (
<>
<label className={cn('service custom-switch', { [modifier]: modifier })}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text" title={placeholder}>
{placeholder}
</span>
{icon && (
<div
dangerouslySetInnerHTML={{ __html: window.atob(icon) }}
className="service__icon"
/>
)}
</label>
{!disabled && touched && error && (
<span className="form__message form__message--error">
<Trans>{error}</Trans>
</span>
)}
</>
); </s> remove export const SERVICES = [
{
id: '9gag',
name: '9GAG',
},
{
id: 'amazon',
name: 'Amazon',
},
{
id: 'bilibili',
name: 'Bilibili',
},
{
id: 'cloudflare',
name: 'CloudFlare',
},
{
id: 'dailymotion',
name: 'Dailymotion',
},
{
id: 'discord',
name: 'Discord',
},
{
id: 'disneyplus',
name: 'Disney+',
},
{
id: 'ebay',
name: 'EBay',
},
{
id: 'epic_games',
name: 'Epic Games',
},
{
id: 'facebook',
name: 'Facebook',
},
{
id: 'hulu',
name: 'Hulu',
},
{
id: 'imgur',
name: 'Imgur',
},
{
id: 'instagram',
name: 'Instagram',
},
{
id: 'mail_ru',
name: 'Mail.ru',
},
{
id: 'netflix',
name: 'Netflix',
},
{
id: 'ok',
name: 'OK.ru',
},
{
id: 'origin',
name: 'Origin',
},
{
id: 'pinterest',
name: 'Pinterest',
},
{
id: 'qq',
name: 'QQ',
},
{
id: 'reddit',
name: 'Reddit',
},
{
id: 'skype',
name: 'Skype',
},
{
id: 'snapchat',
name: 'Snapchat',
},
{
id: 'spotify',
name: 'Spotify',
},
{
id: 'steam',
name: 'Steam',
},
{
id: 'telegram',
name: 'Telegram',
},
{
id: 'tiktok',
name: 'TikTok',
},
{
id: 'tinder',
name: 'Tinder',
},
{
id: 'twitch',
name: 'Twitch',
},
{
id: 'twitter',
name: 'Twitter',
},
{
id: 'viber',
name: 'Viber',
},
{
id: 'vimeo',
name: 'Vimeo',
},
{
id: 'vk',
name: 'VK.com',
},
{
id: 'wechat',
name: 'WeChat',
},
{
id: 'weibo',
name: 'Weibo',
},
{
id: 'whatsapp',
name: 'WhatsApp',
},
{
id: 'youtube',
name: 'YouTube',
},
];
export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
acc[id] = name;
return acc;
}, {});
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
func (d *DNSFilter) handleBlockedServicesAll(w http.ResponseWriter, r *http.Request) {
_ = aghhttp.WriteJSONResponse(w, r, struct {
BlockedServices []blockedService `json:"blocked_services"`
}{
BlockedServices: blockedServices,
})
}
| <mask> _ = aghhttp.WriteJSONResponse(w, r, serviceIDs)
<mask> }
<mask>
<mask> func (d *DNSFilter) handleBlockedServicesList(w http.ResponseWriter, r *http.Request) {
<mask> d.confLock.RLock()
<mask> list := d.Config.BlockedServices
<mask> d.confLock.RUnlock()
<mask>
<mask> _ = aghhttp.WriteJSONResponse(w, r, list)
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove func (d *DNSFilter) handleBlockedServicesAvailableServices(w http.ResponseWriter, r *http.Request) {
</s> add func (d *DNSFilter) handleBlockedServicesIDs(w http.ResponseWriter, r *http.Request) { </s> remove l := len(servicesData)
</s> add l := len(blockedServices) </s> remove for i, s := range servicesData {
netRules := make([]*rules.NetworkRule, 0, len(s.rules))
for _, text := range s.rules {
</s> add for i, s := range blockedServices {
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
for _, text := range s.Rules { </s> remove log.Error("parsing blocked service %q rule %q: %s", s.name, text, err)
</s> add log.Error("parsing blocked service %q rule %q: %s", s.ID, text, err) </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
d.Config.ConfigModified() | <mask> d.confLock.Unlock()
<mask>
<mask> log.Debug("Updated blocked services list: %d", len(list))
<mask>
<mask> d.ConfigModified()
<mask> }
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. </s> remove log.Error("parsing blocked service %q rule %q: %s", s.name, text, err)
</s> add log.Error("parsing blocked service %q rule %q: %s", s.ID, text, err) </s> remove export const getServiceName = (serviceId) => SERVICES_ID_NAME_MAP[serviceId] || serviceId;
</s> add export const getService = (services, id) => services.find((s) => s.id === id);
/**
* @param {array} services
* @param {string} id
* @returns {string}
*/
export const getServiceName = (services, id) => getService(services, id)?.name;
/**
* @param {array} services
* @param {string} id
* @returns {string}
*/
export const getServiceIcon = (services, id) => getService(services, id)?.icon_svg; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
registerHTTP(http.MethodGet, "/control/blocked_services/services", d.handleBlockedServicesIDs)
registerHTTP(http.MethodGet, "/control/blocked_services/all", d.handleBlockedServicesAll) | <mask> registerHTTP(http.MethodGet, "/control/rewrite/list", d.handleRewriteList)
<mask> registerHTTP(http.MethodPost, "/control/rewrite/add", d.handleRewriteAdd)
<mask> registerHTTP(http.MethodPost, "/control/rewrite/delete", d.handleRewriteDelete)
<mask>
<mask> registerHTTP(http.MethodGet, "/control/blocked_services/services", d.handleBlockedServicesAvailableServices)
<mask> registerHTTP(http.MethodGet, "/control/blocked_services/list", d.handleBlockedServicesList)
<mask> registerHTTP(http.MethodPost, "/control/blocked_services/set", d.handleBlockedServicesSet)
<mask>
<mask> registerHTTP(http.MethodGet, "/control/filtering/status", d.handleFilteringStatus)
<mask> registerHTTP(http.MethodPost, "/control/filtering/config", d.handleFilteringConfig)
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove // jsHeader is the header for the generates JavaScript file. It informs the
</s> add // jsHeader is the header for the generated JavaScript file. It informs the </s> remove onClick={() => toggleAllServices(SERVICES, change, true)}
</s> add onClick={() => (
toggleAllServices(services.allServices, change, true)
)} </s> remove import { CLIENT_ID_LINK, FORM_NAME, SERVICES } from '../../../helpers/constants';
</s> add import { CLIENT_ID_LINK, FORM_NAME } from '../../../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/http.go |
'deprecated': true
'description': >
Deprecated: Use `GET /blocked_services/all` instead. | <mask> 'tags':
<mask> - 'clients'
<mask> '/blocked_services/services':
<mask> 'get':
<mask> 'tags':
<mask> - 'blocked_services'
<mask> 'operationId': 'blockedServicesAvailableServices'
<mask> 'summary': 'Get available services to use for blocking'
<mask> 'responses':
<mask> '200':
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. </s> remove // svc represents a single blocked service.
type svc struct {
name string
rules []string
}
// servicesData contains raw blocked service data.
//
// Keep in sync with:
// - client/src/helpers/constants.js
// - client/src/components/ui/Icons.js
var servicesData = []svc{{
name: "whatsapp",
rules: []string{
"||wa.me^",
"||whatsapp.com^",
"||whatsapp.net^",
},
}, {
name: "facebook",
rules: []string{
"||facebook.com^",
"||facebook.net^",
"||fbcdn.net^",
"||accountkit.com^",
"||fb.me^",
"||fb.com^",
"||fb.gg^",
"||fbsbx.com^",
"||fbwat.ch^",
"||messenger.com^",
"||facebookcorewwwi.onion^",
"||fbcdn.com^",
"||fb.watch^",
},
}, {
name: "twitter",
rules: []string{
"||t.co^",
"||twimg.com^",
"||twitter.com^",
"||twttr.com^",
},
}, {
name: "youtube",
rules: []string{
"||googlevideo.com^",
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
"||youtube-nocookie.com^",
"||youtube.com^",
"||youtubei.googleapis.com^",
"||youtubekids.com^",
"||ytimg.com^",
},
}, {
name: "twitch",
rules: []string{
"||jtvnw.net^",
"||ttvnw.net^",
"||twitch.tv^",
"||twitchcdn.net^",
},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{
"||snapchat.com^",
"||sc-cdn.net^",
"||snap-dev.net^",
"||snapkit.co",
"||snapads.com^",
"||impala-media-production.s3.amazonaws.com^",
},
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.gift",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{
"||edge-skype-com.s-0001.s-msedge.net^",
"||skype-edf.akadns.net^",
"||skype.com^",
"||skypeassets.com^",
"||skypedata.akadns.net^",
},
}, {
name: "vk",
rules: []string{
"||userapi.com^",
"||vk-cdn.net^",
"||vk.com^",
"||vkuservideo.net^",
},
}, {
name: "origin",
rules: []string{
"||accounts.ea.com^",
"||origin.com^",
"||signin.ea.com^",
},
}, {
name: "steam",
rules: []string{
"||steam.com^",
"||steampowered.com^",
"||steamcommunity.com^",
"||steamstatic.com^",
"||steamstore-a.akamaihd.net^",
"||steamcdn-a.akamaihd.net^",
},
}, {
name: "epic_games",
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
}, {
name: "reddit",
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
}, {
name: "mail_ru",
rules: []string{"||mail.ru^"},
}, {
name: "cloudflare",
rules: []string{
"||1.1.1.1^",
"||argotunnel.com^",
"||cloudflare-dns.com^",
"||cloudflare-ipfs.com^",
"||cloudflare-quic.com^",
"||cloudflare.cn^",
"||cloudflare.com^",
"||cloudflare.net^",
"||cloudflareaccess.com^",
"||cloudflareapps.com^",
"||cloudflarebolt.com^",
"||cloudflareclient.com^",
"||cloudflareinsights.com^",
"||cloudflareresolve.com^",
"||cloudflarestatus.com^",
"||cloudflarestream.com^",
"||cloudflarewarp.com^",
"||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^",
"||one.one^",
"||pages.dev^",
"||trycloudflare.com^",
"||videodelivery.net^",
"||warp.plus^",
"||workers.dev^",
},
}, {
name: "amazon",
rules: []string{
"||amazon.com^",
"||media-amazon.com^",
"||primevideo.com^",
"||amazontrust.com^",
"||images-amazon.com^",
"||ssl-images-amazon.com^",
"||amazonpay.com^",
"||amazonpay.in^",
"||amazon-adsystem.com^",
"||a2z.com^",
"||amazon.ae^",
"||amazon.ca^",
"||amazon.cn^",
"||amazon.de^",
"||amazon.es^",
"||amazon.fr^",
"||amazon.in^",
"||amazon.it^",
"||amazon.nl^",
"||amazon.com.au^",
"||amazon.com.br^",
"||amazon.co.jp^",
"||amazon.com.mx^",
"||amazon.com.tr^",
"||amazon.co.uk^",
"||createspace.com^",
"||aws",
},
}, {
name: "ebay",
rules: []string{
"||ebay.com^",
"||ebayimg.com^",
"||ebaystatic.com^",
"||ebaycdn.net^",
"||ebayinc.com^",
"||ebay.at^",
"||ebay.be^",
"||ebay.ca^",
"||ebay.ch^",
"||ebay.cn^",
"||ebay.de^",
"||ebay.es^",
"||ebay.fr^",
"||ebay.ie^",
"||ebay.in^",
"||ebay.it^",
"||ebay.ph^",
"||ebay.pl^",
"||ebay.nl^",
"||ebay.com.au^",
"||ebay.com.cn^",
"||ebay.com.hk^",
"||ebay.com.my^",
"||ebay.com.sg^",
"||ebay.co.uk^",
},
}, {
name: "tiktok",
rules: []string{
"||amemv.com^",
"||bdurl.com^",
"||bytecdn.cn^",
"||bytedance.map.fastly.net^",
"||bytedapm.com^",
"||byteimg.com^",
"||byteoversea.com^",
"||douyin.com^",
"||douyincdn.com^",
"||douyinpic.com^",
"||douyinstatic.com^",
"||douyinvod.com^",
"||ixigua.com^",
"||ixiguavideo.com^",
"||muscdn.com^",
"||musical.ly^",
"||pstatp.com^",
"||snssdk.com^",
"||tiktok.com^",
"||tiktokcdn.com^",
"||tiktokv.com^",
"||toutiao.com^",
"||toutiaocloud.com^",
"||toutiaocloud.net^",
"||toutiaovod.com^",
},
}, {
name: "vimeo",
rules: []string{
"*vod-adaptive.akamaized.net^",
"||vimeo.com^",
"||vimeocdn.com^",
},
}, {
name: "pinterest",
rules: []string{
"||pinimg.com^",
"||pinterest.*^",
},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com",
"||qqzaixian.com^",
"||qq-video.cdn-go.cn^",
"||url.cn^",
},
}, {
name: "wechat",
rules: []string{
"||wechat.com^",
"||weixin.qq.com.cn^",
"||weixin.qq.com^",
"||weixinbridge.com^",
"||wx.qq.com^",
},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{
"||weibo.cn^",
"||weibo.com^",
"||weibocdn.com^",
},
}, {
name: "9gag",
rules: []string{
"||9cache.com^",
"||9gag.com^",
},
}, {
name: "telegram",
rules: []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
},
}, {
name: "disneyplus",
rules: []string{
"||disney-plus.net^",
"||disney.playback.edge.bamgrid.com^",
"||disneynow.com^",
"||disneyplus.com^",
"||hotstar.com^",
"||media.dssott.com^",
"||star.playback.edge.bamgrid.com^",
"||starplus.com^",
},
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{
"/_spotify-connect._tcp.local/",
"||spotify.com^",
"||scdn.co^",
"||spotify.com.edgesuite.net^",
"||spotify.map.fastly.net^",
"||spotify.map.fastlylb.net^",
"||spotifycdn.net^",
"||audio-ak-spotify-com.akamaized.net^",
"||audio4-ak-spotify-com.akamaized.net^",
"||heads-ak-spotify-com.akamaized.net^",
"||heads4-ak-spotify-com.akamaized.net^",
},
}, {
name: "tinder",
rules: []string{
"||gotinder.com^",
"||tinder.com^",
"||tindersparks.com^",
},
}, {
name: "bilibili",
rules: []string{
"||b23.tv^",
"||biliapi.net^",
"||bilibili.com^",
"||bilicdn1.com^",
"||bilicdn2.com^",
"||biligame.com^",
"||bilivideo.cn^",
"||bilivideo.com^",
"||dreamcast.hk^",
"||hdslb.com^",
},
}}
</s> add </s> remove // vetted-filters fetches the most recent Hostlists Registry index and
// transforms the filters from it to AdGuard Home's format.
</s> add // vetted-filters fetches the most recent Hostlists Registry filtering rule list
// index and transforms the filters from it to AdGuard Home's format. </s> remove for i, s := range servicesData {
netRules := make([]*rules.NetworkRule, 0, len(s.rules))
for _, text := range s.rules {
</s> add for i, s := range blockedServices {
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
for _, text := range s.Rules { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | openapi/openapi.yaml |
'/blocked_services/all':
'get':
'tags':
- 'blocked_services'
'operationId': 'blockedServicesAll'
'summary': 'Get available services to use for blocking'
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/BlockedServicesAll' | <mask> 'application/json':
<mask> 'schema':
<mask> '$ref': '#/components/schemas/BlockedServicesArray'
<mask> '/blocked_services/list':
<mask> 'get':
<mask> 'tags':
<mask> - 'blocked_services'
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. </s> remove // svc represents a single blocked service.
type svc struct {
name string
rules []string
}
// servicesData contains raw blocked service data.
//
// Keep in sync with:
// - client/src/helpers/constants.js
// - client/src/components/ui/Icons.js
var servicesData = []svc{{
name: "whatsapp",
rules: []string{
"||wa.me^",
"||whatsapp.com^",
"||whatsapp.net^",
},
}, {
name: "facebook",
rules: []string{
"||facebook.com^",
"||facebook.net^",
"||fbcdn.net^",
"||accountkit.com^",
"||fb.me^",
"||fb.com^",
"||fb.gg^",
"||fbsbx.com^",
"||fbwat.ch^",
"||messenger.com^",
"||facebookcorewwwi.onion^",
"||fbcdn.com^",
"||fb.watch^",
},
}, {
name: "twitter",
rules: []string{
"||t.co^",
"||twimg.com^",
"||twitter.com^",
"||twttr.com^",
},
}, {
name: "youtube",
rules: []string{
"||googlevideo.com^",
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
"||youtube-nocookie.com^",
"||youtube.com^",
"||youtubei.googleapis.com^",
"||youtubekids.com^",
"||ytimg.com^",
},
}, {
name: "twitch",
rules: []string{
"||jtvnw.net^",
"||ttvnw.net^",
"||twitch.tv^",
"||twitchcdn.net^",
},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{
"||snapchat.com^",
"||sc-cdn.net^",
"||snap-dev.net^",
"||snapkit.co",
"||snapads.com^",
"||impala-media-production.s3.amazonaws.com^",
},
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.gift",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{
"||edge-skype-com.s-0001.s-msedge.net^",
"||skype-edf.akadns.net^",
"||skype.com^",
"||skypeassets.com^",
"||skypedata.akadns.net^",
},
}, {
name: "vk",
rules: []string{
"||userapi.com^",
"||vk-cdn.net^",
"||vk.com^",
"||vkuservideo.net^",
},
}, {
name: "origin",
rules: []string{
"||accounts.ea.com^",
"||origin.com^",
"||signin.ea.com^",
},
}, {
name: "steam",
rules: []string{
"||steam.com^",
"||steampowered.com^",
"||steamcommunity.com^",
"||steamstatic.com^",
"||steamstore-a.akamaihd.net^",
"||steamcdn-a.akamaihd.net^",
},
}, {
name: "epic_games",
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
}, {
name: "reddit",
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
}, {
name: "mail_ru",
rules: []string{"||mail.ru^"},
}, {
name: "cloudflare",
rules: []string{
"||1.1.1.1^",
"||argotunnel.com^",
"||cloudflare-dns.com^",
"||cloudflare-ipfs.com^",
"||cloudflare-quic.com^",
"||cloudflare.cn^",
"||cloudflare.com^",
"||cloudflare.net^",
"||cloudflareaccess.com^",
"||cloudflareapps.com^",
"||cloudflarebolt.com^",
"||cloudflareclient.com^",
"||cloudflareinsights.com^",
"||cloudflareresolve.com^",
"||cloudflarestatus.com^",
"||cloudflarestream.com^",
"||cloudflarewarp.com^",
"||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^",
"||one.one^",
"||pages.dev^",
"||trycloudflare.com^",
"||videodelivery.net^",
"||warp.plus^",
"||workers.dev^",
},
}, {
name: "amazon",
rules: []string{
"||amazon.com^",
"||media-amazon.com^",
"||primevideo.com^",
"||amazontrust.com^",
"||images-amazon.com^",
"||ssl-images-amazon.com^",
"||amazonpay.com^",
"||amazonpay.in^",
"||amazon-adsystem.com^",
"||a2z.com^",
"||amazon.ae^",
"||amazon.ca^",
"||amazon.cn^",
"||amazon.de^",
"||amazon.es^",
"||amazon.fr^",
"||amazon.in^",
"||amazon.it^",
"||amazon.nl^",
"||amazon.com.au^",
"||amazon.com.br^",
"||amazon.co.jp^",
"||amazon.com.mx^",
"||amazon.com.tr^",
"||amazon.co.uk^",
"||createspace.com^",
"||aws",
},
}, {
name: "ebay",
rules: []string{
"||ebay.com^",
"||ebayimg.com^",
"||ebaystatic.com^",
"||ebaycdn.net^",
"||ebayinc.com^",
"||ebay.at^",
"||ebay.be^",
"||ebay.ca^",
"||ebay.ch^",
"||ebay.cn^",
"||ebay.de^",
"||ebay.es^",
"||ebay.fr^",
"||ebay.ie^",
"||ebay.in^",
"||ebay.it^",
"||ebay.ph^",
"||ebay.pl^",
"||ebay.nl^",
"||ebay.com.au^",
"||ebay.com.cn^",
"||ebay.com.hk^",
"||ebay.com.my^",
"||ebay.com.sg^",
"||ebay.co.uk^",
},
}, {
name: "tiktok",
rules: []string{
"||amemv.com^",
"||bdurl.com^",
"||bytecdn.cn^",
"||bytedance.map.fastly.net^",
"||bytedapm.com^",
"||byteimg.com^",
"||byteoversea.com^",
"||douyin.com^",
"||douyincdn.com^",
"||douyinpic.com^",
"||douyinstatic.com^",
"||douyinvod.com^",
"||ixigua.com^",
"||ixiguavideo.com^",
"||muscdn.com^",
"||musical.ly^",
"||pstatp.com^",
"||snssdk.com^",
"||tiktok.com^",
"||tiktokcdn.com^",
"||tiktokv.com^",
"||toutiao.com^",
"||toutiaocloud.com^",
"||toutiaocloud.net^",
"||toutiaovod.com^",
},
}, {
name: "vimeo",
rules: []string{
"*vod-adaptive.akamaized.net^",
"||vimeo.com^",
"||vimeocdn.com^",
},
}, {
name: "pinterest",
rules: []string{
"||pinimg.com^",
"||pinterest.*^",
},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com",
"||qqzaixian.com^",
"||qq-video.cdn-go.cn^",
"||url.cn^",
},
}, {
name: "wechat",
rules: []string{
"||wechat.com^",
"||weixin.qq.com.cn^",
"||weixin.qq.com^",
"||weixinbridge.com^",
"||wx.qq.com^",
},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{
"||weibo.cn^",
"||weibo.com^",
"||weibocdn.com^",
},
}, {
name: "9gag",
rules: []string{
"||9cache.com^",
"||9gag.com^",
},
}, {
name: "telegram",
rules: []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
},
}, {
name: "disneyplus",
rules: []string{
"||disney-plus.net^",
"||disney.playback.edge.bamgrid.com^",
"||disneynow.com^",
"||disneyplus.com^",
"||hotstar.com^",
"||media.dssott.com^",
"||star.playback.edge.bamgrid.com^",
"||starplus.com^",
},
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{
"/_spotify-connect._tcp.local/",
"||spotify.com^",
"||scdn.co^",
"||spotify.com.edgesuite.net^",
"||spotify.map.fastly.net^",
"||spotify.map.fastlylb.net^",
"||spotifycdn.net^",
"||audio-ak-spotify-com.akamaized.net^",
"||audio4-ak-spotify-com.akamaized.net^",
"||heads-ak-spotify-com.akamaized.net^",
"||heads4-ak-spotify-com.akamaized.net^",
},
}, {
name: "tinder",
rules: []string{
"||gotinder.com^",
"||tinder.com^",
"||tindersparks.com^",
},
}, {
name: "bilibili",
rules: []string{
"||b23.tv^",
"||biliapi.net^",
"||bilibili.com^",
"||bilicdn1.com^",
"||bilicdn2.com^",
"||biligame.com^",
"||bilivideo.cn^",
"||bilivideo.com^",
"||dreamcast.hk^",
"||hdslb.com^",
},
}}
</s> add </s> remove // jsHeader is the header for the generates JavaScript file. It informs the
</s> add // jsHeader is the header for the generated JavaScript file. It informs the | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | openapi/openapi.yaml |
// vetted-filters fetches the most recent Hostlists Registry filtering rule list
// index and transforms the filters from it to AdGuard Home's format. | <mask> // vetted-filters fetches the most recent Hostlists Registry index and
<mask> // transforms the filters from it to AdGuard Home's format.
<mask> package main
<mask>
<mask> import (
<mask> "bytes"
<mask> "encoding/json"
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove // jsHeader is the header for the generates JavaScript file. It informs the
</s> add // jsHeader is the header for the generated JavaScript file. It informs the </s> remove // svc represents a single blocked service.
type svc struct {
name string
rules []string
}
// servicesData contains raw blocked service data.
//
// Keep in sync with:
// - client/src/helpers/constants.js
// - client/src/components/ui/Icons.js
var servicesData = []svc{{
name: "whatsapp",
rules: []string{
"||wa.me^",
"||whatsapp.com^",
"||whatsapp.net^",
},
}, {
name: "facebook",
rules: []string{
"||facebook.com^",
"||facebook.net^",
"||fbcdn.net^",
"||accountkit.com^",
"||fb.me^",
"||fb.com^",
"||fb.gg^",
"||fbsbx.com^",
"||fbwat.ch^",
"||messenger.com^",
"||facebookcorewwwi.onion^",
"||fbcdn.com^",
"||fb.watch^",
},
}, {
name: "twitter",
rules: []string{
"||t.co^",
"||twimg.com^",
"||twitter.com^",
"||twttr.com^",
},
}, {
name: "youtube",
rules: []string{
"||googlevideo.com^",
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
"||youtube-nocookie.com^",
"||youtube.com^",
"||youtubei.googleapis.com^",
"||youtubekids.com^",
"||ytimg.com^",
},
}, {
name: "twitch",
rules: []string{
"||jtvnw.net^",
"||ttvnw.net^",
"||twitch.tv^",
"||twitchcdn.net^",
},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{
"||snapchat.com^",
"||sc-cdn.net^",
"||snap-dev.net^",
"||snapkit.co",
"||snapads.com^",
"||impala-media-production.s3.amazonaws.com^",
},
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.gift",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{
"||edge-skype-com.s-0001.s-msedge.net^",
"||skype-edf.akadns.net^",
"||skype.com^",
"||skypeassets.com^",
"||skypedata.akadns.net^",
},
}, {
name: "vk",
rules: []string{
"||userapi.com^",
"||vk-cdn.net^",
"||vk.com^",
"||vkuservideo.net^",
},
}, {
name: "origin",
rules: []string{
"||accounts.ea.com^",
"||origin.com^",
"||signin.ea.com^",
},
}, {
name: "steam",
rules: []string{
"||steam.com^",
"||steampowered.com^",
"||steamcommunity.com^",
"||steamstatic.com^",
"||steamstore-a.akamaihd.net^",
"||steamcdn-a.akamaihd.net^",
},
}, {
name: "epic_games",
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
}, {
name: "reddit",
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
}, {
name: "mail_ru",
rules: []string{"||mail.ru^"},
}, {
name: "cloudflare",
rules: []string{
"||1.1.1.1^",
"||argotunnel.com^",
"||cloudflare-dns.com^",
"||cloudflare-ipfs.com^",
"||cloudflare-quic.com^",
"||cloudflare.cn^",
"||cloudflare.com^",
"||cloudflare.net^",
"||cloudflareaccess.com^",
"||cloudflareapps.com^",
"||cloudflarebolt.com^",
"||cloudflareclient.com^",
"||cloudflareinsights.com^",
"||cloudflareresolve.com^",
"||cloudflarestatus.com^",
"||cloudflarestream.com^",
"||cloudflarewarp.com^",
"||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^",
"||one.one^",
"||pages.dev^",
"||trycloudflare.com^",
"||videodelivery.net^",
"||warp.plus^",
"||workers.dev^",
},
}, {
name: "amazon",
rules: []string{
"||amazon.com^",
"||media-amazon.com^",
"||primevideo.com^",
"||amazontrust.com^",
"||images-amazon.com^",
"||ssl-images-amazon.com^",
"||amazonpay.com^",
"||amazonpay.in^",
"||amazon-adsystem.com^",
"||a2z.com^",
"||amazon.ae^",
"||amazon.ca^",
"||amazon.cn^",
"||amazon.de^",
"||amazon.es^",
"||amazon.fr^",
"||amazon.in^",
"||amazon.it^",
"||amazon.nl^",
"||amazon.com.au^",
"||amazon.com.br^",
"||amazon.co.jp^",
"||amazon.com.mx^",
"||amazon.com.tr^",
"||amazon.co.uk^",
"||createspace.com^",
"||aws",
},
}, {
name: "ebay",
rules: []string{
"||ebay.com^",
"||ebayimg.com^",
"||ebaystatic.com^",
"||ebaycdn.net^",
"||ebayinc.com^",
"||ebay.at^",
"||ebay.be^",
"||ebay.ca^",
"||ebay.ch^",
"||ebay.cn^",
"||ebay.de^",
"||ebay.es^",
"||ebay.fr^",
"||ebay.ie^",
"||ebay.in^",
"||ebay.it^",
"||ebay.ph^",
"||ebay.pl^",
"||ebay.nl^",
"||ebay.com.au^",
"||ebay.com.cn^",
"||ebay.com.hk^",
"||ebay.com.my^",
"||ebay.com.sg^",
"||ebay.co.uk^",
},
}, {
name: "tiktok",
rules: []string{
"||amemv.com^",
"||bdurl.com^",
"||bytecdn.cn^",
"||bytedance.map.fastly.net^",
"||bytedapm.com^",
"||byteimg.com^",
"||byteoversea.com^",
"||douyin.com^",
"||douyincdn.com^",
"||douyinpic.com^",
"||douyinstatic.com^",
"||douyinvod.com^",
"||ixigua.com^",
"||ixiguavideo.com^",
"||muscdn.com^",
"||musical.ly^",
"||pstatp.com^",
"||snssdk.com^",
"||tiktok.com^",
"||tiktokcdn.com^",
"||tiktokv.com^",
"||toutiao.com^",
"||toutiaocloud.com^",
"||toutiaocloud.net^",
"||toutiaovod.com^",
},
}, {
name: "vimeo",
rules: []string{
"*vod-adaptive.akamaized.net^",
"||vimeo.com^",
"||vimeocdn.com^",
},
}, {
name: "pinterest",
rules: []string{
"||pinimg.com^",
"||pinterest.*^",
},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com",
"||qqzaixian.com^",
"||qq-video.cdn-go.cn^",
"||url.cn^",
},
}, {
name: "wechat",
rules: []string{
"||wechat.com^",
"||weixin.qq.com.cn^",
"||weixin.qq.com^",
"||weixinbridge.com^",
"||wx.qq.com^",
},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{
"||weibo.cn^",
"||weibo.com^",
"||weibocdn.com^",
},
}, {
name: "9gag",
rules: []string{
"||9cache.com^",
"||9gag.com^",
},
}, {
name: "telegram",
rules: []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
},
}, {
name: "disneyplus",
rules: []string{
"||disney-plus.net^",
"||disney.playback.edge.bamgrid.com^",
"||disneynow.com^",
"||disneyplus.com^",
"||hotstar.com^",
"||media.dssott.com^",
"||star.playback.edge.bamgrid.com^",
"||starplus.com^",
},
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{
"/_spotify-connect._tcp.local/",
"||spotify.com^",
"||scdn.co^",
"||spotify.com.edgesuite.net^",
"||spotify.map.fastly.net^",
"||spotify.map.fastlylb.net^",
"||spotifycdn.net^",
"||audio-ak-spotify-com.akamaized.net^",
"||audio4-ak-spotify-com.akamaized.net^",
"||heads-ak-spotify-com.akamaized.net^",
"||heads4-ak-spotify-com.akamaized.net^",
},
}, {
name: "tinder",
rules: []string{
"||gotinder.com^",
"||tinder.com^",
"||tindersparks.com^",
},
}, {
name: "bilibili",
rules: []string{
"||b23.tv^",
"||biliapi.net^",
"||bilibili.com^",
"||bilicdn1.com^",
"||bilicdn2.com^",
"||biligame.com^",
"||bilivideo.cn^",
"||bilivideo.com^",
"||dreamcast.hk^",
"||hdslb.com^",
},
}}
</s> add </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. </s> remove import ClientsTable from './ClientsTable';
</s> add import { ClientsTable } from './ClientsTable'; </s> remove import { connect } from 'react-redux';
</s> add import { connect, useSelector } from 'react-redux'; | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | scripts/vetted-filters/main.go |
// jsHeader is the header for the generated JavaScript file. It informs the | <mask> err = maybe.WriteFile("client/src/helpers/filters/filters.js", buf.Bytes(), 0o644)
<mask> check(err)
<mask> }
<mask>
<mask> // jsHeader is the header for the generates JavaScript file. It informs the
<mask> // reader that the file is generated and disables some style-related eslint
<mask> // checks.
<mask> const jsHeader = `// Code generated by go run ./scripts/vetted-filters/main.go; DO NOT EDIT.
<mask>
<mask> /* eslint quote-props: 'off', quotes: 'off', comma-dangle: 'off', semi: 'off' */
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs </s> remove // vetted-filters fetches the most recent Hostlists Registry index and
// transforms the filters from it to AdGuard Home's format.
</s> add // vetted-filters fetches the most recent Hostlists Registry filtering rule list
// index and transforms the filters from it to AdGuard Home's format. </s> remove // BlockedSvcKnown - return TRUE if a blocked service name is known
</s> add // BlockedSvcKnown returns true if a blocked service ID is known. </s> remove l := len(servicesData)
</s> add l := len(blockedServices) </s> remove // svc represents a single blocked service.
type svc struct {
name string
rules []string
}
// servicesData contains raw blocked service data.
//
// Keep in sync with:
// - client/src/helpers/constants.js
// - client/src/components/ui/Icons.js
var servicesData = []svc{{
name: "whatsapp",
rules: []string{
"||wa.me^",
"||whatsapp.com^",
"||whatsapp.net^",
},
}, {
name: "facebook",
rules: []string{
"||facebook.com^",
"||facebook.net^",
"||fbcdn.net^",
"||accountkit.com^",
"||fb.me^",
"||fb.com^",
"||fb.gg^",
"||fbsbx.com^",
"||fbwat.ch^",
"||messenger.com^",
"||facebookcorewwwi.onion^",
"||fbcdn.com^",
"||fb.watch^",
},
}, {
name: "twitter",
rules: []string{
"||t.co^",
"||twimg.com^",
"||twitter.com^",
"||twttr.com^",
},
}, {
name: "youtube",
rules: []string{
"||googlevideo.com^",
"||wide-youtube.l.google.com^",
"||youtu.be^",
"||youtube",
"||youtube-nocookie.com^",
"||youtube.com^",
"||youtubei.googleapis.com^",
"||youtubekids.com^",
"||ytimg.com^",
},
}, {
name: "twitch",
rules: []string{
"||jtvnw.net^",
"||ttvnw.net^",
"||twitch.tv^",
"||twitchcdn.net^",
},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{
"||snapchat.com^",
"||sc-cdn.net^",
"||snap-dev.net^",
"||snapkit.co",
"||snapads.com^",
"||impala-media-production.s3.amazonaws.com^",
},
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.gift",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{
"||edge-skype-com.s-0001.s-msedge.net^",
"||skype-edf.akadns.net^",
"||skype.com^",
"||skypeassets.com^",
"||skypedata.akadns.net^",
},
}, {
name: "vk",
rules: []string{
"||userapi.com^",
"||vk-cdn.net^",
"||vk.com^",
"||vkuservideo.net^",
},
}, {
name: "origin",
rules: []string{
"||accounts.ea.com^",
"||origin.com^",
"||signin.ea.com^",
},
}, {
name: "steam",
rules: []string{
"||steam.com^",
"||steampowered.com^",
"||steamcommunity.com^",
"||steamstatic.com^",
"||steamstore-a.akamaihd.net^",
"||steamcdn-a.akamaihd.net^",
},
}, {
name: "epic_games",
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
}, {
name: "reddit",
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
}, {
name: "mail_ru",
rules: []string{"||mail.ru^"},
}, {
name: "cloudflare",
rules: []string{
"||1.1.1.1^",
"||argotunnel.com^",
"||cloudflare-dns.com^",
"||cloudflare-ipfs.com^",
"||cloudflare-quic.com^",
"||cloudflare.cn^",
"||cloudflare.com^",
"||cloudflare.net^",
"||cloudflareaccess.com^",
"||cloudflareapps.com^",
"||cloudflarebolt.com^",
"||cloudflareclient.com^",
"||cloudflareinsights.com^",
"||cloudflareresolve.com^",
"||cloudflarestatus.com^",
"||cloudflarestream.com^",
"||cloudflarewarp.com^",
"||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^",
"||one.one^",
"||pages.dev^",
"||trycloudflare.com^",
"||videodelivery.net^",
"||warp.plus^",
"||workers.dev^",
},
}, {
name: "amazon",
rules: []string{
"||amazon.com^",
"||media-amazon.com^",
"||primevideo.com^",
"||amazontrust.com^",
"||images-amazon.com^",
"||ssl-images-amazon.com^",
"||amazonpay.com^",
"||amazonpay.in^",
"||amazon-adsystem.com^",
"||a2z.com^",
"||amazon.ae^",
"||amazon.ca^",
"||amazon.cn^",
"||amazon.de^",
"||amazon.es^",
"||amazon.fr^",
"||amazon.in^",
"||amazon.it^",
"||amazon.nl^",
"||amazon.com.au^",
"||amazon.com.br^",
"||amazon.co.jp^",
"||amazon.com.mx^",
"||amazon.com.tr^",
"||amazon.co.uk^",
"||createspace.com^",
"||aws",
},
}, {
name: "ebay",
rules: []string{
"||ebay.com^",
"||ebayimg.com^",
"||ebaystatic.com^",
"||ebaycdn.net^",
"||ebayinc.com^",
"||ebay.at^",
"||ebay.be^",
"||ebay.ca^",
"||ebay.ch^",
"||ebay.cn^",
"||ebay.de^",
"||ebay.es^",
"||ebay.fr^",
"||ebay.ie^",
"||ebay.in^",
"||ebay.it^",
"||ebay.ph^",
"||ebay.pl^",
"||ebay.nl^",
"||ebay.com.au^",
"||ebay.com.cn^",
"||ebay.com.hk^",
"||ebay.com.my^",
"||ebay.com.sg^",
"||ebay.co.uk^",
},
}, {
name: "tiktok",
rules: []string{
"||amemv.com^",
"||bdurl.com^",
"||bytecdn.cn^",
"||bytedance.map.fastly.net^",
"||bytedapm.com^",
"||byteimg.com^",
"||byteoversea.com^",
"||douyin.com^",
"||douyincdn.com^",
"||douyinpic.com^",
"||douyinstatic.com^",
"||douyinvod.com^",
"||ixigua.com^",
"||ixiguavideo.com^",
"||muscdn.com^",
"||musical.ly^",
"||pstatp.com^",
"||snssdk.com^",
"||tiktok.com^",
"||tiktokcdn.com^",
"||tiktokv.com^",
"||toutiao.com^",
"||toutiaocloud.com^",
"||toutiaocloud.net^",
"||toutiaovod.com^",
},
}, {
name: "vimeo",
rules: []string{
"*vod-adaptive.akamaized.net^",
"||vimeo.com^",
"||vimeocdn.com^",
},
}, {
name: "pinterest",
rules: []string{
"||pinimg.com^",
"||pinterest.*^",
},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com",
"||qqzaixian.com^",
"||qq-video.cdn-go.cn^",
"||url.cn^",
},
}, {
name: "wechat",
rules: []string{
"||wechat.com^",
"||weixin.qq.com.cn^",
"||weixin.qq.com^",
"||weixinbridge.com^",
"||wx.qq.com^",
},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{
"||weibo.cn^",
"||weibo.com^",
"||weibocdn.com^",
},
}, {
name: "9gag",
rules: []string{
"||9cache.com^",
"||9gag.com^",
},
}, {
name: "telegram",
rules: []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
},
}, {
name: "disneyplus",
rules: []string{
"||disney-plus.net^",
"||disney.playback.edge.bamgrid.com^",
"||disneynow.com^",
"||disneyplus.com^",
"||hotstar.com^",
"||media.dssott.com^",
"||star.playback.edge.bamgrid.com^",
"||starplus.com^",
},
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{
"/_spotify-connect._tcp.local/",
"||spotify.com^",
"||scdn.co^",
"||spotify.com.edgesuite.net^",
"||spotify.map.fastly.net^",
"||spotify.map.fastlylb.net^",
"||spotifycdn.net^",
"||audio-ak-spotify-com.akamaized.net^",
"||audio4-ak-spotify-com.akamaized.net^",
"||heads-ak-spotify-com.akamaized.net^",
"||heads4-ak-spotify-com.akamaized.net^",
},
}, {
name: "tinder",
rules: []string{
"||gotinder.com^",
"||tinder.com^",
"||tindersparks.com^",
},
}, {
name: "bilibili",
rules: []string{
"||b23.tv^",
"||biliapi.net^",
"||bilibili.com^",
"||bilicdn1.com^",
"||bilicdn2.com^",
"||biligame.com^",
"||bilivideo.cn^",
"||bilivideo.com^",
"||dreamcast.hk^",
"||hdslb.com^",
},
}}
</s> add </s> remove for i, s := range servicesData {
netRules := make([]*rules.NetworkRule, 0, len(s.rules))
for _, text := range s.rules {
</s> add for i, s := range blockedServices {
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
for _, text := range s.Rules { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | scripts/vetted-filters/main.go |
// Upstream objects:
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
upstreamObjects []upstream.Upstream | <mask> UseOwnBlockedServices bool // false: use global settings
<mask> BlockedServices []string
<mask>
<mask> Upstreams []string // list of upstream servers to be used for the client's requests
<mask> }
<mask>
<mask> type clientSource uint
<mask>
<mask> // Client sources
<mask> const (
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove
// cache for Upstream instances that are used in the case
// when custom DNS servers are configured for a client
upstreamsCache map[string][]upstream.Upstream // name -> []Upstream
lock sync.Mutex
</s> add lock sync.Mutex </s> remove // update upstreams cache
delete(clients.upstreamsCache, name)
</s> add </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go |
lock sync.Mutex | <mask> type clientsContainer struct {
<mask> list map[string]*Client // name -> client
<mask> idIndex map[string]*Client // IP -> client
<mask> ipHost map[string]*ClientHost // IP -> Hostname
<mask>
<mask> // cache for Upstream instances that are used in the case
<mask> // when custom DNS servers are configured for a client
<mask> upstreamsCache map[string][]upstream.Upstream // name -> []Upstream
<mask>
<mask> lock sync.Mutex
<mask>
<mask> // dhcpServer is used for looking up clients IP addresses by MAC addresses
<mask> dhcpServer *dhcpd.Server
<mask>
<mask> testing bool // if TRUE, this object is used for internal tests
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) </s> remove // update upstreams cache
delete(clients.upstreamsCache, name)
</s> add </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go |
<mask> }
<mask> clients.list = make(map[string]*Client)
<mask> clients.idIndex = make(map[string]*Client)
<mask> clients.ipHost = make(map[string]*ClientHost)
<mask> clients.upstreamsCache = make(map[string][]upstream.Upstream)
<mask> clients.dhcpServer = dhcpServer
<mask> clients.addFromConfig(objects)
<mask>
<mask> if !clients.testing {
<mask> go clients.periodicUpdate()
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove if len(upstreams) == 0 {
clients.upstreamsCache[c.Name] = nil
} else {
clients.upstreamsCache[c.Name] = upstreams
</s> add if len(c.upstreamObjects) == 0 {
return nil </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil </s> remove upstreams = append(upstreams, u)
</s> add </s> remove if len(c.Upstreams) == 0 {
return nil
}
upstreams, ok := clients.upstreamsCache[c.Name]
if ok {
return upstreams
}
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
</s> add if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go | |
func upstreamArrayCopy(a []upstream.Upstream) []upstream.Upstream {
a2 := make([]upstream.Upstream, len(a))
copy(a2, a)
return a2
}
| <mask> return clients.findByIP(ip)
<mask> }
<mask>
<mask> // FindUpstreams looks for upstreams configured for the client
<mask> // If no client found for this IP, or if no custom upstreams are configured,
<mask> // this method returns nil
<mask> func (clients *clientsContainer) FindUpstreams(ip string) []upstream.Upstream {
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) </s> remove
// cache for Upstream instances that are used in the case
// when custom DNS servers are configured for a client
upstreamsCache map[string][]upstream.Upstream // name -> []Upstream
lock sync.Mutex
</s> add lock sync.Mutex </s> remove // update upstreams cache
delete(clients.upstreamsCache, name)
</s> add </s> remove if len(c.Upstreams) == 0 {
return nil
}
upstreams, ok := clients.upstreamsCache[c.Name]
if ok {
return upstreams
}
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
</s> add if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go |
if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) | <mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> if len(c.Upstreams) == 0 {
<mask> return nil
<mask> }
<mask>
<mask> upstreams, ok := clients.upstreamsCache[c.Name]
<mask> if ok {
<mask> return upstreams
<mask> }
<mask>
<mask> for _, us := range c.Upstreams {
<mask> u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
<mask> if err != nil {
<mask> log.Error("upstream.AddressToUpstream: %s: %s", us, err)
<mask> continue
<mask> }
<mask> upstreams = append(upstreams, u)
<mask> }
<mask>
<mask> if len(upstreams) == 0 {
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove upstreams = append(upstreams, u)
</s> add </s> remove if len(upstreams) == 0 {
clients.upstreamsCache[c.Name] = nil
} else {
clients.upstreamsCache[c.Name] = upstreams
</s> add if len(c.upstreamObjects) == 0 {
return nil </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go |
<mask> if err != nil {
<mask> log.Error("upstream.AddressToUpstream: %s: %s", us, err)
<mask> continue
<mask> }
<mask> upstreams = append(upstreams, u)
<mask> }
<mask>
<mask> if len(upstreams) == 0 {
<mask> clients.upstreamsCache[c.Name] = nil
<mask> } else {
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove if len(c.Upstreams) == 0 {
return nil
}
upstreams, ok := clients.upstreamsCache[c.Name]
if ok {
return upstreams
}
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
</s> add if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) </s> remove if len(upstreams) == 0 {
clients.upstreamsCache[c.Name] = nil
} else {
clients.upstreamsCache[c.Name] = upstreams
</s> add if len(c.upstreamObjects) == 0 {
return nil </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) </s> remove clients.upstreamsCache = make(map[string][]upstream.Upstream)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go | |
if len(c.upstreamObjects) == 0 {
return nil | <mask> }
<mask> upstreams = append(upstreams, u)
<mask> }
<mask>
<mask> if len(upstreams) == 0 {
<mask> clients.upstreamsCache[c.Name] = nil
<mask> } else {
<mask> clients.upstreamsCache[c.Name] = upstreams
<mask> }
<mask>
<mask> return upstreams
<mask> }
<mask>
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove upstreams = append(upstreams, u)
</s> add </s> remove if len(c.Upstreams) == 0 {
return nil
}
upstreams, ok := clients.upstreamsCache[c.Name]
if ok {
return upstreams
}
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
</s> add if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go |
return upstreamArrayCopy(c.upstreamObjects) | <mask> clients.upstreamsCache[c.Name] = nil
<mask> } else {
<mask> clients.upstreamsCache[c.Name] = upstreams
<mask> }
<mask>
<mask> return upstreams
<mask> }
<mask>
<mask> // Find searches for a client by IP (and does not lock anything)
<mask> func (clients *clientsContainer) findByIP(ip string) (Client, bool) {
<mask> ipAddr := net.ParseIP(ip)
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove if len(upstreams) == 0 {
clients.upstreamsCache[c.Name] = nil
} else {
clients.upstreamsCache[c.Name] = upstreams
</s> add if len(c.upstreamObjects) == 0 {
return nil </s> remove
// cache for Upstream instances that are used in the case
// when custom DNS servers are configured for a client
upstreamsCache map[string][]upstream.Upstream // name -> []Upstream
lock sync.Mutex
</s> add lock sync.Mutex </s> remove if len(c.Upstreams) == 0 {
return nil
}
upstreams, ok := clients.upstreamsCache[c.Name]
if ok {
return upstreams
}
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
</s> add if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go |
<mask>
<mask> // update Name index
<mask> delete(clients.list, name)
<mask>
<mask> // update upstreams cache
<mask> delete(clients.upstreamsCache, name)
<mask>
<mask> // update ID index
<mask> for _, id := range c.IDs {
<mask> delete(clients.idIndex, id)
<mask> }
<mask> return true
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove if old.Name != c.Name {
delete(clients.upstreamsCache, old.Name)
} else {
delete(clients.upstreamsCache, c.Name)
}
</s> add c.upstreamObjects = nil </s> remove if len(c.Upstreams) == 0 {
return nil
}
upstreams, ok := clients.upstreamsCache[c.Name]
if ok {
return upstreams
}
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
</s> add if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) </s> remove
// cache for Upstream instances that are used in the case
// when custom DNS servers are configured for a client
upstreamsCache map[string][]upstream.Upstream // name -> []Upstream
lock sync.Mutex
</s> add lock sync.Mutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go | |
c.upstreamObjects = nil | <mask> clients.list[c.Name] = old
<mask> }
<mask>
<mask> // update upstreams cache
<mask> if old.Name != c.Name {
<mask> delete(clients.upstreamsCache, old.Name)
<mask> } else {
<mask> delete(clients.upstreamsCache, c.Name)
<mask> }
<mask>
<mask> *old = c
<mask> return nil
<mask> }
<mask>
</s> * clients: Upstreams cache: refactor
don't use a separate container </s> remove // update upstreams cache
delete(clients.upstreamsCache, name)
</s> add </s> remove if len(upstreams) == 0 {
clients.upstreamsCache[c.Name] = nil
} else {
clients.upstreamsCache[c.Name] = upstreams
</s> add if len(c.upstreamObjects) == 0 {
return nil </s> remove upstreams = append(upstreams, u)
</s> add </s> remove if len(c.Upstreams) == 0 {
return nil
}
upstreams, ok := clients.upstreamsCache[c.Name]
if ok {
return upstreams
}
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
</s> add if c.upstreamObjects == nil {
c.upstreamObjects = make([]upstream.Upstream, 0)
for _, us := range c.Upstreams {
u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
if err != nil {
log.Error("upstream.AddressToUpstream: %s: %s", us, err)
continue
}
c.upstreamObjects = append(c.upstreamObjects, u) </s> remove
return upstreams
</s> add return upstreamArrayCopy(c.upstreamObjects) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/995373c74bae05fde3c0b5ab04a5318cbaf5fa3d | home/clients.go |
// isValidURL - return TRUE if URL or file path is valid
func isValidURL(rawurl string) bool { | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // IsValidURL - return TRUE if URL or file path is valid
<mask> func IsValidURL(rawurl string) bool {
<mask> if filepath.IsAbs(rawurl) {
<mask> // this is a file path
<mask> return util.FileExists(rawurl)
<mask> }
<mask>
</s> - "set_url": couldn't set a new path for filter local file </s> remove if !IsValidURL(fj.URL) {
</s> add if !isValidURL(fj.URL) { </s> remove if !IsValidURL(fj.URL) {
</s> add if !isValidURL(fj.Data.URL) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99625da1e44b4e6686f3c4b29526949ef471a100 | home/control_filtering.go |
if !isValidURL(fj.URL) { | <mask> httpError(w, http.StatusBadRequest, "Failed to parse request body json: %s", err)
<mask> return
<mask> }
<mask>
<mask> if !IsValidURL(fj.URL) {
<mask> http.Error(w, "Invalid URL or file path", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> // Check for duplicates
</s> - "set_url": couldn't set a new path for filter local file </s> remove if !IsValidURL(fj.URL) {
</s> add if !isValidURL(fj.Data.URL) { </s> remove // IsValidURL - return TRUE if URL or file path is valid
func IsValidURL(rawurl string) bool {
</s> add // isValidURL - return TRUE if URL or file path is valid
func isValidURL(rawurl string) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99625da1e44b4e6686f3c4b29526949ef471a100 | home/control_filtering.go |
if !isValidURL(fj.Data.URL) { | <mask> httpError(w, http.StatusBadRequest, "json decode: %s", err)
<mask> return
<mask> }
<mask>
<mask> if !IsValidURL(fj.URL) {
<mask> http.Error(w, "invalid URL or file path", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> filt := filter{
</s> - "set_url": couldn't set a new path for filter local file </s> remove if !IsValidURL(fj.URL) {
</s> add if !isValidURL(fj.URL) { </s> remove // IsValidURL - return TRUE if URL or file path is valid
func IsValidURL(rawurl string) bool {
</s> add // isValidURL - return TRUE if URL or file path is valid
func isValidURL(rawurl string) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99625da1e44b4e6686f3c4b29526949ef471a100 | home/control_filtering.go |
github.com/AdguardTeam/golibs v0.11.4 | <mask> go 1.18
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.46.5
<mask> github.com/AdguardTeam/golibs v0.11.3
<mask> github.com/AdguardTeam/urlfilter v0.16.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.5
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/dimfeld/httptreemux/v5 v5.5.0
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove github.com/AdguardTeam/golibs v0.11.3 h1:Oif+REq2WLycQ2Xm3ZPmJdfftptss0HbGWbxdFaC310=
github.com/AdguardTeam/golibs v0.11.3/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
</s> add github.com/AdguardTeam/golibs v0.11.4 h1:IltyvxwCTN+xxJF5sh6VadF8Zfbf8elgCm9dgijSVzM=
github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA= </s> remove log.Debug("%s: handling the request", hostsContainerPref)
</s> add log.Debug("%s: handling the request for %s", hostsContainerPref, req.Hostname) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | go.mod |
github.com/AdguardTeam/golibs v0.11.4 h1:IltyvxwCTN+xxJF5sh6VadF8Zfbf8elgCm9dgijSVzM=
github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA= | <mask> github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs=
<mask> github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.11.3 h1:Oif+REq2WLycQ2Xm3ZPmJdfftptss0HbGWbxdFaC310=
<mask> github.com/AdguardTeam/golibs v0.11.3/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
<mask> github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
<mask> github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
<mask> github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove github.com/AdguardTeam/golibs v0.11.3
</s> add github.com/AdguardTeam/golibs v0.11.4 </s> remove log.Debug("%s: handling the request", hostsContainerPref)
</s> add log.Debug("%s: handling the request for %s", hostsContainerPref, req.Hostname) </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | go.sum |
"github.com/AdguardTeam/golibs/mathutil" | <mask> "encoding/json"
<mask> "fmt"
<mask> )
<mask>
<mask> // NullBool is a nullable boolean. Use these in JSON requests and responses
<mask> // instead of pointers to bool.
<mask> type NullBool uint8
<mask>
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove // ip and updates it's blocking moment if needed. For internal use only.
</s> add // usrID and updates it's blocking moment if needed. For internal use only. </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghalg/nullbool.go |
return NBFalse - mathutil.BoolToNumber[NullBool](cond) | <mask> }
<mask>
<mask> // BoolToNullBool converts a bool into a NullBool.
<mask> func BoolToNullBool(cond bool) (nb NullBool) {
<mask> if cond {
<mask> return NBTrue
<mask> }
<mask>
<mask> return NBFalse
<mask> }
<mask>
<mask> // type check
<mask> var _ json.Marshaler = NBNull
<mask>
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove
func max(a, b int) int {
if a > b {
return a
}
return b
}
</s> add </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove rewrites = rewrites[:max(1, i)]
</s> add rewrites = rewrites[:mathutil.Max(1, i)] </s> remove if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
aaaa.Hdr.Ttl = rrTTL
} else {
aaaa.Hdr.Ttl = soaTTL
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghalg/nullbool.go |
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/mathutil" | <mask> import (
<mask> "fmt"
<mask> "io"
<mask> )
<mask>
<mask> // LimitReachedError records the limit and the operation that caused it.
<mask> type LimitReachedError struct {
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // Error implements the error interface for LimitReachedError.
</s> add // Error implements the [error] interface for *LimitReachedError. </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove //
// TODO(a.garipov): Once https://github.com/golang/go/issues/56621 is
// resolved, remove the first condition.
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghio/limitedreader.go |
// Error implements the [error] interface for *LimitReachedError. | <mask> type LimitReachedError struct {
<mask> Limit int64
<mask> }
<mask>
<mask> // Error implements the error interface for LimitReachedError.
<mask> //
<mask> // TODO(a.garipov): Think about error string format.
<mask> func (lre *LimitReachedError) Error() string {
<mask> return fmt.Sprintf("attempted to read more than %d bytes", lre.Limit)
<mask> }
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. </s> remove //
// TODO(a.garipov): Once https://github.com/golang/go/issues/56621 is
// resolved, remove the first condition.
</s> add </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghio/limitedreader.go |
// limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. | <mask> func (lre *LimitReachedError) Error() string {
<mask> return fmt.Sprintf("attempted to read more than %d bytes", lre.Limit)
<mask> }
<mask>
<mask> // limitedReader is a wrapper for io.Reader with limited reader and dealing with
<mask> // errors package.
<mask> type limitedReader struct {
<mask> r io.Reader
<mask> limit int64
<mask> n int64
<mask> }
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // Error implements the error interface for LimitReachedError.
</s> add // Error implements the [error] interface for *LimitReachedError. </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. </s> remove return nil, fmt.Errorf("aghio: invalid n in LimitReader: %d", n)
</s> add return nil, errors.Error("limit must be non-negative") </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghio/limitedreader.go |
// Read implements the [io.Reader] interface. | <mask> limit int64
<mask> n int64
<mask> }
<mask>
<mask> // Read implements Reader interface.
<mask> func (lr *limitedReader) Read(p []byte) (n int, err error) {
<mask> if lr.n == 0 {
<mask> return 0, &LimitReachedError{
<mask> Limit: lr.limit,
<mask> }
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if int64(len(p)) > lr.n {
p = p[:lr.n]
}
</s> add p = p[:mathutil.Min(lr.n, int64(len(p)))] </s> remove return nil, fmt.Errorf("aghio: invalid n in LimitReader: %d", n)
</s> add return nil, errors.Error("limit must be non-negative") </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove // Error implements the error interface for LimitReachedError.
</s> add // Error implements the [error] interface for *LimitReachedError. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghio/limitedreader.go |
p = p[:mathutil.Min(lr.n, int64(len(p)))] | <mask> Limit: lr.limit,
<mask> }
<mask> }
<mask>
<mask> if int64(len(p)) > lr.n {
<mask> p = p[:lr.n]
<mask> }
<mask>
<mask> n, err = lr.r.Read(p)
<mask> lr.n -= int64(n)
<mask>
<mask> return n, err
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. </s> remove if cur > largest {
largest = cur
}
</s> add largest = mathutil.Max(largest, cur) </s> remove if len(out) > MaxCmdOutputSize {
out = out[:MaxCmdOutputSize]
}
</s> add out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] </s> remove return nil, fmt.Errorf("aghio: invalid n in LimitReader: %d", n)
</s> add return nil, errors.Error("limit must be non-negative") </s> remove if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
aaaa.Hdr.Ttl = rrTTL
} else {
aaaa.Hdr.Ttl = soaTTL
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghio/limitedreader.go |
return nil, errors.Error("limit must be non-negative") | <mask> // LimitReader wraps Reader to make it's Reader stop with ErrLimitReached after
<mask> // n bytes read.
<mask> func LimitReader(r io.Reader, n int64) (limited io.Reader, err error) {
<mask> if n < 0 {
<mask> return nil, fmt.Errorf("aghio: invalid n in LimitReader: %d", n)
<mask> }
<mask>
<mask> return &limitedReader{
<mask> r: r,
<mask> limit: n,
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. </s> remove wantErrMsg: "aghio: invalid n in LimitReader: -1",
</s> add wantErrMsg: "limit must be non-negative", </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove if int64(len(p)) > lr.n {
p = p[:lr.n]
}
</s> add p = p[:mathutil.Min(lr.n, int64(len(p)))] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghio/limitedreader.go |
wantErrMsg: "limit must be non-negative", | <mask> wantErrMsg: "",
<mask> name: "zero",
<mask> n: 0,
<mask> }, {
<mask> wantErrMsg: "aghio: invalid n in LimitReader: -1",
<mask> name: "negative",
<mask> n: -1,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove return nil, fmt.Errorf("aghio: invalid n in LimitReader: %d", n)
</s> add return nil, errors.Error("limit must be non-negative") </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove rewrites = rewrites[:max(1, i)]
</s> add rewrites = rewrites[:mathutil.Max(1, i)] </s> remove if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
aaaa.Hdr.Ttl = rrTTL
} else {
aaaa.Hdr.Ttl = soaTTL
}
</s> add </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghio/limitedreader_test.go |
log.Debug("%s: handling the request for %s", hostsContainerPref, req.Hostname) | <mask> req *urlfilter.DNSRequest,
<mask> ) (res *urlfilter.DNSResult, ok bool) {
<mask> switch req.DNSType {
<mask> case dns.TypeA, dns.TypeAAAA, dns.TypePTR:
<mask> log.Debug("%s: handling the request", hostsContainerPref)
<mask> default:
<mask> return nil, false
<mask> }
<mask>
<mask> rm.stateLock.RLock()
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove //
// TODO(a.garipov): Once https://github.com/golang/go/issues/56621 is
// resolved, remove the first condition.
</s> add </s> remove return nil, fmt.Errorf("aghio: invalid n in LimitReader: %d", n)
</s> add return nil, errors.Error("limit must be non-negative") </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghnet/hostscontainer.go |
<mask> return fmt.Errorf("refreshing : %w", err)
<mask> }
<mask>
<mask> // hc.last is nil on the first refresh, so let that one through.
<mask> //
<mask> // TODO(a.garipov): Once https://github.com/golang/go/issues/56621 is
<mask> // resolved, remove the first condition.
<mask> if hc.last != nil && maps.EqualFunc(hp.table, hc.last, (*HostsRecord).equal) {
<mask> log.Debug("%s: no changes detected", hostsContainerPref)
<mask>
<mask> return nil
<mask> }
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if cur > largest {
largest = cur
}
</s> add largest = mathutil.Max(largest, cur) </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove if len(out) > MaxCmdOutputSize {
out = out[:MaxCmdOutputSize]
}
</s> add out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] </s> remove // Error implements the error interface for LimitReachedError.
</s> add // Error implements the [error] interface for *LimitReachedError. </s> remove if aerr != nil || cur < 0 || intIn(cur, ignore) {
</s> add if aerr != nil || cur < 0 || slices.Contains(ignore, cur) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghnet/hostscontainer.go | |
"github.com/AdguardTeam/golibs/mathutil"
"golang.org/x/exp/slices" | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // UnsupportedError is returned by functions and methods when a particular
<mask> // operation Op cannot be performed on the current OS.
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove //
// TODO(a.garipov): Once https://github.com/golang/go/issues/56621 is
// resolved, remove the first condition.
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghos/os.go |
out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] | <mask> // RunCommand runs shell command.
<mask> func RunCommand(command string, arguments ...string) (code int, output []byte, err error) {
<mask> cmd := exec.Command(command, arguments...)
<mask> out, err := cmd.Output()
<mask> if len(out) > MaxCmdOutputSize {
<mask> out = out[:MaxCmdOutputSize]
<mask> }
<mask>
<mask> if err != nil {
<mask> if eerr := new(exec.ExitError); errors.As(err, &eerr) {
<mask> return eerr.ExitCode(), eerr.Stderr, nil
<mask> }
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if cur > largest {
largest = cur
}
</s> add largest = mathutil.Max(largest, cur) </s> remove if aerr != nil || cur < 0 || intIn(cur, ignore) {
</s> add if aerr != nil || cur < 0 || slices.Contains(ignore, cur) { </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove if int64(len(p)) > lr.n {
p = p[:lr.n]
}
</s> add p = p[:mathutil.Min(lr.n, int64(len(p)))] </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghos/os.go |
if aerr != nil || cur < 0 || slices.Contains(ignore, cur) { | <mask> continue
<mask> }
<mask>
<mask> cur, aerr := strconv.Atoi(fields[0])
<mask> if aerr != nil || cur < 0 || intIn(cur, ignore) {
<mask> continue
<mask> }
<mask>
<mask> instNum++
<mask> if cur > largest {
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if cur > largest {
largest = cur
}
</s> add largest = mathutil.Max(largest, cur) </s> remove if len(out) > MaxCmdOutputSize {
out = out[:MaxCmdOutputSize]
}
</s> add out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] </s> remove if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
aaaa.Hdr.Ttl = rrTTL
} else {
aaaa.Hdr.Ttl = soaTTL
}
</s> add </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove
func max(a, b int) int {
if a > b {
return a
}
return b
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghos/os.go |
largest = mathutil.Max(largest, cur) | <mask> continue
<mask> }
<mask>
<mask> instNum++
<mask> if cur > largest {
<mask> largest = cur
<mask> }
<mask> }
<mask> if err = s.Err(); err != nil {
<mask> return 0, 0, fmt.Errorf("scanning stdout: %w", err)
<mask> }
<mask>
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if aerr != nil || cur < 0 || intIn(cur, ignore) {
</s> add if aerr != nil || cur < 0 || slices.Contains(ignore, cur) { </s> remove if len(out) > MaxCmdOutputSize {
out = out[:MaxCmdOutputSize]
}
</s> add out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] </s> remove if int64(len(p)) > lr.n {
p = p[:lr.n]
}
</s> add p = p[:mathutil.Min(lr.n, int64(len(p)))] </s> remove //
// TODO(a.garipov): Once https://github.com/golang/go/issues/56621 is
// resolved, remove the first condition.
</s> add </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghos/os.go |
<mask>
<mask> return largest, instNum, nil
<mask> }
<mask>
<mask> // intIn returns true if nums contains n.
<mask> func intIn(n int, nums []int) (ok bool) {
<mask> for _, nn := range nums {
<mask> if n == nn {
<mask> return true
<mask> }
<mask> }
<mask>
<mask> return false
<mask> }
<mask>
<mask> // IsOpenWrt returns true if host OS is OpenWrt.
<mask> func IsOpenWrt() (ok bool) {
<mask> return isOpenWrt()
<mask> }
<mask>
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) </s> remove // Read implements Reader interface.
</s> add // Read implements the [io.Reader] interface. </s> remove if len(out) > MaxCmdOutputSize {
out = out[:MaxCmdOutputSize]
}
</s> add out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] </s> remove
func max(a, b int) int {
if a > b {
return a
}
return b
}
</s> add </s> remove rewrites = rewrites[:max(1, i)]
</s> add rewrites = rewrites[:mathutil.Max(1, i)] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/aghos/os.go | |
"github.com/AdguardTeam/golibs/mathutil" | <mask>
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove github.com/AdguardTeam/golibs v0.11.3
</s> add github.com/AdguardTeam/golibs v0.11.4 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/dnsforward/dns64.go |
Ttl: mathutil.Min(aResp.Hdr.Ttl, soaTTL), | <mask> Hdr: dns.RR_Header{
<mask> Name: aResp.Hdr.Name,
<mask> Rrtype: dns.TypeAAAA,
<mask> Class: aResp.Hdr.Class,
<mask> },
<mask> AAAA: s.mapDNS64(addr),
<mask> }
<mask>
<mask> return aaaa
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
aaaa.Hdr.Ttl = rrTTL
} else {
aaaa.Hdr.Ttl = soaTTL
}
</s> add </s> remove log.Debug("%s: handling the request", hostsContainerPref)
</s> add log.Debug("%s: handling the request for %s", hostsContainerPref, req.Hostname) </s> remove
func max(a, b int) int {
if a > b {
return a
}
return b
}
</s> add </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/dnsforward/dns64.go |
<mask> },
<mask> AAAA: s.mapDNS64(addr),
<mask> }
<mask>
<mask> if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
<mask> aaaa.Hdr.Ttl = rrTTL
<mask> } else {
<mask> aaaa.Hdr.Ttl = soaTTL
<mask> }
<mask>
<mask> return aaaa
<mask> }
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if cur > largest {
largest = cur
}
</s> add largest = mathutil.Max(largest, cur) </s> remove if int64(len(p)) > lr.n {
p = p[:lr.n]
}
</s> add p = p[:mathutil.Min(lr.n, int64(len(p)))] </s> remove if aerr != nil || cur < 0 || intIn(cur, ignore) {
</s> add if aerr != nil || cur < 0 || slices.Contains(ignore, cur) { </s> remove rewrites = rewrites[:max(1, i)]
</s> add rewrites = rewrites[:mathutil.Max(1, i)] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/dnsforward/dns64.go | |
"github.com/AdguardTeam/golibs/mathutil" | <mask> "sort"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/miekg/dns"
<mask> "golang.org/x/exp/slices"
<mask> )
<mask>
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove log.Debug("%s: handling the request", hostsContainerPref)
</s> add log.Debug("%s: handling the request for %s", hostsContainerPref, req.Hostname) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/filtering/rewrites.go |
rewrites = rewrites[:mathutil.Max(1, i)] | <mask> for i, r := range rewrites {
<mask> if isWildcard(r.Domain) {
<mask> // Don't use rewrites[:0], because we need to return at least one
<mask> // item here.
<mask> rewrites = rewrites[:max(1, i)]
<mask>
<mask> break
<mask> }
<mask> }
<mask>
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove // ip and updates it's blocking moment if needed. For internal use only.
</s> add // usrID and updates it's blocking moment if needed. For internal use only. </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove if len(out) > MaxCmdOutputSize {
out = out[:MaxCmdOutputSize]
}
</s> add out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] </s> remove if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
aaaa.Hdr.Ttl = rrTTL
} else {
aaaa.Hdr.Ttl = soaTTL
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/filtering/rewrites.go |
<mask> }
<mask>
<mask> return rewrites, matched
<mask> }
<mask>
<mask> func max(a, b int) int {
<mask> if a > b {
<mask> return a
<mask> }
<mask>
<mask> return b
<mask> }
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add </s> remove if cur > largest {
largest = cur
}
</s> add largest = mathutil.Max(largest, cur) </s> remove if int64(len(p)) > lr.n {
p = p[:lr.n]
}
</s> add p = p[:mathutil.Min(lr.n, int64(len(p)))] </s> remove if rrTTL := aResp.Hdr.Ttl; rrTTL < soaTTL {
aaaa.Hdr.Ttl = rrTTL
} else {
aaaa.Hdr.Ttl = soaTTL
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/filtering/rewrites.go | |
// usrID and updates it's blocking moment if needed. For internal use only. | <mask> return ab.checkLocked(usrID, now)
<mask> }
<mask>
<mask> // incLocked increments the number of unsuccessful attempts for attempter with
<mask> // ip and updates it's blocking moment if needed. For internal use only.
<mask> func (ab *authRateLimiter) incLocked(usrID string, now time.Time) {
<mask> until := now.Add(failedAuthTTL)
<mask> var attNum uint = 1
<mask>
<mask> a, ok := ab.failedAuths[usrID]
</s> Pull request: use mathutil
Merge in DNS/adguard-home from use-mathutil to master
Squashed commit of the following:
commit cfe2c02a7bb727e81fcd91674aa777df37413a8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 24 18:12:32 2023 +0300
all: use mathutil </s> remove rewrites = rewrites[:max(1, i)]
</s> add rewrites = rewrites[:mathutil.Max(1, i)] </s> remove // limitedReader is a wrapper for io.Reader with limited reader and dealing with
// errors package.
</s> add // limitedReader is a wrapper for [io.Reader] limiting the input and dealing
// with errors package. </s> remove if len(out) > MaxCmdOutputSize {
out = out[:MaxCmdOutputSize]
}
</s> add out = out[:mathutil.Min(len(out), MaxCmdOutputSize)] </s> remove if cond {
return NBTrue
}
return NBFalse
</s> add return NBFalse - mathutil.BoolToNumber[NullBool](cond) </s> remove // intIn returns true if nums contains n.
func intIn(n int, nums []int) (ok bool) {
for _, nn := range nums {
if n == nn {
return true
}
}
return false
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/99ec1d840c0b6c7e8c9fb6a6e13722b4006b0e83 | internal/home/authratelimiter.go |
Name string `yaml:"name"` | <mask> clients.addFromSystemARP()
<mask> }
<mask>
<mask> type clientObject struct {
<mask> Name string `yaml:"name"`
<mask> Tags []string `yaml:"tags"`
<mask> IDs []string `yaml:"ids"`
<mask> UseGlobalSettings bool `yaml:"use_global_settings"`
<mask> FilteringEnabled bool `yaml:"filtering_enabled"`
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask>
<mask> UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"`
<mask> BlockedServices []string `yaml:"blocked_services"`
<mask>
<mask> Upstreams []string `yaml:"upstreams"`
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"`
BlockedServices []string `yaml:"blocked_services"`
</s> add Tags []string `yaml:"tags"`
IDs []string `yaml:"ids"`
BlockedServices []string `yaml:"blocked_services"`
Upstreams []string `yaml:"upstreams"` </s> remove Upstreams []string `yaml:"upstreams"`
</s> add UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"` </s> remove var emptyClient *querylog.Client
</s> add var artClient *querylog.Client
var art bool </s> remove return nil
</s> add // Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true </s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
Tags []string `yaml:"tags"`
IDs []string `yaml:"ids"`
BlockedServices []string `yaml:"blocked_services"`
Upstreams []string `yaml:"upstreams"` | <mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask>
<mask> UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"`
<mask> BlockedServices []string `yaml:"blocked_services"`
<mask>
<mask> Upstreams []string `yaml:"upstreams"`
<mask> }
<mask>
<mask> func (clients *clientsContainer) tagKnown(tag string) (ok bool) {
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove Upstreams []string `yaml:"upstreams"`
</s> add UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"` </s> remove Name string `yaml:"name"`
Tags []string `yaml:"tags"`
IDs []string `yaml:"ids"`
UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add Name string `yaml:"name"` </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true </s> remove var emptyClient *querylog.Client
</s> add var artClient *querylog.Client
var art bool </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"` | <mask>
<mask> UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"`
<mask> BlockedServices []string `yaml:"blocked_services"`
<mask>
<mask> Upstreams []string `yaml:"upstreams"`
<mask> }
<mask>
<mask> func (clients *clientsContainer) tagKnown(tag string) (ok bool) {
<mask> return clients.allTags.Has(tag)
<mask> }
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"`
BlockedServices []string `yaml:"blocked_services"`
</s> add Tags []string `yaml:"tags"`
IDs []string `yaml:"ids"`
BlockedServices []string `yaml:"blocked_services"`
Upstreams []string `yaml:"upstreams"` </s> remove Name string `yaml:"name"`
Tags []string `yaml:"tags"`
IDs []string `yaml:"ids"`
UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add Name string `yaml:"name"` </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove return emptyClient, nil
</s> add return artClient, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
// findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. c is never nil; if no information about the client is found,
// it returns an artificial client record by only setting the blocking-related
// fields. err is always nil. | <mask> Orgname: wi.Orgname,
<mask> }
<mask> }
<mask>
<mask> // findMultiple returns info about client. If no information about the client
<mask> // is found, it sends the client by default only with the "Disallowed" field
<mask> // filled in. err is always nil.
<mask> func (clients *clientsContainer) findMultiple(ids []string) (c *querylog.Client, err error) {
<mask> var emptyClient *querylog.Client
<mask>
<mask> for _, id := range ids {
<mask> ip := net.ParseIP(id)
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove var emptyClient *querylog.Client
</s> add var artClient *querylog.Client
var art bool </s> remove ip := net.ParseIP(id)
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client
</s> add c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c </s> remove // clientInfo is a wrapper around Find to make it a valid client finder for
// the query log.
func (clients *clientsContainer) clientInfo(
</s> add // clientOrArtificial returns information about one client. If art is true,
// this is an artificial client record, meaning that we currently don't have any
// records about this client besides maybe whether or not it is blocked. c is
// never nil.
func (clients *clientsContainer) clientOrArtificial( </s> remove return emptyClient, nil
</s> add return artClient, nil </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
var artClient *querylog.Client
var art bool | <mask> // findMultiple returns info about client. If no information about the client
<mask> // is found, it sends the client by default only with the "Disallowed" field
<mask> // filled in. err is always nil.
<mask> func (clients *clientsContainer) findMultiple(ids []string) (c *querylog.Client, err error) {
<mask> var emptyClient *querylog.Client
<mask>
<mask> for _, id := range ids {
<mask> ip := net.ParseIP(id)
<mask> disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
<mask>
<mask> client := clients.clientInfo(ip, id, disallowed, disallowedRule)
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil.
</s> add // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. c is never nil; if no information about the client is found,
// it returns an artificial client record by only setting the blocking-related
// fields. err is always nil. </s> remove ip := net.ParseIP(id)
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client
</s> add c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c </s> remove // clientInfo is a wrapper around Find to make it a valid client finder for
// the query log.
func (clients *clientsContainer) clientInfo(
</s> add // clientOrArtificial returns information about one client. If art is true,
// this is an artificial client record, meaning that we currently don't have any
// records about this client besides maybe whether or not it is blocked. c is
// never nil.
func (clients *clientsContainer) clientOrArtificial( </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove return emptyClient, nil
</s> add return artClient, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c | <mask> func (clients *clientsContainer) findMultiple(ids []string) (c *querylog.Client, err error) {
<mask> var emptyClient *querylog.Client
<mask>
<mask> for _, id := range ids {
<mask> ip := net.ParseIP(id)
<mask> disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
<mask>
<mask> client := clients.clientInfo(ip, id, disallowed, disallowedRule)
<mask>
<mask> if client.Name == "" && client.DisallowedRule == "" {
<mask> emptyClient = client
<mask>
<mask> continue
<mask> }
<mask>
<mask> return client, nil
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove var emptyClient *querylog.Client
</s> add var artClient *querylog.Client
var art bool </s> remove // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil.
</s> add // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. c is never nil; if no information about the client is found,
// it returns an artificial client record by only setting the blocking-related
// fields. err is always nil. </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false </s> remove return nil
</s> add // Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
return c, nil | <mask>
<mask> continue
<mask> }
<mask>
<mask> return client, nil
<mask> }
<mask>
<mask> return emptyClient, nil
<mask> }
<mask>
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove return emptyClient, nil
</s> add return artClient, nil </s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false </s> remove ip := net.ParseIP(id)
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client
</s> add c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c </s> remove return nil
</s> add // Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
return artClient, nil | <mask>
<mask> return client, nil
<mask> }
<mask>
<mask> return emptyClient, nil
<mask> }
<mask>
<mask> // clientInfo is a wrapper around Find to make it a valid client finder for
<mask> // the query log.
<mask> func (clients *clientsContainer) clientInfo(
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove // clientInfo is a wrapper around Find to make it a valid client finder for
// the query log.
func (clients *clientsContainer) clientInfo(
</s> add // clientOrArtificial returns information about one client. If art is true,
// this is an artificial client record, meaning that we currently don't have any
// records about this client besides maybe whether or not it is blocked. c is
// never nil.
func (clients *clientsContainer) clientOrArtificial( </s> remove // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil.
</s> add // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. c is never nil; if no information about the client is found,
// it returns an artificial client record by only setting the blocking-related
// fields. err is always nil. </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove return client, nil
</s> add return c, nil </s> remove var emptyClient *querylog.Client
</s> add var artClient *querylog.Client
var art bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
// clientOrArtificial returns information about one client. If art is true,
// this is an artificial client record, meaning that we currently don't have any
// records about this client besides maybe whether or not it is blocked. c is
// never nil.
func (clients *clientsContainer) clientOrArtificial( | <mask>
<mask> return emptyClient, nil
<mask> }
<mask>
<mask> // clientInfo is a wrapper around Find to make it a valid client finder for
<mask> // the query log.
<mask> func (clients *clientsContainer) clientInfo(
<mask> ip net.IP,
<mask> id string,
<mask> disallowed bool,
<mask> rule string,
<mask> ) (c *querylog.Client) {
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove return emptyClient, nil
</s> add return artClient, nil </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil.
</s> add // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. c is never nil; if no information about the client is found,
// it returns an artificial client record by only setting the blocking-related
// fields. err is always nil. </s> remove var emptyClient *querylog.Client
</s> add var artClient *querylog.Client
var art bool </s> remove ip := net.ParseIP(id)
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client
</s> add c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
| <mask> // the query log.
<mask> func (clients *clientsContainer) clientInfo(
<mask> ip net.IP,
<mask> id string,
<mask> disallowed bool,
<mask> rule string,
<mask> ) (c *querylog.Client) {
<mask> whois := &querylog.ClientWHOIS{}
<mask> client, ok := clients.Find(id)
<mask> if ok {
<mask> return &querylog.Client{
<mask> Name: client.Name,
<mask> DisallowedRule: rule,
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false </s> remove // clientInfo is a wrapper around Find to make it a valid client finder for
// the query log.
func (clients *clientsContainer) clientInfo(
</s> add // clientOrArtificial returns information about one client. If art is true,
// this is an artificial client record, meaning that we currently don't have any
// records about this client besides maybe whether or not it is blocked. c is
// never nil.
func (clients *clientsContainer) clientOrArtificial( </s> remove Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
}
</s> add Name: rc.Host,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
}, false </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true </s> remove return emptyClient, nil
</s> add return artClient, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
Name: client.Name,
}, false | <mask> whois := &querylog.ClientWHOIS{}
<mask> client, ok := clients.Find(id)
<mask> if ok {
<mask> return &querylog.Client{
<mask> Name: client.Name,
<mask> DisallowedRule: rule,
<mask> WHOIS: whois,
<mask> Disallowed: disallowed,
<mask> }
<mask> }
<mask>
<mask> if ip == nil {
<mask> return nil
<mask> }
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
}
</s> add Name: rc.Host,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
}, false </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true </s> remove return nil
</s> add // Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true </s> remove ip := net.ParseIP(id)
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client
</s> add c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
// Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true | <mask> }
<mask> }
<mask>
<mask> if ip == nil {
<mask> return nil
<mask> }
<mask>
<mask> var rc *RuntimeClient
<mask> rc, ok = clients.FindRuntimeClient(ip)
<mask> if ok {
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
}
</s> add Name: rc.Host,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
}, false </s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove ip := net.ParseIP(id)
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client
</s> add c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
Name: rc.Host,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
}, false | <mask> var rc *RuntimeClient
<mask> rc, ok = clients.FindRuntimeClient(ip)
<mask> if ok {
<mask> return &querylog.Client{
<mask> Name: rc.Host,
<mask> DisallowedRule: rule,
<mask> WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
<mask> Disallowed: disallowed,
<mask> }
<mask> }
<mask>
<mask> return &querylog.Client{
<mask> Name: "",
<mask> DisallowedRule: rule,
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove return nil
</s> add // Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true </s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove ip := net.ParseIP(id)
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client
</s> add c, art = clients.clientOrArtificial(net.ParseIP(id), id)
if art {
artClient = c | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
Name: "",
}, true | <mask> }
<mask> }
<mask>
<mask> return &querylog.Client{
<mask> Name: "",
<mask> DisallowedRule: rule,
<mask> WHOIS: &querylog.ClientWHOIS{},
<mask> Disallowed: disallowed,
<mask> }
<mask> }
<mask>
<mask> func (clients *clientsContainer) Find(id string) (c *Client, ok bool) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
}
</s> add Name: rc.Host,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
}, false </s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false </s> remove disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
</s> add ) (c *querylog.Client, art bool) {
defer func() {
c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
if c.WHOIS == nil {
c.WHOIS = &querylog.ClientWHOIS{}
}
}()
</s> remove return nil
</s> add // Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true </s> remove Upstreams []string `yaml:"upstreams"`
</s> add UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | internal/home/clients.go |
Persistent client's name or runtime client's hostname. May be
empty. | <mask> 'description': >
<mask> The rule due to which the client is allowed or blocked.
<mask> 'name':
<mask> 'description': >
<mask> Persistent client's name or runtime client's hostname.
<mask> 'type': 'string'
<mask> 'whois':
<mask> '$ref': '#/components/schemas/QueryLogItemClientWhois'
<mask> 'required':
<mask> - 'disallowed'
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove - 'ids'
</s> add </s> remove // clientInfo is a wrapper around Find to make it a valid client finder for
// the query log.
func (clients *clientsContainer) clientInfo(
</s> add // clientOrArtificial returns information about one client. If art is true,
// this is an artificial client record, meaning that we currently don't have any
// records about this client besides maybe whether or not it is blocked. c is
// never nil.
func (clients *clientsContainer) clientOrArtificial( </s> remove // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil.
</s> add // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. c is never nil; if no information about the client is found,
// it returns an artificial client record by only setting the blocking-related
// fields. err is always nil. </s> remove return emptyClient, nil
</s> add return artClient, nil </s> remove var emptyClient *querylog.Client
</s> add var artClient *querylog.Client
var art bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | openapi/openapi.yaml |
<mask> '$ref': '#/components/schemas/QueryLogItemClientWhois'
<mask> 'required':
<mask> - 'disallowed'
<mask> - 'disallowed_rule'
<mask> - 'ids'
<mask> - 'name'
<mask> - 'whois'
<mask> 'type': 'object'
<mask> 'QueryLogItemClientWhois':
<mask> 'description': >
</s> Pull request: querylog: fix panic
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic </s> remove Persistent client's name or runtime client's hostname.
</s> add Persistent client's name or runtime client's hostname. May be
empty. </s> remove Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
}
</s> add Name: "",
}, true </s> remove Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
}
</s> add Name: rc.Host,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
}, false </s> remove return nil
</s> add // Technically should never happen, but still.
return &querylog.Client{
Name: "",
}, true </s> remove Name: client.Name,
DisallowedRule: rule,
WHOIS: whois,
Disallowed: disallowed,
}
</s> add Name: client.Name,
}, false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9a1d3ec694e211bf1a44c27c1497ab043ab0b164 | openapi/openapi.yaml | |
"github.com/miekg/dns" | <mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter"
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
</s> * dnsfilter: return the correct IP address (host rules) </s> remove func (d *Dnsfilter) CheckHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) { </s> remove result, err := d.matchHost(host)
</s> add result, err := d.matchHost(host, qtype) </s> remove func (d *Dnsfilter) matchHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) matchHost(host string, qtype uint16) (Result, error) { </s> remove res.IP = hostRule.IP
return res, nil
</s> add if qtype == dns.TypeA && hostRule.IP.To4() != nil {
// either IPv4 or IPv4-mapped IPv6 address
res.IP = hostRule.IP.To4()
return res, nil
} else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP
return res, nil
}
continue | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ad4bba9aba286c88cbf26e0f57e72f6975713cf | dnsfilter/dnsfilter.go |
func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) { | <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) (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> }
<mask> host = strings.ToLower(host)
</s> * dnsfilter: return the correct IP address (host rules) </s> remove func (d *Dnsfilter) matchHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) matchHost(host string, qtype uint16) (Result, error) { </s> remove result, err := d.matchHost(host)
</s> add result, err := d.matchHost(host, qtype) </s> remove res.IP = hostRule.IP
return res, nil
</s> add if qtype == dns.TypeA && hostRule.IP.To4() != nil {
// either IPv4 or IPv4-mapped IPv6 address
res.IP = hostRule.IP.To4()
return res, nil
} else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP
return res, nil
}
continue | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ad4bba9aba286c88cbf26e0f57e72f6975713cf | dnsfilter/dnsfilter.go |
result, err := d.matchHost(host, qtype) | <mask> return Result{}, nil
<mask> }
<mask>
<mask> // try filter lists first
<mask> result, err := d.matchHost(host)
<mask> if err != nil {
<mask> return result, err
<mask> }
<mask> if result.Reason.Matched() {
<mask> return result, nil
</s> * dnsfilter: return the correct IP address (host rules) </s> remove res.IP = hostRule.IP
return res, nil
</s> add if qtype == dns.TypeA && hostRule.IP.To4() != nil {
// either IPv4 or IPv4-mapped IPv6 address
res.IP = hostRule.IP.To4()
return res, nil
} else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP
return res, nil
}
continue </s> remove func (d *Dnsfilter) matchHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) matchHost(host string, qtype uint16) (Result, error) { </s> remove func (d *Dnsfilter) CheckHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ad4bba9aba286c88cbf26e0f57e72f6975713cf | dnsfilter/dnsfilter.go |
func (d *Dnsfilter) matchHost(host string, qtype uint16) (Result, error) { | <mask> return nil
<mask> }
<mask>
<mask> // matchHost is a low-level way to check only if hostname is filtered by rules, skipping expensive safebrowsing and parental lookups
<mask> func (d *Dnsfilter) matchHost(host string) (Result, error) {
<mask> if d.filteringEngine == nil {
<mask> return Result{}, nil
<mask> }
<mask>
<mask> rules, ok := d.filteringEngine.Match(host)
</s> * dnsfilter: return the correct IP address (host rules) </s> remove func (d *Dnsfilter) CheckHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) { </s> remove res.IP = hostRule.IP
return res, nil
</s> add if qtype == dns.TypeA && hostRule.IP.To4() != nil {
// either IPv4 or IPv4-mapped IPv6 address
res.IP = hostRule.IP.To4()
return res, nil
} else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP
return res, nil
}
continue </s> remove result, err := d.matchHost(host)
</s> add result, err := d.matchHost(host, qtype) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ad4bba9aba286c88cbf26e0f57e72f6975713cf | dnsfilter/dnsfilter.go |
log.Tracef("%d rules matched for host '%s'", len(rules), host)
| <mask> return Result{}, nil
<mask> }
<mask>
<mask> for _, rule := range rules {
<mask>
<mask> log.Tracef("Found rule for host '%s': '%s' list_id: %d",
<mask> host, rule.Text(), rule.GetFilterListID())
<mask>
</s> * dnsfilter: return the correct IP address (host rules) </s> remove res.IP = hostRule.IP
return res, nil
</s> add if qtype == dns.TypeA && hostRule.IP.To4() != nil {
// either IPv4 or IPv4-mapped IPv6 address
res.IP = hostRule.IP.To4()
return res, nil
} else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP
return res, nil
}
continue </s> remove result, err := d.matchHost(host)
</s> add result, err := d.matchHost(host, qtype) </s> remove func (d *Dnsfilter) CheckHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) { </s> remove func (d *Dnsfilter) matchHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) matchHost(host string, qtype uint16) (Result, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ad4bba9aba286c88cbf26e0f57e72f6975713cf | dnsfilter/dnsfilter.go |
if qtype == dns.TypeA && hostRule.IP.To4() != nil {
// either IPv4 or IPv4-mapped IPv6 address
res.IP = hostRule.IP.To4()
return res, nil
} else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP
return res, nil
}
continue | <mask> return res, nil
<mask>
<mask> } else if hostRule, ok := rule.(*urlfilter.HostRule); ok {
<mask>
<mask> res.IP = hostRule.IP
<mask> return res, nil
<mask>
<mask> } else {
<mask> log.Tracef("Rule type is unsupported: '%s' list_id: %d",
<mask> rule.Text(), rule.GetFilterListID())
<mask> }
</s> * dnsfilter: return the correct IP address (host rules) </s> remove func (d *Dnsfilter) matchHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) matchHost(host string, qtype uint16) (Result, error) { </s> remove result, err := d.matchHost(host)
</s> add result, err := d.matchHost(host, qtype) </s> remove func (d *Dnsfilter) CheckHost(host string) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ad4bba9aba286c88cbf26e0f57e72f6975713cf | dnsfilter/dnsfilter.go |
// done is the channel to sign closing the container.
done chan struct{}
| <mask> engine *urlfilter.DNSEngine
<mask>
<mask> // updates is the channel for receiving updated hosts.
<mask> updates chan *netutil.IPMap
<mask> // last is the set of hosts that was cached within last detected change.
<mask> last *netutil.IPMap
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
</s> add close(hc.done)
return nil </s> remove updater *updater.Updater
</s> add // hostsWatcher is the watcher to detect changes in the hosts files.
hostsWatcher aghos.FSWatcher
updater *updater.Updater </s> remove // errNoPaths is returned when there are no paths to watch passed to the
// HostsContainer.
const errNoPaths errors.Error = "hosts paths are empty"
</s> add // ErrNoHostsPaths is returned when there are no valid paths to watch passed to
// the HostsContainer.
const ErrNoHostsPaths errors.Error = "no valid paths to hosts files provided" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
// ErrNoHostsPaths is returned when there are no valid paths to watch passed to
// the HostsContainer.
const ErrNoHostsPaths errors.Error = "no valid paths to hosts files provided" | <mask> // patterns stores specified paths in the fs.Glob-compatible form.
<mask> patterns []string
<mask> }
<mask>
<mask> // errNoPaths is returned when there are no paths to watch passed to the
<mask> // HostsContainer.
<mask> const errNoPaths errors.Error = "hosts paths are empty"
<mask>
<mask> // NewHostsContainer creates a container of hosts, that watches the paths with
<mask> // w. paths shouldn't be empty and each of them should locate either a file or
<mask> // a directory in fsys. fsys and w must be non-nil.
<mask> func NewHostsContainer(
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove // w. paths shouldn't be empty and each of them should locate either a file or
</s> add // w. paths shouldn't be empty and each of paths should locate either a file or </s> remove return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
</s> add close(hc.done)
return nil </s> remove const closeCalled errors.Error = "close method called"
// fsWatcherOnCloseStub is a stub implementation of the Close method of
// aghos.FSWatcher.
func fsWatcherOnCloseStub() (err error) {
return closeCalled
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
// w. paths shouldn't be empty and each of paths should locate either a file or | <mask> // HostsContainer.
<mask> const errNoPaths errors.Error = "hosts paths are empty"
<mask>
<mask> // NewHostsContainer creates a container of hosts, that watches the paths with
<mask> // w. paths shouldn't be empty and each of them should locate either a file or
<mask> // a directory in fsys. fsys and w must be non-nil.
<mask> func NewHostsContainer(
<mask> fsys fs.FS,
<mask> w aghos.FSWatcher,
<mask> paths ...string,
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove // errNoPaths is returned when there are no paths to watch passed to the
// HostsContainer.
const errNoPaths errors.Error = "hosts paths are empty"
</s> add // ErrNoHostsPaths is returned when there are no valid paths to watch passed to
// the HostsContainer.
const ErrNoHostsPaths errors.Error = "no valid paths to hosts files provided" </s> remove const closeCalled errors.Error = "close method called"
// fsWatcherOnCloseStub is a stub implementation of the Close method of
// aghos.FSWatcher.
func fsWatcherOnCloseStub() (err error) {
return closeCalled
}
</s> add </s> remove if fi, err = fs.Stat(fsys, p); err != nil {
return nil, fmt.Errorf("%q at index %d: %w", p, i, err)
</s> add fi, err = fs.Stat(fsys, p)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
continue
}
// Don't put a filename here since it's already added by fs.Stat.
return nil, fmt.Errorf("path at index %d: %w", i, err) </s> remove return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
</s> add close(hc.done)
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
return nil, ErrNoHostsPaths | <mask> ) (hc *HostsContainer, err error) {
<mask> defer func() { err = errors.Annotate(err, "%s: %w", hostsContainerPref) }()
<mask>
<mask> if len(paths) == 0 {
<mask> return nil, errNoPaths
<mask> }
<mask>
<mask> patterns, err := pathsToPatterns(fsys, paths)
<mask> if err != nil {
<mask> return nil, err
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove patterns, err := pathsToPatterns(fsys, paths)
</s> add var patterns []string
patterns, err = pathsToPatterns(fsys, paths) </s> remove err = w.Add(p)
if err == nil {
continue
} else if errors.Is(err, fs.ErrNotExist) {
log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
</s> add if err = w.Add(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return nil, fmt.Errorf("adding path: %w", err)
} </s> remove var osWritesWatcher aghos.FSWatcher
osWritesWatcher, err = aghos.NewOSWritesWatcher()
if err != nil {
return fmt.Errorf("initing os watcher: %w", err)
}
Context.etcHosts, err = aghnet.NewHostsContainer(
aghos.RootDirFS(),
osWritesWatcher,
aghnet.DefaultHostsPaths()...,
)
if err != nil {
return fmt.Errorf("initing hosts container: %w", err)
</s> add if err = setupHostsContainer(); err != nil {
return err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
var patterns []string
patterns, err = pathsToPatterns(fsys, paths) | <mask> if len(paths) == 0 {
<mask> return nil, errNoPaths
<mask> }
<mask>
<mask> patterns, err := pathsToPatterns(fsys, paths)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> hc = &HostsContainer{
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove return nil, errNoPaths
</s> add return nil, ErrNoHostsPaths </s> remove err = w.Add(p)
if err == nil {
continue
} else if errors.Is(err, fs.ErrNotExist) {
log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
</s> add if err = w.Add(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return nil, fmt.Errorf("adding path: %w", err)
} </s> remove log.Error("stopping hosts container: %s", err)
</s> add log.Error("closing hosts container: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
} else if len(patterns) == 0 {
return nil, ErrNoHostsPaths | <mask> var patterns []string
<mask> patterns, err = pathsToPatterns(fsys, paths)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> hc = &HostsContainer{
<mask> engLock: &sync.RWMutex{},
<mask> done: make(chan struct{}, 1),
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove patterns, err := pathsToPatterns(fsys, paths)
</s> add var patterns []string
patterns, err = pathsToPatterns(fsys, paths) </s> remove return nil, errNoPaths
</s> add return nil, ErrNoHostsPaths </s> remove if fi, err = fs.Stat(fsys, p); err != nil {
return nil, fmt.Errorf("%q at index %d: %w", p, i, err)
</s> add fi, err = fs.Stat(fsys, p)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
continue
}
// Don't put a filename here since it's already added by fs.Stat.
return nil, fmt.Errorf("path at index %d: %w", i, err) </s> remove var osWritesWatcher aghos.FSWatcher
osWritesWatcher, err = aghos.NewOSWritesWatcher()
if err != nil {
return fmt.Errorf("initing os watcher: %w", err)
}
Context.etcHosts, err = aghnet.NewHostsContainer(
aghos.RootDirFS(),
osWritesWatcher,
aghnet.DefaultHostsPaths()...,
)
if err != nil {
return fmt.Errorf("initing hosts container: %w", err)
</s> add if err = setupHostsContainer(); err != nil {
return err | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
done: make(chan struct{}, 1), | <mask> }
<mask>
<mask> hc = &HostsContainer{
<mask> engLock: &sync.RWMutex{},
<mask> updates: make(chan *netutil.IPMap, 1),
<mask> last: &netutil.IPMap{},
<mask> fsys: fsys,
<mask> w: w,
<mask> patterns: patterns,
<mask> }
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove patterns, err := pathsToPatterns(fsys, paths)
</s> add var patterns []string
patterns, err = pathsToPatterns(fsys, paths) </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove return nil, errNoPaths
</s> add return nil, ErrNoHostsPaths | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
if err = w.Add(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return nil, fmt.Errorf("adding path: %w", err)
} | <mask> return nil, err
<mask> }
<mask>
<mask> for _, p := range paths {
<mask> err = w.Add(p)
<mask> if err == nil {
<mask> continue
<mask> } else if errors.Is(err, fs.ErrNotExist) {
<mask> log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
<mask>
<mask> continue
<mask> }
<mask>
<mask> return nil, fmt.Errorf("adding path: %w", err)
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove continue
</s> add log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p) </s> remove
return nil, fmt.Errorf("adding path: %w", err)
</s> add </s> remove if fi, err = fs.Stat(fsys, p); err != nil {
return nil, fmt.Errorf("%q at index %d: %w", p, i, err)
</s> add fi, err = fs.Stat(fsys, p)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
continue
}
// Don't put a filename here since it's already added by fs.Stat.
return nil, fmt.Errorf("path at index %d: %w", i, err) </s> remove for range hc.w.Events() {
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
</s> add ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p) | <mask> continue
<mask> } else if errors.Is(err, fs.ErrNotExist) {
<mask> log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
<mask>
<mask> continue
<mask> }
<mask>
<mask> return nil, fmt.Errorf("adding path: %w", err)
<mask> }
<mask>
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove err = w.Add(p)
if err == nil {
continue
} else if errors.Is(err, fs.ErrNotExist) {
log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
</s> add if err = w.Add(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return nil, fmt.Errorf("adding path: %w", err)
} </s> remove
return nil, fmt.Errorf("adding path: %w", err)
</s> add </s> remove if fi, err = fs.Stat(fsys, p); err != nil {
return nil, fmt.Errorf("%q at index %d: %w", p, i, err)
</s> add fi, err = fs.Stat(fsys, p)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
continue
}
// Don't put a filename here since it's already added by fs.Stat.
return nil, fmt.Errorf("path at index %d: %w", i, err) </s> remove for range hc.w.Events() {
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
</s> add ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
<mask> log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
<mask>
<mask> continue
<mask> }
<mask>
<mask> return nil, fmt.Errorf("adding path: %w", err)
<mask> }
<mask>
<mask> go hc.handleEvents()
<mask>
<mask> return hc, nil
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove continue
</s> add log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p) </s> remove err = w.Add(p)
if err == nil {
continue
} else if errors.Is(err, fs.ErrNotExist) {
log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
</s> add if err = w.Add(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return nil, fmt.Errorf("adding path: %w", err)
} </s> remove for range hc.w.Events() {
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
</s> add ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. </s> remove if fi, err = fs.Stat(fsys, p); err != nil {
return nil, fmt.Errorf("%q at index %d: %w", p, i, err)
</s> add fi, err = fs.Stat(fsys, p)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
continue
}
// Don't put a filename here since it's already added by fs.Stat.
return nil, fmt.Errorf("path at index %d: %w", i, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go | |
return hc.engine.MatchRequest(req) | <mask>
<mask> hc.engLock.RLock()
<mask> defer hc.engLock.RUnlock()
<mask>
<mask> res, ok = hc.engine.MatchRequest(req)
<mask>
<mask> return res, ok
<mask> }
<mask>
<mask> // Close implements the io.Closer interface for *HostsContainer.
<mask> func (hc *HostsContainer) Close() (err error) {
<mask> log.Debug("%s: closing", hostsContainerPref)
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove // Close implements the io.Closer interface for *HostsContainer.
</s> add // Close implements the io.Closer interface for *HostsContainer. Close must
// only be called once. The returned err is always nil. </s> remove return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
</s> add close(hc.done)
return nil </s> remove for range hc.w.Events() {
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
</s> add ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
// Close implements the io.Closer interface for *HostsContainer. Close must
// only be called once. The returned err is always nil. | <mask>
<mask> return res, ok
<mask> }
<mask>
<mask> // Close implements the io.Closer interface for *HostsContainer.
<mask> func (hc *HostsContainer) Close() (err error) {
<mask> log.Debug("%s: closing", hostsContainerPref)
<mask>
<mask> return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
<mask> }
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove res, ok = hc.engine.MatchRequest(req)
return res, ok
</s> add return hc.engine.MatchRequest(req) </s> remove return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
</s> add close(hc.done)
return nil </s> remove for range hc.w.Events() {
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
</s> add ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
close(hc.done)
return nil | <mask> // Close implements the io.Closer interface for *HostsContainer.
<mask> func (hc *HostsContainer) Close() (err error) {
<mask> log.Debug("%s: closing", hostsContainerPref)
<mask>
<mask> return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
<mask> }
<mask>
<mask> // Upd returns the channel into which the updates are sent. The receivable
<mask> // map's values are guaranteed to be of type of *stringutil.Set.
<mask> func (hc *HostsContainer) Upd() (updates <-chan *netutil.IPMap) {
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove // Close implements the io.Closer interface for *HostsContainer.
</s> add // Close implements the io.Closer interface for *HostsContainer. Close must
// only be called once. The returned err is always nil. </s> remove res, ok = hc.engine.MatchRequest(req)
return res, ok
</s> add return hc.engine.MatchRequest(req) </s> remove // errNoPaths is returned when there are no paths to watch passed to the
// HostsContainer.
const errNoPaths errors.Error = "hosts paths are empty"
</s> add // ErrNoHostsPaths is returned when there are no valid paths to watch passed to
// the HostsContainer.
const ErrNoHostsPaths errors.Error = "no valid paths to hosts files provided" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
fi, err = fs.Stat(fsys, p)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
continue
}
// Don't put a filename here since it's already added by fs.Stat.
return nil, fmt.Errorf("path at index %d: %w", i, err) | <mask> // pathsToPatterns converts paths into patterns compatible with fs.Glob.
<mask> func pathsToPatterns(fsys fs.FS, paths []string) (patterns []string, err error) {
<mask> for i, p := range paths {
<mask> var fi fs.FileInfo
<mask> if fi, err = fs.Stat(fsys, p); err != nil {
<mask> return nil, fmt.Errorf("%q at index %d: %w", p, i, err)
<mask> }
<mask>
<mask> if fi.IsDir() {
<mask> p = path.Join(p, "*")
<mask> }
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove err = w.Add(p)
if err == nil {
continue
} else if errors.Is(err, fs.ErrNotExist) {
log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
</s> add if err = w.Add(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return nil, fmt.Errorf("adding path: %w", err)
} </s> remove patterns, err := pathsToPatterns(fsys, paths)
</s> add var patterns []string
patterns, err = pathsToPatterns(fsys, paths) </s> remove var osWritesWatcher aghos.FSWatcher
osWritesWatcher, err = aghos.NewOSWritesWatcher()
if err != nil {
return fmt.Errorf("initing os watcher: %w", err)
}
Context.etcHosts, err = aghnet.NewHostsContainer(
aghos.RootDirFS(),
osWritesWatcher,
aghnet.DefaultHostsPaths()...,
)
if err != nil {
return fmt.Errorf("initing hosts container: %w", err)
</s> add if err = setupHostsContainer(); err != nil {
return err </s> remove for range hc.w.Events() {
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
</s> add ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. | <mask> defer log.OnPanic(fmt.Sprintf("%s: handling events", hostsContainerPref))
<mask>
<mask> defer close(hc.updates)
<mask>
<mask> for range hc.w.Events() {
<mask> if err := hc.refresh(); err != nil {
<mask> log.Error("%s: %s", hostsContainerPref, err)
<mask> }
<mask> }
<mask> }
<mask>
<mask> // hostsParser is a helper type to parse rules from the operating system's hosts
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove log.Error("stopping hosts container: %s", err)
</s> add log.Error("closing hosts container: %s", err) </s> remove err = w.Add(p)
if err == nil {
continue
} else if errors.Is(err, fs.ErrNotExist) {
log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
</s> add if err = w.Add(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return nil, fmt.Errorf("adding path: %w", err)
} </s> remove return nil, errNoPaths
</s> add return nil, ErrNoHostsPaths | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
//
// TODO(e.burkov): Accept a parameter to specify the files to refresh. | <mask> // refresh gets the data from specified files and propagates the updates if
<mask> // needed.
<mask> func (hc *HostsContainer) refresh() (err error) {
<mask> log.Debug("%s: refreshing", hostsContainerPref)
<mask>
<mask> hp := hc.newHostsParser()
<mask> if _, err = aghos.FileWalker(hp.parseFile).Walk(hc.fsys, hc.patterns...); err != nil {
<mask> return fmt.Errorf("refreshing : %w", err)
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
</s> add close(hc.done)
return nil </s> remove // Close implements the io.Closer interface for *HostsContainer.
</s> add // Close implements the io.Closer interface for *HostsContainer. Close must
// only be called once. The returned err is always nil. </s> remove res, ok = hc.engine.MatchRequest(req)
return res, ok
</s> add return hc.engine.MatchRequest(req) </s> remove for range hc.w.Events() {
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
</s> add ok, eventsCh := true, hc.w.Events()
for ok {
select {
case _, ok = <-eventsCh:
if !ok {
log.Debug("%s: watcher closed the events channel", hostsContainerPref)
continue
}
if err := hc.refresh(); err != nil {
log.Error("%s: %s", hostsContainerPref, err)
}
case _, ok = <-hc.done:
// Go on. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer.go |
<mask> nl = "\n"
<mask> sp = " "
<mask> )
<mask>
<mask> const closeCalled errors.Error = "close method called"
<mask>
<mask> // fsWatcherOnCloseStub is a stub implementation of the Close method of
<mask> // aghos.FSWatcher.
<mask> func fsWatcherOnCloseStub() (err error) {
<mask> return closeCalled
<mask> }
<mask>
<mask> func TestNewHostsContainer(t *testing.T) {
<mask> const dirname = "dir"
<mask> const filename = "file1"
<mask>
<mask> p := path.Join(dirname, filename)
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove const closeCalled errors.Error = "close method called"
</s> add </s> remove // errNoPaths is returned when there are no paths to watch passed to the
// HostsContainer.
const errNoPaths errors.Error = "hosts paths are empty"
</s> add // ErrNoHostsPaths is returned when there are no valid paths to watch passed to
// the HostsContainer.
const ErrNoHostsPaths errors.Error = "no valid paths to hosts files provided" </s> remove // w. paths shouldn't be empty and each of them should locate either a file or
</s> add // w. paths shouldn't be empty and each of paths should locate either a file or </s> remove return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref)
</s> add close(hc.done)
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go | |
wantErr error
name string
paths []string | <mask> p: &fstest.MapFile{Data: []byte("127.0.0.1 localhost")},
<mask> }
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> paths []string
<mask> wantErr error
<mask> wantPatterns []string
<mask> }{{
<mask> name: "one_file",
<mask> paths: []string{p},
<mask> wantErr: nil,
<mask> wantPatterns: []string{p},
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove name: "one_file",
paths: []string{p},
wantErr: nil,
wantPatterns: []string{p},
</s> add wantErr: nil,
name: "one_file",
paths: []string{p}, </s> remove name: "no_files",
paths: []string{},
wantErr: errNoPaths,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "no_files",
paths: []string{}, </s> remove name: "whole_dir",
paths: []string{dirname},
wantErr: nil,
wantPatterns: []string{path.Join(dirname, "*")},
</s> add wantErr: nil,
name: "whole_dir",
paths: []string{dirname}, </s> remove name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")},
wantErr: fs.ErrNotExist,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")}, </s> remove wantErr: fs.ErrNotExist,
</s> add wantErr: nil, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
wantErr: nil,
name: "one_file",
paths: []string{p}, | <mask> paths []string
<mask> wantErr error
<mask> wantPatterns []string
<mask> }{{
<mask> name: "one_file",
<mask> paths: []string{p},
<mask> wantErr: nil,
<mask> wantPatterns: []string{p},
<mask> }, {
<mask> name: "no_files",
<mask> paths: []string{},
<mask> wantErr: errNoPaths,
<mask> wantPatterns: nil,
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove name string
paths []string
wantErr error
wantPatterns []string
</s> add wantErr error
name string
paths []string </s> remove name: "no_files",
paths: []string{},
wantErr: errNoPaths,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "no_files",
paths: []string{}, </s> remove name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")},
wantErr: fs.ErrNotExist,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")}, </s> remove name: "whole_dir",
paths: []string{dirname},
wantErr: nil,
wantPatterns: []string{path.Join(dirname, "*")},
</s> add wantErr: nil,
name: "whole_dir",
paths: []string{dirname}, </s> remove wantErr: fs.ErrNotExist,
</s> add wantErr: nil, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
wantErr: ErrNoHostsPaths,
name: "no_files",
paths: []string{}, | <mask> paths: []string{p},
<mask> wantErr: nil,
<mask> wantPatterns: []string{p},
<mask> }, {
<mask> name: "no_files",
<mask> paths: []string{},
<mask> wantErr: errNoPaths,
<mask> wantPatterns: nil,
<mask> }, {
<mask> name: "non-existent_file",
<mask> paths: []string{path.Join(dirname, filename+"2")},
<mask> wantErr: fs.ErrNotExist,
<mask> wantPatterns: nil,
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")},
wantErr: fs.ErrNotExist,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")}, </s> remove name: "one_file",
paths: []string{p},
wantErr: nil,
wantPatterns: []string{p},
</s> add wantErr: nil,
name: "one_file",
paths: []string{p}, </s> remove name: "whole_dir",
paths: []string{dirname},
wantErr: nil,
wantPatterns: []string{path.Join(dirname, "*")},
</s> add wantErr: nil,
name: "whole_dir",
paths: []string{dirname}, </s> remove name string
paths []string
wantErr error
wantPatterns []string
</s> add wantErr error
name string
paths []string </s> remove wantErr: fs.ErrNotExist,
</s> add wantErr: nil, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
wantErr: ErrNoHostsPaths,
name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")}, | <mask> paths: []string{},
<mask> wantErr: errNoPaths,
<mask> wantPatterns: nil,
<mask> }, {
<mask> name: "non-existent_file",
<mask> paths: []string{path.Join(dirname, filename+"2")},
<mask> wantErr: fs.ErrNotExist,
<mask> wantPatterns: nil,
<mask> }, {
<mask> name: "whole_dir",
<mask> paths: []string{dirname},
<mask> wantErr: nil,
<mask> wantPatterns: []string{path.Join(dirname, "*")},
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove name: "no_files",
paths: []string{},
wantErr: errNoPaths,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "no_files",
paths: []string{}, </s> remove name: "whole_dir",
paths: []string{dirname},
wantErr: nil,
wantPatterns: []string{path.Join(dirname, "*")},
</s> add wantErr: nil,
name: "whole_dir",
paths: []string{dirname}, </s> remove name: "one_file",
paths: []string{p},
wantErr: nil,
wantPatterns: []string{p},
</s> add wantErr: nil,
name: "one_file",
paths: []string{p}, </s> remove wantErr: fs.ErrNotExist,
</s> add wantErr: nil, </s> remove name string
paths []string
wantErr error
wantPatterns []string
</s> add wantErr error
name string
paths []string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
wantErr: nil,
name: "whole_dir",
paths: []string{dirname}, | <mask> paths: []string{path.Join(dirname, filename+"2")},
<mask> wantErr: fs.ErrNotExist,
<mask> wantPatterns: nil,
<mask> }, {
<mask> name: "whole_dir",
<mask> paths: []string{dirname},
<mask> wantErr: nil,
<mask> wantPatterns: []string{path.Join(dirname, "*")},
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> onAdd := func(name string) (err error) {
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")},
wantErr: fs.ErrNotExist,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")}, </s> remove name: "no_files",
paths: []string{},
wantErr: errNoPaths,
wantPatterns: nil,
</s> add wantErr: ErrNoHostsPaths,
name: "no_files",
paths: []string{}, </s> remove wantErr: fs.ErrNotExist,
</s> add wantErr: nil, </s> remove name: "one_file",
paths: []string{p},
wantErr: nil,
wantPatterns: []string{p},
</s> add wantErr: nil,
name: "one_file",
paths: []string{p}, </s> remove name string
paths []string
wantErr error
wantPatterns []string
</s> add wantErr error
name string
paths []string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
OnClose: func() (err error) { panic("not implemented") }, | <mask>
<mask> hc, err := NewHostsContainer(testFS, &aghtest.FSWatcher{
<mask> OnEvents: onEvents,
<mask> OnAdd: onAdd,
<mask> OnClose: fsWatcherOnCloseStub,
<mask> }, tc.paths...)
<mask> if tc.wantErr != nil {
<mask> require.ErrorIs(t, err, tc.wantErr)
<mask>
<mask> assert.Nil(t, hc)
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove const closeCalled errors.Error = "close method called"
</s> add </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
<mask> return
<mask> }
<mask>
<mask> require.NoError(t, err)
<mask> t.Cleanup(func() {
<mask> require.ErrorIs(t, hc.Close(), closeCalled)
<mask> })
<mask>
<mask> require.NotNil(t, hc)
<mask>
<mask> assert.Equal(t, tc.wantPatterns, hc.patterns)
<mask> assert.NotNil(t, <-hc.Upd())
<mask>
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove assert.Equal(t, tc.wantPatterns, hc.patterns)
</s> add </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add </s> remove
require.ErrorIs(t, hc.Close(), closeCalled)
</s> add </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go | |
<mask> })
<mask>
<mask> require.NotNil(t, hc)
<mask>
<mask> assert.Equal(t, tc.wantPatterns, hc.patterns)
<mask> assert.NotNil(t, <-hc.Upd())
<mask>
<mask> eventsCh <- struct{}{}
<mask> assert.Equal(t, uint32(1), atomic.LoadUint32(&eventsCalledCounter))
<mask> })
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove t.Cleanup(func() {
require.ErrorIs(t, hc.Close(), closeCalled)
})
</s> add </s> remove
require.ErrorIs(t, hc.Close(), closeCalled)
</s> add </s> remove OnClose: func() (err error) { return closeCalled },
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go | |
OnClose: func() (err error) { panic("not implemented") }, | <mask> assert.Equal(t, dirname, name)
<mask>
<mask> return nil
<mask> },
<mask> OnClose: fsWatcherOnCloseStub,
<mask> }
<mask>
<mask> hc, err := NewHostsContainer(testFS, w, dirname)
<mask> require.NoError(t, err)
<mask> t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add </s> remove
require.ErrorIs(t, hc.Close(), closeCalled)
</s> add </s> remove t.Cleanup(func() {
require.ErrorIs(t, hc.Close(), closeCalled)
})
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
<mask> }
<mask>
<mask> hc, err := NewHostsContainer(testFS, w, dirname)
<mask> require.NoError(t, err)
<mask> t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
<mask>
<mask> checkRefresh := func(t *testing.T, wantHosts *stringutil.Set) {
<mask> upd, ok := <-hc.Upd()
<mask> require.True(t, ok)
<mask> require.NotNil(t, upd)
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove t.Cleanup(func() {
require.ErrorIs(t, hc.Close(), closeCalled)
})
</s> add </s> remove
require.ErrorIs(t, hc.Close(), closeCalled)
</s> add </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go | |
OnClose: func() (err error) { panic("not implemented") }, | <mask> assert.Equal(t, filename, name)
<mask>
<mask> return nil
<mask> },
<mask> OnClose: fsWatcherOnCloseStub,
<mask> }, filename)
<mask> require.NoError(t, err)
<mask> t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
<mask>
<mask> testCase := []struct {
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove
require.ErrorIs(t, hc.Close(), closeCalled)
</s> add </s> remove OnClose: func() (err error) { return closeCalled },
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove t.Cleanup(func() {
require.ErrorIs(t, hc.Close(), closeCalled)
})
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
<mask> },
<mask> OnClose: fsWatcherOnCloseStub,
<mask> }, filename)
<mask> require.NoError(t, err)
<mask> t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
<mask>
<mask> testCase := []struct {
<mask> name string
<mask> want []interface{}
<mask> req urlfilter.DNSRequest
</s> Pull request: 3845 hosts fatality
Merge in DNS/adguard-home from 3845-hosts-fatality to master
Updates #3845.
Squashed commit of the following:
commit 1447efcc4066e0226feaebde01fcc632cb7b7432
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 17:14:35 2021 +0300
home: imp readability
commit e934499072e983e1111b6c976eb93e1d6017981b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:35:10 2021 +0300
aghnet: imp more
commit ed9995ee52bd9ec3fa130f3f56989619184a6669
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 17 13:05:56 2021 +0300
all: imp docs, code
commit 7b0718a1a4a58a4fd5f1ba24c33792b0610c334f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 20:32:24 2021 +0300
all: reduce hosts container fatality </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove OnClose: fsWatcherOnCloseStub,
</s> add OnClose: func() (err error) { panic("not implemented") }, </s> remove
require.ErrorIs(t, hc.Close(), closeCalled)
</s> add </s> remove t.Cleanup(func() {
require.ErrorIs(t, hc.Close(), closeCalled)
})
</s> add </s> remove t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) })
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9bac4b3db2416e05d5d6100e2815b806196fcc9b | internal/aghnet/hostscontainer_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.