Skip to content

Commit 83317fc

Browse files
staaldraadstaaldraad
committed
misc: update go and deps
1 parent e3ff067 commit 83317fc

File tree

8 files changed

+70
-49
lines changed

8 files changed

+70
-49
lines changed

‎autodiscover/autodiscover.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"crypto/tls"
66
"fmt"
7-
"io/ioutil"
7+
"io"
88
"net"
99
"net/http"
1010
"net/url"
@@ -13,7 +13,7 @@ import (
1313
"strings"
1414
"text/template"
1515

16-
"github.com/sensepost/ruler/http-ntlm"
16+
httpntlm "github.com/sensepost/ruler/http-ntlm"
1717
"github.com/sensepost/ruler/utils"
1818
)
1919

@@ -205,7 +205,7 @@ func CheckCache(email string) *utils.AutodiscoverResp {
205205
return nil
206206
}
207207
utils.Info.Println("Found cached Autodiscover record. Using this (use --nocache to force new lookup)")
208-
data, err := ioutil.ReadFile(path)
208+
data, err := os.ReadFile(path)
209209
if err != nil {
210210
utils.Error.Println("Error reading stored record ", err)
211211
return nil
@@ -374,7 +374,7 @@ func autodiscover(domain string, mapi bool) (*utils.AutodiscoverResp, string, er
374374

375375
defer resp.Body.Close()
376376

377-
body, err := ioutil.ReadAll(resp.Body)
377+
body, err := io.ReadAll(resp.Body)
378378
if err != nil {
379379
return nil, "", err
380380
}

‎autodiscover/brute.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package autodiscover
33
import (
44
"crypto/tls"
55
"fmt"
6-
"io/ioutil"
76
"net/http"
87
"net/http/cookiejar"
98
"net/url"
9+
"os"
1010
"regexp"
1111
"strings"
1212
"time"
1313

14-
"github.com/sensepost/ruler/http-ntlm"
14+
httpntlm "github.com/sensepost/ruler/http-ntlm"
1515
"github.com/sensepost/ruler/utils"
1616
)
1717

@@ -311,7 +311,7 @@ func UserPassBruteForce() {
311311
func readFile(filename string) []string {
312312
var outputs []string
313313

314-
data, err := ioutil.ReadFile(filename)
314+
data, err := os.ReadFile(filename)
315315
if err != nil {
316316
utils.Error.Println("Input file not found")
317317
return nil

‎go.mod

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
module github.com/sensepost/ruler
22

3-
go 1.15
3+
go 1.21
44

55
require (
6-
github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c
6+
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef
77
github.com/staaldraad/go-ntlm v0.0.0-20200612175713-cd032d41aa8c
8-
github.com/urfave/cli v1.22.5
9-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
10-
golang.org/x/net v0.0.0-20210119194325-5f4716e94777
8+
github.com/urfave/cli v1.22.15
9+
golang.org/x/net v0.26.0
1110
gopkg.in/yaml.v2 v2.4.0
1211
)
12+
13+
require (
14+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
15+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
16+
golang.org/x/crypto v0.24.0 // indirect
17+
golang.org/x/sys v0.21.0 // indirect
18+
golang.org/x/term v0.21.0 // indirect
19+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
20+
)

‎go.sum

+39-24
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,46 @@
1-
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
2-
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
3-
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
4-
github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c h1:aY2hhxLhjEAbfXOx2nRJxCXezC6CO2V/yN+OCr1srtk=
5-
github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
1+
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
2+
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
3+
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
4+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7+
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef h1:A9HsByNhogrvm9cWb28sjiS3i7tcKCkflWFEkHfuAgM=
8+
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
9+
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
10+
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
11+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
12+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
13+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
614
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
715
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8-
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
9-
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
10-
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
11-
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
16+
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
17+
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
1218
github.com/staaldraad/go-ntlm v0.0.0-20200612175713-cd032d41aa8c h1:ZGPsFTrrYiQUmVV+86h6HX9ml4PyrA1REy8NWQwrcBE=
1319
github.com/staaldraad/go-ntlm v0.0.0-20200612175713-cd032d41aa8c/go.mod h1:Jzdz9vcdmcS8ZT5Q+UYGSx8PSIKaQtxQvNVUqN/MOMQ=
14-
github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
15-
github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
16-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
17-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
18-
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
19-
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
20-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
21-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
22-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
23-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
24-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
25-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
26-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
27-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
20+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
21+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
22+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
23+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
24+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
25+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
26+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
27+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
28+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
29+
github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM=
30+
github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0=
31+
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
32+
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
33+
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
34+
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
35+
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
36+
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
37+
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
38+
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
2839
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
29-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
40+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
41+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
3042
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
3143
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
44+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
45+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
46+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎http-ntlm/ntlmtransport.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"errors"
1313
"fmt"
1414
"io"
15-
"io/ioutil"
1615
"net/http"
1716
"net/http/cookiejar"
1817
"net/url"
@@ -84,7 +83,7 @@ func (t NtlmTransport) RoundTrip(req *http.Request) (res *http.Response, err err
8483

8584
// it's necessary to reuse the same http connection
8685
// in order to do that it's required to read Body and close it
87-
_, err = io.Copy(ioutil.Discard, resp.Body)
86+
_, err = io.Copy(io.Discard, resp.Body)
8887
if err != nil {
8988
return nil, err
9089
}

‎mapi/mapi.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import (
55
"crypto/tls"
66
"encoding/hex"
77
"fmt"
8-
"io/ioutil"
8+
"io"
99
"net/http"
1010
"net/url"
1111
"regexp"
1212
"runtime"
1313
"strings"
1414
"time"
1515

16-
"github.com/sensepost/ruler/http-ntlm"
17-
"github.com/sensepost/ruler/rpc-http"
16+
httpntlm "github.com/sensepost/ruler/http-ntlm"
17+
rpchttp "github.com/sensepost/ruler/rpc-http"
1818
"github.com/sensepost/ruler/utils"
1919
)
2020

@@ -242,7 +242,7 @@ func mapiRequestHTTP(URL, mapiType string, body []byte) ([]byte, error) {
242242
}
243243
}
244244

245-
rbody, err := ioutil.ReadAll(resp.Body)
245+
rbody, err := io.ReadAll(resp.Body)
246246
if err != nil {
247247
return nil, &TransportError{err}
248248
}

‎ruler.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bufio"
55
"encoding/hex"
66
"fmt"
7-
"io/ioutil"
7+
"io"
88
"net/http"
99
"net/http/cookiejar"
1010
"net/url"
@@ -1244,13 +1244,13 @@ A tool by @_staaldraad and @sensepost to abuse Exchange Services.
12441244

12451245
app.Before = func(c *cli.Context) error {
12461246
if c.Bool("verbose") == true && c.Bool("debug") == false {
1247-
utils.Init(os.Stdout, os.Stdout, ioutil.Discard, os.Stderr)
1247+
utils.Init(os.Stdout, os.Stdout, io.Discard, os.Stderr)
12481248
} else if c.Bool("verbose") == false && c.Bool("debug") == true {
1249-
utils.Init(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr)
1249+
utils.Init(io.Discard, os.Stdout, os.Stdout, os.Stderr)
12501250
} else if c.Bool("debug") == true {
12511251
utils.Init(os.Stdout, os.Stdout, os.Stdout, os.Stderr)
12521252
} else {
1253-
utils.Init(ioutil.Discard, os.Stdout, ioutil.Discard, os.Stderr)
1253+
utils.Init(io.Discard, os.Stdout, io.Discard, os.Stderr)
12541254
}
12551255
return nil
12561256
}

‎utils/utils.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"encoding/hex"
88
"fmt"
99
"hash/fnv"
10-
"io/ioutil"
1110
"math/rand"
1211
"os"
1312
"reflect"
@@ -31,7 +30,7 @@ func ReadFile(path string) ([]byte, error) {
3130
if _, err := os.Stat(path); err != nil {
3231
return nil, err
3332
}
34-
data, err := ioutil.ReadFile(path)
33+
data, err := os.ReadFile(path)
3534
if err != nil {
3635
return nil, err
3736
}
@@ -318,7 +317,7 @@ func GenerateString(pcount int) string {
318317
// ReadYml reads the supplied config file, Unmarshals the data into the global config struct.
319318
func ReadYml(yml string) (YamlConfig, error) {
320319
var config YamlConfig
321-
data, err := ioutil.ReadFile(yml)
320+
data, err := os.ReadFile(yml)
322321
if err != nil {
323322
return YamlConfig{}, err
324323
}

0 commit comments

Comments
 (0)