mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-26 06:55:48 +03:00
2796e65468
Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master
Updates #2499.
Squashed commit of the following:
commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3
Merge: f49e9186 2b635bf6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 19:23:07 2021 +0300
Merge branch 'master' into 2499-merge-rewrites-vol.1
commit f49e9186ffc8b7074d03c6721ee56cdb09243684
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 18:50:49 2021 +0300
aghos: fix fs events filtering
commit 567dd646556606212af5dab60e3ecbb8fff22c25
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 16:50:37 2021 +0300
all: imp code, docs, fix windows
commit 140c8bf519345eb54d0e7500a996fcf465353d71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:41:53 2021 +0300
aghnet: use const
commit bebf3f76bd394a498ccad812c57d4507c69529ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:32:37 2021 +0300
all: imp tests, docs
commit 9bfdbb6eb454833135d616e208e82699f98e2562
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 18:42:20 2021 +0300
all: imp path more, imp docs
commit ee9ea4c132a6b17787d150bf2bee703abaa57be3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 16:09:46 2021 +0300
all: fix windows, imp paths
commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 19:53:35 2021 +0300
all: imp code, docs
commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 18:22:50 2021 +0300
aghnet: fix windows tests
commit d29de359ed68118d71efb226a8433fac15ff5c66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 21:02:14 2021 +0300
all: repl & imp
commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 01:41:19 2021 +0300
all: add tests, mv logic, added tmpfs
commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 7 14:26:30 2021 +0300
all: imp filewalker, refactor hosts container
178 lines
4.6 KiB
Go
178 lines
4.6 KiB
Go
//go:build linux
|
|
// +build linux
|
|
|
|
package aghnet
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghos"
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/google/renameio/maybe"
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
// dhcpcdStaticConfig checks if interface is configured by /etc/dhcpcd.conf to
|
|
// have a static IP.
|
|
func (n interfaceName) dhcpcdStaticConfig(r io.Reader) (subsources []string, cont bool, err error) {
|
|
s := bufio.NewScanner(r)
|
|
ifaceFound := findIfaceLine(s, string(n))
|
|
if !ifaceFound {
|
|
return nil, true, s.Err()
|
|
}
|
|
|
|
for s.Scan() {
|
|
line := strings.TrimSpace(s.Text())
|
|
fields := strings.Fields(line)
|
|
if len(fields) >= 2 &&
|
|
fields[0] == "static" &&
|
|
strings.HasPrefix(fields[1], "ip_address=") {
|
|
return nil, false, s.Err()
|
|
}
|
|
|
|
if len(fields) > 0 && fields[0] == "interface" {
|
|
// Another interface found.
|
|
break
|
|
}
|
|
}
|
|
|
|
return nil, true, s.Err()
|
|
}
|
|
|
|
// ifacesStaticConfig checks if the interface is configured by any file of
|
|
// /etc/network/interfaces format to have a static IP.
|
|
func (n interfaceName) ifacesStaticConfig(r io.Reader) (sub []string, cont bool, err error) {
|
|
s := bufio.NewScanner(r)
|
|
for s.Scan() {
|
|
line := strings.TrimSpace(s.Text())
|
|
if len(line) == 0 || line[0] == '#' {
|
|
continue
|
|
}
|
|
|
|
// TODO(e.burkov): As man page interfaces(5) says, a line may be
|
|
// extended across multiple lines by making the last character a
|
|
// backslash. Provide extended lines support.
|
|
|
|
fields := strings.Fields(line)
|
|
fieldsNum := len(fields)
|
|
|
|
// Man page interfaces(5) declares that interface definition
|
|
// should consist of the key word "iface" followed by interface
|
|
// name, and method at fourth field.
|
|
if fieldsNum >= 4 &&
|
|
fields[0] == "iface" && fields[1] == string(n) && fields[3] == "static" {
|
|
return nil, false, nil
|
|
}
|
|
|
|
if fieldsNum >= 2 && fields[0] == "source" {
|
|
sub = append(sub, fields[1])
|
|
}
|
|
}
|
|
|
|
return sub, true, s.Err()
|
|
}
|
|
|
|
func ifaceHasStaticIP(ifaceName string) (has bool, err error) {
|
|
// TODO(a.garipov): Currently, this function returns the first
|
|
// definitive result. So if /etc/dhcpcd.conf has a static IP while
|
|
// /etc/network/interfaces doesn't, it will return true. Perhaps this
|
|
// is not the most desirable behavior.
|
|
|
|
iface := interfaceName(ifaceName)
|
|
|
|
for _, pair := range [...]struct {
|
|
aghos.FileWalker
|
|
filename string
|
|
}{{
|
|
FileWalker: iface.dhcpcdStaticConfig,
|
|
filename: "etc/dhcpcd.conf",
|
|
}, {
|
|
FileWalker: iface.ifacesStaticConfig,
|
|
filename: "etc/network/interfaces",
|
|
}} {
|
|
has, err = pair.Walk(aghos.RootDirFS(), pair.filename)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
|
|
if has {
|
|
return true, nil
|
|
}
|
|
}
|
|
|
|
return false, ErrNoStaticIPInfo
|
|
}
|
|
|
|
func canBindPrivilegedPorts() (can bool, err error) {
|
|
cnbs, err := unix.PrctlRetInt(unix.PR_CAP_AMBIENT, unix.PR_CAP_AMBIENT_IS_SET, unix.CAP_NET_BIND_SERVICE, 0, 0)
|
|
// Don't check the error because it's always nil on Linux.
|
|
adm, _ := aghos.HaveAdminRights()
|
|
|
|
return cnbs == 1 || adm, err
|
|
}
|
|
|
|
// findIfaceLine scans s until it finds the line that declares an interface with
|
|
// the given name. If findIfaceLine can't find the line, it returns false.
|
|
func findIfaceLine(s *bufio.Scanner, name string) (ok bool) {
|
|
for s.Scan() {
|
|
line := strings.TrimSpace(s.Text())
|
|
fields := strings.Fields(line)
|
|
if len(fields) == 2 && fields[0] == "interface" && fields[1] == name {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// ifaceSetStaticIP configures the system to retain its current IP on the
|
|
// interface through dhcpdc.conf.
|
|
func ifaceSetStaticIP(ifaceName string) (err error) {
|
|
ipNet := GetSubnet(ifaceName)
|
|
if ipNet.IP == nil {
|
|
return errors.Error("can't get IP address")
|
|
}
|
|
|
|
gatewayIP := GatewayIP(ifaceName)
|
|
add := dhcpcdConfIface(ifaceName, ipNet, gatewayIP, ipNet.IP)
|
|
|
|
body, err := os.ReadFile("/etc/dhcpcd.conf")
|
|
if err != nil && !errors.Is(err, os.ErrNotExist) {
|
|
return err
|
|
}
|
|
|
|
body = append(body, []byte(add)...)
|
|
err = maybe.WriteFile("/etc/dhcpcd.conf", body, 0o644)
|
|
if err != nil {
|
|
return fmt.Errorf("writing conf: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// dhcpcdConfIface returns configuration lines for the dhcpdc.conf files that
|
|
// configure the interface to have a static IP.
|
|
func dhcpcdConfIface(ifaceName string, ipNet *net.IPNet, gatewayIP, dnsIP net.IP) (conf string) {
|
|
var body []byte
|
|
|
|
add := fmt.Sprintf(
|
|
"\n# %[1]s added by AdGuard Home.\ninterface %[1]s\nstatic ip_address=%s\n",
|
|
ifaceName,
|
|
ipNet)
|
|
body = append(body, []byte(add)...)
|
|
|
|
if gatewayIP != nil {
|
|
add = fmt.Sprintf("static routers=%s\n", gatewayIP)
|
|
body = append(body, []byte(add)...)
|
|
}
|
|
|
|
add = fmt.Sprintf("static domain_name_servers=%s\n\n", dnsIP)
|
|
body = append(body, []byte(add)...)
|
|
|
|
return string(body)
|
|
}
|