projectdiscovery · Mzack9999 · Jul 15, 2025 · Jul 10, 2025 · Jul 10, 2025 · Jul 10, 2025
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -22,13 +22,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
         with:
-          go-version-file: v2/go.mod
+          go-version-file: go.mod
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v8
         with:
           version: latest
           args: --timeout 5m
-          working-directory: v2/
 
   build:
     name: Test Builds
@@ -41,9 +40,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go@v1
         with:
-          go-version-file: v2/go.mod
+          go-version-file: go.mod
       - run: go build ./...
-        working-directory: v2/
 
       - name: Run tests
         env:
@@ -75,12 +73,10 @@ jobs:
         with:
           timeout_seconds: 360
           max_attempts: 3
-          command: cd v2; go test ./... -v ${{ github.event.inputs.short == 'true' && '-short' || '' }}
+          command: go test ./... -v ${{ github.event.inputs.short == 'true' && '-short' || '' }}
 
       - name: Race Condition Tests
         run: go build -race ./...
-        working-directory: v2/
 
       - name: Run Example
         run: go run .
-        working-directory: v2/examples
diff --git a/.github/workflows/compat-checks.yaml b/.github/workflows/compat-checks.yaml
@@ -16,5 +16,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: projectdiscovery/actions/setup/go/compat-checks@master
         with:
-          go-version-file: 'v2/go.mod'
+          go-version-file: 'go.mod'
 
diff --git a/.github/workflows/dockerhub-push.yml b/.github/workflows/dockerhub-push.yml
@@ -37,4 +37,4 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64,linux/arm
           push: true
-          tags: projectdiscovery/subfinder:latest,projectdiscovery/subfinder:${{ steps.meta.outputs.TAG }}
+          tags: projectdiscovery/subfinder:latest,projectdiscovery/subfinder:${{ steps.meta.outputs.TAG }}
diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml
@@ -25,9 +25,8 @@ jobs:
         with:
           args: "release --clean"
           version: latest
-          workdir: v2/
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"
           DISCORD_WEBHOOK_ID: "${{ secrets.DISCORD_WEBHOOK_ID }}"
-          DISCORD_WEBHOOK_TOKEN: "${{ secrets.DISCORD_WEBHOOK_TOKEN }}"
+          DISCORD_WEBHOOK_TOKEN: "${{ secrets.DISCORD_WEBHOOK_TOKEN }}"
diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -26,4 +26,3 @@ jobs:
         with:
           args: "release --clean --snapshot"
           version: latest
-          workdir: v2
diff --git a/v2/.goreleaser.yml → .goreleaser.yml b/v2/.goreleaser.yml → .goreleaser.yml
diff --git a/Dockerfile b/Dockerfile
@@ -3,14 +3,13 @@ FROM golang:1.24-alpine AS build-env
 RUN apk add build-base
 WORKDIR /app
 COPY . /app
-WORKDIR /app/v2
 RUN go mod download
 RUN go build ./cmd/subfinder
 
 # Release
 FROM alpine:latest
 RUN apk upgrade --no-cache \
     && apk add --no-cache bind-tools ca-certificates
-COPY --from=build-env /app/v2/subfinder /usr/local/bin/
+COPY --from=build-env /app/subfinder /usr/local/bin/
 
 ENTRYPOINT ["subfinder"]
diff --git a/v2/Makefile → Makefile b/v2/Makefile → Makefile
diff --git a/v2/cmd/subfinder/main.go → cmd/subfinder/main.go b/v2/cmd/subfinder/main.go → cmd/subfinder/main.go
diff --git a/v2/examples/main.go → examples/main.go b/v2/examples/main.go → examples/main.go
diff --git a/v2/go.mod → go.mod b/v2/go.mod → go.mod
diff --git a/v2/go.sum → go.sum b/v2/go.sum → go.sum
diff --git a/v2/pkg/passive/doc.go → pkg/passive/doc.go b/v2/pkg/passive/doc.go → pkg/passive/doc.go
diff --git a/v2/pkg/passive/passive.go → pkg/passive/passive.go b/v2/pkg/passive/passive.go → pkg/passive/passive.go
diff --git a/v2/pkg/passive/sources.go → pkg/passive/sources.go b/v2/pkg/passive/sources.go → pkg/passive/sources.go
diff --git a/v2/pkg/passive/sources_test.go → pkg/passive/sources_test.go b/v2/pkg/passive/sources_test.go → pkg/passive/sources_test.go
diff --git a/v2/pkg/passive/sources_w_auth_test.go → pkg/passive/sources_w_auth_test.go b/v2/pkg/passive/sources_w_auth_test.go → pkg/passive/sources_w_auth_test.go
diff --git a/v2/pkg/passive/sources_wo_auth_test.go → pkg/passive/sources_wo_auth_test.go b/v2/pkg/passive/sources_wo_auth_test.go → pkg/passive/sources_wo_auth_test.go
diff --git a/v2/pkg/resolve/client.go → pkg/resolve/client.go b/v2/pkg/resolve/client.go → pkg/resolve/client.go
diff --git a/v2/pkg/resolve/doc.go → pkg/resolve/doc.go b/v2/pkg/resolve/doc.go → pkg/resolve/doc.go
diff --git a/v2/pkg/resolve/resolve.go → pkg/resolve/resolve.go b/v2/pkg/resolve/resolve.go → pkg/resolve/resolve.go
diff --git a/v2/pkg/runner/banners.go → pkg/runner/banners.go b/v2/pkg/runner/banners.go → pkg/runner/banners.go
diff --git a/v2/pkg/runner/config.go → pkg/runner/config.go b/v2/pkg/runner/config.go → pkg/runner/config.go
diff --git a/v2/pkg/runner/doc.go → pkg/runner/doc.go b/v2/pkg/runner/doc.go → pkg/runner/doc.go
diff --git a/v2/pkg/runner/enumerate.go → pkg/runner/enumerate.go b/v2/pkg/runner/enumerate.go → pkg/runner/enumerate.go
diff --git a/v2/pkg/runner/enumerate_test.go → pkg/runner/enumerate_test.go b/v2/pkg/runner/enumerate_test.go → pkg/runner/enumerate_test.go
diff --git a/v2/pkg/runner/initialize.go → pkg/runner/initialize.go b/v2/pkg/runner/initialize.go → pkg/runner/initialize.go
diff --git a/v2/pkg/runner/options.go → pkg/runner/options.go b/v2/pkg/runner/options.go → pkg/runner/options.go
diff --git a/v2/pkg/runner/outputter.go → pkg/runner/outputter.go b/v2/pkg/runner/outputter.go → pkg/runner/outputter.go
diff --git a/v2/pkg/runner/runner.go → pkg/runner/runner.go b/v2/pkg/runner/runner.go → pkg/runner/runner.go
diff --git a/v2/pkg/runner/stats.go → pkg/runner/stats.go b/v2/pkg/runner/stats.go → pkg/runner/stats.go
diff --git a/v2/pkg/runner/util.go → pkg/runner/util.go b/v2/pkg/runner/util.go → pkg/runner/util.go
diff --git a/v2/pkg/runner/validate.go → pkg/runner/validate.go b/v2/pkg/runner/validate.go → pkg/runner/validate.go
diff --git a/v2/pkg/subscraping/agent.go → pkg/subscraping/agent.go b/v2/pkg/subscraping/agent.go → pkg/subscraping/agent.go
diff --git a/v2/pkg/subscraping/doc.go → pkg/subscraping/doc.go b/v2/pkg/subscraping/doc.go → pkg/subscraping/doc.go
diff --git a/v2/pkg/subscraping/extractor.go → pkg/subscraping/extractor.go b/v2/pkg/subscraping/extractor.go → pkg/subscraping/extractor.go
diff --git a/...scraping/sources/alienvault/alienvault.go → ...scraping/sources/alienvault/alienvault.go b/...scraping/sources/alienvault/alienvault.go → ...scraping/sources/alienvault/alienvault.go
diff --git a/v2/pkg/subscraping/sources/anubis/anubis.go → pkg/subscraping/sources/anubis/anubis.go b/v2/pkg/subscraping/sources/anubis/anubis.go → pkg/subscraping/sources/anubis/anubis.go
diff --git a/...kg/subscraping/sources/bevigil/bevigil.go → pkg/subscraping/sources/bevigil/bevigil.go b/...kg/subscraping/sources/bevigil/bevigil.go → pkg/subscraping/sources/bevigil/bevigil.go
diff --git a/...scraping/sources/bufferover/bufferover.go → ...scraping/sources/bufferover/bufferover.go b/...scraping/sources/bufferover/bufferover.go → ...scraping/sources/bufferover/bufferover.go
diff --git a/...ubscraping/sources/builtwith/builtwith.go → ...ubscraping/sources/builtwith/builtwith.go b/...ubscraping/sources/builtwith/builtwith.go → ...ubscraping/sources/builtwith/builtwith.go
diff --git a/v2/pkg/subscraping/sources/c99/c99.go → pkg/subscraping/sources/c99/c99.go b/v2/pkg/subscraping/sources/c99/c99.go → pkg/subscraping/sources/c99/c99.go
diff --git a/v2/pkg/subscraping/sources/censys/censys.go → pkg/subscraping/sources/censys/censys.go b/v2/pkg/subscraping/sources/censys/censys.go → pkg/subscraping/sources/censys/censys.go
diff --git a/...raping/sources/certspotter/certspotter.go → ...raping/sources/certspotter/certspotter.go b/...raping/sources/certspotter/certspotter.go → ...raping/sources/certspotter/certspotter.go
diff --git a/v2/pkg/subscraping/sources/chaos/chaos.go → pkg/subscraping/sources/chaos/chaos.go b/v2/pkg/subscraping/sources/chaos/chaos.go → pkg/subscraping/sources/chaos/chaos.go
diff --git a/v2/pkg/subscraping/sources/chinaz/chinaz.go → pkg/subscraping/sources/chinaz/chinaz.go b/v2/pkg/subscraping/sources/chinaz/chinaz.go → pkg/subscraping/sources/chinaz/chinaz.go
diff --git a/...raping/sources/commoncrawl/commoncrawl.go → ...raping/sources/commoncrawl/commoncrawl.go b/...raping/sources/commoncrawl/commoncrawl.go → ...raping/sources/commoncrawl/commoncrawl.go
diff --git a/v2/pkg/subscraping/sources/crtsh/crtsh.go → pkg/subscraping/sources/crtsh/crtsh.go b/v2/pkg/subscraping/sources/crtsh/crtsh.go → pkg/subscraping/sources/crtsh/crtsh.go
diff --git a/...raping/sources/digitalyama/digitalyama.go → ...raping/sources/digitalyama/digitalyama.go b/...raping/sources/digitalyama/digitalyama.go → ...raping/sources/digitalyama/digitalyama.go
diff --git a/...ubscraping/sources/digitorus/digitorus.go → ...ubscraping/sources/digitorus/digitorus.go b/...ubscraping/sources/digitorus/digitorus.go → ...ubscraping/sources/digitorus/digitorus.go
diff --git a/v2/pkg/subscraping/sources/dnsdb/dnsdb.go → pkg/subscraping/sources/dnsdb/dnsdb.go b/v2/pkg/subscraping/sources/dnsdb/dnsdb.go → pkg/subscraping/sources/dnsdb/dnsdb.go
diff --git a/...raping/sources/dnsdumpster/dnsdumpster.go → ...raping/sources/dnsdumpster/dnsdumpster.go b/...raping/sources/dnsdumpster/dnsdumpster.go → ...raping/sources/dnsdumpster/dnsdumpster.go
diff --git a/...kg/subscraping/sources/dnsrepo/dnsrepo.go → pkg/subscraping/sources/dnsrepo/dnsrepo.go b/...kg/subscraping/sources/dnsrepo/dnsrepo.go → pkg/subscraping/sources/dnsrepo/dnsrepo.go
diff --git a/...kg/subscraping/sources/facebook/ctlogs.go → pkg/subscraping/sources/facebook/ctlogs.go b/...kg/subscraping/sources/facebook/ctlogs.go → pkg/subscraping/sources/facebook/ctlogs.go
diff --git a/...bscraping/sources/facebook/ctlogs_test.go → ...bscraping/sources/facebook/ctlogs_test.go b/...bscraping/sources/facebook/ctlogs_test.go → ...bscraping/sources/facebook/ctlogs_test.go
diff --git a/v2/pkg/subscraping/sources/facebook/types.go → pkg/subscraping/sources/facebook/types.go b/v2/pkg/subscraping/sources/facebook/types.go → pkg/subscraping/sources/facebook/types.go
diff --git a/v2/pkg/subscraping/sources/fofa/fofa.go → pkg/subscraping/sources/fofa/fofa.go b/v2/pkg/subscraping/sources/fofa/fofa.go → pkg/subscraping/sources/fofa/fofa.go
diff --git a/.../subscraping/sources/fullhunt/fullhunt.go → pkg/subscraping/sources/fullhunt/fullhunt.go b/.../subscraping/sources/fullhunt/fullhunt.go → pkg/subscraping/sources/fullhunt/fullhunt.go
diff --git a/v2/pkg/subscraping/sources/github/github.go → pkg/subscraping/sources/github/github.go b/v2/pkg/subscraping/sources/github/github.go → pkg/subscraping/sources/github/github.go
diff --git a/...ubscraping/sources/github/tokenmanager.go → ...ubscraping/sources/github/tokenmanager.go b/...ubscraping/sources/github/tokenmanager.go → ...ubscraping/sources/github/tokenmanager.go
diff --git a/v2/pkg/subscraping/sources/gitlab/gitlab.go → pkg/subscraping/sources/gitlab/gitlab.go b/v2/pkg/subscraping/sources/gitlab/gitlab.go → pkg/subscraping/sources/gitlab/gitlab.go
diff --git a/...ping/sources/hackertarget/hackertarget.go → ...ping/sources/hackertarget/hackertarget.go b/...ping/sources/hackertarget/hackertarget.go → ...ping/sources/hackertarget/hackertarget.go
diff --git a/...scraping/sources/hudsonrock/hudsonrock.go → ...scraping/sources/hudsonrock/hudsonrock.go b/...scraping/sources/hudsonrock/hudsonrock.go → ...scraping/sources/hudsonrock/hudsonrock.go
diff --git a/v2/pkg/subscraping/sources/hunter/hunter.go → pkg/subscraping/sources/hunter/hunter.go b/v2/pkg/subscraping/sources/hunter/hunter.go → pkg/subscraping/sources/hunter/hunter.go
diff --git a/v2/pkg/subscraping/sources/intelx/intelx.go → pkg/subscraping/sources/intelx/intelx.go b/v2/pkg/subscraping/sources/intelx/intelx.go → pkg/subscraping/sources/intelx/intelx.go
diff --git a/v2/pkg/subscraping/sources/leakix/leakix.go → pkg/subscraping/sources/leakix/leakix.go b/v2/pkg/subscraping/sources/leakix/leakix.go → pkg/subscraping/sources/leakix/leakix.go
diff --git a/v2/pkg/subscraping/sources/netlas/netlas.go → pkg/subscraping/sources/netlas/netlas.go b/v2/pkg/subscraping/sources/netlas/netlas.go → pkg/subscraping/sources/netlas/netlas.go
diff --git a/.../subscraping/sources/pugrecon/pugrecon.go → pkg/subscraping/sources/pugrecon/pugrecon.go b/.../subscraping/sources/pugrecon/pugrecon.go → pkg/subscraping/sources/pugrecon/pugrecon.go
diff --git a/v2/pkg/subscraping/sources/quake/quake.go → pkg/subscraping/sources/quake/quake.go b/v2/pkg/subscraping/sources/quake/quake.go → pkg/subscraping/sources/quake/quake.go
diff --git a/.../subscraping/sources/rapiddns/rapiddns.go → pkg/subscraping/sources/rapiddns/rapiddns.go b/.../subscraping/sources/rapiddns/rapiddns.go → pkg/subscraping/sources/rapiddns/rapiddns.go
diff --git a/...scraping/sources/reconcloud/reconcloud.go → ...scraping/sources/reconcloud/reconcloud.go b/...scraping/sources/reconcloud/reconcloud.go → ...scraping/sources/reconcloud/reconcloud.go
diff --git a/...raping/sources/redhuntlabs/redhuntlabs.go → ...raping/sources/redhuntlabs/redhuntlabs.go b/...raping/sources/redhuntlabs/redhuntlabs.go → ...raping/sources/redhuntlabs/redhuntlabs.go
diff --git a/...kg/subscraping/sources/riddler/riddler.go → pkg/subscraping/sources/riddler/riddler.go b/...kg/subscraping/sources/riddler/riddler.go → pkg/subscraping/sources/riddler/riddler.go
diff --git a/v2/pkg/subscraping/sources/robtex/robtext.go → pkg/subscraping/sources/robtex/robtext.go b/v2/pkg/subscraping/sources/robtex/robtext.go → pkg/subscraping/sources/robtex/robtext.go
diff --git a/.../subscraping/sources/rsecloud/rsecloud.go → pkg/subscraping/sources/rsecloud/rsecloud.go b/.../subscraping/sources/rsecloud/rsecloud.go → pkg/subscraping/sources/rsecloud/rsecloud.go
diff --git a/.../sources/securitytrails/securitytrails.go → .../sources/securitytrails/securitytrails.go b/.../sources/securitytrails/securitytrails.go → .../sources/securitytrails/securitytrails.go
diff --git a/v2/pkg/subscraping/sources/shodan/shodan.go → pkg/subscraping/sources/shodan/shodan.go b/v2/pkg/subscraping/sources/shodan/shodan.go → pkg/subscraping/sources/shodan/shodan.go
diff --git a/...raping/sources/sitedossier/sitedossier.go → ...raping/sources/sitedossier/sitedossier.go b/...raping/sources/sitedossier/sitedossier.go → ...raping/sources/sitedossier/sitedossier.go
diff --git a/...scraping/sources/threatbook/threatbook.go → ...scraping/sources/threatbook/threatbook.go b/...scraping/sources/threatbook/threatbook.go → ...scraping/sources/threatbook/threatbook.go
diff --git a/...raping/sources/threatcrowd/threatcrowd.go → ...raping/sources/threatcrowd/threatcrowd.go b/...raping/sources/threatcrowd/threatcrowd.go → ...raping/sources/threatcrowd/threatcrowd.go
diff --git a/...raping/sources/threatminer/threatminer.go → ...raping/sources/threatminer/threatminer.go b/...raping/sources/threatminer/threatminer.go → ...raping/sources/threatminer/threatminer.go
diff --git a/...scraping/sources/virustotal/virustotal.go → ...scraping/sources/virustotal/virustotal.go b/...scraping/sources/virustotal/virustotal.go → ...scraping/sources/virustotal/virustotal.go
diff --git a/.../sources/waybackarchive/waybackarchive.go → .../sources/waybackarchive/waybackarchive.go b/.../sources/waybackarchive/waybackarchive.go → .../sources/waybackarchive/waybackarchive.go
diff --git a/...raping/sources/whoisxmlapi/whoisxmlapi.go → ...raping/sources/whoisxmlapi/whoisxmlapi.go b/...raping/sources/whoisxmlapi/whoisxmlapi.go → ...raping/sources/whoisxmlapi/whoisxmlapi.go
diff --git a/...scraping/sources/zoomeyeapi/zoomeyeapi.go → ...scraping/sources/zoomeyeapi/zoomeyeapi.go b/...scraping/sources/zoomeyeapi/zoomeyeapi.go → ...scraping/sources/zoomeyeapi/zoomeyeapi.go
diff --git a/v2/pkg/subscraping/types.go → pkg/subscraping/types.go b/v2/pkg/subscraping/types.go → pkg/subscraping/types.go
diff --git a/v2/pkg/subscraping/utils.go → pkg/subscraping/utils.go b/v2/pkg/subscraping/utils.go → pkg/subscraping/utils.go
diff --git a/v2/pkg/testutils/integration.go → pkg/testutils/integration.go b/v2/pkg/testutils/integration.go → pkg/testutils/integration.go