Skip to content

Commit c6f36ad

Browse files
Merge pull request #1598 from projectdiscovery/dev
release v2.8.0
2 parents fea5afa + b350e9d commit c6f36ad

File tree

63 files changed

+565
-379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+565
-379
lines changed

.github/workflows/build-test.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: 🔨 Build Test
33
on:
44
pull_request:
55
paths:
6-
- '**.go'
7-
- '**.mod'
6+
- "**.go"
7+
- "**.mod"
88
workflow_dispatch:
99
inputs:
1010
short:
11-
description: 'Use -short flag for tests'
11+
description: "Use -short flag for tests"
1212
required: false
1313
type: boolean
1414
default: false
@@ -21,8 +21,10 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v4
2323
- uses: projectdiscovery/actions/setup/go@v1
24+
with:
25+
go-version-file: v2/go.mod
2426
- name: Run golangci-lint
25-
uses: projectdiscovery/actions/golangci-lint/v2@v1
27+
uses: golangci/golangci-lint-action@v8
2628
with:
2729
version: latest
2830
args: --timeout 5m
@@ -38,6 +40,8 @@ jobs:
3840
steps:
3941
- uses: actions/checkout@v4
4042
- uses: projectdiscovery/actions/setup/go@v1
43+
with:
44+
go-version-file: v2/go.mod
4145
- run: go build ./...
4246
working-directory: v2/
4347

@@ -79,4 +83,4 @@ jobs:
7983

8084
- name: Run Example
8185
run: go run .
82-
working-directory: v2/examples
86+
working-directory: v2/examples

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build
2-
FROM golang:1.21-alpine AS build-env
2+
FROM golang:1.24-alpine AS build-env
33
RUN apk add build-base
44
WORKDIR /app
55
COPY . /app
@@ -8,7 +8,7 @@ RUN go mod download
88
RUN go build ./cmd/subfinder
99

1010
# Release
11-
FROM alpine:3.18.6
11+
FROM alpine:latest
1212
RUN apk upgrade --no-cache \
1313
&& apk add --no-cache bind-tools ca-certificates
1414
COPY --from=build-env /app/v2/subfinder /usr/local/bin/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ OPTIMIZATION:
111111

112112
# Installation
113113

114-
`subfinder` requires **go1.21** to install successfully. Run the following command to install the latest version:
114+
`subfinder` requires **go1.24** to install successfully. Run the following command to install the latest version:
115115

116116
```sh
117117
go install -v github.com/projectdiscovery/subfinder/v2/cmd/subfinder@latest

v2/.goreleaser.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version: 2
2+
13
before:
24
hooks:
35
- go mod tidy
@@ -25,7 +27,8 @@ builds:
2527
main: cmd/subfinder/main.go
2628

2729
archives:
28-
- format: zip
30+
- formats:
31+
- zip
2932
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}'
3033

3134
checksum:
@@ -40,4 +43,4 @@ announce:
4043

4144
discord:
4245
enabled: true
43-
message_template: '**New Release: {{ .ProjectName }} {{.Tag}}** is published! Check it out at {{ .ReleaseURL }}'
46+
message_template: '**New Release: {{ .ProjectName }} {{.Tag}}** is published! Check it out at {{ .ReleaseURL }}'

v2/go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
github.com/projectdiscovery/dnsx v1.2.2
1414
github.com/projectdiscovery/fdmax v0.0.4
1515
github.com/projectdiscovery/gologger v1.1.54
16-
github.com/projectdiscovery/ratelimit v0.0.79
17-
github.com/projectdiscovery/retryablehttp-go v1.0.109
18-
github.com/projectdiscovery/utils v0.4.18
16+
github.com/projectdiscovery/ratelimit v0.0.81
17+
github.com/projectdiscovery/retryablehttp-go v1.0.114
18+
github.com/projectdiscovery/utils v0.4.20
1919
github.com/rs/xid v1.5.0
2020
github.com/stretchr/testify v1.10.0
2121
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
@@ -43,13 +43,13 @@ require (
4343
github.com/charmbracelet/lipgloss v0.13.0 // indirect
4444
github.com/charmbracelet/x/ansi v0.3.2 // indirect
4545
github.com/cheggaaa/pb/v3 v3.1.4 // indirect
46-
github.com/cloudflare/circl v1.5.0 // indirect
46+
github.com/cloudflare/circl v1.6.1 // indirect
4747
github.com/dimchansky/utfbom v1.1.1 // indirect
4848
github.com/dlclark/regexp2 v1.11.4 // indirect
4949
github.com/docker/go-units v0.5.0 // indirect
5050
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
5151
github.com/fatih/color v1.15.0 // indirect
52-
github.com/gaissmai/bart v0.17.10 // indirect
52+
github.com/gaissmai/bart v0.20.4 // indirect
5353
github.com/go-ole/go-ole v1.2.6 // indirect
5454
github.com/golang/protobuf v1.5.3 // indirect
5555
github.com/golang/snappy v0.0.4 // indirect
@@ -78,11 +78,11 @@ require (
7878
github.com/pierrec/lz4/v4 v4.1.21 // indirect
7979
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
8080
github.com/projectdiscovery/blackrock v0.0.1 // indirect
81-
github.com/projectdiscovery/cdncheck v1.1.15 // indirect
82-
github.com/projectdiscovery/fastdialer v0.4.0 // indirect
83-
github.com/projectdiscovery/hmap v0.0.87 // indirect
81+
github.com/projectdiscovery/cdncheck v1.1.23 // indirect
82+
github.com/projectdiscovery/fastdialer v0.4.1 // indirect
83+
github.com/projectdiscovery/hmap v0.0.89 // indirect
8484
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 // indirect
85-
github.com/projectdiscovery/networkpolicy v0.1.12 // indirect
85+
github.com/projectdiscovery/networkpolicy v0.1.15 // indirect
8686
github.com/refraction-networking/utls v1.7.0 // indirect
8787
github.com/rivo/uniseg v0.4.7 // indirect
8888
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
@@ -135,7 +135,7 @@ require (
135135
github.com/pkg/errors v0.9.1 // indirect
136136
github.com/pmezard/go-difflib v1.0.0 // indirect
137137
github.com/projectdiscovery/goflags v0.1.74
138-
github.com/projectdiscovery/retryabledns v1.0.98 // indirect
138+
github.com/projectdiscovery/retryabledns v1.0.101 // indirect
139139
golang.org/x/net v0.38.0 // indirect
140140
golang.org/x/sys v0.31.0 // indirect
141141
)

v2/go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
7676
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
7777
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
7878
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
79-
github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
80-
github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
79+
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
80+
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
8181
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 h1:ox2F0PSMlrAAiAdknSRMDrAr8mfxPCfSZolH+/qQnyQ=
8282
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08/go.mod h1:pCxVEbcm3AMg7ejXyorUXi6HQCzOIBf7zEDVPtw0/U4=
8383
github.com/corpix/uarand v0.2.0 h1:U98xXwud/AVuCpkpgfPF7J5TQgr7R5tqT8VZP5KWbzE=
@@ -102,8 +102,8 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD
102102
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
103103
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
104104
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
105-
github.com/gaissmai/bart v0.17.10 h1:TY1y++A6N/ESrwRLTRWrnVOrQpZqpOYSVnKMu/FYW6o=
106-
github.com/gaissmai/bart v0.17.10/go.mod h1:JCPkH/Xt5bSPCKDc6OpzkhSCeib8BIxu3kthzZwcl6w=
105+
github.com/gaissmai/bart v0.20.4 h1:Ik47r1fy3jRVU+1eYzKSW3ho2UgBVTVnUS8O993584U=
106+
github.com/gaissmai/bart v0.20.4/go.mod h1:cEed+ge8dalcbpi8wtS9x9m2hn/fNJH5suhdGQOHnYk=
107107
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
108108
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
109109
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
@@ -255,34 +255,34 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
255255
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
256256
github.com/projectdiscovery/blackrock v0.0.1 h1:lHQqhaaEFjgf5WkuItbpeCZv2DUIE45k0VbGJyft6LQ=
257257
github.com/projectdiscovery/blackrock v0.0.1/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss=
258-
github.com/projectdiscovery/cdncheck v1.1.15 h1:rRs3LW2MP7V8QeONVRYce6RhDcWp83O+AWmt+QQ4mBM=
259-
github.com/projectdiscovery/cdncheck v1.1.15/go.mod h1:dFEGsG0qAJY0AaRr2N1BY0OtZiTxS4kYeT5+OkF8t1U=
258+
github.com/projectdiscovery/cdncheck v1.1.23 h1:LOd6Y7hnV6sXFBs4qGDM0N9xfheAmqLhsfH2cog+M2c=
259+
github.com/projectdiscovery/cdncheck v1.1.23/go.mod h1:dFEGsG0qAJY0AaRr2N1BY0OtZiTxS4kYeT5+OkF8t1U=
260260
github.com/projectdiscovery/chaos-client v0.5.2 h1:dN+7GXEypsJAbCD//dBcUxzAEAEH1fjc/7Rf4F/RiNU=
261261
github.com/projectdiscovery/chaos-client v0.5.2/go.mod h1:KnoJ/NJPhll42uaqlDga6oafFfNw5l2XI2ajRijtDuU=
262262
github.com/projectdiscovery/dnsx v1.2.2 h1:ZjUov0GOyrS8ERlKAAhk+AOkqzaYHBzCP0qZfO+6Ihg=
263263
github.com/projectdiscovery/dnsx v1.2.2/go.mod h1:3iYm86OEqo0WxeGDkVl5WZNmG0qYE5TYNx8fBg6wX1I=
264-
github.com/projectdiscovery/fastdialer v0.4.0 h1:licZKyq+Shd5lLDb8uPd60Jp43K4NFE8cr67XD2eg7w=
265-
github.com/projectdiscovery/fastdialer v0.4.0/go.mod h1:Q0YLArvpx9GAfY/NcTPMCA9qZuVOGnuVoNYWzKBwxdQ=
264+
github.com/projectdiscovery/fastdialer v0.4.1 h1:kp6Q0odo0VZ0vZIGOn+q9aLgBSk6uYoD1MsjCAH8+h4=
265+
github.com/projectdiscovery/fastdialer v0.4.1/go.mod h1:875Wlggf0JAz+fDIPwUQeeBqEF6nJA71XVrjuTZCV7I=
266266
github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc=
267267
github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I=
268268
github.com/projectdiscovery/goflags v0.1.74 h1:n85uTRj5qMosm0PFBfsvOL24I7TdWRcWq/1GynhXS7c=
269269
github.com/projectdiscovery/goflags v0.1.74/go.mod h1:UMc9/7dFz2oln+10tv6cy+7WZKTHf9UGhaNkF95emh4=
270270
github.com/projectdiscovery/gologger v1.1.54 h1:WMzvJ8j/4gGfPKpCttSTaYCVDU1MWQSJnk3wU8/U6Ws=
271271
github.com/projectdiscovery/gologger v1.1.54/go.mod h1:vza/8pe2OKOt+ujFWncngknad1XWr8EnLKlbcejOyUE=
272-
github.com/projectdiscovery/hmap v0.0.87 h1:bSIqggL878qmmMG67rNgmEa314GB1o2rFM9wjJbsJHA=
273-
github.com/projectdiscovery/hmap v0.0.87/go.mod h1:Je1MuSMaP1gM2toj/t3YQhGQpSJGYjQuQwHJpPyJT6g=
272+
github.com/projectdiscovery/hmap v0.0.89 h1:H+XIzk2YcE/9PpW/1N9NdQSrJWm2vthGPNIxSM+WHNU=
273+
github.com/projectdiscovery/hmap v0.0.89/go.mod h1:N3gXFDLN6GqkYsk+2ZkReVOo32OBUV+PNiYyWhWG4ZE=
274274
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 h1:ZScLodGSezQVwsQDtBSMFp72WDq0nNN+KE/5DHKY5QE=
275275
github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983/go.mod h1:3G3BRKui7nMuDFAZKR/M2hiOLtaOmyukT20g88qRQjI=
276-
github.com/projectdiscovery/networkpolicy v0.1.12 h1:SwfCOm772jmkLQNKWKZHIhjJK3eYz4RVzMHZJfwtti8=
277-
github.com/projectdiscovery/networkpolicy v0.1.12/go.mod h1:8fm26WaxgfNY3CGQWzohQy95oSzZlgikU9Oxd1Pq5mk=
278-
github.com/projectdiscovery/ratelimit v0.0.79 h1:9Kzff7K5ZyAX0IWspx5X3fHtff0/TzFq7jDxEScO1Qw=
279-
github.com/projectdiscovery/ratelimit v0.0.79/go.mod h1:z+hNaODlTmdajGj7V2yIqcQhB7fovdMSK2PNwpbrlHY=
280-
github.com/projectdiscovery/retryabledns v1.0.98 h1:2rz0dExX6pJlp8BrF0ZwwimO+Y6T7KCDsstmUioF8cA=
281-
github.com/projectdiscovery/retryabledns v1.0.98/go.mod h1:AeFHeqjpm375uKHKf9dn4+EvwsE/xXGGDU5cT5EEiqQ=
282-
github.com/projectdiscovery/retryablehttp-go v1.0.109 h1:z7USVuroBrJJH/ozGS4m+evwukFyJvIvjmvaTNXrhr8=
283-
github.com/projectdiscovery/retryablehttp-go v1.0.109/go.mod h1:0A6WpqP585LzGIFHQButwfQin4746gvNK2BrGpmRoXI=
284-
github.com/projectdiscovery/utils v0.4.18 h1:cSjMOLXI5gAajfA6KV+0iQG4dGx2IHWLQyND/Snvw7k=
285-
github.com/projectdiscovery/utils v0.4.18/go.mod h1:y5gnpQn802iEWqf0djTRNskJlS62P5eqe1VS1+ah0tk=
276+
github.com/projectdiscovery/networkpolicy v0.1.15 h1:jHHPo43s/TSiWmm6T8kJuMqTwL3ukU92iQhxq0K0jg0=
277+
github.com/projectdiscovery/networkpolicy v0.1.15/go.mod h1:GWMDGJmgJ9qGoVTUOxbq1oLIbEx0pPsL0VKlriCkn2g=
278+
github.com/projectdiscovery/ratelimit v0.0.81 h1:u6lW+rAhS/UO0amHTYmYLipPK8NEotA9521hdojBtgI=
279+
github.com/projectdiscovery/ratelimit v0.0.81/go.mod h1:tK04WXHuC4i6AsFkByInODSNf45gd9sfaMHzmy2bAsA=
280+
github.com/projectdiscovery/retryabledns v1.0.101 h1:8DIVD8CL34Lc9h6KeOopPUfsPlcFxMlrnKOaI9VeOMk=
281+
github.com/projectdiscovery/retryabledns v1.0.101/go.mod h1:fQI91PKUyTZYL2pYloyA9Bh3Bq8IgOB6X+bN+8Xm14I=
282+
github.com/projectdiscovery/retryablehttp-go v1.0.114 h1:JFvk7RJ2AUrHV9dScHcnyaBpQRGq1d8/QfrpccCT0xc=
283+
github.com/projectdiscovery/retryablehttp-go v1.0.114/go.mod h1:ZXHlpbSw9w3nZqe1LH0GPX2UDAmv2QpUOoafy+xydYs=
284+
github.com/projectdiscovery/utils v0.4.20 h1:7Fmjb+4YZJSzn7bL21sjF3wAR53eSi7VdAfDkDBUUwY=
285+
github.com/projectdiscovery/utils v0.4.20/go.mod h1:RnC23+hI8j4drZFHQpMX92hV9++9d/yBeNr1pzcbF7Y=
286286
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
287287
github.com/refraction-networking/utls v1.7.0 h1:9JTnze/Md74uS3ZWiRAabityY0un69rOLXsBf8LGgTs=
288288
github.com/refraction-networking/utls v1.7.0/go.mod h1:lV0Gwc1/Fi+HYH8hOtgFRdHfKo4FKSn6+FdyOz9hRms=

v2/pkg/passive/sources.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package passive
22

33
import (
4+
"fmt"
5+
"os"
46
"strings"
57

68
"golang.org/x/exp/maps"
@@ -10,7 +12,6 @@ import (
1012
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/alienvault"
1113
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/anubis"
1214
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/bevigil"
13-
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/binaryedge"
1415
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/bufferover"
1516
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/builtwith"
1617
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/c99"
@@ -20,6 +21,7 @@ import (
2021
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/chinaz"
2122
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/commoncrawl"
2223
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/crtsh"
24+
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/digitalyama"
2325
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/digitorus"
2426
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/dnsdb"
2527
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/dnsdumpster"
@@ -34,10 +36,12 @@ import (
3436
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/intelx"
3537
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/leakix"
3638
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/netlas"
39+
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/pugrecon"
3740
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/quake"
3841
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/rapiddns"
3942
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/redhuntlabs"
4043
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/robtex"
44+
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/rsecloud"
4145
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/securitytrails"
4246
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/shodan"
4347
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/sitedossier"
@@ -47,15 +51,13 @@ import (
4751
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/waybackarchive"
4852
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/whoisxmlapi"
4953
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/zoomeyeapi"
50-
"github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/digitalyama"
5154
mapsutil "github.com/projectdiscovery/utils/maps"
5255
)
5356

5457
var AllSources = [...]subscraping.Source{
5558
&alienvault.Source{},
5659
&anubis.Source{},
5760
&bevigil.Source{},
58-
&binaryedge.Source{},
5961
&bufferover.Source{},
6062
&c99.Source{},
6163
&censys.Source{},
@@ -77,10 +79,12 @@ var AllSources = [...]subscraping.Source{
7779
&netlas.Source{},
7880
&leakix.Source{},
7981
&quake.Source{},
82+
&pugrecon.Source{},
8083
&rapiddns.Source{},
8184
&redhuntlabs.Source{},
8285
// &riddler.Source{}, // failing due to cloudfront protection
8386
&robtex.Source{},
87+
&rsecloud.Source{},
8488
&securitytrails.Source{},
8589
&shodan.Source{},
8690
&sitedossier.Source{},
@@ -166,6 +170,15 @@ func New(sourceNames, excludedSourceNames []string, useAllSources, useSourcesSup
166170
}
167171
}
168172

173+
// TODO: Consider refactoring this to avoid potential duplication issues
174+
for _, source := range sources {
175+
if source.NeedsKey() {
176+
if apiKey := os.Getenv(fmt.Sprintf("%s_API_KEY", strings.ToUpper(source.Name()))); apiKey != "" {
177+
source.AddApiKeys([]string{apiKey})
178+
}
179+
}
180+
}
181+
169182
// Create the agent, insert the sources and remove the excluded sources
170183
agent := &Agent{sources: maps.Values(sources)}
171184

v2/pkg/passive/sources_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ var (
1414
"alienvault",
1515
"anubis",
1616
"bevigil",
17-
"binaryedge",
1817
"bufferover",
1918
"c99",
2019
"censys",
@@ -34,10 +33,12 @@ var (
3433
"intelx",
3534
"netlas",
3635
"quake",
36+
"pugrecon",
3737
"rapiddns",
3838
"redhuntlabs",
3939
// "riddler", // failing due to cloudfront protection
4040
"robtex",
41+
"rsecloud",
4142
"securitytrails",
4243
"shodan",
4344
"sitedossier",
@@ -79,6 +80,7 @@ var (
7980
"redhuntlabs",
8081
"robtex",
8182
// "riddler", // failing due to cloudfront protection
83+
"rsecloud",
8284
"securitytrails",
8385
"shodan",
8486
"virustotal",
@@ -94,7 +96,6 @@ var (
9496

9597
expectedDefaultRecursiveSources = []string{
9698
"alienvault",
97-
"binaryedge",
9899
"bufferover",
99100
"certspotter",
100101
"crtsh",

v2/pkg/passive/sources_wo_auth_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ func TestSourcesWithoutKeys(t *testing.T) {
2424
}
2525

2626
ignoredSources := []string{
27-
"commoncrawl", // commoncrawl is under resourced and will likely time-out so step over it for this test https://groups.google.com/u/2/g/common-crawl/c/3QmQjFA_3y4/m/vTbhGqIBBQAJ
28-
"riddler", // failing due to cloudfront protection
29-
"crtsh", // Fails in GH Action (possibly IP-based ban) causing a timeout.
30-
"hackertarget", // Fails in GH Action (possibly IP-based ban) but works locally
31-
"waybackarchive", // Fails randomly
32-
"alienvault", // 503 Service Temporarily Unavailable
33-
"digitorus", // failing with "Failed to retrieve certificate"
34-
"dnsdumpster", // failing with "unexpected status code 403 received"
27+
"commoncrawl", // commoncrawl is under resourced and will likely time-out so step over it for this test https://groups.google.com/u/2/g/common-crawl/c/3QmQjFA_3y4/m/vTbhGqIBBQAJ
28+
"riddler", // failing due to cloudfront protection
29+
"crtsh", // Fails in GH Action (possibly IP-based ban) causing a timeout.
30+
"hackertarget", // Fails in GH Action (possibly IP-based ban) but works locally
31+
"waybackarchive", // Fails randomly
32+
"alienvault", // 503 Service Temporarily Unavailable
33+
"digitorus", // failing with "Failed to retrieve certificate"
34+
"dnsdumpster", // failing with "unexpected status code 403 received"
35+
"anubis", // failing with "too many redirects"
3536
}
3637

3738
domain := "hackerone.com"

v2/pkg/resolve/resolve.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (r *Resolver) NewResolutionPool(workers int, removeWildcard bool) *Resoluti
6060
}
6161

6262
go func() {
63-
for i := 0; i < workers; i++ {
63+
for range workers {
6464
resolutionPool.wg.Add(1)
6565
go resolutionPool.resolveWorker()
6666
}
@@ -73,7 +73,7 @@ func (r *Resolver) NewResolutionPool(workers int, removeWildcard bool) *Resoluti
7373

7474
// InitWildcards inits the wildcard ips array
7575
func (r *ResolutionPool) InitWildcards(domain string) error {
76-
for i := 0; i < maxWildcardChecks; i++ {
76+
for range maxWildcardChecks {
7777
uid := xid.New().String()
7878

7979
hosts, _ := r.DNSClient.Lookup(uid + "." + domain)

0 commit comments

Comments
 (0)