0a66913b4d
Close #1212 * Server.Start(config *ServerConfig) -> Start() + Server.Prepare(config *ServerConfig) + Server.Resolve(host string) + Server.Exchange() * rDNS: use internal DNS resolver - clients: fix race in WriteDiskConfig() - fix race: move 'clients' object from 'configuration' to 'HomeContext' Go race detector didn't like our 'clients' object in 'configuration'. + add AGH startup test . Create a configuration file . Start AGH instance . Check Web server . Check DNS server . Wait until the filters are downloaded . Stop and cleanup * move module objects from config.* to Context.* * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning * ci.sh: 'make' and then run tests Squashed commit of the following: commit 86500c7f749307f37af4cc8c2a1066f679d0cfad Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:53 2019 +0300 minor commit 6e6abb9dca3cd250c458bec23aa30d2250a9eb40 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:31 2019 +0300 * ci.sh: 'make' and then run tests commit 114192eefea6800e565ba9ab238202c006516c27 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:50:04 2019 +0300 fix commit d426deea7f02cdfd4c7217a38c59e51251956a0f Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:46:33 2019 +0300 tests commit 7b350edf03027895b4e43dee908d0155a9b0ac9b Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:56:12 2019 +0300 fix test commit 2f5f116873bbbfdd4bb7f82a596f9e1f5c2bcfd8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:48:56 2019 +0300 fix tests commit 3fbdc77f9c34726e2295185279444983652d559e Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:45:00 2019 +0300 linter commit 9da0b6965a2b6863bcd552fa83a4de2866600bb8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:33:23 2019 +0300 * config.dnsctx.whois -> Context.whois commit c71ebdbdf6efd88c877b2f243c69d3bc00a997d7 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:31:08 2019 +0300 * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning commit 0f250220133cefdcb0843a50000cb932802b8324 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:28:19 2019 +0300 * rdns: refactor commit c460d8c9414940dac852e390b6c1b4d4fb38dff9 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 14:08:08 2019 +0300 Revert: * stats: serialize access to 'limit' Use 'conf *Config' and update it atomically, as in querylog module. (Note: Race detector still doesn't like it) commit 488bcb884971276de0d5629384b29e22c59ee7e6 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:50:23 2019 +0300 * config.dnsFilter -> Context.dnsFilter commit 86c0a6827a450414b50acec7ebfc5220d13b81e4 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:45:05 2019 +0300 * config.dnsServer -> Context.dnsServer commit ee35ef095ccaabc89e3de0ef52c9b5ed56b36873 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:42:10 2019 +0300 * config.dhcpServer -> Context.dhcpServer commit 1537001cd211099d5fad01696c0b806ae5d257b1 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:39:45 2019 +0300 * config.queryLog -> Context.queryLog commit e5955fe4ff1ef6f41763461b37b502ea25a3d04c Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:03:18 2019 +0300 * config.httpsServer -> Context.httpsServer commit 6153c10a9ac173e159d1f05e0db1512579b9203c Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:12:24 2019 +0300 * config.httpServer -> Context.httpServer commit abd021fb94039015cd45c97614e8b78d4694f956 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:08:05 2019 +0300 * stats: serialize access to 'limit' commit 38c2decfd87c712100edcabe62a6d4518719cb53 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:57:04 2019 +0300 * config.stats -> Context.stats commit 6caf8965ad44db9dce9a7a5103aa8fa305ad9a06 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:45:23 2019 +0300 fix Restart() ... and 6 more commits
282 lines
7.6 KiB
Go
282 lines
7.6 KiB
Go
package home
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"os/exec"
|
|
"strconv"
|
|
|
|
"github.com/AdguardTeam/golibs/log"
|
|
)
|
|
|
|
type firstRunData struct {
|
|
WebPort int `json:"web_port"`
|
|
DNSPort int `json:"dns_port"`
|
|
Interfaces map[string]interface{} `json:"interfaces"`
|
|
}
|
|
|
|
// Get initial installation settings
|
|
func handleInstallGetAddresses(w http.ResponseWriter, r *http.Request) {
|
|
data := firstRunData{}
|
|
data.WebPort = 80
|
|
data.DNSPort = 53
|
|
|
|
ifaces, err := getValidNetInterfacesForWeb()
|
|
if err != nil {
|
|
httpError(w, http.StatusInternalServerError, "Couldn't get interfaces: %s", err)
|
|
return
|
|
}
|
|
|
|
data.Interfaces = make(map[string]interface{})
|
|
for _, iface := range ifaces {
|
|
data.Interfaces[iface.Name] = iface
|
|
}
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
err = json.NewEncoder(w).Encode(data)
|
|
if err != nil {
|
|
httpError(w, http.StatusInternalServerError, "Unable to marshal default addresses to json: %s", err)
|
|
return
|
|
}
|
|
}
|
|
|
|
type checkConfigReqEnt struct {
|
|
Port int `json:"port"`
|
|
IP string `json:"ip"`
|
|
Autofix bool `json:"autofix"`
|
|
}
|
|
type checkConfigReq struct {
|
|
Web checkConfigReqEnt `json:"web"`
|
|
DNS checkConfigReqEnt `json:"dns"`
|
|
}
|
|
|
|
type checkConfigRespEnt struct {
|
|
Status string `json:"status"`
|
|
CanAutofix bool `json:"can_autofix"`
|
|
}
|
|
type checkConfigResp struct {
|
|
Web checkConfigRespEnt `json:"web"`
|
|
DNS checkConfigRespEnt `json:"dns"`
|
|
}
|
|
|
|
// Check if ports are available, respond with results
|
|
func handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
|
|
reqData := checkConfigReq{}
|
|
respData := checkConfigResp{}
|
|
err := json.NewDecoder(r.Body).Decode(&reqData)
|
|
if err != nil {
|
|
httpError(w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
|
|
return
|
|
}
|
|
|
|
if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
|
|
err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
|
|
if err != nil {
|
|
respData.Web.Status = fmt.Sprintf("%v", err)
|
|
}
|
|
}
|
|
|
|
if reqData.DNS.Port != 0 {
|
|
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
|
|
|
|
if errorIsAddrInUse(err) {
|
|
canAutofix := checkDNSStubListener()
|
|
if canAutofix && reqData.DNS.Autofix {
|
|
|
|
err = disableDNSStubListener()
|
|
if err != nil {
|
|
log.Error("Couldn't disable DNSStubListener: %s", err)
|
|
}
|
|
|
|
err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
|
|
canAutofix = false
|
|
}
|
|
|
|
respData.DNS.CanAutofix = canAutofix
|
|
}
|
|
|
|
if err == nil {
|
|
err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
|
|
}
|
|
|
|
if err != nil {
|
|
respData.DNS.Status = fmt.Sprintf("%v", err)
|
|
}
|
|
}
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
err = json.NewEncoder(w).Encode(respData)
|
|
if err != nil {
|
|
httpError(w, http.StatusInternalServerError, "Unable to marshal JSON: %s", err)
|
|
return
|
|
}
|
|
}
|
|
|
|
// Check if DNSStubListener is active
|
|
func checkDNSStubListener() bool {
|
|
cmd := exec.Command("systemctl", "is-enabled", "systemd-resolved")
|
|
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
|
|
_, err := cmd.Output()
|
|
if err != nil || cmd.ProcessState.ExitCode() != 0 {
|
|
log.Error("command %s has failed: %v code:%d",
|
|
cmd.Path, err, cmd.ProcessState.ExitCode())
|
|
return false
|
|
}
|
|
|
|
cmd = exec.Command("grep", "-E", "#?DNSStubListener=yes", "/etc/systemd/resolved.conf")
|
|
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
|
|
_, err = cmd.Output()
|
|
if err != nil || cmd.ProcessState.ExitCode() != 0 {
|
|
log.Error("command %s has failed: %v code:%d",
|
|
cmd.Path, err, cmd.ProcessState.ExitCode())
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// Deactivate DNSStubListener
|
|
func disableDNSStubListener() error {
|
|
cmd := exec.Command("sed", "-r", "-i.orig", "s/#?DNSStubListener=yes/DNSStubListener=no/g", "/etc/systemd/resolved.conf")
|
|
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
|
|
_, err := cmd.Output()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if cmd.ProcessState.ExitCode() != 0 {
|
|
return fmt.Errorf("process %s exited with an error: %d",
|
|
cmd.Path, cmd.ProcessState.ExitCode())
|
|
}
|
|
|
|
cmd = exec.Command("systemctl", "reload-or-restart", "systemd-resolved")
|
|
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
|
|
_, err = cmd.Output()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if cmd.ProcessState.ExitCode() != 0 {
|
|
return fmt.Errorf("process %s exited with an error: %d",
|
|
cmd.Path, cmd.ProcessState.ExitCode())
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
type applyConfigReqEnt struct {
|
|
IP string `json:"ip"`
|
|
Port int `json:"port"`
|
|
}
|
|
type applyConfigReq struct {
|
|
Web applyConfigReqEnt `json:"web"`
|
|
DNS applyConfigReqEnt `json:"dns"`
|
|
Username string `json:"username"`
|
|
Password string `json:"password"`
|
|
}
|
|
|
|
// Copy installation parameters between two configuration objects
|
|
func copyInstallSettings(dst *configuration, src *configuration) {
|
|
dst.BindHost = src.BindHost
|
|
dst.BindPort = src.BindPort
|
|
dst.DNS.BindHost = src.DNS.BindHost
|
|
dst.DNS.Port = src.DNS.Port
|
|
}
|
|
|
|
// Apply new configuration, start DNS server, restart Web server
|
|
func handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
|
|
newSettings := applyConfigReq{}
|
|
err := json.NewDecoder(r.Body).Decode(&newSettings)
|
|
if err != nil {
|
|
httpError(w, http.StatusBadRequest, "Failed to parse 'configure' JSON: %s", err)
|
|
return
|
|
}
|
|
|
|
if newSettings.Web.Port == 0 || newSettings.DNS.Port == 0 {
|
|
httpError(w, http.StatusBadRequest, "port value can't be 0")
|
|
return
|
|
}
|
|
|
|
restartHTTP := true
|
|
if config.BindHost == newSettings.Web.IP && config.BindPort == newSettings.Web.Port {
|
|
// no need to rebind
|
|
restartHTTP = false
|
|
}
|
|
|
|
// validate that hosts and ports are bindable
|
|
if restartHTTP {
|
|
err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
|
|
if err != nil {
|
|
httpError(w, http.StatusBadRequest, "Impossible to listen on IP:port %s due to %s",
|
|
net.JoinHostPort(newSettings.Web.IP, strconv.Itoa(newSettings.Web.Port)), err)
|
|
return
|
|
}
|
|
}
|
|
|
|
err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
|
|
if err != nil {
|
|
httpError(w, http.StatusBadRequest, "%s", err)
|
|
return
|
|
}
|
|
|
|
err = checkPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
|
|
if err != nil {
|
|
httpError(w, http.StatusBadRequest, "%s", err)
|
|
return
|
|
}
|
|
|
|
var curConfig configuration
|
|
copyInstallSettings(&curConfig, &config)
|
|
|
|
config.firstRun = false
|
|
config.BindHost = newSettings.Web.IP
|
|
config.BindPort = newSettings.Web.Port
|
|
config.DNS.BindHost = newSettings.DNS.IP
|
|
config.DNS.Port = newSettings.DNS.Port
|
|
|
|
err = initDNSServer()
|
|
var err2 error
|
|
if err == nil {
|
|
err2 = startDNSServer()
|
|
}
|
|
if err != nil || err2 != nil {
|
|
config.firstRun = true
|
|
copyInstallSettings(&config, &curConfig)
|
|
if err != nil {
|
|
httpError(w, http.StatusInternalServerError, "Couldn't initialize DNS server: %s", err)
|
|
} else {
|
|
httpError(w, http.StatusInternalServerError, "Couldn't start DNS server: %s", err2)
|
|
}
|
|
return
|
|
}
|
|
|
|
u := User{}
|
|
u.Name = newSettings.Username
|
|
config.auth.UserAdd(&u, newSettings.Password)
|
|
|
|
err = config.write()
|
|
if err != nil {
|
|
config.firstRun = true
|
|
copyInstallSettings(&config, &curConfig)
|
|
httpError(w, http.StatusInternalServerError, "Couldn't write config: %s", err)
|
|
return
|
|
}
|
|
|
|
// this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
|
|
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
|
|
if restartHTTP {
|
|
go func() {
|
|
_ = Context.httpServer.Shutdown(context.TODO())
|
|
}()
|
|
}
|
|
|
|
returnOK(w)
|
|
}
|
|
|
|
func registerInstallHandlers() {
|
|
http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(handleInstallGetAddresses)))
|
|
http.HandleFunc("/control/install/check_config", preInstall(ensurePOST(handleInstallCheckConfig)))
|
|
http.HandleFunc("/control/install/configure", preInstall(ensurePOST(handleInstallConfigure)))
|
|
}
|