2019-06-10 11:33:19 +03:00
|
|
|
package home
|
2018-11-27 20:39:59 +03:00
|
|
|
|
|
|
|
import (
|
2022-08-08 15:50:54 +03:00
|
|
|
"bytes"
|
2018-11-27 20:39:59 +03:00
|
|
|
"fmt"
|
2021-04-21 12:49:41 +03:00
|
|
|
"net/url"
|
2018-11-27 20:39:59 +03:00
|
|
|
"os"
|
2020-12-07 16:04:53 +03:00
|
|
|
"path"
|
2018-11-27 20:39:59 +03:00
|
|
|
"path/filepath"
|
2020-12-07 16:04:53 +03:00
|
|
|
"runtime"
|
2021-04-21 12:49:41 +03:00
|
|
|
"strconv"
|
|
|
|
"strings"
|
2021-07-01 18:50:28 +03:00
|
|
|
"time"
|
2020-02-13 18:42:07 +03:00
|
|
|
|
2021-05-24 17:28:11 +03:00
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
2019-02-25 16:44:22 +03:00
|
|
|
"github.com/AdguardTeam/golibs/log"
|
2021-08-09 16:03:37 +03:00
|
|
|
"github.com/AdguardTeam/golibs/netutil"
|
2021-09-30 21:17:54 +03:00
|
|
|
"github.com/AdguardTeam/golibs/timeutil"
|
2021-04-06 20:48:36 +03:00
|
|
|
"github.com/google/renameio/maybe"
|
2019-09-13 14:19:10 +03:00
|
|
|
"golang.org/x/crypto/bcrypt"
|
2022-08-08 15:50:54 +03:00
|
|
|
yaml "gopkg.in/yaml.v3"
|
2018-11-27 20:39:59 +03:00
|
|
|
)
|
|
|
|
|
2021-03-23 12:32:07 +03:00
|
|
|
// currentSchemaVersion is the current schema version.
|
2023-04-12 14:48:42 +03:00
|
|
|
const currentSchemaVersion = 20
|
2021-03-23 12:32:07 +03:00
|
|
|
|
|
|
|
// These aliases are provided for convenience.
|
|
|
|
type (
|
|
|
|
yarr = []any
|
2022-08-19 15:19:11 +03:00
|
|
|
yobj = map[string]any
|
2021-03-23 12:32:07 +03:00
|
|
|
)
|
2018-12-05 20:29:00 +03:00
|
|
|
|
2018-11-27 20:39:59 +03:00
|
|
|
// Performs necessary upgrade operations if needed
|
|
|
|
func upgradeConfig() error {
|
|
|
|
// read a config file into an interface map, so we can manipulate values without losing any
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf := yobj{}
|
2019-04-30 14:38:24 +03:00
|
|
|
body, err := readConfigFile()
|
2018-11-27 20:39:59 +03:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
err = yaml.Unmarshal(body, &diskConf)
|
2018-11-27 20:39:59 +03:00
|
|
|
if err != nil {
|
2019-04-30 14:38:24 +03:00
|
|
|
log.Printf("Couldn't parse config file: %s", err)
|
2018-11-27 20:39:59 +03:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
schemaVersionInterface, ok := diskConf["schema_version"]
|
2019-02-07 18:24:12 +03:00
|
|
|
log.Tracef("got schema version %v", schemaVersionInterface)
|
2018-11-27 20:39:59 +03:00
|
|
|
if !ok {
|
|
|
|
// no schema version, set it to 0
|
|
|
|
schemaVersionInterface = 0
|
|
|
|
}
|
|
|
|
|
|
|
|
schemaVersion, ok := schemaVersionInterface.(int)
|
|
|
|
if !ok {
|
|
|
|
err = fmt.Errorf("configuration file contains non-integer schema_version, abort")
|
|
|
|
log.Println(err)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2018-11-27 20:51:12 +03:00
|
|
|
if schemaVersion == currentSchemaVersion {
|
2018-11-27 20:39:59 +03:00
|
|
|
// do nothing
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
return upgradeConfigSchema(schemaVersion, diskConf)
|
2018-11-27 20:39:59 +03:00
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
// upgradeFunc is a function that upgrades a config and returns an error.
|
|
|
|
type upgradeFunc = func(diskConf yobj) (err error)
|
|
|
|
|
2018-11-27 20:39:59 +03:00
|
|
|
// Upgrade from oldVersion to newVersion
|
2021-03-24 17:17:44 +03:00
|
|
|
func upgradeConfigSchema(oldVersion int, diskConf yobj) (err error) {
|
|
|
|
upgrades := []upgradeFunc{
|
|
|
|
upgradeSchema0to1,
|
|
|
|
upgradeSchema1to2,
|
|
|
|
upgradeSchema2to3,
|
|
|
|
upgradeSchema3to4,
|
|
|
|
upgradeSchema4to5,
|
|
|
|
upgradeSchema5to6,
|
|
|
|
upgradeSchema6to7,
|
|
|
|
upgradeSchema7to8,
|
2021-04-15 19:00:31 +03:00
|
|
|
upgradeSchema8to9,
|
2021-04-21 12:49:41 +03:00
|
|
|
upgradeSchema9to10,
|
2021-06-04 16:35:34 +03:00
|
|
|
upgradeSchema10to11,
|
2021-07-01 18:50:28 +03:00
|
|
|
upgradeSchema11to12,
|
2022-06-02 17:55:48 +03:00
|
|
|
upgradeSchema12to13,
|
|
|
|
upgradeSchema13to14,
|
2023-02-15 16:53:29 +03:00
|
|
|
upgradeSchema14to15,
|
|
|
|
upgradeSchema15to16,
|
2023-03-09 15:39:35 +03:00
|
|
|
upgradeSchema16to17,
|
2023-04-12 14:48:42 +03:00
|
|
|
upgradeSchema17to18,
|
|
|
|
upgradeSchema18to19,
|
|
|
|
upgradeSchema19to20,
|
2021-03-24 17:17:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
n := 0
|
|
|
|
for i, u := range upgrades {
|
|
|
|
if i >= oldVersion {
|
|
|
|
err = u(diskConf)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
n++
|
2021-03-23 12:32:07 +03:00
|
|
|
}
|
2018-11-27 20:39:59 +03:00
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
if n == 0 {
|
|
|
|
return fmt.Errorf("unknown configuration schema version %d", oldVersion)
|
|
|
|
}
|
|
|
|
|
2022-08-08 15:50:54 +03:00
|
|
|
buf := &bytes.Buffer{}
|
|
|
|
enc := yaml.NewEncoder(buf)
|
|
|
|
enc.SetIndent(2)
|
|
|
|
|
|
|
|
err = enc.Encode(diskConf)
|
2018-11-27 20:39:59 +03:00
|
|
|
if err != nil {
|
2021-03-24 17:17:44 +03:00
|
|
|
return fmt.Errorf("generating new config: %w", err)
|
2018-11-27 20:39:59 +03:00
|
|
|
}
|
|
|
|
|
2022-08-08 15:50:54 +03:00
|
|
|
config.fileData = buf.Bytes()
|
2021-03-24 17:17:44 +03:00
|
|
|
confFile := config.getConfigFilename()
|
2022-08-08 15:50:54 +03:00
|
|
|
err = maybe.WriteFile(confFile, config.fileData, 0o644)
|
2018-11-27 20:39:59 +03:00
|
|
|
if err != nil {
|
2022-08-08 15:50:54 +03:00
|
|
|
return fmt.Errorf("writing new config: %w", err)
|
2018-11-27 20:39:59 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-12-05 20:29:00 +03:00
|
|
|
// The first schema upgrade:
|
|
|
|
// No more "dnsfilter.txt", filters are now kept in data/filters/
|
2021-05-14 19:41:45 +03:00
|
|
|
func upgradeSchema0to1(diskConf yobj) (err error) {
|
2020-12-07 16:04:53 +03:00
|
|
|
log.Printf("%s(): called", funcName())
|
2018-11-27 20:39:59 +03:00
|
|
|
|
2020-02-13 18:42:07 +03:00
|
|
|
dnsFilterPath := filepath.Join(Context.workDir, "dnsfilter.txt")
|
2021-05-14 19:41:45 +03:00
|
|
|
log.Printf("deleting %s as we don't need it anymore", dnsFilterPath)
|
|
|
|
err = os.Remove(dnsFilterPath)
|
|
|
|
if err != nil && !errors.Is(err, os.ErrNotExist) {
|
|
|
|
log.Info("warning: %s", err)
|
|
|
|
|
|
|
|
// Go on.
|
2018-11-27 20:39:59 +03:00
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 1
|
2018-11-27 20:39:59 +03:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2018-12-05 20:29:00 +03:00
|
|
|
|
|
|
|
// Second schema upgrade:
|
|
|
|
// coredns is now dns in config
|
|
|
|
// delete 'Corefile', since we don't use that anymore
|
2021-05-14 19:41:45 +03:00
|
|
|
func upgradeSchema1to2(diskConf yobj) (err error) {
|
2020-12-07 16:04:53 +03:00
|
|
|
log.Printf("%s(): called", funcName())
|
2018-12-05 20:29:00 +03:00
|
|
|
|
2020-02-13 18:42:07 +03:00
|
|
|
coreFilePath := filepath.Join(Context.workDir, "Corefile")
|
2021-05-14 19:41:45 +03:00
|
|
|
log.Printf("deleting %s as we don't need it anymore", coreFilePath)
|
|
|
|
err = os.Remove(coreFilePath)
|
|
|
|
if err != nil && !errors.Is(err, os.ErrNotExist) {
|
|
|
|
log.Info("warning: %s", err)
|
|
|
|
|
|
|
|
// Go on.
|
2018-12-05 20:29:00 +03:00
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
if _, ok := diskConf["dns"]; !ok {
|
|
|
|
diskConf["dns"] = diskConf["coredns"]
|
|
|
|
delete(diskConf, "coredns")
|
2018-12-06 00:29:38 +03:00
|
|
|
}
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 2
|
2018-12-05 20:29:00 +03:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-02-27 16:15:36 +03:00
|
|
|
// Third schema upgrade:
|
|
|
|
// Bootstrap DNS becomes an array
|
2021-03-24 17:17:44 +03:00
|
|
|
func upgradeSchema2to3(diskConf yobj) error {
|
2020-12-07 16:04:53 +03:00
|
|
|
log.Printf("%s(): called", funcName())
|
2019-02-27 16:15:36 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
// Let's read dns configuration from diskConf
|
|
|
|
dnsConfig, ok := diskConf["dns"]
|
2019-02-27 16:15:36 +03:00
|
|
|
if !ok {
|
2019-02-27 16:19:45 +03:00
|
|
|
return fmt.Errorf("no DNS configuration in config file")
|
2019-02-27 16:15:36 +03:00
|
|
|
}
|
|
|
|
|
2022-08-03 14:36:18 +03:00
|
|
|
// Convert any to yobj
|
2021-03-23 12:32:07 +03:00
|
|
|
newDNSConfig := make(yobj)
|
2019-02-27 16:15:36 +03:00
|
|
|
|
|
|
|
switch v := dnsConfig.(type) {
|
2022-08-19 15:19:11 +03:00
|
|
|
case yobj:
|
2019-02-27 16:15:36 +03:00
|
|
|
for k, v := range v {
|
|
|
|
newDNSConfig[fmt.Sprint(k)] = v
|
|
|
|
}
|
|
|
|
default:
|
2022-08-19 15:19:11 +03:00
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsConfig)
|
2019-02-27 16:15:36 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside
|
2021-03-12 14:32:08 +03:00
|
|
|
bootstrapDNS, ok := newDNSConfig["bootstrap_dns"]
|
|
|
|
if !ok {
|
2019-02-27 16:19:45 +03:00
|
|
|
return fmt.Errorf("no bootstrap DNS in DNS config")
|
2019-02-27 16:15:36 +03:00
|
|
|
}
|
|
|
|
|
2021-03-12 14:32:08 +03:00
|
|
|
newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)}
|
|
|
|
newDNSConfig["bootstrap_dns"] = newBootstrapConfig
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["dns"] = newDNSConfig
|
2021-03-12 14:32:08 +03:00
|
|
|
|
2019-02-27 16:15:36 +03:00
|
|
|
// Bump schema version
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 3
|
2019-02-27 16:15:36 +03:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-08-05 12:54:17 +03:00
|
|
|
// Add use_global_blocked_services=true setting for existing "clients" array
|
2021-03-24 17:17:44 +03:00
|
|
|
func upgradeSchema3to4(diskConf yobj) error {
|
2020-12-07 16:04:53 +03:00
|
|
|
log.Printf("%s(): called", funcName())
|
2019-08-05 12:54:17 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 4
|
2019-08-05 12:54:17 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
clients, ok := diskConf["clients"]
|
2019-08-05 12:54:17 +03:00
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
switch arr := clients.(type) {
|
2022-08-03 14:36:18 +03:00
|
|
|
case []any:
|
2019-08-05 12:54:17 +03:00
|
|
|
|
|
|
|
for i := range arr {
|
|
|
|
switch c := arr[i].(type) {
|
|
|
|
|
2022-08-03 14:36:18 +03:00
|
|
|
case map[any]any:
|
2019-08-05 12:54:17 +03:00
|
|
|
c["use_global_blocked_services"] = true
|
|
|
|
|
|
|
|
default:
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2019-09-13 14:19:10 +03:00
|
|
|
|
|
|
|
// Replace "auth_name", "auth_pass" string settings with an array:
|
|
|
|
// users:
|
2022-09-07 18:03:18 +03:00
|
|
|
// - name: "..."
|
|
|
|
// password: "..."
|
|
|
|
//
|
2019-09-13 14:19:10 +03:00
|
|
|
// ...
|
2021-03-24 17:17:44 +03:00
|
|
|
func upgradeSchema4to5(diskConf yobj) error {
|
2020-12-07 16:04:53 +03:00
|
|
|
log.Printf("%s(): called", funcName())
|
2019-09-13 14:19:10 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 5
|
2019-09-13 14:19:10 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
name, ok := diskConf["auth_name"]
|
2019-09-13 14:19:10 +03:00
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
nameStr, ok := name.(string)
|
|
|
|
if !ok {
|
|
|
|
log.Fatal("Please use double quotes in your user name in \"auth_name\" and restart AdGuardHome")
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
pass, ok := diskConf["auth_pass"]
|
2019-09-13 14:19:10 +03:00
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
passStr, ok := pass.(string)
|
|
|
|
if !ok {
|
|
|
|
log.Fatal("Please use double quotes in your password in \"auth_pass\" and restart AdGuardHome")
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(nameStr) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
hash, err := bcrypt.GenerateFromPassword([]byte(passStr), bcrypt.DefaultCost)
|
|
|
|
if err != nil {
|
|
|
|
log.Fatalf("Can't use password \"%s\": bcrypt.GenerateFromPassword: %s", passStr, err)
|
|
|
|
return nil
|
|
|
|
}
|
2022-09-29 19:10:03 +03:00
|
|
|
u := webUser{
|
2019-09-13 14:19:10 +03:00
|
|
|
Name: nameStr,
|
|
|
|
PasswordHash: string(hash),
|
|
|
|
}
|
2022-09-29 19:10:03 +03:00
|
|
|
users := []webUser{u}
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["users"] = users
|
2019-09-13 14:19:10 +03:00
|
|
|
return nil
|
|
|
|
}
|
2019-11-19 19:23:37 +03:00
|
|
|
|
|
|
|
// clients:
|
|
|
|
// ...
|
2022-09-07 18:03:18 +03:00
|
|
|
//
|
|
|
|
// ip: 127.0.0.1
|
|
|
|
// mac: ...
|
2019-11-19 19:23:37 +03:00
|
|
|
//
|
|
|
|
// ->
|
|
|
|
//
|
|
|
|
// clients:
|
|
|
|
// ...
|
2022-09-07 18:03:18 +03:00
|
|
|
//
|
|
|
|
// ids:
|
|
|
|
// - 127.0.0.1
|
|
|
|
// - ...
|
2021-03-24 17:17:44 +03:00
|
|
|
func upgradeSchema5to6(diskConf yobj) error {
|
2020-12-07 16:04:53 +03:00
|
|
|
log.Printf("%s(): called", funcName())
|
2019-11-19 19:23:37 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 6
|
2019-11-19 19:23:37 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
clients, ok := diskConf["clients"]
|
2019-11-19 19:23:37 +03:00
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
switch arr := clients.(type) {
|
2022-08-03 14:36:18 +03:00
|
|
|
case []any:
|
2019-11-19 19:23:37 +03:00
|
|
|
for i := range arr {
|
|
|
|
switch c := arr[i].(type) {
|
2022-08-03 14:36:18 +03:00
|
|
|
case map[any]any:
|
|
|
|
var ipVal any
|
2021-03-12 14:32:08 +03:00
|
|
|
ipVal, ok = c["ip"]
|
2019-11-19 19:23:37 +03:00
|
|
|
ids := []string{}
|
|
|
|
if ok {
|
2021-03-12 14:32:08 +03:00
|
|
|
var ip string
|
|
|
|
ip, ok = ipVal.(string)
|
2019-11-19 19:23:37 +03:00
|
|
|
if !ok {
|
2021-03-12 14:32:08 +03:00
|
|
|
log.Fatalf("client.ip is not a string: %v", ipVal)
|
2019-11-19 19:23:37 +03:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if len(ip) != 0 {
|
|
|
|
ids = append(ids, ip)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-03 14:36:18 +03:00
|
|
|
var macVal any
|
2021-03-12 14:32:08 +03:00
|
|
|
macVal, ok = c["mac"]
|
2019-11-19 19:23:37 +03:00
|
|
|
if ok {
|
2021-03-12 14:32:08 +03:00
|
|
|
var mac string
|
|
|
|
mac, ok = macVal.(string)
|
2019-11-19 19:23:37 +03:00
|
|
|
if !ok {
|
2021-03-12 14:32:08 +03:00
|
|
|
log.Fatalf("client.mac is not a string: %v", macVal)
|
2019-11-19 19:23:37 +03:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if len(mac) != 0 {
|
|
|
|
ids = append(ids, mac)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
c["ids"] = ids
|
|
|
|
default:
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2020-08-18 17:34:02 +03:00
|
|
|
|
|
|
|
// dhcp:
|
2022-09-07 18:03:18 +03:00
|
|
|
//
|
|
|
|
// enabled: false
|
|
|
|
// interface_name: vboxnet0
|
|
|
|
// gateway_ip: 192.168.56.1
|
|
|
|
// ...
|
2020-08-18 17:34:02 +03:00
|
|
|
//
|
|
|
|
// ->
|
|
|
|
//
|
|
|
|
// dhcp:
|
2022-09-07 18:03:18 +03:00
|
|
|
//
|
|
|
|
// enabled: false
|
|
|
|
// interface_name: vboxnet0
|
|
|
|
// dhcpv4:
|
|
|
|
// gateway_ip: 192.168.56.1
|
|
|
|
// ...
|
2021-03-24 17:17:44 +03:00
|
|
|
func upgradeSchema6to7(diskConf yobj) error {
|
2020-08-18 17:34:02 +03:00
|
|
|
log.Printf("Upgrade yaml: 6 to 7")
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 7
|
2020-08-18 17:34:02 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
dhcpVal, ok := diskConf["dhcp"]
|
2020-08-18 17:34:02 +03:00
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-03-12 14:32:08 +03:00
|
|
|
switch dhcp := dhcpVal.(type) {
|
2022-08-03 14:36:18 +03:00
|
|
|
case map[any]any:
|
2021-03-12 14:32:08 +03:00
|
|
|
var str string
|
|
|
|
str, ok = dhcp["gateway_ip"].(string)
|
2020-08-18 17:34:02 +03:00
|
|
|
if !ok {
|
|
|
|
log.Fatalf("expecting dhcp.%s to be a string", "gateway_ip")
|
|
|
|
return nil
|
|
|
|
}
|
2021-03-12 14:32:08 +03:00
|
|
|
|
2021-03-23 12:32:07 +03:00
|
|
|
dhcpv4 := yobj{
|
2021-03-12 14:32:08 +03:00
|
|
|
"gateway_ip": str,
|
|
|
|
}
|
2020-08-18 17:34:02 +03:00
|
|
|
delete(dhcp, "gateway_ip")
|
|
|
|
|
2021-03-12 14:32:08 +03:00
|
|
|
str, ok = dhcp["subnet_mask"].(string)
|
2020-08-18 17:34:02 +03:00
|
|
|
if !ok {
|
|
|
|
log.Fatalf("expecting dhcp.%s to be a string", "subnet_mask")
|
|
|
|
return nil
|
|
|
|
}
|
2021-03-12 14:32:08 +03:00
|
|
|
dhcpv4["subnet_mask"] = str
|
2020-08-18 17:34:02 +03:00
|
|
|
delete(dhcp, "subnet_mask")
|
|
|
|
|
2021-03-12 14:32:08 +03:00
|
|
|
str, ok = dhcp["range_start"].(string)
|
2020-08-18 17:34:02 +03:00
|
|
|
if !ok {
|
|
|
|
log.Fatalf("expecting dhcp.%s to be a string", "range_start")
|
|
|
|
return nil
|
|
|
|
}
|
2021-03-12 14:32:08 +03:00
|
|
|
dhcpv4["range_start"] = str
|
2020-08-18 17:34:02 +03:00
|
|
|
delete(dhcp, "range_start")
|
|
|
|
|
2021-03-12 14:32:08 +03:00
|
|
|
str, ok = dhcp["range_end"].(string)
|
2020-08-18 17:34:02 +03:00
|
|
|
if !ok {
|
|
|
|
log.Fatalf("expecting dhcp.%s to be a string", "range_end")
|
|
|
|
return nil
|
|
|
|
}
|
2021-03-12 14:32:08 +03:00
|
|
|
dhcpv4["range_end"] = str
|
2020-08-18 17:34:02 +03:00
|
|
|
delete(dhcp, "range_end")
|
|
|
|
|
2021-03-12 14:32:08 +03:00
|
|
|
var n int
|
|
|
|
n, ok = dhcp["lease_duration"].(int)
|
2020-08-18 17:34:02 +03:00
|
|
|
if !ok {
|
|
|
|
log.Fatalf("expecting dhcp.%s to be an integer", "lease_duration")
|
|
|
|
return nil
|
|
|
|
}
|
2021-03-12 14:32:08 +03:00
|
|
|
dhcpv4["lease_duration"] = n
|
2020-08-18 17:34:02 +03:00
|
|
|
delete(dhcp, "lease_duration")
|
|
|
|
|
2021-03-12 14:32:08 +03:00
|
|
|
n, ok = dhcp["icmp_timeout_msec"].(int)
|
2020-08-18 17:34:02 +03:00
|
|
|
if !ok {
|
|
|
|
log.Fatalf("expecting dhcp.%s to be an integer", "icmp_timeout_msec")
|
|
|
|
return nil
|
|
|
|
}
|
2021-03-12 14:32:08 +03:00
|
|
|
dhcpv4["icmp_timeout_msec"] = n
|
2020-08-18 17:34:02 +03:00
|
|
|
delete(dhcp, "icmp_timeout_msec")
|
|
|
|
|
|
|
|
dhcp["dhcpv4"] = dhcpv4
|
|
|
|
default:
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2020-12-07 16:04:53 +03:00
|
|
|
|
2021-03-23 12:32:07 +03:00
|
|
|
// upgradeSchema7to8 performs the following changes:
|
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'bind_host': '127.0.0.1'
|
2021-03-23 12:32:07 +03:00
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # AFTER:
|
|
|
|
// 'dns':
|
|
|
|
// 'bind_hosts':
|
|
|
|
// - '127.0.0.1'
|
2021-03-24 17:17:44 +03:00
|
|
|
func upgradeSchema7to8(diskConf yobj) (err error) {
|
2021-03-23 12:32:07 +03:00
|
|
|
log.Printf("Upgrade yaml: 7 to 8")
|
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
diskConf["schema_version"] = 8
|
2021-03-23 12:32:07 +03:00
|
|
|
|
2021-03-24 17:17:44 +03:00
|
|
|
dnsVal, ok := diskConf["dns"]
|
2021-03-23 12:32:07 +03:00
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
dns, ok := dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
bindHostVal := dns["bind_host"]
|
|
|
|
bindHost, ok := bindHostVal.(string)
|
|
|
|
if !ok {
|
2021-04-21 12:49:41 +03:00
|
|
|
return fmt.Errorf("unexpected type of dns.bind_host: %T", bindHostVal)
|
2021-03-23 12:32:07 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
delete(dns, "bind_host")
|
|
|
|
dns["bind_hosts"] = yarr{bindHost}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-04-15 19:00:31 +03:00
|
|
|
// upgradeSchema8to9 performs the following changes:
|
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'autohost_tld': 'lan'
|
2021-04-15 19:00:31 +03:00
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # AFTER:
|
|
|
|
// 'dns':
|
|
|
|
// 'local_domain_name': 'lan'
|
2021-04-15 19:00:31 +03:00
|
|
|
func upgradeSchema8to9(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 8 to 9")
|
|
|
|
|
|
|
|
diskConf["schema_version"] = 9
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
dns, ok := dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
2021-04-20 18:56:15 +03:00
|
|
|
autohostTLDVal, ok := dns["autohost_tld"]
|
|
|
|
if !ok {
|
|
|
|
// This happens when upgrading directly from v0.105.2, because
|
|
|
|
// dns.autohost_tld was never set to any value. Go on and leave
|
|
|
|
// it that way.
|
|
|
|
//
|
|
|
|
// See https://github.com/AdguardTeam/AdGuardHome/issues/2988.
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-04-15 19:00:31 +03:00
|
|
|
autohostTLD, ok := autohostTLDVal.(string)
|
|
|
|
if !ok {
|
2021-04-21 12:49:41 +03:00
|
|
|
return fmt.Errorf("unexpected type of dns.autohost_tld: %T", autohostTLDVal)
|
2021-04-15 19:00:31 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
delete(dns, "autohost_tld")
|
|
|
|
dns["local_domain_name"] = autohostTLD
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-04-21 12:49:41 +03:00
|
|
|
// addQUICPort inserts a port into QUIC upstream's hostname if it is missing.
|
|
|
|
func addQUICPort(ups string, port int) (withPort string) {
|
|
|
|
if ups == "" || ups[0] == '#' {
|
|
|
|
return ups
|
|
|
|
}
|
|
|
|
|
|
|
|
var doms string
|
|
|
|
withPort = ups
|
|
|
|
if strings.HasPrefix(ups, "[/") {
|
|
|
|
domsAndUps := strings.Split(strings.TrimPrefix(ups, "[/"), "/]")
|
|
|
|
if len(domsAndUps) != 2 {
|
|
|
|
return ups
|
|
|
|
}
|
|
|
|
|
|
|
|
doms, withPort = "[/"+domsAndUps[0]+"/]", domsAndUps[1]
|
|
|
|
}
|
|
|
|
|
|
|
|
if !strings.Contains(withPort, "://") {
|
|
|
|
return ups
|
|
|
|
}
|
|
|
|
|
|
|
|
upsURL, err := url.Parse(withPort)
|
|
|
|
if err != nil || upsURL.Scheme != "quic" {
|
|
|
|
return ups
|
|
|
|
}
|
|
|
|
|
|
|
|
var host string
|
2021-08-09 16:03:37 +03:00
|
|
|
host, err = netutil.SplitHost(upsURL.Host)
|
2021-04-21 12:49:41 +03:00
|
|
|
if err != nil || host != upsURL.Host {
|
|
|
|
return ups
|
|
|
|
}
|
|
|
|
|
|
|
|
upsURL.Host = strings.Join([]string{host, strconv.Itoa(port)}, ":")
|
|
|
|
|
|
|
|
return doms + upsURL.String()
|
|
|
|
}
|
|
|
|
|
|
|
|
// upgradeSchema9to10 performs the following changes:
|
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'upstream_dns':
|
|
|
|
// - 'quic://some-upstream.com'
|
2021-04-21 12:49:41 +03:00
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # AFTER:
|
|
|
|
// 'dns':
|
|
|
|
// 'upstream_dns':
|
|
|
|
// - 'quic://some-upstream.com:784'
|
2021-04-21 12:49:41 +03:00
|
|
|
func upgradeSchema9to10(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 9 to 10")
|
|
|
|
|
|
|
|
diskConf["schema_version"] = 10
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var dns yobj
|
|
|
|
dns, ok = dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
const quicPort = 784
|
|
|
|
for _, upsField := range []string{
|
|
|
|
"upstream_dns",
|
|
|
|
"local_ptr_upstreams",
|
|
|
|
} {
|
|
|
|
var upsVal any
|
|
|
|
upsVal, ok = dns[upsField]
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
var ups yarr
|
|
|
|
ups, ok = upsVal.(yarr)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns.%s: %T", upsField, upsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
var u string
|
|
|
|
for i, uVal := range ups {
|
|
|
|
u, ok = uVal.(string)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of upstream field: %T", uVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
ups[i] = addQUICPort(u, quicPort)
|
|
|
|
}
|
|
|
|
dns[upsField] = ups
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-06-04 16:35:34 +03:00
|
|
|
// upgradeSchema10to11 performs the following changes:
|
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # BEFORE:
|
|
|
|
// 'rlimit_nofile': 42
|
2021-06-04 16:35:34 +03:00
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # AFTER:
|
|
|
|
// 'os':
|
|
|
|
// 'group': ''
|
|
|
|
// 'rlimit_nofile': 42
|
|
|
|
// 'user': ''
|
2021-06-04 16:35:34 +03:00
|
|
|
func upgradeSchema10to11(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 10 to 11")
|
|
|
|
|
|
|
|
diskConf["schema_version"] = 11
|
|
|
|
|
|
|
|
rlimit := 0
|
|
|
|
rlimitVal, ok := diskConf["rlimit_nofile"]
|
|
|
|
if ok {
|
|
|
|
rlimit, ok = rlimitVal.(int)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of rlimit_nofile: %T", rlimitVal)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete(diskConf, "rlimit_nofile")
|
|
|
|
diskConf["os"] = yobj{
|
|
|
|
"group": "",
|
|
|
|
"rlimit_nofile": rlimit,
|
|
|
|
"user": "",
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-07-01 18:50:28 +03:00
|
|
|
// upgradeSchema11to12 performs the following changes:
|
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # BEFORE:
|
|
|
|
// 'querylog_interval': 90
|
2021-07-01 18:50:28 +03:00
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # AFTER:
|
|
|
|
// 'querylog_interval': '2160h'
|
2021-07-01 18:50:28 +03:00
|
|
|
func upgradeSchema11to12(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 11 to 12")
|
|
|
|
diskConf["schema_version"] = 12
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var dns yobj
|
|
|
|
dns, ok = dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
const field = "querylog_interval"
|
|
|
|
|
|
|
|
// Set the initial value from home.initConfig function.
|
|
|
|
qlogIvl := 90
|
|
|
|
qlogIvlVal, ok := dns[field]
|
|
|
|
if ok {
|
|
|
|
qlogIvl, ok = qlogIvlVal.(int)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of %s: %T", field, qlogIvlVal)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-30 21:17:54 +03:00
|
|
|
dns[field] = timeutil.Duration{Duration: time.Duration(qlogIvl) * timeutil.Day}
|
2021-07-01 18:50:28 +03:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-06-02 17:55:48 +03:00
|
|
|
// upgradeSchema12to13 performs the following changes:
|
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// # …
|
|
|
|
// 'local_domain_name': 'lan'
|
2022-06-02 17:55:48 +03:00
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # AFTER:
|
|
|
|
// 'dhcp':
|
|
|
|
// # …
|
|
|
|
// 'local_domain_name': 'lan'
|
2022-06-02 17:55:48 +03:00
|
|
|
func upgradeSchema12to13(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 12 to 13")
|
|
|
|
diskConf["schema_version"] = 13
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var dns yobj
|
|
|
|
dns, ok = dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
dhcpVal, ok := diskConf["dhcp"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var dhcp yobj
|
|
|
|
dhcp, ok = dhcpVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dhcp: %T", dhcpVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
const field = "local_domain_name"
|
|
|
|
|
|
|
|
dhcp[field] = dns[field]
|
|
|
|
delete(dns, field)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// upgradeSchema13to14 performs the following changes:
|
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # BEFORE:
|
|
|
|
// 'clients':
|
|
|
|
// - 'name': 'client-name'
|
|
|
|
// # …
|
2022-06-02 17:55:48 +03:00
|
|
|
//
|
2022-09-07 18:03:18 +03:00
|
|
|
// # AFTER:
|
|
|
|
// 'clients':
|
|
|
|
// 'persistent':
|
|
|
|
// - 'name': 'client-name'
|
|
|
|
// # …
|
|
|
|
// 'runtime_sources':
|
|
|
|
// 'whois': true
|
|
|
|
// 'arp': true
|
|
|
|
// 'rdns': true
|
|
|
|
// 'dhcp': true
|
|
|
|
// 'hosts': true
|
2022-06-02 17:55:48 +03:00
|
|
|
func upgradeSchema13to14(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 13 to 14")
|
|
|
|
diskConf["schema_version"] = 14
|
|
|
|
|
|
|
|
clientsVal, ok := diskConf["clients"]
|
|
|
|
if !ok {
|
|
|
|
clientsVal = yarr{}
|
|
|
|
}
|
|
|
|
|
|
|
|
var rdnsSrc bool
|
|
|
|
if dnsVal, dok := diskConf["dns"]; dok {
|
|
|
|
var dnsSettings yobj
|
|
|
|
dnsSettings, ok = dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
var rdnsSrcVal any
|
|
|
|
rdnsSrcVal, ok = dnsSettings["resolve_clients"]
|
|
|
|
if ok {
|
|
|
|
rdnsSrc, ok = rdnsSrcVal.(bool)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of resolve_clients: %T", rdnsSrcVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
delete(dnsSettings, "resolve_clients")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
diskConf["clients"] = yobj{
|
|
|
|
"persistent": clientsVal,
|
2023-03-09 15:39:35 +03:00
|
|
|
"runtime_sources": &clientSourcesConfig{
|
2022-06-02 17:55:48 +03:00
|
|
|
WHOIS: true,
|
|
|
|
ARP: true,
|
|
|
|
RDNS: rdnsSrc,
|
|
|
|
DHCP: true,
|
|
|
|
HostsFile: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2023-02-15 16:53:29 +03:00
|
|
|
// upgradeSchema14to15 performs the following changes:
|
|
|
|
//
|
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'querylog_enabled': true
|
|
|
|
// 'querylog_file_enabled': true
|
|
|
|
// 'querylog_interval': '2160h'
|
|
|
|
// 'querylog_size_memory': 1000
|
|
|
|
//
|
|
|
|
// # AFTER:
|
|
|
|
// 'querylog':
|
|
|
|
// 'enabled': true
|
|
|
|
// 'file_enabled': true
|
|
|
|
// 'interval': '2160h'
|
|
|
|
// 'size_memory': 1000
|
|
|
|
// 'ignored': []
|
|
|
|
func upgradeSchema14to15(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 14 to 15")
|
|
|
|
diskConf["schema_version"] = 15
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
dns, ok := dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
type temp struct {
|
2023-04-12 14:48:42 +03:00
|
|
|
val any
|
2023-02-15 16:53:29 +03:00
|
|
|
from string
|
|
|
|
to string
|
|
|
|
}
|
|
|
|
replaces := []temp{
|
|
|
|
{from: "querylog_enabled", to: "enabled", val: true},
|
|
|
|
{from: "querylog_file_enabled", to: "file_enabled", val: true},
|
|
|
|
{from: "querylog_interval", to: "interval", val: "2160h"},
|
|
|
|
{from: "querylog_size_memory", to: "size_memory", val: 1000},
|
|
|
|
}
|
|
|
|
qlog := map[string]any{
|
|
|
|
"ignored": []any{},
|
|
|
|
}
|
|
|
|
for _, r := range replaces {
|
|
|
|
v, has := dns[r.from]
|
|
|
|
if !has {
|
|
|
|
v = r.val
|
|
|
|
}
|
|
|
|
delete(dns, r.from)
|
|
|
|
qlog[r.to] = v
|
|
|
|
}
|
|
|
|
diskConf["querylog"] = qlog
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// upgradeSchema15to16 performs the following changes:
|
|
|
|
//
|
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'statistics_interval': 1
|
|
|
|
//
|
|
|
|
// # AFTER:
|
|
|
|
// 'statistics':
|
|
|
|
// 'enabled': true
|
|
|
|
// 'interval': 1
|
|
|
|
// 'ignored': []
|
2023-04-12 14:48:42 +03:00
|
|
|
//
|
|
|
|
// If statistics were disabled:
|
|
|
|
//
|
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'statistics_interval': 0
|
|
|
|
//
|
|
|
|
// # AFTER:
|
|
|
|
// 'statistics':
|
|
|
|
// 'enabled': false
|
|
|
|
// 'interval': 1
|
|
|
|
// 'ignored': []
|
2023-02-15 16:53:29 +03:00
|
|
|
func upgradeSchema15to16(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 15 to 16")
|
|
|
|
diskConf["schema_version"] = 16
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
dns, ok := dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
stats := map[string]any{
|
|
|
|
"enabled": true,
|
|
|
|
"interval": 1,
|
|
|
|
"ignored": []any{},
|
|
|
|
}
|
|
|
|
|
2023-03-09 15:39:35 +03:00
|
|
|
const field = "statistics_interval"
|
2023-04-12 14:48:42 +03:00
|
|
|
statsIvlVal, has := dns[field]
|
2023-02-15 16:53:29 +03:00
|
|
|
if has {
|
2023-04-12 14:48:42 +03:00
|
|
|
var statsIvl int
|
|
|
|
statsIvl, ok = statsIvlVal.(int)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns.statistics_interval: %T", statsIvlVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
if statsIvl == 0 {
|
|
|
|
// Set the interval to the default value of one day to make sure
|
|
|
|
// that it passes the validations.
|
|
|
|
stats["interval"] = 1
|
|
|
|
stats["enabled"] = false
|
|
|
|
} else {
|
|
|
|
stats["interval"] = statsIvl
|
|
|
|
stats["enabled"] = true
|
|
|
|
}
|
2023-02-15 16:53:29 +03:00
|
|
|
}
|
2023-03-09 15:39:35 +03:00
|
|
|
delete(dns, field)
|
2023-02-15 16:53:29 +03:00
|
|
|
|
|
|
|
diskConf["statistics"] = stats
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2023-03-09 15:39:35 +03:00
|
|
|
// upgradeSchema16to17 performs the following changes:
|
|
|
|
//
|
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'edns_client_subnet': false
|
|
|
|
//
|
|
|
|
// # AFTER:
|
|
|
|
// 'dns':
|
|
|
|
// 'edns_client_subnet':
|
|
|
|
// 'enabled': false
|
|
|
|
// 'use_custom': false
|
|
|
|
// 'custom_ip': ""
|
|
|
|
func upgradeSchema16to17(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 16 to 17")
|
|
|
|
diskConf["schema_version"] = 17
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
dns, ok := dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
const field = "edns_client_subnet"
|
|
|
|
|
|
|
|
dns[field] = map[string]any{
|
|
|
|
"enabled": dns[field] == true,
|
|
|
|
"use_custom": false,
|
|
|
|
"custom_ip": "",
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2023-04-12 14:48:42 +03:00
|
|
|
// upgradeSchema17to18 performs the following changes:
|
|
|
|
//
|
|
|
|
// # BEFORE:
|
|
|
|
// 'dns':
|
|
|
|
// 'safesearch_enabled': true
|
|
|
|
//
|
|
|
|
// # AFTER:
|
|
|
|
// 'dns':
|
|
|
|
// 'safe_search':
|
|
|
|
// 'enabled': true
|
|
|
|
// 'bing': true
|
|
|
|
// 'duckduckgo': true
|
|
|
|
// 'google': true
|
|
|
|
// 'pixabay': true
|
|
|
|
// 'yandex': true
|
|
|
|
// 'youtube': true
|
|
|
|
func upgradeSchema17to18(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 17 to 18")
|
|
|
|
diskConf["schema_version"] = 18
|
|
|
|
|
|
|
|
dnsVal, ok := diskConf["dns"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
dns, ok := dnsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of dns: %T", dnsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
safeSearch := yobj{
|
|
|
|
"enabled": true,
|
|
|
|
"bing": true,
|
|
|
|
"duckduckgo": true,
|
|
|
|
"google": true,
|
|
|
|
"pixabay": true,
|
|
|
|
"yandex": true,
|
|
|
|
"youtube": true,
|
|
|
|
}
|
|
|
|
|
|
|
|
const safeSearchKey = "safesearch_enabled"
|
|
|
|
|
|
|
|
v, has := dns[safeSearchKey]
|
|
|
|
if has {
|
|
|
|
safeSearch["enabled"] = v
|
|
|
|
}
|
|
|
|
delete(dns, safeSearchKey)
|
|
|
|
|
|
|
|
dns["safe_search"] = safeSearch
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// upgradeSchema18to19 performs the following changes:
|
|
|
|
//
|
|
|
|
// # BEFORE:
|
|
|
|
// 'clients':
|
|
|
|
// 'persistent':
|
|
|
|
// - 'name': 'client-name'
|
|
|
|
// 'safesearch_enabled': true
|
|
|
|
//
|
|
|
|
// # AFTER:
|
|
|
|
// 'clients':
|
|
|
|
// 'persistent':
|
|
|
|
// - 'name': 'client-name'
|
|
|
|
// 'safe_search':
|
|
|
|
// 'enabled': true
|
|
|
|
// 'bing': true
|
|
|
|
// 'duckduckgo': true
|
|
|
|
// 'google': true
|
|
|
|
// 'pixabay': true
|
|
|
|
// 'yandex': true
|
|
|
|
// 'youtube': true
|
|
|
|
func upgradeSchema18to19(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 18 to 19")
|
|
|
|
diskConf["schema_version"] = 19
|
|
|
|
|
|
|
|
clientsVal, ok := diskConf["clients"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
clients, ok := clientsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of clients: %T", clientsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
persistent, ok := clients["persistent"].([]yobj)
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
const safeSearchKey = "safesearch_enabled"
|
|
|
|
|
|
|
|
for i := range persistent {
|
|
|
|
c := persistent[i]
|
|
|
|
|
|
|
|
safeSearch := yobj{
|
|
|
|
"enabled": true,
|
|
|
|
"bing": true,
|
|
|
|
"duckduckgo": true,
|
|
|
|
"google": true,
|
|
|
|
"pixabay": true,
|
|
|
|
"yandex": true,
|
|
|
|
"youtube": true,
|
|
|
|
}
|
|
|
|
|
|
|
|
v, has := c[safeSearchKey]
|
|
|
|
if has {
|
|
|
|
safeSearch["enabled"] = v
|
|
|
|
}
|
|
|
|
delete(c, safeSearchKey)
|
|
|
|
|
|
|
|
c["safe_search"] = safeSearch
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// upgradeSchema19to20 performs the following changes:
|
|
|
|
//
|
|
|
|
// # BEFORE:
|
|
|
|
// 'statistics':
|
|
|
|
// 'interval': 1
|
|
|
|
//
|
|
|
|
// # AFTER:
|
|
|
|
// 'statistics':
|
|
|
|
// 'interval': 24h
|
|
|
|
func upgradeSchema19to20(diskConf yobj) (err error) {
|
|
|
|
log.Printf("Upgrade yaml: 19 to 20")
|
|
|
|
diskConf["schema_version"] = 20
|
|
|
|
|
|
|
|
statsVal, ok := diskConf["statistics"]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var stats yobj
|
|
|
|
stats, ok = statsVal.(yobj)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of stats: %T", statsVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
const field = "interval"
|
|
|
|
|
|
|
|
// Set the initial value from the global configuration structure.
|
|
|
|
statsIvl := 1
|
|
|
|
statsIvlVal, ok := stats[field]
|
|
|
|
if ok {
|
|
|
|
statsIvl, ok = statsIvlVal.(int)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("unexpected type of %s: %T", field, statsIvlVal)
|
|
|
|
}
|
|
|
|
|
|
|
|
// The initial version of upgradeSchema16to17 did not set the zero
|
|
|
|
// interval to a non-zero one. So, reset it now.
|
|
|
|
if statsIvl == 0 {
|
|
|
|
statsIvl = 1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
stats[field] = timeutil.Duration{Duration: time.Duration(statsIvl) * timeutil.Day}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-12-07 16:04:53 +03:00
|
|
|
// TODO(a.garipov): Replace with log.Output when we port it to our logging
|
|
|
|
// package.
|
|
|
|
func funcName() string {
|
|
|
|
pc := make([]uintptr, 10) // at least 1 entry needed
|
|
|
|
runtime.Callers(2, pc)
|
|
|
|
f := runtime.FuncForPC(pc[0])
|
|
|
|
return path.Base(f.Name())
|
|
|
|
}
|