a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: 2509 type-safety vol.3 

Merge in DNS/adguard-home from 2509-type-safety-vol2-1 to master

Squashed commit of the following:

commit d58efb32396328247e1bb044f2b01145530cd84c
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Jan 22 14:27:54 2021 +0300

    home: imp JSON encoding
This commit is contained in:
Eugene Burkov 2021-01-22 15:00:45 +03:00
parent d9482b7588
commit ecd9ef47b0
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/home/clientshttp.go
View File

@ -22,7 +22,7 @@ type clientJSON struct {
Upstreams []string `json:"upstreams"` Upstreams []string `json:"upstreams"`
WhoisInfo map[string]interface{} `json:"whois_info"` WhoisInfo map[string]string `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed // Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked. // Otherwise, it is blocked.
@ -39,7 +39,7 @@ type clientHostJSON struct {
Name string `json:"name"` Name string `json:"name"`
Source string `json:"source"` Source string `json:"source"`
WhoisInfo map[string]interface{} `json:"whois_info"` WhoisInfo map[string]string `json:"whois_info"`
} }
type clientListJSON struct { type clientListJSON struct {
@ -75,7 +75,7 @@ func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, _ *http
cj.Source = "WHOIS" cj.Source = "WHOIS"
} }
cj.WhoisInfo = make(map[string]interface{}) cj.WhoisInfo = map[string]string{}
for _, wi := range ch.WhoisInfo { for _, wi := range ch.WhoisInfo {
cj.WhoisInfo[wi[0]] = wi[1] cj.WhoisInfo[wi[0]] = wi[1]
} }
@ -140,7 +140,7 @@ func clientHostToJSON(ip string, ch ClientHost) clientJSON {
IDs: []string{ip}, IDs: []string{ip},
} }
cj.WhoisInfo = make(map[string]interface{}) cj.WhoisInfo = map[string]string{}
for _, wi := range ch.WhoisInfo { for _, wi := range ch.WhoisInfo {
cj.WhoisInfo[wi[0]] = wi[1] cj.WhoisInfo[wi[0]] = wi[1]
} }
@ -228,7 +228,7 @@ func (clients *clientsContainer) handleUpdateClient(w http.ResponseWriter, r *ht
// Get the list of clients by IP address list // Get the list of clients by IP address list
func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http.Request) { func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query() q := r.URL.Query()
data := []map[string]interface{}{} data := []map[string]clientJSON{}
for i := 0; ; i++ { for i := 0; ; i++ {
ipStr := q.Get(fmt.Sprintf("ip%d", i)) ipStr := q.Get(fmt.Sprintf("ip%d", i))
ip := net.ParseIP(ipStr) ip := net.ParseIP(ipStr)
@ -236,7 +236,6 @@ func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http
break break
} }
el := map[string]interface{}{}
c, ok := clients.Find(ip) c, ok := clients.Find(ip)
var cj clientJSON var cj clientJSON
if !ok { if !ok {
@ -250,18 +249,13 @@ func (clients *clientsContainer) handleFindClient(w http.ResponseWriter, r *http
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip) cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
} }
el[ipStr] = cj data = append(data, map[string]clientJSON{
data = append(data, el) ipStr: cj,
} })
js, err := json.Marshal(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "json.Marshal: %s", err)
return
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
_, err = w.Write(js) err := json.NewEncoder(w).Encode(data)
if err != nil { if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't write response: %s", err) httpError(w, http.StatusInternalServerError, "Couldn't write response: %s", err)
} }