@@ -2,62 +2,28 @@ package settings
22
33import (
44 "errors"
5- "fmt"
65 "net/netip"
76
8- "github.com/qdm12/dns/pkg/provider"
9- "github.com/qdm12/dns/pkg/unbound"
7+ "github.com/qdm12/dns/v2/pkg/provider"
108 "github.com/qdm12/gosettings"
119 "github.com/qdm12/gotree"
1210)
1311
1412// Unbound is settings for the Unbound program.
1513type Unbound struct {
16- Providers []string `json:"providers"`
17- Caching * bool `json:"caching"`
18- IPv6 * bool `json:"ipv6"`
19- VerbosityLevel * uint8 `json:"verbosity_level"`
20- VerbosityDetailsLevel * uint8 `json:"verbosity_details_level"`
21- ValidationLogLevel * uint8 `json:"validation_log_level"`
22- Username string `json:"username"`
23- Allowed []netip.Prefix `json:"allowed"`
14+ Providers []string `json:"providers"`
15+ Caching * bool `json:"caching"`
16+ IPv6 * bool `json:"ipv6"`
2417}
2518
2619func (u * Unbound ) setDefaults () {
27- if len (u .Providers ) == 0 {
28- u .Providers = []string {
29- provider .Cloudflare ().String (),
30- }
31- }
32-
20+ u .Providers = gosettings .DefaultSlice (u .Providers , []string {
21+ provider .Cloudflare ().Name ,
22+ })
3323 u .Caching = gosettings .DefaultPointer (u .Caching , true )
3424 u .IPv6 = gosettings .DefaultPointer (u .IPv6 , false )
35-
36- const defaultVerbosityLevel = 1
37- u .VerbosityLevel = gosettings .DefaultPointer (u .VerbosityLevel , defaultVerbosityLevel )
38-
39- const defaultVerbosityDetailsLevel = 0
40- u .VerbosityDetailsLevel = gosettings .DefaultPointer (u .VerbosityDetailsLevel , defaultVerbosityDetailsLevel )
41-
42- const defaultValidationLogLevel = 0
43- u .ValidationLogLevel = gosettings .DefaultPointer (u .ValidationLogLevel , defaultValidationLogLevel )
44-
45- if u .Allowed == nil {
46- u .Allowed = []netip.Prefix {
47- netip .PrefixFrom (netip .AddrFrom4 ([4 ]byte {}), 0 ),
48- netip .PrefixFrom (netip .AddrFrom16 ([16 ]byte {}), 0 ),
49- }
50- }
51-
52- u .Username = gosettings .DefaultString (u .Username , "root" )
5325}
5426
55- var (
56- ErrUnboundVerbosityLevelNotValid = errors .New ("Unbound verbosity level is not valid" )
57- ErrUnboundVerbosityDetailsLevelNotValid = errors .New ("Unbound verbosity details level is not valid" )
58- ErrUnboundValidationLogLevelNotValid = errors .New ("Unbound validation log level is not valid" )
59- )
60-
6127func (u Unbound ) validate () (err error ) {
6228 for _ , s := range u .Providers {
6329 _ , err := provider .Parse (s )
@@ -66,120 +32,51 @@ func (u Unbound) validate() (err error) {
6632 }
6733 }
6834
69- const maxVerbosityLevel = 5
70- if * u .VerbosityLevel > maxVerbosityLevel {
71- return fmt .Errorf ("%w: %d must be between 0 and %d" ,
72- ErrUnboundVerbosityLevelNotValid ,
73- * u .VerbosityLevel ,
74- maxVerbosityLevel )
75- }
76-
77- const maxVerbosityDetailsLevel = 4
78- if * u .VerbosityDetailsLevel > maxVerbosityDetailsLevel {
79- return fmt .Errorf ("%w: %d must be between 0 and %d" ,
80- ErrUnboundVerbosityDetailsLevelNotValid ,
81- * u .VerbosityDetailsLevel ,
82- maxVerbosityDetailsLevel )
83- }
84-
85- const maxValidationLogLevel = 2
86- if * u .ValidationLogLevel > maxValidationLogLevel {
87- return fmt .Errorf ("%w: %d must be between 0 and %d" ,
88- ErrUnboundValidationLogLevelNotValid ,
89- * u .ValidationLogLevel , maxValidationLogLevel )
90- }
91-
9235 return nil
9336}
9437
9538func (u Unbound ) copy () (copied Unbound ) {
9639 return Unbound {
97- Providers : gosettings .CopySlice (u .Providers ),
98- Caching : gosettings .CopyPointer (u .Caching ),
99- IPv6 : gosettings .CopyPointer (u .IPv6 ),
100- VerbosityLevel : gosettings .CopyPointer (u .VerbosityLevel ),
101- VerbosityDetailsLevel : gosettings .CopyPointer (u .VerbosityDetailsLevel ),
102- ValidationLogLevel : gosettings .CopyPointer (u .ValidationLogLevel ),
103- Username : u .Username ,
104- Allowed : gosettings .CopySlice (u .Allowed ),
40+ Providers : gosettings .CopySlice (u .Providers ),
41+ Caching : gosettings .CopyPointer (u .Caching ),
42+ IPv6 : gosettings .CopyPointer (u .IPv6 ),
10543 }
10644}
10745
10846func (u * Unbound ) mergeWith (other Unbound ) {
10947 u .Providers = gosettings .MergeWithSlice (u .Providers , other .Providers )
11048 u .Caching = gosettings .MergeWithPointer (u .Caching , other .Caching )
11149 u .IPv6 = gosettings .MergeWithPointer (u .IPv6 , other .IPv6 )
112- u .VerbosityLevel = gosettings .MergeWithPointer (u .VerbosityLevel , other .VerbosityLevel )
113- u .VerbosityDetailsLevel = gosettings .MergeWithPointer (u .VerbosityDetailsLevel , other .VerbosityDetailsLevel )
114- u .ValidationLogLevel = gosettings .MergeWithPointer (u .ValidationLogLevel , other .ValidationLogLevel )
115- u .Username = gosettings .MergeWithString (u .Username , other .Username )
116- u .Allowed = gosettings .MergeWithSlice (u .Allowed , other .Allowed )
11750}
11851
11952func (u * Unbound ) overrideWith (other Unbound ) {
12053 u .Providers = gosettings .OverrideWithSlice (u .Providers , other .Providers )
12154 u .Caching = gosettings .OverrideWithPointer (u .Caching , other .Caching )
12255 u .IPv6 = gosettings .OverrideWithPointer (u .IPv6 , other .IPv6 )
123- u .VerbosityLevel = gosettings .OverrideWithPointer (u .VerbosityLevel , other .VerbosityLevel )
124- u .VerbosityDetailsLevel = gosettings .OverrideWithPointer (u .VerbosityDetailsLevel , other .VerbosityDetailsLevel )
125- u .ValidationLogLevel = gosettings .OverrideWithPointer (u .ValidationLogLevel , other .ValidationLogLevel )
126- u .Username = gosettings .OverrideWithString (u .Username , other .Username )
127- u .Allowed = gosettings .OverrideWithSlice (u .Allowed , other .Allowed )
128- }
129-
130- func (u Unbound ) ToUnboundFormat () (settings unbound.Settings , err error ) {
131- providers := make ([]provider.Provider , len (u .Providers ))
132- for i := range providers {
133- providers [i ], err = provider .Parse (u .Providers [i ])
134- if err != nil {
135- return settings , err
136- }
137- }
138-
139- const port = 53
140-
141- return unbound.Settings {
142- ListeningPort : port ,
143- IPv4 : true ,
144- Providers : providers ,
145- Caching : * u .Caching ,
146- IPv6 : * u .IPv6 ,
147- VerbosityLevel : * u .VerbosityLevel ,
148- VerbosityDetailsLevel : * u .VerbosityDetailsLevel ,
149- ValidationLogLevel : * u .ValidationLogLevel ,
150- AccessControl : unbound.AccessControlSettings {
151- Allowed : netipPrefixesToNetaddrIPPrefixes (u .Allowed ),
152- },
153- Username : u .Username ,
154- }, nil
15556}
15657
15758var (
15859 ErrConvertingNetip = errors .New ("converting net.IP to netip.Addr failed" )
15960)
16061
161- func (u Unbound ) GetFirstPlaintextIPv4 () (ipv4 netip.Addr , err error ) {
62+ func (u Unbound ) GetFirstPlaintextIPv4 () (ipv4 netip.Addr ) {
16263 s := u .Providers [0 ]
16364 provider , err := provider .Parse (s )
16465 if err != nil {
165- return ipv4 , err
66+ // Settings should be validated before calling this function,
67+ // so an error happening here is a programming error.
68+ panic (err )
16669 }
16770
168- ip := provider .DNS ().IPv4 [0 ]
169- ipv4 , ok := netip .AddrFromSlice (ip )
170- if ! ok {
171- return ipv4 , fmt .Errorf ("%w: for ip %s (%#v)" ,
172- ErrConvertingNetip , ip , ip )
173- }
174- return ipv4 .Unmap (), nil
71+ return provider .DNS .IPv4 [0 ]
17572}
17673
17774func (u Unbound ) String () string {
17875 return u .toLinesNode ().String ()
17976}
18077
18178func (u Unbound ) toLinesNode () (node * gotree.Node ) {
182- node = gotree .New ("Unbound settings:" )
79+ node = gotree .New ("DNS over TLS settings:" )
18380
18481 authServers := node .Appendf ("Authoritative servers:" )
18582 for _ , provider := range u .Providers {
@@ -188,15 +85,6 @@ func (u Unbound) toLinesNode() (node *gotree.Node) {
18885
18986 node .Appendf ("Caching: %s" , gosettings .BoolToYesNo (u .Caching ))
19087 node .Appendf ("IPv6: %s" , gosettings .BoolToYesNo (u .IPv6 ))
191- node .Appendf ("Verbosity level: %d" , * u .VerbosityLevel )
192- node .Appendf ("Verbosity details level: %d" , * u .VerbosityDetailsLevel )
193- node .Appendf ("Validation log level: %d" , * u .ValidationLogLevel )
194- node .Appendf ("System user: %s" , u .Username )
195-
196- allowedNetworks := node .Appendf ("Allowed networks:" )
197- for _ , network := range u .Allowed {
198- allowedNetworks .Appendf (network .String ())
199- }
20088
20189 return node
20290}
0 commit comments