mirror of
https://github.com/m13253/dns-over-https.git
synced 2026-07-28 14:39:29 +00:00
Resolve (some) linter warnings
This commit is contained in:
Star Brilliant
+3
-3
@@ -21,7 +21,7 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package jsonDNS
|
||||
package jsondns
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -38,11 +38,11 @@ type dnsError struct {
|
||||
|
||||
func FormatError(w http.ResponseWriter, comment string, errcode int) {
|
||||
w.Header().Set("Content-Type", "application/json; charset=UTF-8")
|
||||
errJson := dnsError{
|
||||
errJSON := dnsError{
|
||||
Status: dns.RcodeServerFailure,
|
||||
Comment: comment,
|
||||
}
|
||||
errStr, err := json.Marshal(errJson)
|
||||
errStr, err := json.Marshal(errJSON)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
+31
-30
@@ -21,11 +21,12 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package jsonDNS
|
||||
package jsondns
|
||||
|
||||
import (
|
||||
"github.com/infobloxopen/go-trees/iptree"
|
||||
"net"
|
||||
|
||||
"github.com/infobloxopen/go-trees/iptree"
|
||||
)
|
||||
|
||||
var defaultFilter *iptree.Tree
|
||||
@@ -36,87 +37,87 @@ func init() {
|
||||
// RFC6890
|
||||
// This host on this network
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{0, 0, 0, 0},
|
||||
net.IPMask{255, 0, 0, 0},
|
||||
IP: net.IP{0, 0, 0, 0},
|
||||
Mask: net.IPMask{255, 0, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// Private-Use Networks
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{10, 0, 0, 0},
|
||||
net.IPMask{255, 0, 0, 0},
|
||||
IP: net.IP{10, 0, 0, 0},
|
||||
Mask: net.IPMask{255, 0, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// Shared Address Space
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{100, 64, 0, 0},
|
||||
net.IPMask{255, 192, 0, 0},
|
||||
IP: net.IP{100, 64, 0, 0},
|
||||
Mask: net.IPMask{255, 192, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// Loopback
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{127, 0, 0, 0},
|
||||
net.IPMask{255, 0, 0, 0},
|
||||
IP: net.IP{127, 0, 0, 0},
|
||||
Mask: net.IPMask{255, 0, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// Link Local
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{169, 254, 0, 0},
|
||||
net.IPMask{255, 255, 0, 0},
|
||||
IP: net.IP{169, 254, 0, 0},
|
||||
Mask: net.IPMask{255, 255, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// Private-Use Networks
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{172, 16, 0, 0},
|
||||
net.IPMask{255, 240, 0, 0},
|
||||
IP: net.IP{172, 16, 0, 0},
|
||||
Mask: net.IPMask{255, 240, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// DS-Lite
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{192, 0, 0, 0},
|
||||
net.IPMask{255, 255, 255, 248},
|
||||
IP: net.IP{192, 0, 0, 0},
|
||||
Mask: net.IPMask{255, 255, 255, 248},
|
||||
}, struct{}{})
|
||||
|
||||
// 6to4 Relay Anycast
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{192, 88, 99, 0},
|
||||
net.IPMask{255, 255, 255, 0},
|
||||
IP: net.IP{192, 88, 99, 0},
|
||||
Mask: net.IPMask{255, 255, 255, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// Private-Use Networks
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{192, 168, 0, 0},
|
||||
net.IPMask{255, 255, 0, 0},
|
||||
IP: net.IP{192, 168, 0, 0},
|
||||
Mask: net.IPMask{255, 255, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// Reserved for Future Use & Limited Broadcast
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{240, 0, 0, 0},
|
||||
net.IPMask{240, 0, 0, 0},
|
||||
IP: net.IP{240, 0, 0, 0},
|
||||
Mask: net.IPMask{240, 0, 0, 0},
|
||||
}, struct{}{})
|
||||
|
||||
// RFC6890
|
||||
// Unspecified & Loopback Address
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
net.IPMask{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe},
|
||||
IP: net.IP{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
Mask: net.IPMask{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe},
|
||||
}, struct{}{})
|
||||
|
||||
// Discard-Only Prefix
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
net.IPMask{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
IP: net.IP{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
Mask: net.IPMask{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
}, struct{}{})
|
||||
|
||||
// Unique-Local
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
net.IPMask{0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
IP: net.IP{0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
Mask: net.IPMask{0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
}, struct{}{})
|
||||
|
||||
// Linked-Scoped Unicast
|
||||
defaultFilter.InplaceInsertNet(&net.IPNet{
|
||||
net.IP{0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
net.IPMask{0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
IP: net.IP{0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
Mask: net.IPMask{0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
|
||||
}, struct{}{})
|
||||
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package jsonDNS
|
||||
package jsondns
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
)
|
||||
|
||||
func ExampleFindIP() {
|
||||
func ExampleIsGlobalIP() {
|
||||
fmt.Println(IsGlobalIP(net.ParseIP("127.0.0.1")))
|
||||
fmt.Println(IsGlobalIP(net.IP{192, 168, 1, 1}))
|
||||
fmt.Println(IsGlobalIP(net.ParseIP("8.8.8.8")))
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package jsonDNS
|
||||
package jsondns
|
||||
|
||||
import (
|
||||
"net"
|
||||
|
||||
+13
-13
@@ -21,7 +21,7 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package jsonDNS
|
||||
package jsondns
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@@ -30,12 +30,12 @@ import (
|
||||
|
||||
type QuestionList []Question
|
||||
|
||||
// Fix variant question response in Response.Question
|
||||
//
|
||||
// Solution taken from:
|
||||
// https://engineering.bitnami.com/articles/dealing-with-json-with-non-homogeneous-types-in-go.html
|
||||
// https://archive.is/NU4zR
|
||||
func (ql *QuestionList) UnmarshalJSON(b []byte) error {
|
||||
// Fix variant question response in Response.Question
|
||||
//
|
||||
// Solution taken from:
|
||||
// https://engineering.bitnami.com/articles/dealing-with-json-with-non-homogeneous-types-in-go.html
|
||||
// https://archive.is/NU4zR
|
||||
if len(b) > 0 && b[0] == '[' {
|
||||
return json.Unmarshal(b, (*[]Question)(ql))
|
||||
}
|
||||
@@ -60,13 +60,13 @@ type Response struct {
|
||||
// FIXME: We don't have DNSSEC yet! This bit is not reliable!
|
||||
AD bool `json:"AD"`
|
||||
// Whether the client asked to disable DNSSEC
|
||||
CD bool `json:"CD"`
|
||||
Question QuestionList `json:"Question"`
|
||||
Answer []RR `json:"Answer,omitempty"`
|
||||
Authority []RR `json:"Authority,omitempty"`
|
||||
Additional []RR `json:"Additional,omitempty"`
|
||||
Comment string `json:"Comment,omitempty"`
|
||||
EdnsClientSubnet string `json:"edns_client_subnet,omitempty"`
|
||||
CD bool `json:"CD"`
|
||||
Question QuestionList `json:"Question"`
|
||||
Answer []RR `json:"Answer,omitempty"`
|
||||
Authority []RR `json:"Authority,omitempty"`
|
||||
Additional []RR `json:"Additional,omitempty"`
|
||||
Comment string `json:"Comment,omitempty"`
|
||||
EdnsClientSubnet string `json:"edns_client_subnet,omitempty"`
|
||||
// Least time-to-live
|
||||
HaveTTL bool `json:"-"`
|
||||
LeastTTL uint32 `json:"-"`
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package jsonDNS
|
||||
package jsondns
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
Reference in New Issue
Block a user