Merge branch 'dev'

.github/workflows/build-test.yml

@@ -28,19 +28,39 @@ jobs:
  working-directory: v2/
 
  - name: Run tests
+ env:
+ BEVIGIL_API_KEY: ${{secrets.BEVIGIL_API_KEY}}
+ BINARYEDGE_API_KEY: ${{secrets.BINARYEDGE_API_KEY}}
+ BUFFEROVER_API_KEY: ${{secrets.BUFFEROVER_API_KEY}}
+ C99_API_KEY: ${{secrets.C99_API_KEY}}
+ CENSYS_API_KEY: ${{secrets.CENSYS_API_KEY}}
+ CERTSPOTTER_API_KEY: ${{secrets.CERTSPOTTER_API_KEY}}
+ CHAOS_API_KEY: ${{secrets.CHAOS_API_KEY}}
+ CHINAZ_API_KEY: ${{secrets.CHINAZ_API_KEY}}
+ DNSDB_API_KEY: ${{secrets.DNSDB_API_KEY}}
+ DNSREPO_API_KEY: ${{secrets.DNSREPO_API_KEY}}
+ FOFA_API_KEY: ${{secrets.FOFA_API_KEY}}
+ FULLHUNT_API_KEY: ${{secrets.FULLHUNT_API_KEY}}
+ GITHUB_API_KEY: ${{secrets.GITHUB_API_KEY}}
+ HUNTER_API_KEY: ${{secrets.HUNTER_API_KEY}}
+ INTELX_API_KEY: ${{secrets.INTELX_API_KEY}}
+ LEAKIX_API_KEY: ${{secrets.LEAKIX_API_KEY}}
+ PASSIVETOTAL_API_KEY: ${{secrets.PASSIVETOTAL_API_KEY}}
+ QUAKE_API_KEY: ${{secrets.QUAKE_API_KEY}}
+ ROBTEX_API_KEY: ${{secrets.ROBTEX_API_KEY}}
+ SECURITYTRAILS_API_KEY: ${{secrets.SECURITYTRAILS_API_KEY}}
+ SHODAN_API_KEY: ${{secrets.SHODAN_API_KEY}}
+ THREATBOOK_API_KEY: ${{secrets.THREATBOOK_API_KEY}}
+ VIRUSTOTAL_API_KEY: ${{secrets.VIRUSTOTAL_API_KEY}}
+ WHOISXMLAPI_API_KEY: ${{secrets.WHOISXMLAPI_API_KEY}}
+ ZOOMEYE_API_KEY: ${{secrets.ZOOMEYE_API_KEY}}
+ ZOOMEYEAPI_API_KEY: ${{secrets.ZOOMEYEAPI_API_KEY}}
  uses: nick-invision/retry@v2
  with:
  timeout_seconds: 360
  max_attempts: 3
  command: cd v2; go test ./... -v
 
- - name: Integration Tests
- env:
- GH_ACTION: true
- DNSREPO_API_KEY: ${{secrets.DNSREPO_API}}
- run: bash run.sh
- working-directory: v2/cmd/integration-test/
-
  - name: Race Condition Tests
  run: go build -race ./...
  working-directory: v2/

Dockerfile

@@ -1,5 +1,5 @@
 # Build
-FROM golang:1.20.3-alpine AS build-env
+FROM golang:1.20.4-alpine AS build-env
 RUN apk add build-base
 WORKDIR /app
 COPY . /app
@@ -8,7 +8,7 @@ RUN go mod download
 RUN go build ./cmd/subfinder
 
 # Release
-FROM alpine:3.17.3
+FROM alpine:3.18.0
 RUN apk -U upgrade --no-cache \
  && apk add --no-cache bind-tools ca-certificates
 COPY --from=build-env /app/v2/subfinder /usr/local/bin/

v2/go.mod

@@ -10,11 +10,11 @@ require (
  github.com/projectdiscovery/chaos-client v0.5.1
  github.com/projectdiscovery/dnsx v1.1.4
  github.com/projectdiscovery/fdmax v0.0.4
- github.com/projectdiscovery/gologger v1.1.8
- github.com/projectdiscovery/ratelimit v0.0.6
- github.com/projectdiscovery/utils v0.0.26
+ github.com/projectdiscovery/gologger v1.1.10
+ github.com/projectdiscovery/ratelimit v0.0.8
+ github.com/projectdiscovery/utils v0.0.34
  github.com/rs/xid v1.5.0
- github.com/stretchr/testify v1.8.2
+ github.com/stretchr/testify v1.8.4
  github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
  golang.org/x/exp v0.0.0-20230420155640-133eef4313cb
  gopkg.in/yaml.v3 v3.0.1
@@ -44,13 +44,14 @@ require (
  github.com/mattn/go-isatty v0.0.17 // indirect
  github.com/mattn/go-runewidth v0.0.14 // indirect
  github.com/mholt/archiver v3.1.1+incompatible // indirect
- github.com/microcosm-cc/bluemonday v1.0.23 // indirect
+ github.com/microcosm-cc/bluemonday v1.0.24 // indirect
  github.com/minio/selfupdate v0.6.0 // indirect
  github.com/muesli/reflow v0.3.0 // indirect
  github.com/muesli/termenv v0.15.1 // indirect
  github.com/nwaples/rardecode v1.1.3 // indirect
  github.com/olekukonko/tablewriter v0.0.5 // indirect
  github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+ github.com/projectdiscovery/blackrock v0.0.1 // indirect
  github.com/projectdiscovery/cdncheck v1.0.1 // indirect
  github.com/projectdiscovery/retryablehttp-go v1.0.15 // indirect
  github.com/rivo/uniseg v0.4.4 // indirect
@@ -64,7 +65,7 @@ require (
  go.uber.org/multierr v1.11.0 // indirect
  golang.org/x/crypto v0.7.0 // indirect
  golang.org/x/mod v0.10.0 // indirect
- golang.org/x/oauth2 v0.7.0 // indirect
+ golang.org/x/oauth2 v0.8.0 // indirect
  golang.org/x/text v0.9.0 // indirect
  golang.org/x/tools v0.8.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
@@ -83,6 +84,6 @@ require (
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/projectdiscovery/goflags v0.1.8
  github.com/projectdiscovery/retryabledns v1.0.23 // indirect
- golang.org/x/net v0.9.0 // indirect
- golang.org/x/sys v0.7.0 // indirect
+ golang.org/x/net v0.10.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
 )