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
165 lines
4.1 KiB
Go
165 lines
4.1 KiB
Go
// vetted-filters fetches the most recent Hostlists Registry filtering rule list
|
|
// index and transforms the filters from it to AdGuard Home's format.
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/google/renameio/maybe"
|
|
)
|
|
|
|
func main() {
|
|
urlStr := "https://adguardteam.github.io/HostlistsRegistry/assets/filters.json"
|
|
if v, ok := os.LookupEnv("URL"); ok {
|
|
urlStr = v
|
|
}
|
|
|
|
// Validate the URL.
|
|
_, err := url.Parse(urlStr)
|
|
check(err)
|
|
|
|
c := &http.Client{
|
|
Timeout: 10 * time.Second,
|
|
}
|
|
|
|
resp, err := c.Get(urlStr)
|
|
check(err)
|
|
defer log.OnCloserError(resp.Body, log.ERROR)
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
panic(fmt.Errorf("expected code %d, got %d", http.StatusOK, resp.StatusCode))
|
|
}
|
|
|
|
hlFlt := &hlFilters{}
|
|
err = json.NewDecoder(resp.Body).Decode(hlFlt)
|
|
check(err)
|
|
|
|
aghFlt := &aghFilters{
|
|
Categories: map[string]*aghFiltersCategory{
|
|
"general": {
|
|
Name: "filter_category_general",
|
|
Description: "filter_category_general_desc",
|
|
},
|
|
"other": {
|
|
Name: "filter_category_other",
|
|
Description: "filter_category_other_desc",
|
|
},
|
|
"regional": {
|
|
Name: "filter_category_regional",
|
|
Description: "filter_category_regional_desc",
|
|
},
|
|
"security": {
|
|
Name: "filter_category_security",
|
|
Description: "filter_category_security_desc",
|
|
},
|
|
},
|
|
Filters: map[string]*aghFiltersFilter{},
|
|
}
|
|
|
|
for i, f := range hlFlt.Filters {
|
|
id := f.FilterID
|
|
cat := f.category()
|
|
if cat == "" {
|
|
log.Info("warning: filter %s at index %d does not have a fitting category", id, i)
|
|
}
|
|
|
|
aghFlt.Filters[id] = &aghFiltersFilter{
|
|
Name: f.Name,
|
|
CategoryID: cat,
|
|
Homepage: f.Homepage,
|
|
Source: f.SourceURL,
|
|
}
|
|
}
|
|
|
|
buf := &bytes.Buffer{}
|
|
_, _ = buf.WriteString(jsHeader)
|
|
|
|
enc := json.NewEncoder(buf)
|
|
enc.SetIndent("", " ")
|
|
|
|
err = enc.Encode(aghFlt)
|
|
check(err)
|
|
|
|
err = maybe.WriteFile("client/src/helpers/filters/filters.js", buf.Bytes(), 0o644)
|
|
check(err)
|
|
}
|
|
|
|
// jsHeader is the header for the generated JavaScript file. It informs the
|
|
// reader that the file is generated and disables some style-related eslint
|
|
// checks.
|
|
const jsHeader = `// Code generated by go run ./scripts/vetted-filters/main.go; DO NOT EDIT.
|
|
|
|
/* eslint quote-props: 'off', quotes: 'off', comma-dangle: 'off', semi: 'off' */
|
|
|
|
export default `
|
|
|
|
// check is a simple error-checking helper for scripts.
|
|
func check(err error) {
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
// hlFilters is the JSON structure for the Hostlists Registry rule list index.
|
|
type hlFilters struct {
|
|
Filters []*hlFiltersFilter `json:"filters"`
|
|
}
|
|
|
|
// hlFiltersFilter is the JSON structure for a filter in the Hostlists Registry.
|
|
type hlFiltersFilter struct {
|
|
FilterID string `json:"filterId"`
|
|
Name string `json:"name"`
|
|
Homepage string `json:"homepage"`
|
|
SourceURL string `json:"sourceUrl"`
|
|
Tags []string `json:"tags"`
|
|
}
|
|
|
|
// category returns the AdGuard Home category for this filter. If there is no
|
|
// fitting category, cat is empty.
|
|
func (f *hlFiltersFilter) category() (cat string) {
|
|
for _, t := range f.Tags {
|
|
switch t {
|
|
case "purpose:general":
|
|
return "general"
|
|
case "purpose:other":
|
|
return "other"
|
|
case "purpose:regional":
|
|
return "regional"
|
|
case "purpose:security":
|
|
return "security"
|
|
}
|
|
}
|
|
|
|
return ""
|
|
}
|
|
|
|
// aghFilters is the JSON structure for AdGuard Home's list of vetted filtering
|
|
// rule list in file client/src/helpers/filters/filters.js.
|
|
type aghFilters struct {
|
|
Categories map[string]*aghFiltersCategory `json:"categories"`
|
|
Filters map[string]*aghFiltersFilter `json:"filters"`
|
|
}
|
|
|
|
// aghFiltersCategory is the JSON structure for a category in the vetted
|
|
// filtering rule list file.
|
|
type aghFiltersCategory struct {
|
|
Name string `json:"name"`
|
|
Description string `json:"description"`
|
|
}
|
|
|
|
// aghFiltersFilter is the JSON structure for a filter in the vetted filtering
|
|
// rule list file.
|
|
type aghFiltersFilter struct {
|
|
Name string `json:"name"`
|
|
CategoryID string `json:"categoryId"`
|
|
Homepage string `json:"homepage"`
|
|
Source string `json:"source"`
|
|
}
|