zishuo/nip
1
0
Fork 0
mirror of https://github.com/cunnie/sslip.io.git synced 2025-10-05 23:56:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

🐞 Remove incorrect -delegates warning

Browse Source 
fixes, when server is started with `-delegates` unset:

```
-delegates: arguments should be in the format "delegatedDomain=nameserver", not ""
```
This commit is contained in:
Brian Cunnie
2024-06-22 14:55:27 -07:00
parent 74a5c2edfd
commit ba85d1aacf
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration_flags_test.go
View File

@@ -173,7 +173,7 @@ var _ = Describe("flags", func() {
flags = []string{"-delegates="} flags = []string{"-delegates="}
}) })
It("should give an informative message", func() { It("should give an informative message", func() {
Expect(string(serverSession.Err.Contents())).Should(MatchRegexp(`-delegates: arguments should be in the format "delegatedDomain=nameserver", not ""`)) Expect(string(serverSession.Err.Contents())).Should(Not(MatchRegexp(`-delegates`)))
}) })
}) })
When("the arguments are mangled", func() { When("the arguments are mangled", func() {

3
xip/xip.go
View File

@@ -250,6 +250,9 @@ func NewXip(blocklistURL string, nameservers []string, addresses []string, deleg
} }
// Parse and set the nameservers of our delegated domains // Parse and set the nameservers of our delegated domains
for _, delegate := range delegates { for _, delegate := range delegates {
if delegate == "" { // most common case: no delegates defined
continue
}
delegatedDomainAndNameserver := strings.Split(strings.ToLower(delegate), "=") delegatedDomainAndNameserver := strings.Split(strings.ToLower(delegate), "=")
if len(delegatedDomainAndNameserver) != 2 { if len(delegatedDomainAndNameserver) != 2 {
logmessages = append(logmessages, fmt.Sprintf(`-delegates: arguments should be in the format "delegatedDomain=nameserver", not "%s"`, delegate)) logmessages = append(logmessages, fmt.Sprintf(`-delegates: arguments should be in the format "delegatedDomain=nameserver", not "%s"`, delegate))