Skip to content

Commit 10bb8af

Browse files
ehsandeepehsandeep
committed
Merge remote-tracking branch 'origin'
2 parents b814627 + 7b8642b commit 10bb8af

File tree

5 files changed

+47
-27
lines changed

5 files changed

+47
-27
lines changed

‎v2/go.mod‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/projectdiscovery/dnsx v1.1.6
1212
github.com/projectdiscovery/fdmax v0.0.4
1313
github.com/projectdiscovery/gologger v1.1.12
14-
github.com/projectdiscovery/ratelimit v0.0.23
15-
github.com/projectdiscovery/retryablehttp-go v1.0.42
16-
github.com/projectdiscovery/utils v0.0.72
14+
github.com/projectdiscovery/ratelimit v0.0.26
15+
github.com/projectdiscovery/retryablehttp-go v1.0.44
16+
github.com/projectdiscovery/utils v0.0.76
1717
github.com/rs/xid v1.5.0
1818
github.com/stretchr/testify v1.8.4
1919
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
@@ -24,6 +24,7 @@ require (
2424
require (
2525
aead.dev/minisign v0.2.0 // indirect
2626
github.com/Masterminds/semver/v3 v3.2.1 // indirect
27+
github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057 // indirect
2728
github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 // indirect
2829
github.com/VividCortex/ewma v1.2.0 // indirect
2930
github.com/akrylysov/pogreb v0.10.1 // indirect
@@ -38,6 +39,7 @@ require (
3839
github.com/denisbrodbeck/machineid v1.0.1 // indirect
3940
github.com/dimchansky/utfbom v1.1.1 // indirect
4041
github.com/dlclark/regexp2 v1.8.1 // indirect
42+
github.com/docker/go-units v0.5.0 // indirect
4143
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
4244
github.com/fatih/color v1.15.0 // indirect
4345
github.com/gaukas/godicttls v0.0.4 // indirect
@@ -63,9 +65,9 @@ require (
6365
github.com/pierrec/lz4/v4 v4.1.2 // indirect
6466
github.com/projectdiscovery/blackrock v0.0.1 // indirect
6567
github.com/projectdiscovery/cdncheck v1.0.9 // indirect
66-
github.com/projectdiscovery/fastdialer v0.0.51 // indirect
67-
github.com/projectdiscovery/hmap v0.0.33 // indirect
68-
github.com/projectdiscovery/networkpolicy v0.0.6 // indirect
68+
github.com/projectdiscovery/fastdialer v0.0.56 // indirect
69+
github.com/projectdiscovery/hmap v0.0.36 // indirect
70+
github.com/projectdiscovery/networkpolicy v0.0.7 // indirect
6971
github.com/quic-go/quic-go v0.37.7 // indirect
7072
github.com/refraction-networking/utls v1.5.4 // indirect
7173
github.com/rivo/uniseg v0.4.4 // indirect
@@ -110,7 +112,7 @@ require (
110112
github.com/pkg/errors v0.9.1
111113
github.com/pmezard/go-difflib v1.0.0 // indirect
112114
github.com/projectdiscovery/goflags v0.1.34
113-
github.com/projectdiscovery/retryabledns v1.0.50 // indirect
115+
github.com/projectdiscovery/retryabledns v1.0.53 // indirect
114116
golang.org/x/net v0.17.0 // indirect
115-
golang.org/x/sys v0.15.0 // indirect
117+
golang.org/x/sys v0.16.0 // indirect
116118
)

‎v2/go.sum‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ aead.dev/minisign v0.2.0/go.mod h1:zdq6LdSd9TbuSxchxwhpA9zEb9YXcVGoE8JakuiGaIQ=
33
cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
44
github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
55
github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
6+
github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057 h1:KFac3SiGbId8ub47e7kd2PLZeACxc1LkiiNoDOFRClE=
7+
github.com/Mzack9999/gcache v0.0.0-20230410081825-519e28eab057/go.mod h1:iLB2pivrPICvLOuROKmlqURtFIEsoJZaMidQfCG1+D4=
68
github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 h1:ZbFL+BDfBqegi+/Ssh7im5+aQfBRx6it+kHnC7jaDU8=
79
github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809/go.mod h1:upgc3Zs45jBDnBT4tVRgRcgm26ABpaP7MoTSdgysca4=
810
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
@@ -46,6 +48,8 @@ github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/
4648
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
4749
github.com/dlclark/regexp2 v1.8.1 h1:6Lcdwya6GjPUNsBct8Lg/yRPwMhABj269AAzdGSiR+0=
4850
github.com/dlclark/regexp2 v1.8.1/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
51+
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
52+
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
4953
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY=
5054
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
5155
github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
@@ -179,26 +183,26 @@ github.com/projectdiscovery/chaos-client v0.5.1 h1:NFxU7cxBY7AL1OKxQQRLRvJrkXlV+
179183
github.com/projectdiscovery/chaos-client v0.5.1/go.mod h1:uU7X/hVEKpOP8OZ8meDAAetMZ4Up0lz9oCcPGe86Yx4=
180184
github.com/projectdiscovery/dnsx v1.1.6 h1:QdKVKC0n/fpgaB4q3s6A2wn+qqg75CY0XxNkU9sVjws=
181185
github.com/projectdiscovery/dnsx v1.1.6/go.mod h1:9rkLQzJHxQ26qiD1PhfoJDrhqCVN8lKLsxiAON1uDxM=
182-
github.com/projectdiscovery/fastdialer v0.0.51 h1:LsRry/aSzUfgSCakJve05d6Ut83w1n1NcGS5tyUqsEY=
183-
github.com/projectdiscovery/fastdialer v0.0.51/go.mod h1:OqJbaFL/a6kX7107K6OjZ3usi2MStZ7dQop73DUOUJU=
186+
github.com/projectdiscovery/fastdialer v0.0.56 h1:SUw193mzYaDFtBpQOs4+EHa6r1NnBYj3xwSqK1j9Chk=
187+
github.com/projectdiscovery/fastdialer v0.0.56/go.mod h1:o0Oeb78Bn6mpr+dTLV4Jb7hnEFQjjA7lUeDe8Ga6zq4=
184188
github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc=
185189
github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I=
186190
github.com/projectdiscovery/goflags v0.1.34 h1:s64GffNF7lsdMz4V4ZS2vfo+x+FxaMB0/TpqZC2q6FI=
187191
github.com/projectdiscovery/goflags v0.1.34/go.mod h1:Br+lowrSpQuQOwDon5w1ZLq9BPJvxZhBUpUTc98UXZs=
188192
github.com/projectdiscovery/gologger v1.1.12 h1:uX/QkQdip4PubJjjG0+uk5DtyAi1ANPJUvpmimXqv4A=
189193
github.com/projectdiscovery/gologger v1.1.12/go.mod h1:DI8nywPLERS5mo8QEA9E7gd5HZ3Je14SjJBH3F5/kLw=
190-
github.com/projectdiscovery/hmap v0.0.33 h1:kDkw4xVE8uyko6Cv3Cd9MZsHByn9BtXK3y7PeLKVBs4=
191-
github.com/projectdiscovery/hmap v0.0.33/go.mod h1:IlKSbnFKtn68STLiNwc5Kbu4GaR6aIsGaHbpFOYNFGY=
192-
github.com/projectdiscovery/networkpolicy v0.0.6 h1:yDvm0XCrS9HeemRrBS+J+22surzVczM94W5nHiOy/1o=
193-
github.com/projectdiscovery/networkpolicy v0.0.6/go.mod h1:8HJQ/33Pi7v3a3MRWIQGXzpj+zHw2d60TysEL4qdoQk=
194-
github.com/projectdiscovery/ratelimit v0.0.23 h1:Fz2A57UW6GK0L0huOGVXd97EhASrJV41SC1NrGImShU=
195-
github.com/projectdiscovery/ratelimit v0.0.23/go.mod h1:042iuvdggjUnsgAIzyxM3iLFveMaXnGTRwlCpfd03I0=
196-
github.com/projectdiscovery/retryabledns v1.0.50 h1:0nM3x29G5LAZ7urfl0jSs501RQ5q57SkPwkdY19ECn8=
197-
github.com/projectdiscovery/retryabledns v1.0.50/go.mod h1:CbQhVC9JjtqU/89gz25gs6UgpQKYwFN2RoWoW5a/M9Q=
198-
github.com/projectdiscovery/retryablehttp-go v1.0.42 h1:NW76U/r0pWNi6iudBqggG69sN8aguuXLLbGRkLvniyo=
199-
github.com/projectdiscovery/retryablehttp-go v1.0.42/go.mod h1:NWR4amTNHwM+ALk1QL1HiyzhFejRTMCHapM+oSoNSv8=
200-
github.com/projectdiscovery/utils v0.0.72 h1:sJ1lBcaWO6dJ65F+fVhSJbguhgWjixgy9mjj7jKBUW8=
201-
github.com/projectdiscovery/utils v0.0.72/go.mod h1:VPnijH51D8wB1VJiEujUp7UZ+TUTKN8PpoW82nivUVY=
194+
github.com/projectdiscovery/hmap v0.0.36 h1:hnaiw+NZKQzoP0TXGjf5QmAtMgmrR0LHtR4xINJXWr0=
195+
github.com/projectdiscovery/hmap v0.0.36/go.mod h1:q6UNS9PoJqZHq5s3BjFTKdYRTZvmFr1JvhMKjNGdGgo=
196+
github.com/projectdiscovery/networkpolicy v0.0.7 h1:AwHqBRXBqDQgnWzBMuoJtHBNEYBw+NFp/4qIK688x7o=
197+
github.com/projectdiscovery/networkpolicy v0.0.7/go.mod h1:CK0CnFoLF1Nou6mY7P4WODSAxhPN8g8g7XpapgEP8tI=
198+
github.com/projectdiscovery/ratelimit v0.0.26 h1:sxZCh72lMpQ1YNnJOWrJ+uZE9GFWdVE58LOArOc6c+4=
199+
github.com/projectdiscovery/ratelimit v0.0.26/go.mod h1:2NHqfqqb9xAnqW+Ztd8AzzNi+JP38Kcdhb8cnbfX9sI=
200+
github.com/projectdiscovery/retryabledns v1.0.53 h1:eX4f7Afi2INmEaDj8F5x5T/VfEj62Q5qS+z3kcRuMBk=
201+
github.com/projectdiscovery/retryabledns v1.0.53/go.mod h1:FbjRnVnTkyGujjnQGDVzMomIYA4apN+AR6VrlJ8toHk=
202+
github.com/projectdiscovery/retryablehttp-go v1.0.44 h1:hicCe2h6daHt4muPovmffZE3YKBqGioreO6EpIGZ87g=
203+
github.com/projectdiscovery/retryablehttp-go v1.0.44/go.mod h1:7ECXK2cH2/G4sstf8hacyrMdPPJ/3wCAO5tFPZ4iO4s=
204+
github.com/projectdiscovery/utils v0.0.76 h1:6azn0Zju0taw5Y9qAjpGPxyqwJf2AI4VJjtIzPBcRzQ=
205+
github.com/projectdiscovery/utils v0.0.76/go.mod h1:ERIYcW+h5jKIYyYkfdOpNPIUtH8Ogz4q5Wq3gx/71Zw=
202206
github.com/quic-go/quic-go v0.37.7 h1:AgKsQLZ1+YCwZd2GYhBUsJDYZwEkA5gENtAjb+MxONU=
203207
github.com/quic-go/quic-go v0.37.7/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
204208
github.com/refraction-networking/utls v1.5.4 h1:9k6EO2b8TaOGsQ7Pl7p9w6PUhx18/ZCeT0WNTZ7Uw4o=
@@ -346,8 +350,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
346350
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
347351
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
348352
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
349-
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
350-
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
353+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
354+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
351355
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
352356
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
353357
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎v2/pkg/runner/banners.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const banner = `
1717
const ToolName = `subfinder`
1818

1919
// Version is the current version of subfinder
20-
const version = `v2.6.4`
20+
const version = `v2.6.5`
2121

2222
// showBanner is used to show the banner to the user
2323
func showBanner() {

‎v2/pkg/runner/enumerate.go‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func (r *Runner) EnumerateSingleDomainWithCtx(ctx context.Context, domain string
4949
uniqueMap := make(map[string]resolve.HostEntry)
5050
// Create a map to track sources for each host
5151
sourceMap := make(map[string]map[string]struct{})
52+
skippedCounts := make(map[string]int)
5253
// Process the results in a separate goroutine
5354
go func() {
5455
for result := range passiveResults {
@@ -58,6 +59,7 @@ func (r *Runner) EnumerateSingleDomainWithCtx(ctx context.Context, domain string
5859
case subscraping.Subdomain:
5960
// Validate the subdomain found and remove wildcards from
6061
if !strings.HasSuffix(result.Value, "."+domain) {
62+
skippedCounts[result.Source]++
6163
continue
6264
}
6365
subdomain := strings.ReplaceAll(strings.ToLower(result.Value), "*.", "")
@@ -77,6 +79,7 @@ func (r *Runner) EnumerateSingleDomainWithCtx(ctx context.Context, domain string
7779
// Check if the subdomain is a duplicate. If not,
7880
// send the subdomain for resolution.
7981
if _, ok := uniqueMap[subdomain]; ok {
82+
skippedCounts[result.Source]++
8083
continue
8184
}
8285

@@ -164,7 +167,17 @@ func (r *Runner) EnumerateSingleDomainWithCtx(ctx context.Context, domain string
164167

165168
if r.options.Statistics {
166169
gologger.Info().Msgf("Printing source statistics for %s", domain)
167-
printStatistics(r.passiveAgent.GetStatistics())
170+
statistics := r.passiveAgent.GetStatistics()
171+
// This is a hack to remove the skipped count from the statistics
172+
// as we don't want to show it in the statistics.
173+
// TODO: Design a better way to do this.
174+
for source, count := range skippedCounts {
175+
if stat, ok := statistics[source]; ok {
176+
stat.Results -= count
177+
statistics[source] = stat
178+
}
179+
}
180+
printStatistics(statistics)
168181
}
169182

170183
return nil

‎v2/pkg/subscraping/sources/securitytrails/securitytrails.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
jsoniter "github.com/json-iterator/go"
1313

1414
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping"
15+
"github.com/projectdiscovery/utils/ptr"
1516
)
1617

1718
type response struct {
@@ -66,7 +67,7 @@ func (s *Source) Run(ctx context.Context, domain string, session *subscraping.Se
6667
resp, err = session.Get(ctx, fmt.Sprintf("https://api.securitytrails.com/v1/scroll/%s", scrollId), "", headers)
6768
}
6869

69-
if err != nil && resp.StatusCode == 403 {
70+
if err != nil && ptr.Safe(resp).StatusCode == 403 {
7071
resp, err = session.Get(ctx, fmt.Sprintf("https://api.securitytrails.com/v1/domain/%s/subdomains", domain), "", headers)
7172
}
7273

0 commit comments

Comments
 (0)