Revert "hehe off-by-one"

This reverts commit db78235ecd.

Reverting to old commit because I fucked up
This commit is contained in:
grumbulon 2022-06-25 13:46:38 -04:00
parent db78235ecd
commit 182ec20469
2 changed files with 48 additions and 1 deletions

2
cli.go
View File

@ -186,7 +186,7 @@ func parseArgs(args []string) (util.Answers, error) {
// TODO: Actually find where windows stuffs its dns resolvers
resp.Answers.Server = "8.8.4.4"
} else {
resp.Answers.Server = resolv.Servers[rand.Intn(len(resolv.Servers))]
resp.Answers.Server = resolv.Servers[rand.Intn(len(resolv.Servers)-1)]
}
}

47
util/dns.go Normal file
View File

@ -0,0 +1,47 @@
package util
import (
"encoding/base64"
"fmt"
"io"
"net/http"
"github.com/miekg/dns"
)
func ResolveHTTPS(msg *dns.Msg, server string) (*dns.Msg, error) {
httpR := &http.Client{}
buf, err := msg.Pack()
if err != nil {
return nil, err
}
query := server + "?dns=" + base64.RawURLEncoding.EncodeToString(buf)
req, err := http.NewRequest("GET", query, nil)
if err != nil {
return nil, err
}
req.Header.Set("Accept", "application/dns-message")
res, err := httpR.Do(req)
if err != nil {
return nil, err
}
defer res.Body.Close()
if res.StatusCode != http.StatusOK {
return nil, fmt.Errorf("bad HTTP Request: %d", res.StatusCode)
}
fullRes, err := io.ReadAll(res.Body)
if err != nil {
return nil, err
}
response := dns.Msg{}
err = response.Unpack(fullRes)
if err != nil {
return nil, err
}
return &response, nil
}