mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 11:22:49 +03:00
a91a257b15
Merge in DNS/adguard-home from AG-20352-imp-leases-db to master Squashed commit of the following: commit 2235fb4671bb3f80c933847362cd35b5704dd18d Merge: 0c4d76d4f76a74b271
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 18 15:09:34 2023 +0300 Merge branch 'master' into AG-20352-imp-leases-db commit 0c4d76d4f6222ae06c568864d366df866dc55a54 Merge: e586b82c74afd39b22
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 18 11:07:27 2023 +0300 Merge branch 'master' into AG-20352-imp-leases-db commit e586b82c700c4d432e34f36400519eb08b2653ad Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 18 11:06:40 2023 +0300 dhcpd: imp docs commit 411d4e6f6e36051bf6a66c709380ed268c161c41 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 17 16:56:56 2023 +0300 dhcpd: imp code commit e457dc2c385ab62b36df7f96c949e6b90ed2034a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 17 14:29:29 2023 +0300 all: imp code more commit c2df20d0125d368d0155af0808af979921763e1f Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 14 15:07:53 2023 +0300 all: imp code commit a4e9ffb9ae769c828c22d62ddf231f7bcfea14db Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 12 19:19:35 2023 +0300 dhcpd: fix test more commit 138d89414f1a89558b23962acb7174dce28346d9 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 12 18:08:29 2023 +0300 dhcpd: fix test commit e07e7a23e7c913951c8ecb38c12a3345ebe473be Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 12 17:22:27 2023 +0300 all: upd chlog commit 1b6a76e79cf4beed9ca980766ce97930b375bfde Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 12 13:24:11 2023 +0300 all: migrate leases db
107 lines
2.1 KiB
Go
107 lines
2.1 KiB
Go
package dhcpd
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net"
|
|
"net/netip"
|
|
"os"
|
|
"path/filepath"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
)
|
|
|
|
const (
|
|
// leaseExpireStatic is used to define the Expiry field for static
|
|
// leases.
|
|
//
|
|
// Deprecated: Remove it when migration of DHCP leases will be not needed.
|
|
leaseExpireStatic = 1
|
|
|
|
// dbFilename contains saved leases.
|
|
//
|
|
// Deprecated: Use dataFilename.
|
|
dbFilename = "leases.db"
|
|
)
|
|
|
|
// leaseJSON is the structure of stored lease.
|
|
//
|
|
// Deprecated: Use [Lease].
|
|
type leaseJSON struct {
|
|
HWAddr []byte `json:"mac"`
|
|
IP []byte `json:"ip"`
|
|
Hostname string `json:"host"`
|
|
Expiry int64 `json:"exp"`
|
|
}
|
|
|
|
func normalizeIP(ip net.IP) net.IP {
|
|
ip4 := ip.To4()
|
|
if ip4 != nil {
|
|
return ip4
|
|
}
|
|
|
|
return ip
|
|
}
|
|
|
|
// migrateDB migrates stored leases if necessary.
|
|
func migrateDB(conf *ServerConfig) (err error) {
|
|
defer func() { err = errors.Annotate(err, "migrating db: %w") }()
|
|
|
|
oldLeasesPath := filepath.Join(conf.WorkDir, dbFilename)
|
|
dataDirPath := filepath.Join(conf.DataDir, dataFilename)
|
|
|
|
file, err := os.Open(oldLeasesPath)
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
// Nothing to migrate.
|
|
return nil
|
|
} else if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
ljs := []leaseJSON{}
|
|
err = json.NewDecoder(file).Decode(&ljs)
|
|
if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
err = file.Close()
|
|
if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
leases := []*Lease{}
|
|
|
|
for _, lj := range ljs {
|
|
lj.IP = normalizeIP(lj.IP)
|
|
|
|
ip, ok := netip.AddrFromSlice(lj.IP)
|
|
if !ok {
|
|
log.Info("dhcp: invalid IP: %s", lj.IP)
|
|
|
|
continue
|
|
}
|
|
|
|
lease := &Lease{
|
|
Expiry: time.Unix(lj.Expiry, 0),
|
|
Hostname: lj.Hostname,
|
|
HWAddr: lj.HWAddr,
|
|
IP: ip,
|
|
IsStatic: lj.Expiry == leaseExpireStatic,
|
|
}
|
|
|
|
leases = append(leases, lease)
|
|
}
|
|
|
|
err = writeDB(dataDirPath, leases)
|
|
if err != nil {
|
|
// Don't wrap the error since it's informative enough as is.
|
|
return err
|
|
}
|
|
|
|
return os.Remove(oldLeasesPath)
|
|
}
|