AdGuardHome/scripts/blocked-services/main.go

117 lines
3.1 KiB
Go
Raw Normal View History

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
2022-10-27 15:46:25 +03:00
// blocked services fetches the most recent Hostlists Registry blocked service
// index and transforms the filters from it to AdGuard Home's data and code
// formats.
package main
import (
"context"
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
2022-10-27 15:46:25 +03:00
"encoding/json"
"fmt"
"log/slog"
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
2022-10-27 15:46:25 +03:00
"net/http"
"net/url"
"os"
"slices"
"strings"
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
2022-10-27 15:46:25 +03:00
"text/template"
"time"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/logutil/slogutil"
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
2022-10-27 15:46:25 +03:00
)
func main() {
ctx := context.Background()
l := slogutil.New(nil)
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
2022-10-27 15:46:25 +03:00
urlStr := "https://adguardteam.github.io/HostlistsRegistry/assets/services.json"
if v, ok := os.LookupEnv("URL"); ok {
urlStr = v
}
// Validate the URL.
_, err := url.Parse(urlStr)
errors.Check(err)
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
2022-10-27 15:46:25 +03:00
c := &http.Client{
Timeout: 10 * time.Second,
}
resp := errors.Must(c.Get(urlStr))
defer slogutil.CloseAndLog(ctx, l, resp.Body, slog.LevelError)
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
2022-10-27 15:46:25 +03:00
if resp.StatusCode != http.StatusOK {
panic(fmt.Errorf("expected code %d, got %d", http.StatusOK, resp.StatusCode))
}
hlSvcs := &hlServices{}
err = json.NewDecoder(resp.Body).Decode(hlSvcs)
errors.Check(err)
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
2022-10-27 15:46:25 +03:00
// Sort all services and rules to make the output more predictable.
slices.SortStableFunc(hlSvcs.BlockedServices, func(a, b *hlServicesService) (res int) {
return strings.Compare(a.ID, b.ID)
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
2022-10-27 15:46:25 +03:00
})
for _, s := range hlSvcs.BlockedServices {
slices.Sort(s.Rules)
}
// Use another set of delimiters to prevent them interfering with the Go
// code.
tmpl, err := template.New("main").Delims("<%", "%>").Funcs(template.FuncMap{
"isnotlast": func(idx, sliceLen int) (ok bool) {
return idx != sliceLen-1
},
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
2022-10-27 15:46:25 +03:00
}).Parse(tmplStr)
errors.Check(err)
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
2022-10-27 15:46:25 +03:00
f := errors.Must(os.OpenFile(
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
2022-10-27 15:46:25 +03:00
"./internal/filtering/servicelist.go",
os.O_CREATE|os.O_TRUNC|os.O_WRONLY,
0o644,
))
defer slogutil.CloseAndLog(ctx, l, f, slog.LevelError)
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
2022-10-27 15:46:25 +03:00
errors.Check(tmpl.Execute(f, hlSvcs))
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
2022-10-27 15:46:25 +03:00
}
// tmplStr is the template for the Go source file with the services.
const tmplStr = `// Code generated by go run ./scripts/blocked-services/main.go; DO NOT EDIT.
package filtering
// blockedService represents a single blocked service.
type blockedService struct {
ID string ` + "`" + `json:"id"` + "`" + `
Name string ` + "`" + `json:"name"` + "`" + `
IconSVG []byte ` + "`" + `json:"icon_svg"` + "`" + `
Rules []string ` + "`" + `json:"rules"` + "`" + `
}
// blockedServices contains raw blocked service data.
var blockedServices = []blockedService{<% $l := len .BlockedServices %>
<%- range $i, $s := .BlockedServices %>{
ID: <% printf "%q" $s.ID %>,
Name: <% printf "%q" $s.Name %>,
IconSVG: []byte(<% printf "%q" $s.IconSVG %>),
Rules: []string{<% range $s.Rules %>
<% printf "%q" . %>,<% end %>
},
}<% if isnotlast $i $l %>, <% end %><% end %>}
`
// hlServices is the JSON structure for the Hostlists Registry blocked service
// index.
type hlServices struct {
BlockedServices []*hlServicesService `json:"blocked_services"`
}
// hlServicesService is the JSON structure for a service in the Hostlists
// Registry.
type hlServicesService struct {
ID string `json:"id"`
Name string `json:"name"`
IconSVG string `json:"icon_svg"`
Rules []string `json:"rules"`
}