2019-09-26 14:40:52 +01:00
|
|
|
package home
|
|
|
|
|
|
|
|
import (
|
|
|
|
"encoding/json"
|
|
|
|
"fmt"
|
|
|
|
"net/http"
|
2022-11-09 11:37:07 +00:00
|
|
|
"net/netip"
|
2021-06-29 13:53:28 +01:00
|
|
|
|
2023-04-14 13:25:04 +01:00
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
|
2021-12-16 17:54:59 +00:00
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
2023-03-15 11:31:07 +00:00
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
2023-06-30 09:56:03 +01:00
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/schedule"
|
2023-06-21 10:53:53 +01:00
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/whois"
|
2019-09-26 14:40:52 +01:00
|
|
|
)
|
|
|
|
|
2021-05-06 14:41:33 +01:00
|
|
|
// 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?
|
2019-09-26 14:40:52 +01:00
|
|
|
type clientJSON struct {
|
2021-05-06 14:41:33 +01:00
|
|
|
// 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"`
|
|
|
|
|
2023-06-21 10:53:53 +01:00
|
|
|
// WHOIS is the filtered WHOIS data of a client.
|
|
|
|
WHOIS *whois.Info `json:"whois_info,omitempty"`
|
2023-03-23 12:25:58 +00:00
|
|
|
SafeSearchConf *filtering.SafeSearchConfig `json:"safe_search"`
|
2021-05-06 14:41:33 +01:00
|
|
|
|
|
|
|
Name string `json:"name"`
|
|
|
|
|
|
|
|
BlockedServices []string `json:"blocked_services"`
|
|
|
|
IDs []string `json:"ids"`
|
|
|
|
Tags []string `json:"tags"`
|
|
|
|
Upstreams []string `json:"upstreams"`
|
|
|
|
|
2023-03-15 11:31:07 +00:00
|
|
|
FilteringEnabled bool `json:"filtering_enabled"`
|
|
|
|
ParentalEnabled bool `json:"parental_enabled"`
|
|
|
|
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
|
|
|
|
// Deprecated: use safeSearchConf.
|
2021-05-06 14:41:33 +01:00
|
|
|
SafeSearchEnabled bool `json:"safesearch_enabled"`
|
|
|
|
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
|
|
|
|
UseGlobalSettings bool `json:"use_global_settings"`
|
2023-04-14 13:25:04 +01:00
|
|
|
|
|
|
|
IgnoreQueryLog aghalg.NullBool `json:"ignore_querylog"`
|
|
|
|
IgnoreStatistics aghalg.NullBool `json:"ignore_statistics"`
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2021-04-02 15:30:39 +01:00
|
|
|
type runtimeClientJSON struct {
|
2023-06-21 10:53:53 +01:00
|
|
|
WHOIS *whois.Info `json:"whois_info"`
|
2021-04-02 15:30:39 +01:00
|
|
|
|
2022-11-09 11:37:07 +00:00
|
|
|
IP netip.Addr `json:"ip"`
|
2023-04-06 12:12:50 +01:00
|
|
|
Name string `json:"name"`
|
2022-08-04 17:05:28 +01:00
|
|
|
Source clientSource `json:"source"`
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type clientListJSON struct {
|
2021-06-29 13:53:28 +01:00
|
|
|
Clients []*clientJSON `json:"clients"`
|
2021-04-02 15:30:39 +01:00
|
|
|
RuntimeClients []runtimeClientJSON `json:"auto_clients"`
|
|
|
|
Tags []string `json:"supported_tags"`
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
// handleGetClients is the handler for GET /control/clients HTTP API.
|
2021-12-16 17:54:59 +00:00
|
|
|
func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, r *http.Request) {
|
2019-09-26 14:40:52 +01:00
|
|
|
data := clientListJSON{}
|
|
|
|
|
2019-11-22 11:37:25 +00:00
|
|
|
clients.lock.Lock()
|
2021-04-02 15:30:39 +01:00
|
|
|
defer clients.lock.Unlock()
|
|
|
|
|
2019-11-22 11:37:25 +00:00
|
|
|
for _, c := range clients.list {
|
2019-09-26 14:40:52 +01:00
|
|
|
cj := clientToJSON(c)
|
|
|
|
data.Clients = append(data.Clients, cj)
|
|
|
|
}
|
2021-06-29 13:53:28 +01:00
|
|
|
|
2022-10-24 15:49:52 +01:00
|
|
|
for ip, rc := range clients.ipToRC {
|
2021-04-02 15:30:39 +01:00
|
|
|
cj := runtimeClientJSON{
|
2023-06-21 10:53:53 +01:00
|
|
|
WHOIS: rc.WHOIS,
|
2021-06-29 13:53:28 +01:00
|
|
|
|
2022-08-04 17:05:28 +01:00
|
|
|
Name: rc.Host,
|
|
|
|
Source: rc.Source,
|
2022-11-09 11:37:07 +00:00
|
|
|
IP: ip,
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2021-04-02 15:30:39 +01:00
|
|
|
data.RuntimeClients = append(data.RuntimeClients, cj)
|
2022-10-24 15:49:52 +01:00
|
|
|
}
|
2019-09-26 14:40:52 +01:00
|
|
|
|
2020-01-28 11:06:52 +00:00
|
|
|
data.Tags = clientTags
|
|
|
|
|
2022-09-29 17:04:26 +01:00
|
|
|
_ = aghhttp.WriteJSONResponse(w, r, data)
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
// jsonToClient converts JSON object to Client object.
|
2023-04-14 13:25:04 +01:00
|
|
|
func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *Client, err error) {
|
2023-03-23 12:25:58 +00:00
|
|
|
var safeSearchConf filtering.SafeSearchConfig
|
|
|
|
if cj.SafeSearchConf != nil {
|
|
|
|
safeSearchConf = *cj.SafeSearchConf
|
|
|
|
} else {
|
|
|
|
// TODO(d.kolyshev): Remove after cleaning the deprecated
|
|
|
|
// [clientJSON.SafeSearchEnabled] field.
|
2023-04-06 12:12:50 +01:00
|
|
|
safeSearchConf = filtering.SafeSearchConfig{
|
|
|
|
Enabled: cj.SafeSearchEnabled,
|
|
|
|
}
|
2023-03-23 12:25:58 +00:00
|
|
|
|
|
|
|
// Set default service flags for enabled safesearch.
|
|
|
|
if safeSearchConf.Enabled {
|
|
|
|
safeSearchConf.Bing = true
|
|
|
|
safeSearchConf.DuckDuckGo = true
|
|
|
|
safeSearchConf.Google = true
|
|
|
|
safeSearchConf.Pixabay = true
|
|
|
|
safeSearchConf.Yandex = true
|
|
|
|
safeSearchConf.YouTube = true
|
|
|
|
}
|
2023-03-15 11:31:07 +00:00
|
|
|
}
|
|
|
|
|
2023-06-30 09:56:03 +01:00
|
|
|
weekly := schedule.EmptyWeekly()
|
|
|
|
if prev != nil {
|
|
|
|
weekly = prev.BlockedServices.Schedule.Clone()
|
|
|
|
}
|
|
|
|
|
2023-04-06 12:12:50 +01:00
|
|
|
c = &Client{
|
|
|
|
safeSearchConf: safeSearchConf,
|
|
|
|
|
|
|
|
Name: cj.Name,
|
|
|
|
|
2023-06-27 16:03:07 +01:00
|
|
|
BlockedServices: &filtering.BlockedServices{
|
2023-06-30 09:56:03 +01:00
|
|
|
Schedule: weekly,
|
2023-06-27 16:03:07 +01:00
|
|
|
IDs: cj.BlockedServices,
|
|
|
|
},
|
|
|
|
|
|
|
|
IDs: cj.IDs,
|
|
|
|
Tags: cj.Tags,
|
|
|
|
Upstreams: cj.Upstreams,
|
2023-04-06 12:12:50 +01:00
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
UseOwnSettings: !cj.UseGlobalSettings,
|
|
|
|
FilteringEnabled: cj.FilteringEnabled,
|
|
|
|
ParentalEnabled: cj.ParentalEnabled,
|
|
|
|
SafeBrowsingEnabled: cj.SafeBrowsingEnabled,
|
2019-09-26 14:40:52 +01:00
|
|
|
UseOwnBlockedServices: !cj.UseGlobalBlockedServices,
|
2023-04-06 12:12:50 +01:00
|
|
|
}
|
2019-11-06 14:24:15 +00:00
|
|
|
|
2023-04-14 13:25:04 +01:00
|
|
|
if cj.IgnoreQueryLog != aghalg.NBNull {
|
|
|
|
c.IgnoreQueryLog = cj.IgnoreQueryLog == aghalg.NBTrue
|
|
|
|
} else if prev != nil {
|
|
|
|
c.IgnoreQueryLog = prev.IgnoreQueryLog
|
|
|
|
}
|
|
|
|
|
|
|
|
if cj.IgnoreStatistics != aghalg.NBNull {
|
|
|
|
c.IgnoreStatistics = cj.IgnoreStatistics == aghalg.NBTrue
|
|
|
|
} else if prev != nil {
|
|
|
|
c.IgnoreStatistics = prev.IgnoreStatistics
|
|
|
|
}
|
|
|
|
|
2023-04-06 12:12:50 +01:00
|
|
|
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)
|
|
|
|
}
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
2023-04-06 12:12:50 +01:00
|
|
|
|
|
|
|
return c, nil
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
// clientToJSON converts Client object to JSON.
|
2021-06-29 13:53:28 +01:00
|
|
|
func clientToJSON(c *Client) (cj *clientJSON) {
|
2023-03-15 11:31:07 +00:00
|
|
|
// TODO(d.kolyshev): Remove after cleaning the deprecated
|
|
|
|
// [clientJSON.SafeSearchEnabled] field.
|
|
|
|
cloneVal := c.safeSearchConf
|
|
|
|
safeSearchConf := &cloneVal
|
|
|
|
|
2021-06-29 13:53:28 +01:00
|
|
|
return &clientJSON{
|
2019-09-26 14:40:52 +01:00
|
|
|
Name: c.Name,
|
|
|
|
IDs: c.IDs,
|
2020-01-28 11:06:52 +00:00
|
|
|
Tags: c.Tags,
|
2019-09-26 14:40:52 +01:00
|
|
|
UseGlobalSettings: !c.UseOwnSettings,
|
|
|
|
FilteringEnabled: c.FilteringEnabled,
|
|
|
|
ParentalEnabled: c.ParentalEnabled,
|
2023-03-15 11:31:07 +00:00
|
|
|
SafeSearchEnabled: safeSearchConf.Enabled,
|
2023-03-23 12:25:58 +00:00
|
|
|
SafeSearchConf: safeSearchConf,
|
2019-09-26 14:40:52 +01:00
|
|
|
SafeBrowsingEnabled: c.SafeBrowsingEnabled,
|
|
|
|
|
|
|
|
UseGlobalBlockedServices: !c.UseOwnBlockedServices,
|
2023-06-27 16:03:07 +01:00
|
|
|
|
|
|
|
BlockedServices: c.BlockedServices.IDs,
|
2019-11-06 14:24:15 +00:00
|
|
|
|
|
|
|
Upstreams: c.Upstreams,
|
2023-04-14 13:25:04 +01:00
|
|
|
|
|
|
|
IgnoreQueryLog: aghalg.BoolToNullBool(c.IgnoreQueryLog),
|
|
|
|
IgnoreStatistics: aghalg.BoolToNullBool(c.IgnoreStatistics),
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
// handleAddClient is the handler for POST /control/clients/add HTTP API.
|
2019-11-22 11:37:25 +00:00
|
|
|
func (clients *clientsContainer) handleAddClient(w http.ResponseWriter, r *http.Request) {
|
2019-09-26 14:40:52 +01:00
|
|
|
cj := clientJSON{}
|
2020-11-23 11:14:08 +00:00
|
|
|
err := json.NewDecoder(r.Body).Decode(&cj)
|
2019-09-26 14:40:52 +01:00
|
|
|
if err != nil {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "failed to process request body: %s", err)
|
2020-11-23 11:14:08 +00:00
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2023-04-14 13:25:04 +01:00
|
|
|
c, err := clients.jsonToClient(cj, nil)
|
2023-04-06 12:12:50 +01:00
|
|
|
if err != nil {
|
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2021-01-27 15:32:13 +00:00
|
|
|
ok, err := clients.Add(c)
|
2019-09-26 14:40:52 +01:00
|
|
|
if err != nil {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
2021-12-16 17:54:59 +00:00
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
if !ok {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Client already exists")
|
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-10-30 08:52:58 +00:00
|
|
|
onConfigModified()
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
// handleDelClient is the handler for POST /control/clients/delete HTTP API.
|
2019-11-22 11:37:25 +00:00
|
|
|
func (clients *clientsContainer) handleDelClient(w http.ResponseWriter, r *http.Request) {
|
2020-11-23 11:14:08 +00:00
|
|
|
cj := clientJSON{}
|
|
|
|
err := json.NewDecoder(r.Body).Decode(&cj)
|
2019-09-26 14:40:52 +01:00
|
|
|
if err != nil {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "failed to process request body: %s", err)
|
2020-11-23 11:14:08 +00:00
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-11-23 11:14:08 +00:00
|
|
|
if len(cj.Name) == 0 {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "client's name must be non-empty")
|
2020-11-23 11:14:08 +00:00
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-11-22 11:37:25 +00:00
|
|
|
if !clients.Del(cj.Name) {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Client not found")
|
2022-10-19 14:13:05 +01:00
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-10-30 08:52:58 +00:00
|
|
|
onConfigModified()
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type updateJSON struct {
|
|
|
|
Name string `json:"name"`
|
|
|
|
Data clientJSON `json:"data"`
|
|
|
|
}
|
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
// handleUpdateClient is the handler for POST /control/clients/update HTTP API.
|
2023-04-14 13:25:04 +01:00
|
|
|
//
|
|
|
|
// TODO(s.chzhen): Accept updated parameters instead of whole structure.
|
2019-11-22 11:37:25 +00:00
|
|
|
func (clients *clientsContainer) handleUpdateClient(w http.ResponseWriter, r *http.Request) {
|
2020-11-23 11:14:08 +00:00
|
|
|
dj := updateJSON{}
|
|
|
|
err := json.NewDecoder(r.Body).Decode(&dj)
|
2019-09-26 14:40:52 +01:00
|
|
|
if err != nil {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "failed to process request body: %s", err)
|
2019-09-26 14:40:52 +01:00
|
|
|
|
|
|
|
return
|
|
|
|
}
|
2020-11-23 11:14:08 +00:00
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
if len(dj.Name) == 0 {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Invalid request")
|
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2023-04-14 13:25:04 +01:00
|
|
|
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)
|
2023-04-06 12:12:50 +01:00
|
|
|
if err != nil {
|
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2023-05-25 15:45:55 +01:00
|
|
|
err = clients.Update(prev, c)
|
2019-09-26 14:40:52 +01:00
|
|
|
if err != nil {
|
2021-12-16 17:54:59 +00:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-10-30 08:52:58 +00:00
|
|
|
onConfigModified()
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2023-03-23 12:25:58 +00:00
|
|
|
// handleFindClient is the handler for GET /control/clients/find HTTP API.
|
2019-11-22 11:37:25 +00:00
|
|
|
func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http.Request) {
|
2019-09-26 14:40:52 +01:00
|
|
|
q := r.URL.Query()
|
2021-06-29 13:53:28 +01:00
|
|
|
data := []map[string]*clientJSON{}
|
2021-01-27 15:32:13 +00:00
|
|
|
for i := 0; i < len(q); i++ {
|
|
|
|
idStr := q.Get(fmt.Sprintf("ip%d", i))
|
|
|
|
if idStr == "" {
|
2019-09-26 14:40:52 +01:00
|
|
|
break
|
|
|
|
}
|
2021-01-15 17:30:48 +00:00
|
|
|
|
2022-11-09 11:37:07 +00:00
|
|
|
ip, _ := netip.ParseAddr(idStr)
|
2021-01-27 15:32:13 +00:00
|
|
|
c, ok := clients.Find(idStr)
|
2021-06-29 13:53:28 +01:00
|
|
|
var cj *clientJSON
|
2019-09-26 14:40:52 +01:00
|
|
|
if !ok {
|
2021-06-29 13:53:28 +01:00
|
|
|
cj = clients.findRuntime(ip, idStr)
|
2019-09-26 14:40:52 +01:00
|
|
|
} else {
|
2021-01-27 15:32:13 +00:00
|
|
|
cj = clientToJSON(c)
|
2021-06-29 13:53:28 +01:00
|
|
|
disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)
|
2021-05-06 14:41:33 +01:00
|
|
|
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2021-06-29 13:53:28 +01:00
|
|
|
data = append(data, map[string]*clientJSON{
|
2021-01-27 15:32:13 +00:00
|
|
|
idStr: cj,
|
2021-01-22 12:00:45 +00:00
|
|
|
})
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2022-09-29 17:04:26 +01:00
|
|
|
_ = aghhttp.WriteJSONResponse(w, r, data)
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|
|
|
|
|
2021-04-15 17:00:31 +01:00
|
|
|
// findRuntime looks up the IP in runtime and temporary storages, like
|
2021-06-29 13:53:28 +01:00
|
|
|
// /etc/hosts tables, DHCP leases, or blocklists. cj is guaranteed to be
|
|
|
|
// non-nil.
|
2022-11-09 11:37:07 +00:00
|
|
|
func (clients *clientsContainer) findRuntime(ip netip.Addr, idStr string) (cj *clientJSON) {
|
2022-10-25 13:08:12 +01:00
|
|
|
rc, ok := clients.findRuntimeClient(ip)
|
2021-01-28 16:39:33 +00:00
|
|
|
if !ok {
|
2022-08-04 17:05:28 +01:00
|
|
|
// 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.
|
2021-01-15 17:30:48 +00:00
|
|
|
//
|
|
|
|
// See https://github.com/AdguardTeam/AdGuardHome/issues/2428.
|
2021-06-29 13:53:28 +01:00
|
|
|
disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)
|
|
|
|
cj = &clientJSON{
|
2021-01-27 15:32:13 +00:00
|
|
|
IDs: []string{idStr},
|
2021-05-06 14:41:33 +01:00
|
|
|
Disallowed: &disallowed,
|
|
|
|
DisallowedRule: &rule,
|
2023-06-21 10:53:53 +01:00
|
|
|
WHOIS: &whois.Info{},
|
2021-01-15 17:30:48 +00:00
|
|
|
}
|
|
|
|
|
2021-06-29 13:53:28 +01:00
|
|
|
return cj
|
|
|
|
}
|
|
|
|
|
|
|
|
cj = &clientJSON{
|
2023-06-21 10:53:53 +01:00
|
|
|
Name: rc.Host,
|
|
|
|
IDs: []string{idStr},
|
|
|
|
WHOIS: rc.WHOIS,
|
2021-01-15 17:30:48 +00:00
|
|
|
}
|
|
|
|
|
2021-06-29 13:53:28 +01:00
|
|
|
disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)
|
2021-05-06 14:41:33 +01:00
|
|
|
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
2021-01-15 17:30:48 +00:00
|
|
|
|
2021-06-29 13:53:28 +01:00
|
|
|
return cj
|
2021-01-15 17:30:48 +00:00
|
|
|
}
|
|
|
|
|
2019-09-26 14:40:52 +01:00
|
|
|
// RegisterClientsHandlers registers HTTP handlers
|
2019-11-22 11:37:25 +00:00
|
|
|
func (clients *clientsContainer) registerWebHandlers() {
|
2021-02-04 11:15:34 +00:00
|
|
|
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)
|
2019-09-26 14:40:52 +01:00
|
|
|
}
|