mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 04:55:33 +03:00
e1995408e4
Updates #6263. Squashed commit of the following: commitf6b704fb58
Merge:780d001ce
5dd10d9fc
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Nov 24 09:55:04 2023 +0200 Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache commit780d001cef
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Nov 24 09:53:46 2023 +0200 all: imp locales commit820bcf0e23
Merge:e7ca51563
1320043e9
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Nov 23 11:16:54 2023 +0200 Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache # Conflicts: # CHANGELOG.md commite7ca515630
Merge:23392d08b
0f5e8ca56
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 22 09:49:32 2023 +0200 Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache commit23392d08b1
Merge:a09cd190c
feb15745d
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 22 09:49:10 2023 +0200 Merge remote-tracking branch 'origin/6263-custom-ups-cache' into 6263-custom-ups-cache commita09cd190c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 22 09:48:43 2023 +0200 home: imp code commitfeb15745d2
Author: Ildar Kamalov <ik@adguard.com> Date: Tue Nov 21 17:27:38 2023 +0300 client: move cache fields to the upstream tab commit789060e4d4
Author: Ildar Kamalov <ik@adguard.com> Date: Tue Nov 21 16:28:03 2023 +0300 client: add form fields commita700bfb42e
Merge:7669419b5
db42254d7
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Nov 21 11:44:14 2023 +0200 Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache commit7669419b59
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Nov 21 11:34:17 2023 +0200 home: imp code commit4a9dc1d6c1
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 20 15:08:44 2023 +0200 docs: http client docs commit944e0d7a4b
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 20 13:51:00 2023 +0200 home: http client dns cache
459 lines
12 KiB
Go
459 lines
12 KiB
Go
package home
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/netip"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/client"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/schedule"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/whois"
|
|
)
|
|
|
|
// clientJSON is a common structure used by several handlers to deal with
|
|
// clients. Some of the fields are only necessary in one or two handlers and
|
|
// are thus made pointers with an omitempty tag.
|
|
//
|
|
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
|
|
// split into several structs?
|
|
type clientJSON struct {
|
|
// Disallowed, if non-nil and false, means that the client's IP is
|
|
// allowed. Otherwise, the IP is blocked.
|
|
Disallowed *bool `json:"disallowed,omitempty"`
|
|
|
|
// DisallowedRule is the rule due to which the client is disallowed.
|
|
// If Disallowed is true and this string is empty, the client IP is
|
|
// disallowed by the "allowed IP list", that is it is not included in
|
|
// the allowlist.
|
|
DisallowedRule *string `json:"disallowed_rule,omitempty"`
|
|
|
|
// WHOIS is the filtered WHOIS data of a client.
|
|
WHOIS *whois.Info `json:"whois_info,omitempty"`
|
|
SafeSearchConf *filtering.SafeSearchConfig `json:"safe_search"`
|
|
|
|
// Schedule is blocked services schedule for every day of the week.
|
|
Schedule *schedule.Weekly `json:"blocked_services_schedule"`
|
|
|
|
Name string `json:"name"`
|
|
|
|
// BlockedServices is the names of blocked services.
|
|
BlockedServices []string `json:"blocked_services"`
|
|
IDs []string `json:"ids"`
|
|
Tags []string `json:"tags"`
|
|
Upstreams []string `json:"upstreams"`
|
|
|
|
FilteringEnabled bool `json:"filtering_enabled"`
|
|
ParentalEnabled bool `json:"parental_enabled"`
|
|
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
|
|
// Deprecated: use safeSearchConf.
|
|
SafeSearchEnabled bool `json:"safesearch_enabled"`
|
|
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
|
|
UseGlobalSettings bool `json:"use_global_settings"`
|
|
|
|
IgnoreQueryLog aghalg.NullBool `json:"ignore_querylog"`
|
|
IgnoreStatistics aghalg.NullBool `json:"ignore_statistics"`
|
|
|
|
UpstreamsCacheSize uint32 `json:"upstreams_cache_size"`
|
|
UpstreamsCacheEnabled aghalg.NullBool `json:"upstreams_cache_enabled"`
|
|
}
|
|
|
|
type runtimeClientJSON struct {
|
|
WHOIS *whois.Info `json:"whois_info"`
|
|
|
|
IP netip.Addr `json:"ip"`
|
|
Name string `json:"name"`
|
|
Source client.Source `json:"source"`
|
|
}
|
|
|
|
type clientListJSON struct {
|
|
Clients []*clientJSON `json:"clients"`
|
|
RuntimeClients []runtimeClientJSON `json:"auto_clients"`
|
|
Tags []string `json:"supported_tags"`
|
|
}
|
|
|
|
// handleGetClients is the handler for GET /control/clients HTTP API.
|
|
func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, r *http.Request) {
|
|
data := clientListJSON{}
|
|
|
|
clients.lock.Lock()
|
|
defer clients.lock.Unlock()
|
|
|
|
for _, c := range clients.list {
|
|
cj := clientToJSON(c)
|
|
data.Clients = append(data.Clients, cj)
|
|
}
|
|
|
|
for ip, rc := range clients.ipToRC {
|
|
cj := runtimeClientJSON{
|
|
WHOIS: rc.WHOIS,
|
|
|
|
Name: rc.Host,
|
|
Source: rc.Source,
|
|
IP: ip,
|
|
}
|
|
|
|
data.RuntimeClients = append(data.RuntimeClients, cj)
|
|
}
|
|
|
|
for _, l := range clients.dhcp.Leases() {
|
|
cj := runtimeClientJSON{
|
|
Name: l.Hostname,
|
|
Source: client.SourceDHCP,
|
|
IP: l.IP,
|
|
WHOIS: &whois.Info{},
|
|
}
|
|
|
|
data.RuntimeClients = append(data.RuntimeClients, cj)
|
|
}
|
|
|
|
data.Tags = clientTags
|
|
|
|
aghhttp.WriteJSONResponseOK(w, r, data)
|
|
}
|
|
|
|
// jsonToClient converts JSON object to Client object.
|
|
func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *Client, err error) {
|
|
safeSearchConf := copySafeSearch(cj.SafeSearchConf, cj.SafeSearchEnabled)
|
|
|
|
var ignoreQueryLog bool
|
|
if cj.IgnoreQueryLog != aghalg.NBNull {
|
|
ignoreQueryLog = cj.IgnoreQueryLog == aghalg.NBTrue
|
|
} else if prev != nil {
|
|
ignoreQueryLog = prev.IgnoreQueryLog
|
|
}
|
|
|
|
var ignoreStatistics bool
|
|
if cj.IgnoreStatistics != aghalg.NBNull {
|
|
ignoreStatistics = cj.IgnoreStatistics == aghalg.NBTrue
|
|
} else if prev != nil {
|
|
ignoreStatistics = prev.IgnoreStatistics
|
|
}
|
|
|
|
var upsCacheEnabled bool
|
|
var upsCacheSize uint32
|
|
if cj.UpstreamsCacheEnabled != aghalg.NBNull {
|
|
upsCacheEnabled = cj.UpstreamsCacheEnabled == aghalg.NBTrue
|
|
upsCacheSize = cj.UpstreamsCacheSize
|
|
} else if prev != nil {
|
|
upsCacheEnabled = prev.UpstreamsCacheEnabled
|
|
upsCacheSize = prev.UpstreamsCacheSize
|
|
}
|
|
|
|
svcs, err := copyBlockedServices(cj.Schedule, cj.BlockedServices, prev)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid blocked services: %w", err)
|
|
}
|
|
|
|
c = &Client{
|
|
safeSearchConf: safeSearchConf,
|
|
|
|
Name: cj.Name,
|
|
|
|
BlockedServices: svcs,
|
|
|
|
IDs: cj.IDs,
|
|
Tags: cj.Tags,
|
|
Upstreams: cj.Upstreams,
|
|
|
|
UseOwnSettings: !cj.UseGlobalSettings,
|
|
FilteringEnabled: cj.FilteringEnabled,
|
|
ParentalEnabled: cj.ParentalEnabled,
|
|
SafeBrowsingEnabled: cj.SafeBrowsingEnabled,
|
|
UseOwnBlockedServices: !cj.UseGlobalBlockedServices,
|
|
IgnoreQueryLog: ignoreQueryLog,
|
|
IgnoreStatistics: ignoreStatistics,
|
|
UpstreamsCacheEnabled: upsCacheEnabled,
|
|
UpstreamsCacheSize: upsCacheSize,
|
|
}
|
|
|
|
if safeSearchConf.Enabled {
|
|
err = c.setSafeSearch(
|
|
safeSearchConf,
|
|
clients.safeSearchCacheSize,
|
|
clients.safeSearchCacheTTL,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("creating safesearch for client %q: %w", c.Name, err)
|
|
}
|
|
}
|
|
|
|
return c, nil
|
|
}
|
|
|
|
// copySafeSearch returns safe search config created from provided parameters.
|
|
func copySafeSearch(
|
|
jsonConf *filtering.SafeSearchConfig,
|
|
enabled bool,
|
|
) (conf filtering.SafeSearchConfig) {
|
|
if jsonConf != nil {
|
|
return *jsonConf
|
|
}
|
|
|
|
// TODO(d.kolyshev): Remove after cleaning the deprecated
|
|
// [clientJSON.SafeSearchEnabled] field.
|
|
conf = filtering.SafeSearchConfig{
|
|
Enabled: enabled,
|
|
}
|
|
|
|
// Set default service flags for enabled safesearch.
|
|
if conf.Enabled {
|
|
conf.Bing = true
|
|
conf.DuckDuckGo = true
|
|
conf.Google = true
|
|
conf.Pixabay = true
|
|
conf.Yandex = true
|
|
conf.YouTube = true
|
|
}
|
|
|
|
return conf
|
|
}
|
|
|
|
// copyBlockedServices converts a json blocked services to an internal blocked
|
|
// services.
|
|
func copyBlockedServices(
|
|
sch *schedule.Weekly,
|
|
svcStrs []string,
|
|
prev *Client,
|
|
) (svcs *filtering.BlockedServices, err error) {
|
|
var weekly *schedule.Weekly
|
|
if sch != nil {
|
|
weekly = sch.Clone()
|
|
} else if prev != nil && prev.BlockedServices != nil {
|
|
weekly = prev.BlockedServices.Schedule.Clone()
|
|
} else {
|
|
weekly = schedule.EmptyWeekly()
|
|
}
|
|
|
|
svcs = &filtering.BlockedServices{
|
|
Schedule: weekly,
|
|
IDs: svcStrs,
|
|
}
|
|
|
|
err = svcs.Validate()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("validating blocked services: %w", err)
|
|
}
|
|
|
|
return svcs, nil
|
|
}
|
|
|
|
// clientToJSON converts Client object to JSON.
|
|
func clientToJSON(c *Client) (cj *clientJSON) {
|
|
// TODO(d.kolyshev): Remove after cleaning the deprecated
|
|
// [clientJSON.SafeSearchEnabled] field.
|
|
cloneVal := c.safeSearchConf
|
|
safeSearchConf := &cloneVal
|
|
|
|
return &clientJSON{
|
|
Name: c.Name,
|
|
IDs: c.IDs,
|
|
Tags: c.Tags,
|
|
UseGlobalSettings: !c.UseOwnSettings,
|
|
FilteringEnabled: c.FilteringEnabled,
|
|
ParentalEnabled: c.ParentalEnabled,
|
|
SafeSearchEnabled: safeSearchConf.Enabled,
|
|
SafeSearchConf: safeSearchConf,
|
|
SafeBrowsingEnabled: c.SafeBrowsingEnabled,
|
|
|
|
UseGlobalBlockedServices: !c.UseOwnBlockedServices,
|
|
|
|
Schedule: c.BlockedServices.Schedule,
|
|
BlockedServices: c.BlockedServices.IDs,
|
|
|
|
Upstreams: c.Upstreams,
|
|
|
|
IgnoreQueryLog: aghalg.BoolToNullBool(c.IgnoreQueryLog),
|
|
IgnoreStatistics: aghalg.BoolToNullBool(c.IgnoreStatistics),
|
|
|
|
UpstreamsCacheSize: c.UpstreamsCacheSize,
|
|
UpstreamsCacheEnabled: aghalg.BoolToNullBool(c.UpstreamsCacheEnabled),
|
|
}
|
|
}
|
|
|
|
// handleAddClient is the handler for POST /control/clients/add HTTP API.
|
|
func (clients *clientsContainer) handleAddClient(w http.ResponseWriter, r *http.Request) {
|
|
cj := clientJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&cj)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "failed to process request body: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
c, err := clients.jsonToClient(cj, nil)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
return
|
|
}
|
|
|
|
ok, err := clients.Add(c)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
return
|
|
}
|
|
|
|
if !ok {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Client already exists")
|
|
|
|
return
|
|
}
|
|
|
|
onConfigModified()
|
|
}
|
|
|
|
// handleDelClient is the handler for POST /control/clients/delete HTTP API.
|
|
func (clients *clientsContainer) handleDelClient(w http.ResponseWriter, r *http.Request) {
|
|
cj := clientJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&cj)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "failed to process request body: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
if len(cj.Name) == 0 {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "client's name must be non-empty")
|
|
|
|
return
|
|
}
|
|
|
|
if !clients.Del(cj.Name) {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Client not found")
|
|
|
|
return
|
|
}
|
|
|
|
onConfigModified()
|
|
}
|
|
|
|
type updateJSON struct {
|
|
Name string `json:"name"`
|
|
Data clientJSON `json:"data"`
|
|
}
|
|
|
|
// handleUpdateClient is the handler for POST /control/clients/update HTTP API.
|
|
//
|
|
// TODO(s.chzhen): Accept updated parameters instead of whole structure.
|
|
func (clients *clientsContainer) handleUpdateClient(w http.ResponseWriter, r *http.Request) {
|
|
dj := updateJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&dj)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "failed to process request body: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
if len(dj.Name) == 0 {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Invalid request")
|
|
|
|
return
|
|
}
|
|
|
|
var prev *Client
|
|
var ok bool
|
|
|
|
func() {
|
|
clients.lock.Lock()
|
|
defer clients.lock.Unlock()
|
|
|
|
prev, ok = clients.list[dj.Name]
|
|
}()
|
|
|
|
if !ok {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "client not found")
|
|
}
|
|
|
|
c, err := clients.jsonToClient(dj.Data, prev)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
return
|
|
}
|
|
|
|
err = clients.Update(prev, c)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
return
|
|
}
|
|
|
|
onConfigModified()
|
|
}
|
|
|
|
// handleFindClient is the handler for GET /control/clients/find HTTP API.
|
|
func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http.Request) {
|
|
q := r.URL.Query()
|
|
data := []map[string]*clientJSON{}
|
|
for i := 0; i < len(q); i++ {
|
|
idStr := q.Get(fmt.Sprintf("ip%d", i))
|
|
if idStr == "" {
|
|
break
|
|
}
|
|
|
|
ip, _ := netip.ParseAddr(idStr)
|
|
c, ok := clients.Find(idStr)
|
|
var cj *clientJSON
|
|
if !ok {
|
|
cj = clients.findRuntime(ip, idStr)
|
|
} else {
|
|
cj = clientToJSON(c)
|
|
disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)
|
|
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
|
}
|
|
|
|
data = append(data, map[string]*clientJSON{
|
|
idStr: cj,
|
|
})
|
|
}
|
|
|
|
aghhttp.WriteJSONResponseOK(w, r, data)
|
|
}
|
|
|
|
// findRuntime looks up the IP in runtime and temporary storages, like
|
|
// /etc/hosts tables, DHCP leases, or blocklists. cj is guaranteed to be
|
|
// non-nil.
|
|
func (clients *clientsContainer) findRuntime(ip netip.Addr, idStr string) (cj *clientJSON) {
|
|
rc, ok := clients.findRuntimeClient(ip)
|
|
if !ok {
|
|
// It is still possible that the IP used to be in the runtime clients
|
|
// list, but then the server was reloaded. So, check the DNS server's
|
|
// blocked IP list.
|
|
//
|
|
// See https://github.com/AdguardTeam/AdGuardHome/issues/2428.
|
|
disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)
|
|
cj = &clientJSON{
|
|
IDs: []string{idStr},
|
|
Disallowed: &disallowed,
|
|
DisallowedRule: &rule,
|
|
WHOIS: &whois.Info{},
|
|
}
|
|
|
|
return cj
|
|
}
|
|
|
|
cj = &clientJSON{
|
|
Name: rc.Host,
|
|
IDs: []string{idStr},
|
|
WHOIS: rc.WHOIS,
|
|
}
|
|
|
|
disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)
|
|
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
|
|
|
return cj
|
|
}
|
|
|
|
// RegisterClientsHandlers registers HTTP handlers
|
|
func (clients *clientsContainer) registerWebHandlers() {
|
|
httpRegister(http.MethodGet, "/control/clients", clients.handleGetClients)
|
|
httpRegister(http.MethodPost, "/control/clients/add", clients.handleAddClient)
|
|
httpRegister(http.MethodPost, "/control/clients/delete", clients.handleDelClient)
|
|
httpRegister(http.MethodPost, "/control/clients/update", clients.handleUpdateClient)
|
|
httpRegister(http.MethodGet, "/control/clients/find", clients.handleFindClient)
|
|
}
|