mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-03-31 14:33:32 +03:00
Merge in DNS/adguard-home from 4299-querylog-stats-api to master Updates #1717. Updates #4299. Squashed commit of the following: commit 5b706b7997a536bc4fd2c532fb89ca5ab3536848 Merge: 48b62b0f306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 13:53:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 48b62b0f1882f1ad120c6cdd90cd7dd8cb8a7738 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Mar 22 12:25:04 2023 +0200 client: fix styles, add titles and descrs commit 97e31cff70d05b51bd0e5ea2d20e8e7a251a7e41 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:38:12 2023 +0200 client: add ignored domains for querylog commit 24d75c4376382205ae6b8f731b1cd23d517772c9 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:21:13 2023 +0200 client: add ignore domains for stats commit eefc3891d01f90af79fdac9ba8eea06d4d54a0bc Merge: 978675ea1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:35 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 978675ea2c07bf248b4c8f26ebdf78cf59a12ef5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:11 2023 +0300 openapi: fix chlog commit 2ed33007aade115d38b0ca582206cc10678b084c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:49:07 2023 +0300 home: fix tests commit 6af11520c164553ee9fce8f214ea169672188d7e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:40:16 2023 +0300 home: fix typo commit 56acdfde5b1ee8d16b232c1293b91affbe319ad1 Merge: 319da34d48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:32:58 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 319da34de41ec84310b23bba2ad79c8a3a4c14ff Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 17:34:38 2023 +0300 querylog: fix docs commit d5a8f24d5b336e7bdbbca18069f6ede8c96bcc2c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 11:42:00 2023 +0300 stats: fix docs commit e0cbfc1c4078180a05835ce7587e9f45484adc81 Merge: 4743c810012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:45:17 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 4743c81038052b9e0ca29ae5f1565021d36ca1ef Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:14:16 2023 +0300 all: imp code; fix time conversion commit 34310cffd7e331d098c535590245387051674fa8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:34:11 2023 +0300 chlog: restore order commit cadd864a66655242948f1cb16e6d4945c0235d7e Merge: 2f3e25bebb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:26:06 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 2f3e25bee56d2c6ddcf4aa2fc6a1dc51ed9b06e1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:25:14 2023 +0300 all: fix fmt commit d54022baa6c8a3d0d3c308a9b6b1a6a9dc6ac7b6 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 28 16:16:40 2023 +0300 all: imp code; fix chlog commit df22de91f59a51194c55e7bcbe5bc3fcc60cb8e3 Merge: e1ea4797a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:24:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit e1ea4797af974c36f06683ffc6eaaae917921a43 Merge: d7db0a5abb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:23:20 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit d7db0a5af1e1f49f6174c1c42e6d9306f2381d16 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:12:20 2023 +0300 all: imp docs ... and 15 more commits
90 lines
2.2 KiB
Go
90 lines
2.2 KiB
Go
package aghnet
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/AdguardTeam/golibs/stringutil"
|
|
)
|
|
|
|
// The maximum lengths of generated hostnames for different IP versions.
|
|
const (
|
|
ipv4HostnameMaxLen = len("192-168-100-100")
|
|
ipv6HostnameMaxLen = len("ff80-f076-0000-0000-0000-0000-0000-0010")
|
|
)
|
|
|
|
// generateIPv4Hostname generates the hostname by IP address version 4.
|
|
func generateIPv4Hostname(ipv4 net.IP) (hostname string) {
|
|
hnData := make([]byte, 0, ipv4HostnameMaxLen)
|
|
for i, part := range ipv4 {
|
|
if i > 0 {
|
|
hnData = append(hnData, '-')
|
|
}
|
|
hnData = strconv.AppendUint(hnData, uint64(part), 10)
|
|
}
|
|
|
|
return string(hnData)
|
|
}
|
|
|
|
// generateIPv6Hostname generates the hostname by IP address version 6.
|
|
func generateIPv6Hostname(ipv6 net.IP) (hostname string) {
|
|
hnData := make([]byte, 0, ipv6HostnameMaxLen)
|
|
for i, partsNum := 0, net.IPv6len/2; i < partsNum; i++ {
|
|
if i > 0 {
|
|
hnData = append(hnData, '-')
|
|
}
|
|
for _, val := range ipv6[i*2 : i*2+2] {
|
|
if val < 10 {
|
|
hnData = append(hnData, '0')
|
|
}
|
|
hnData = strconv.AppendUint(hnData, uint64(val), 16)
|
|
}
|
|
}
|
|
|
|
return string(hnData)
|
|
}
|
|
|
|
// GenerateHostname generates the hostname from ip. In case of using IPv4 the
|
|
// result should be like:
|
|
//
|
|
// 192-168-10-1
|
|
//
|
|
// In case of using IPv6, the result is like:
|
|
//
|
|
// ff80-f076-0000-0000-0000-0000-0000-0010
|
|
//
|
|
// ip must be either an IPv4 or an IPv6.
|
|
func GenerateHostname(ip net.IP) (hostname string) {
|
|
if ipv4 := ip.To4(); ipv4 != nil {
|
|
return generateIPv4Hostname(ipv4)
|
|
}
|
|
|
|
return generateIPv6Hostname(ip)
|
|
}
|
|
|
|
// NewDomainNameSet returns nil and error, if list has duplicate or empty
|
|
// domain name. Otherwise returns a set, which contains non-FQDN domain names,
|
|
// and nil error.
|
|
func NewDomainNameSet(list []string) (set *stringutil.Set, err error) {
|
|
set = stringutil.NewSet()
|
|
|
|
for i, v := range list {
|
|
host := strings.ToLower(strings.TrimSuffix(v, "."))
|
|
// TODO(a.garipov): Think about ignoring empty (".") names in the
|
|
// future.
|
|
if host == "" {
|
|
return nil, errors.Error("host name is empty")
|
|
}
|
|
|
|
if set.Has(host) {
|
|
return nil, fmt.Errorf("duplicate host name %q at index %d", host, i)
|
|
}
|
|
|
|
set.Add(host)
|
|
}
|
|
|
|
return set, nil
|
|
}
|