mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[change] control: update bootstrap DNS check

This commit is contained in:
Aleksey Dmitrevskiy 2019-03-06 18:06:26 +03:00
parent bda6f777c4
commit 89b6323f03
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
control.go
View File

@ -329,7 +329,7 @@ func handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request) {
// bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice
for _, host := range newconfig.BootstrapDNS { for _, host := range newconfig.BootstrapDNS {
err := checkBootstrapDNS(host) err := checkPlainDNS(host)
if err != nil { if err != nil {
httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err) httpError(w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", host, err)
return return
@ -345,16 +345,29 @@ func handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request) {
httpUpdateConfigReloadDNSReturnOK(w, r) httpUpdateConfigReloadDNSReturnOK(w, r)
} }
// checkBootstrapDNS checks if host is plain DNS // checkPlainDNS checks if host is plain DNS
func checkBootstrapDNS(host string) error { func checkPlainDNS(host string) error {
// Check if host is ip without port // Check if host is ip without port
if net.ParseIP(host) != nil { if net.ParseIP(host) != nil {
return nil return nil
} }
// Check if host is ip with port // Check if host is ip with port
_, _, err := net.SplitHostPort(host) ip, port, err := net.SplitHostPort(host)
if err != nil {
return err return err
}
if net.ParseIP(ip) == nil {
return fmt.Errorf("%s is not valid IP", ip)
}
_, err = strconv.ParseInt(port, 0, 64)
if err != nil {
return fmt.Errorf("%s is not valid port: %s", port, err)
}
return nil
} }
func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) { func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {