Skip to content

Commit 3912c82

Browse files
42wim42wim
committed
Clean up based on linters
1 parent 07db470 commit 3912c82

File tree

9 files changed

+44
-65
lines changed

9 files changed

+44
-65
lines changed

‎dnssec.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func validateChain(domain string) (bool, error) {
6969
if err != nil {
7070
return false, err
7171
}
72-
if valid == false {
72+
if !valid {
7373
return false, fmt.Errorf("validateChain failed. Run with -debug for more information")
7474
}
7575
parent := getParentDomain(domain)
@@ -78,7 +78,6 @@ func validateChain(domain string) (bool, error) {
7878
}
7979
domain = parent
8080
}
81-
return true, nil
8281
}
8382

8483
func validateDomain(domain string) (bool, error) {
@@ -94,6 +93,7 @@ func validateDomain(domain string) (bool, error) {
9493
// get auth servers
9594
nsdata, err := findNS(domain)
9695
if err != nil {
96+
log.Debugf("validateDomain() error: %#v\n")
9797
}
9898
for _, ns := range nsdata {
9999
for _, nsip := range ns.IP {
@@ -122,7 +122,7 @@ func validateDomain(domain string) (bool, error) {
122122
return false, fmt.Errorf("Validation failed. No DNSKEY found for %s on %s", domain, nsip.String())
123123
}
124124

125-
valid, info, err := validateDNSKEY(res.Msg.Answer)
125+
valid, info, _ := validateDNSKEY(res.Msg.Answer)
126126
if valid {
127127
log.Debugf("RRSIG validated (%s -> %s)", time.Unix(info.Start, 0), time.Unix(info.End, 0))
128128
} else {
@@ -137,6 +137,7 @@ func validateDomain(domain string) (bool, error) {
137137
log.Debugf("Finding NS of parent: %s", dns.Fqdn(getParentDomain(domain)))
138138
nsdata, err = findNS(getParentDomain(domain))
139139
if err != nil {
140+
log.Debugf("ValidateDomain() error: %#v", err)
140141
}
141142

142143
// asking parent about DS

‎glue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (g *Glue) Compare(parentGlue []net.IP) (bool, []string) {
8686
m[ip.String()] = true
8787
}
8888
for k, v := range m {
89-
if v == false {
89+
if !v {
9090
ips = append(ips, k)
9191
}
9292
}

‎main.go

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package main
22

33
import (
4+
"encoding/json"
45
"flag"
56
"fmt"
67
"io/ioutil"
78
"net"
9+
"os"
810
"sync"
911
"text/tabwriter"
1012
"time"
1113

12-
"os"
13-
14-
"encoding/json"
1514
"github.com/ammario/ipisp"
1615
"github.com/briandowns/spinner"
1716
"github.com/dustin/go-humanize"
@@ -65,11 +64,6 @@ type KeyInfo struct {
6564
End int64
6665
}
6766

68-
type DomainStat struct {
69-
Domain string
70-
NS []NSInfo
71-
}
72-
7367
type Response struct {
7468
Msg *dns.Msg
7569
Server string
@@ -157,10 +151,6 @@ func outputter() {
157151
done <- struct{}{}
158152
}
159153

160-
func writeStats() {
161-
162-
}
163-
164154
func main() {
165155
flagDebug = flag.Bool("debug", false, "enable debug")
166156
flagScan = flag.Bool("scan", false, "scan domain for common records")
@@ -319,7 +309,7 @@ func main() {
319309
}
320310
for _, report := range domainReport.Report {
321311
for _, res := range report.Result {
322-
if res.Result != "" && res.Status == false {
312+
if res.Result != "" && !res.Status {
323313
fmt.Println(report.Type, "\t", res.Result)
324314
}
325315
}

‎mx.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/miekg/dns"
65
"net"
76
"sort"
87
"strings"
8+
9+
"github.com/miekg/dns"
910
)
1011

1112
type MXCheck struct {

‎ns.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/miekg/dns"
65
"net"
76
"sort"
87
"strings"
8+
9+
"github.com/miekg/dns"
910
)
1011

1112
type NSCheck struct {
@@ -128,7 +129,7 @@ loop:
128129
// find the records that are sent by parent NS but arent in the domain NS
129130
missing = []string{}
130131
for k, v := range m {
131-
if v == true {
132+
if v {
132133
missing = append(missing, k)
133134
}
134135
}

‎scan.go

+11-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package main
22

33
import (
4-
"crypto/hmac"
5-
"crypto/sha256"
64
"fmt"
75
"io/ioutil"
86
"net"
@@ -45,7 +43,11 @@ func zoneTransfer(domain, server string) []string {
4543
var records []string
4644
t := new(dns.Transfer)
4745
req := prepMsg()
48-
req.Question[0] = dns.Question{dns.Fqdn(domain), dns.TypeAXFR, dns.ClassINET}
46+
req.Question[0] = dns.Question{
47+
Name: dns.Fqdn(domain),
48+
Qtype: dns.TypeAXFR,
49+
Qclass: dns.ClassINET,
50+
}
4951
q, err := t.In(req, net.JoinHostPort(server, "53"))
5052
if err != nil {
5153
return records
@@ -82,17 +84,17 @@ func domainscan(domain string) []ScanResponse {
8284

8385
scanEntries := 0
8486
for _, src := range DSP {
85-
scanEntries = scanEntries + len(src.Entries)
87+
scanEntries += len(src.Entries)
8688
}
8789

88-
*flagQPS = *flagQPS * len(servers)
90+
*flagQPS *= len(servers)
8991

9092
for _, ip := range ips {
9193
res := zoneTransfer(domain, ip.String())
9294
if len(res) > 0 {
9395
zt := ""
9496
for _, rr := range res {
95-
zt = zt + fmt.Sprintln(rr)
97+
zt += fmt.Sprintln(rr)
9698
}
9799
if !*flagJSON {
98100
fmt.Println(zt)
@@ -101,10 +103,8 @@ func domainscan(domain string) []ScanResponse {
101103
return []ScanResponse{}
102104
// TODO compare hashes
103105
// fmt.Printf("%x\n", Hash("key", []byte(zt)))
104-
} else {
105-
if !*flagJSON {
106-
fmt.Printf("%s ", ip.String())
107-
}
106+
} else if !*flagJSON {
107+
fmt.Printf("%s ", ip.String())
108108
}
109109
}
110110
if !*flagJSON {
@@ -123,7 +123,7 @@ func domainscan(domain string) []ScanResponse {
123123
avgRttServers++
124124
}
125125
}
126-
avgRtt = avgRtt / time.Duration(avgRttServers)
126+
avgRtt /= time.Duration(avgRttServers)
127127

128128
s.Suffix = " Scanning... will take approx " + fmt.Sprintf("%#v seconds", float64(scanEntries/(len(servers)*(*flagQPS)))+float64(scanEntries)*avgRtt.Seconds())
129129
t := time.Now()
@@ -213,9 +213,3 @@ func domainscan(domain string) []ScanResponse {
213213
}
214214
return responses
215215
}
216-
217-
func Hash(tag string, data []byte) []byte {
218-
h := hmac.New(sha256.New, []byte(tag))
219-
h.Write(data)
220-
return h.Sum(nil)
221-
}

‎soa.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/miekg/dns"
65
"time"
6+
7+
"github.com/miekg/dns"
78
)
89

910
type SOACheck struct {
@@ -97,10 +98,7 @@ func checkSerial(serial uint32) bool {
9798
return false
9899
}
99100
_, err := time.Parse("20060102", serialstr[:len(serialstr)-2])
100-
if err != nil {
101-
return false
102-
}
103-
return true
101+
return err != nil
104102
}
105103

106104
func (c *SOACheck) checkRFC1918() bool {

‎spam.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package main
22

33
import (
4-
"github.com/miekg/dns"
54
"strings"
5+
6+
"github.com/miekg/dns"
67
)
78

89
type SpamCheck struct {
@@ -119,15 +120,14 @@ func (c *SpamCheck) Values() []ReportResult {
119120
Status: true, Name: "SPF"})
120121
}
121122
if strings.Contains(rr.String(), "~all") {
122-
results = append(results, ReportResult{Result: "WARN: SPF record set to softfail.",
123+
results = append(results, ReportResult{Result: "WARN: SPF record set to softfail.",
123124
Status: true, Name: "SPF"})
124125
}
125-
if strings.Contains(rr.String(), " ptr ") || strings.Contains(rr.String(), " ptr:") {
126-
results = append(results, ReportResult{Result: "WARN: SPF record uses ptr mechanism (see RFC7208 5.5).",
126+
if strings.Contains(rr.String(), " ptr ") || strings.Contains(rr.String(), " ptr:") {
127+
results = append(results, ReportResult{Result: "WARN: SPF record uses ptr mechanism (see RFC7208 5.5).",
127128
Status: true, Name: "SPF"})
128129
}
129130

130-
break
131131
}
132132

133133
// TODO

‎utils.go

+12-18
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ func getIP(host string, qtype uint16, servers ...string) []net.IP {
3434
func extractIP(rrset []dns.RR) []net.IP {
3535
var ips []net.IP
3636
for _, rr := range rrset {
37-
switch rr.(type) {
37+
switch rr := rr.(type) {
3838
case *dns.A:
39-
ips = append(ips, rr.(*dns.A).A)
39+
ips = append(ips, rr.A)
4040
case *dns.AAAA:
41-
ips = append(ips, rr.(*dns.AAAA).AAAA)
41+
ips = append(ips, rr.AAAA)
4242
}
4343
}
4444
return ips
@@ -76,7 +76,11 @@ func query(q string, qtype uint16, server string, sec bool) (Response, error) {
7676
}
7777
var resp Response
7878
log.Debugf("Asking %s about %s (%s)", server, q, dns.TypeToString[qtype])
79-
m.Question[0] = dns.Question{dns.Fqdn(q), qtype, dns.ClassINET}
79+
m.Question[0] = dns.Question{
80+
Name: dns.Fqdn(q),
81+
Qtype: qtype,
82+
Qclass: dns.ClassINET,
83+
}
8084
in, rtt, err := c.Exchange(m, net.JoinHostPort(server, "53"))
8185
if err != nil {
8286
return resp, err
@@ -172,10 +176,7 @@ func isSameSubnet(ips ...net.IP) bool {
172176
}
173177
}
174178
}
175-
if count == ipv4*len(ipnets) {
176-
return true
177-
}
178-
return false
179+
return count == ipv4*len(ipnets)
179180
}
180181

181182
func scanerror(r *Report, check, ns, ip, domain string, results []dns.RR, err error) bool {
@@ -193,30 +194,23 @@ func scanerror(r *Report, check, ns, ip, domain string, results []dns.RR, err er
193194
return fail
194195
}
195196

196-
func rrset2map(rrset []dns.RR, m map[dns.RR]bool) map[dns.RR]bool {
197-
for _, rr := range rrset {
198-
m[rr] = true
199-
}
200-
return m
201-
}
202-
203197
func removeWild(wild []string, rrset []dns.RR) []dns.RR {
204198
if len(wild) == 0 {
205199
return rrset
206200
}
207201
newset := []dns.RR{}
208202
for _, rr := range rrset {
209203
match := false
210-
switch rr.(type) {
204+
switch rr := rr.(type) {
211205
case *dns.A:
212206
for _, ip := range wild {
213-
if rr.(*dns.A).A.String() == ip {
207+
if rr.A.String() == ip {
214208
match = true
215209
}
216210
}
217211
case *dns.AAAA:
218212
for _, ip := range wild {
219-
if rr.(*dns.AAAA).AAAA.String() == ip {
213+
if rr.AAAA.String() == ip {
220214
match = true
221215
}
222216
}

0 commit comments

Comments
 (0)