Skip to content

Commit ffa558d

Browse files
leonjzaleonjza
authored
Merge pull request #2 from leonjza/master
Migrate to Go Modules and internal serialiser updates
2 parents 5b0db27 + 8cf5ef4 commit ffa558d

8 files changed

Lines changed: 95 additions & 134 deletions

File tree

‎Gopkg.lock‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎Gopkg.toml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎cmd/root.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func init() {
6262
}
6363

6464
rootCmd.PersistentFlags().StringVarP(&dnsProviderName,
65-
"provider", "p", "googlefront",
65+
"provider", "p", "google",
6666
"Preferred DNS provider to use. [possible: googlefront, google, cloudflare, quad9, raw]")
6767
rootCmd.PersistentFlags().BoolVarP(&validateSSL,
6868
"validate-certificate", "K", false, "Validate DoH provider SSL certificates")
@@ -87,6 +87,8 @@ func validateDNSDomain() {
8787
func validateDNSProvider() {
8888
switch dnsProviderName {
8989
case "googlefront":
90+
log.Warn(`WARNING: Domain fronting dns.google.com via www.google.com no longer works. ` +
91+
`A redirect to dns.google.com will be returned. See: https://twitter.com/leonjza/status/1187002742553923584`)
9092
dnsProvider = dnsclient.NewGoogleFrontDNS()
9193
break
9294
case "google":

‎go.mod‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module github.com/sensepost/godoh
2+
3+
go 1.13
4+
5+
require (
6+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
7+
github.com/miekg/dns v1.1.15
8+
github.com/sirupsen/logrus v1.4.2
9+
github.com/spf13/cobra v0.0.5
10+
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
11+
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
12+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
13+
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect
14+
)

‎go.sum‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
2+
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
3+
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
4+
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
5+
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
6+
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
7+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
10+
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
11+
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
12+
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
13+
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
14+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
15+
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
16+
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
17+
github.com/miekg/dns v1.1.15 h1:CSSIDtllwGLMoA6zjdKnaE6Tx6eVUxQ29LUgGetiDCI=
18+
github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
19+
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
20+
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
21+
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
22+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
23+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
24+
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
25+
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
26+
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
27+
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
28+
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
29+
github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
30+
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
31+
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
32+
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
33+
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
34+
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
35+
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
36+
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
37+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
38+
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
39+
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
40+
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
41+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
42+
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
43+
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
44+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
45+
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
46+
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
47+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
48+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
49+
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
50+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
51+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
52+
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
53+
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI=
54+
golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
55+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
56+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
57+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎protocol/command.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import (
99

1010
// Command represents a command to be send over DNS.
1111
type Command struct {
12-
Exec string
13-
Data []byte
14-
ExecTime time.Time
15-
identifier string
12+
Exec string `json:"exec"`
13+
Data []byte `json:"data"`
14+
ExecTime time.Time `json:"exectime"`
15+
Identifier string `json:"identifier"`
1616
}
1717

1818
// Prepare configures the File struct with relevant data.
1919
func (c *Command) Prepare(cmd string) {
2020

2121
c.Exec = cmd
22-
c.identifier = utils.RandomString(5)
22+
c.Identifier = utils.RandomString(5)
2323
}
2424

2525
// GetOutgoing returns the hostnames to lookup as part of a file

‎protocol/file.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111

1212
// File represents a file to be send over DNS.
1313
type File struct {
14-
Size int64
15-
Shasum string
16-
Name string
17-
Data *[]byte
18-
identifier string
14+
Size int64 `json:"size"`
15+
Shasum string `json:"shasum"`
16+
Name string `json:"name"`
17+
Data *[]byte `json:"data"`
18+
Identifier string `json:"identifier"`
1919
}
2020

2121
// Prepare configures the File struct with relevant data.
@@ -29,7 +29,7 @@ func (fc *File) Prepare(data *[]byte, fileInfo os.FileInfo) {
2929
fc.Shasum = hex.EncodeToString(h.Sum(nil))
3030
fc.Name = fileInfo.Name()
3131
fc.Data = data
32-
fc.identifier = utils.RandomString(5)
32+
fc.Identifier = utils.RandomString(5)
3333
}
3434

3535
// GetRequests returns the hostnames to lookup as part of a file

‎utils/utils.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"crypto/aes"
77
"crypto/cipher"
88
"crypto/rand"
9-
"encoding/gob"
109
"encoding/hex"
10+
"encoding/json"
1111
"errors"
1212
"io"
1313
"io/ioutil"
@@ -17,15 +17,13 @@ import (
1717
// GobPress will gob encode and compress a struct
1818
func GobPress(s interface{}, data io.Writer) error {
1919

20-
b := bytes.Buffer{}
21-
encoder := gob.NewEncoder(&b)
22-
23-
if err := encoder.Encode(s); err != nil {
20+
j, err := json.Marshal(s)
21+
if err != nil {
2422
return err
2523
}
2624

27-
// Encrypt the Gobbed data
28-
enc, err := Encrypt(b.Bytes())
25+
// Encrypt the data
26+
enc, err := Encrypt(j)
2927
if err != nil {
3028
return err
3129
}
@@ -47,8 +45,11 @@ func UngobUnpress(s interface{}, data []byte) error {
4745
return err
4846
}
4947

50-
decoder := gob.NewDecoder(bytes.NewReader(decryptData))
51-
return decoder.Decode(s)
48+
if err := json.Unmarshal(decryptData, &s); err != nil {
49+
return err
50+
}
51+
52+
return nil
5253
}
5354

5455
// GzipWrite data to a Writer

0 commit comments

Comments
 (0)