From 7d89b5facb7435b1d2783d6b4cbb180f2d37daa3 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Thu, 24 Sep 2020 19:02:02 +0200 Subject: [PATCH] go mod v2 fix --- .github/workflows/build.yaml | 4 +- .gitignore | 1 + .goreleaser.yml | 2 +- Dockerfile | 2 +- {cmd => v2/cmd}/subfinder/main.go | 2 +- go.mod => v2/go.mod | 11 ++- go.sum => v2/go.sum | 56 +++------------ {pkg => v2/pkg}/passive/doc.go | 0 {pkg => v2/pkg}/passive/passive.go | 2 +- {pkg => v2/pkg}/passive/sources.go | 72 +++++++++---------- {pkg => v2/pkg}/resolve/client.go | 0 {pkg => v2/pkg}/resolve/doc.go | 0 {pkg => v2/pkg}/resolve/resolve.go | 0 {pkg => v2/pkg}/runner/banners.go | 4 +- {pkg => v2/pkg}/runner/chaosuploader.go | 0 {pkg => v2/pkg}/runner/config.go | 2 +- {pkg => v2/pkg}/runner/config_test.go | 0 {pkg => v2/pkg}/runner/doc.go | 0 {pkg => v2/pkg}/runner/enumerate.go | 4 +- {pkg => v2/pkg}/runner/initialize.go | 4 +- {pkg => v2/pkg}/runner/options.go | 0 {pkg => v2/pkg}/runner/outputter.go | 2 +- {pkg => v2/pkg}/runner/runner.go | 4 +- {pkg => v2/pkg}/runner/validate.go | 0 {pkg => v2/pkg}/subscraping/agent.go | 0 .../sources/alienvault/alienvault.go | 2 +- .../pkg}/subscraping/sources/anubis/anubis.go | 2 +- .../sources/archiveis/archiveis.go | 2 +- .../sources/binaryedge/binaryedge.go | 2 +- .../sources/bufferover/bufferover.go | 2 +- .../subscraping/sources/cebaidu/cebaidu.go | 2 +- .../pkg}/subscraping/sources/censys/censys.go | 2 +- .../sources/certspotter/certspotter.go | 2 +- .../sources/certspotterold/certspotterold.go | 2 +- .../pkg}/subscraping/sources/chaos/chaos.go | 2 +- .../sources/commoncrawl/commoncrawl.go | 2 +- .../pkg}/subscraping/sources/crtsh/crtsh.go | 2 +- .../pkg}/subscraping/sources/dnsdb/dnsdb.go | 2 +- .../sources/dnsdumpster/dnsdumpster.go | 2 +- .../pkg}/subscraping/sources/github/github.go | 2 +- .../sources/github/tokenmanager.go | 0 .../sources/hackertarget/hackertarget.go | 2 +- .../pkg}/subscraping/sources/intelx/intelx.go | 2 +- .../subscraping/sources/ipv4info/ipv4info.go | 2 +- .../sources/passivetotal/passivetotal.go | 2 +- .../subscraping/sources/rapiddns/rapiddns.go | 2 +- .../pkg}/subscraping/sources/recon/recon.go | 2 +- .../subscraping/sources/riddler/riddler.go | 2 +- .../subscraping/sources/robtex/robtext.go | 2 +- .../sources/securitytrails/securitytrails.go | 2 +- .../pkg}/subscraping/sources/shodan/shodan.go | 2 +- .../sources/sitedossier/sitedossier.go | 2 +- .../pkg}/subscraping/sources/spyse/spyse.go | 2 +- .../sources/sublist3r/subllist3r.go | 2 +- .../sources/threatbook/threatbook.go | 2 +- .../sources/threatcrowd/threatcrowd.go | 2 +- .../sources/threatminer/threatminer.go | 2 +- .../sources/virustotal/virustotal.go | 2 +- .../sources/waybackarchive/waybackarchive.go | 2 +- .../pkg}/subscraping/sources/ximcx/ximcx.go | 2 +- .../subscraping/sources/zoomeye/zoomeye.go | 2 +- {pkg => v2/pkg}/subscraping/types.go | 0 {pkg => v2/pkg}/subscraping/utils.go | 0 63 files changed, 103 insertions(+), 139 deletions(-) rename {cmd => v2/cmd}/subfinder/main.go (90%) rename go.mod => v2/go.mod (58%) rename go.sum => v2/go.sum (51%) rename {pkg => v2/pkg}/passive/doc.go (100%) rename {pkg => v2/pkg}/passive/passive.go (95%) rename {pkg => v2/pkg}/passive/sources.go (61%) rename {pkg => v2/pkg}/resolve/client.go (100%) rename {pkg => v2/pkg}/resolve/doc.go (100%) rename {pkg => v2/pkg}/resolve/resolve.go (100%) rename {pkg => v2/pkg}/runner/banners.go (95%) rename {pkg => v2/pkg}/runner/chaosuploader.go (100%) rename {pkg => v2/pkg}/runner/config.go (98%) rename {pkg => v2/pkg}/runner/config_test.go (100%) rename {pkg => v2/pkg}/runner/doc.go (100%) rename {pkg => v2/pkg}/runner/enumerate.go (97%) rename {pkg => v2/pkg}/runner/initialize.go (94%) rename {pkg => v2/pkg}/runner/options.go (100%) rename {pkg => v2/pkg}/runner/outputter.go (98%) rename {pkg => v2/pkg}/runner/runner.go (95%) rename {pkg => v2/pkg}/runner/validate.go (100%) rename {pkg => v2/pkg}/subscraping/agent.go (100%) rename {pkg => v2/pkg}/subscraping/sources/alienvault/alienvault.go (96%) rename {pkg => v2/pkg}/subscraping/sources/anubis/anubis.go (95%) rename {pkg => v2/pkg}/subscraping/sources/archiveis/archiveis.go (96%) rename {pkg => v2/pkg}/subscraping/sources/binaryedge/binaryedge.go (98%) rename {pkg => v2/pkg}/subscraping/sources/bufferover/bufferover.go (97%) rename {pkg => v2/pkg}/subscraping/sources/cebaidu/cebaidu.go (96%) rename {pkg => v2/pkg}/subscraping/sources/censys/censys.go (97%) rename {pkg => v2/pkg}/subscraping/sources/certspotter/certspotter.go (97%) rename {pkg => v2/pkg}/subscraping/sources/certspotterold/certspotterold.go (96%) rename {pkg => v2/pkg}/subscraping/sources/chaos/chaos.go (94%) rename {pkg => v2/pkg}/subscraping/sources/commoncrawl/commoncrawl.go (97%) rename {pkg => v2/pkg}/subscraping/sources/crtsh/crtsh.go (97%) rename {pkg => v2/pkg}/subscraping/sources/dnsdb/dnsdb.go (96%) rename {pkg => v2/pkg}/subscraping/sources/dnsdumpster/dnsdumpster.go (97%) rename {pkg => v2/pkg}/subscraping/sources/github/github.go (98%) rename {pkg => v2/pkg}/subscraping/sources/github/tokenmanager.go (100%) rename {pkg => v2/pkg}/subscraping/sources/hackertarget/hackertarget.go (94%) rename {pkg => v2/pkg}/subscraping/sources/intelx/intelx.go (98%) rename {pkg => v2/pkg}/subscraping/sources/ipv4info/ipv4info.go (98%) rename {pkg => v2/pkg}/subscraping/sources/passivetotal/passivetotal.go (96%) rename {pkg => v2/pkg}/subscraping/sources/rapiddns/rapiddns.go (95%) rename {pkg => v2/pkg}/subscraping/sources/recon/recon.go (95%) rename {pkg => v2/pkg}/subscraping/sources/riddler/riddler.go (94%) rename {pkg => v2/pkg}/subscraping/sources/robtex/robtext.go (97%) rename {pkg => v2/pkg}/subscraping/sources/securitytrails/securitytrails.go (96%) rename {pkg => v2/pkg}/subscraping/sources/shodan/shodan.go (96%) rename {pkg => v2/pkg}/subscraping/sources/sitedossier/sitedossier.go (97%) rename {pkg => v2/pkg}/subscraping/sources/spyse/spyse.go (96%) rename {pkg => v2/pkg}/subscraping/sources/sublist3r/subllist3r.go (95%) rename {pkg => v2/pkg}/subscraping/sources/threatbook/threatbook.go (97%) rename {pkg => v2/pkg}/subscraping/sources/threatcrowd/threatcrowd.go (95%) rename {pkg => v2/pkg}/subscraping/sources/threatminer/threatminer.go (95%) rename {pkg => v2/pkg}/subscraping/sources/virustotal/virustotal.go (95%) rename {pkg => v2/pkg}/subscraping/sources/waybackarchive/waybackarchive.go (95%) rename {pkg => v2/pkg}/subscraping/sources/ximcx/ximcx.go (96%) rename {pkg => v2/pkg}/subscraping/sources/zoomeye/zoomeye.go (98%) rename {pkg => v2/pkg}/subscraping/types.go (100%) rename {pkg => v2/pkg}/subscraping/utils.go (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 742972b..615967c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,8 +42,8 @@ jobs: - name: Test run: go test . - working-directory: cmd/subfinder/ + working-directory: v2/cmd/subfinder/ - name: Build run: go build . - working-directory: cmd/subfinder/ + working-directory: v2/cmd/subfinder/ diff --git a/.gitignore b/.gitignore index d2af926..536163a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store cmd/subfinder/subfinder +v2/cmd/subfinder/subfinder vendor/ .idea \ No newline at end of file diff --git a/.goreleaser.yml b/.goreleaser.yml index 47d83c7..e3b78af 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,6 +1,6 @@ builds: - binary: subfinder - main: cmd/subfinder/main.go + main: v2/cmd/subfinder/main.go goos: - linux - windows diff --git a/Dockerfile b/Dockerfile index b03ce55..4b42d58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,6 @@ RUN go get -u github.com/golang/dep/cmd/dep WORKDIR /go/src/app # Install -RUN go get -u github.com/projectdiscovery/subfinder/cmd/subfinder +RUN go get -u github.com/projectdiscovery/v2/subfinder/cmd/subfinder ENTRYPOINT ["subfinder"] diff --git a/cmd/subfinder/main.go b/v2/cmd/subfinder/main.go similarity index 90% rename from cmd/subfinder/main.go rename to v2/cmd/subfinder/main.go index 45de03c..d955d51 100644 --- a/cmd/subfinder/main.go +++ b/v2/cmd/subfinder/main.go @@ -6,7 +6,7 @@ import ( // Attempts to increase the OS file descriptors - Fail silently _ "github.com/projectdiscovery/fdmax/autofdmax" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/subfinder/pkg/runner" + "github.com/projectdiscovery/subfinder/v2/pkg/runner" ) func main() { diff --git a/go.mod b/v2/go.mod similarity index 58% rename from go.mod rename to v2/go.mod index 458bc34..285e88b 100644 --- a/go.mod +++ b/v2/go.mod @@ -1,18 +1,17 @@ -module github.com/projectdiscovery/subfinder +module github.com/projectdiscovery/subfinder/v2 go 1.14 require ( github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 github.com/json-iterator/go v1.1.10 - github.com/lib/pq v1.6.0 - github.com/miekg/dns v1.1.29 + github.com/lib/pq v1.8.0 + github.com/miekg/dns v1.1.31 github.com/pkg/errors v0.9.1 github.com/projectdiscovery/chaos-client v0.1.6 github.com/projectdiscovery/fdmax v0.0.2 - github.com/projectdiscovery/gologger v1.0.0 + github.com/projectdiscovery/gologger v1.0.1 github.com/rs/xid v1.2.1 - github.com/stretchr/testify v1.5.1 github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 - gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c + gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 ) diff --git a/go.sum b/v2/go.sum similarity index 51% rename from go.sum rename to v2/go.sum index 7fc0d5b..bdb9ef1 100644 --- a/go.sum +++ b/v2/go.sum @@ -1,74 +1,45 @@ -github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5 h1:P5U+E4x5OkVEKQDklVPmzs71WM56RTTRqV4OrDC//Y4= -github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ= -github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 h1:BpJ2o0OR5FV7vrkDYfXYVJQeMNWa8RhklZOpW2ITAIQ= github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026/go.mod h1:5Scbynm8dF1XAPwIwkGPqzkM/shndPm79Jd1003hTjE= -github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= -github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= -github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= -github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= -github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= -github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.2.0 h1:lzPl/30ZLkTveYsYZPKMcgXc8MbnE6RsTd4F9KgiLtk= -github.com/jcmturner/gokrb5/v8 v8.2.0/go.mod h1:T1hnNppQsBtxW0tCHMHTkAt8n/sABdzZgZdoFrZaZNM= -github.com/jcmturner/rpc/v2 v2.0.2 h1:gMB4IwRXYsWw4Bc6o/az2HJgFUA1ffSh90i26ZJ6Xl0= -github.com/jcmturner/rpc/v2 v2.0.2/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/lib/pq v1.6.0 h1:I5DPxhYJChW9KYc66se+oKFFQX6VuQrKiprsX6ivRZc= -github.com/lib/pq v1.6.0/go.mod h1:4vXEAYvW1fRQ2/FhZ78H73A60MHw1geSm145z2mdY1g= +github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg= +github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381 h1:bqDmpDG49ZRnB5PcgP0RXtQvnMSgIF14M7CBd2shtXs= github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg= -github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo= +github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/projectdiscovery/chaos-client v0.1.6 h1:AbIN7xUszjUi7FxI4qUVSqJ3um+6eImE/xstbNS0A1M= github.com/projectdiscovery/chaos-client v0.1.6/go.mod h1:F5omaoJh/vMvWnZhKD4zFFA5ti+RPwUletwepKSyfxk= -github.com/projectdiscovery/fdmax v0.0.1 h1:EDpan+CgIAAYJ1K1zpTii2SouIDPHQwpGQsYc2UGUj0= -github.com/projectdiscovery/fdmax v0.0.1/go.mod h1:mbR7lJ9EONyxEfcsL2LlGtOSlzCQ5VraLzoJa/VTrAs= github.com/projectdiscovery/fdmax v0.0.2 h1:d0HqNC4kbrMWT669u9W7ksFS7UBvnW0zmgY6FBU45UY= github.com/projectdiscovery/fdmax v0.0.2/go.mod h1:mbR7lJ9EONyxEfcsL2LlGtOSlzCQ5VraLzoJa/VTrAs= -github.com/projectdiscovery/gologger v1.0.0 h1:XAQ8kHeVKXMjY4rLGh7eT5+oHU077BNEvs7X6n+vu1s= github.com/projectdiscovery/gologger v1.0.0/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= +github.com/projectdiscovery/gologger v1.0.1 h1:FzoYQZnxz9DCvSi/eg5A6+ET4CQ0CDUs27l6Exr8zMQ= +github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 h1:nrZ3ySNYwJbSpD6ce9duiP+QkD3JuLCcWkdaehUS/3Y= github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFyPdL66DjUD96XmzVL3ZntbzcflLnznH0fr99w5VqE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 h1:QmwruyY+bKbDDL0BaglrbZABEali68eoMFhTZpCjYVA= -golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -77,14 +48,7 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= -gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= -gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= -gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/passive/doc.go b/v2/pkg/passive/doc.go similarity index 100% rename from pkg/passive/doc.go rename to v2/pkg/passive/doc.go diff --git a/pkg/passive/passive.go b/v2/pkg/passive/passive.go similarity index 95% rename from pkg/passive/passive.go rename to v2/pkg/passive/passive.go index c9a0683..d4be059 100644 --- a/pkg/passive/passive.go +++ b/v2/pkg/passive/passive.go @@ -7,7 +7,7 @@ import ( "time" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // EnumerateSubdomains enumerates all the subdomains for a given domain diff --git a/pkg/passive/sources.go b/v2/pkg/passive/sources.go similarity index 61% rename from pkg/passive/sources.go rename to v2/pkg/passive/sources.go index 3f8f4e1..78b6cab 100644 --- a/pkg/passive/sources.go +++ b/v2/pkg/passive/sources.go @@ -1,42 +1,42 @@ package passive import ( - "github.com/projectdiscovery/subfinder/pkg/subscraping" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/alienvault" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/anubis" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/archiveis" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/binaryedge" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/bufferover" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/cebaidu" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/censys" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/certspotter" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/certspotterold" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/chaos" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/commoncrawl" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/crtsh" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/dnsdb" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/dnsdumpster" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/github" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/hackertarget" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/intelx" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/ipv4info" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/passivetotal" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/rapiddns" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/recon" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/riddler" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/robtex" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/securitytrails" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/shodan" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/sitedossier" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/spyse" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/sublist3r" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/threatbook" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/threatcrowd" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/threatminer" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/virustotal" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/waybackarchive" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/ximcx" - "github.com/projectdiscovery/subfinder/pkg/subscraping/sources/zoomeye" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/alienvault" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/anubis" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/archiveis" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/binaryedge" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/bufferover" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/cebaidu" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/censys" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/certspotter" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/certspotterold" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/chaos" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/commoncrawl" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/crtsh" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/dnsdb" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/dnsdumpster" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/github" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/hackertarget" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/intelx" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/ipv4info" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/passivetotal" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/rapiddns" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/recon" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/riddler" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/robtex" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/securitytrails" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/shodan" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/sitedossier" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/spyse" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/sublist3r" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/threatbook" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/threatcrowd" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/threatminer" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/virustotal" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/waybackarchive" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/ximcx" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping/sources/zoomeye" ) // DefaultSources contains the list of fast sources used by default. diff --git a/pkg/resolve/client.go b/v2/pkg/resolve/client.go similarity index 100% rename from pkg/resolve/client.go rename to v2/pkg/resolve/client.go diff --git a/pkg/resolve/doc.go b/v2/pkg/resolve/doc.go similarity index 100% rename from pkg/resolve/doc.go rename to v2/pkg/resolve/doc.go diff --git a/pkg/resolve/resolve.go b/v2/pkg/resolve/resolve.go similarity index 100% rename from pkg/resolve/resolve.go rename to v2/pkg/resolve/resolve.go diff --git a/pkg/runner/banners.go b/v2/pkg/runner/banners.go similarity index 95% rename from pkg/runner/banners.go rename to v2/pkg/runner/banners.go index ad17f69..b7ff55e 100644 --- a/pkg/runner/banners.go +++ b/v2/pkg/runner/banners.go @@ -2,8 +2,8 @@ package runner import ( "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/subfinder/pkg/passive" - "github.com/projectdiscovery/subfinder/pkg/resolve" + "github.com/projectdiscovery/subfinder/v2/pkg/passive" + "github.com/projectdiscovery/subfinder/v2/pkg/resolve" ) const banner = ` diff --git a/pkg/runner/chaosuploader.go b/v2/pkg/runner/chaosuploader.go similarity index 100% rename from pkg/runner/chaosuploader.go rename to v2/pkg/runner/chaosuploader.go diff --git a/pkg/runner/config.go b/v2/pkg/runner/config.go similarity index 98% rename from pkg/runner/config.go rename to v2/pkg/runner/config.go index f6c8bc0..81ebe40 100644 --- a/pkg/runner/config.go +++ b/v2/pkg/runner/config.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" "gopkg.in/yaml.v3" ) diff --git a/pkg/runner/config_test.go b/v2/pkg/runner/config_test.go similarity index 100% rename from pkg/runner/config_test.go rename to v2/pkg/runner/config_test.go diff --git a/pkg/runner/doc.go b/v2/pkg/runner/doc.go similarity index 100% rename from pkg/runner/doc.go rename to v2/pkg/runner/doc.go diff --git a/pkg/runner/enumerate.go b/v2/pkg/runner/enumerate.go similarity index 97% rename from pkg/runner/enumerate.go rename to v2/pkg/runner/enumerate.go index 1d6af81..ffd2e32 100644 --- a/pkg/runner/enumerate.go +++ b/v2/pkg/runner/enumerate.go @@ -10,8 +10,8 @@ import ( "github.com/hako/durafmt" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/subfinder/pkg/resolve" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/resolve" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) const maxNumCount = 2 diff --git a/pkg/runner/initialize.go b/v2/pkg/runner/initialize.go similarity index 94% rename from pkg/runner/initialize.go rename to v2/pkg/runner/initialize.go index a87bd4a..69a5a4d 100644 --- a/pkg/runner/initialize.go +++ b/v2/pkg/runner/initialize.go @@ -3,8 +3,8 @@ package runner import ( "strings" - "github.com/projectdiscovery/subfinder/pkg/passive" - "github.com/projectdiscovery/subfinder/pkg/resolve" + "github.com/projectdiscovery/subfinder/v2/pkg/passive" + "github.com/projectdiscovery/subfinder/v2/pkg/resolve" ) // initializePassiveEngine creates the passive engine and loads sources etc diff --git a/pkg/runner/options.go b/v2/pkg/runner/options.go similarity index 100% rename from pkg/runner/options.go rename to v2/pkg/runner/options.go diff --git a/pkg/runner/outputter.go b/v2/pkg/runner/outputter.go similarity index 98% rename from pkg/runner/outputter.go rename to v2/pkg/runner/outputter.go index 25b13d4..a787f85 100644 --- a/pkg/runner/outputter.go +++ b/v2/pkg/runner/outputter.go @@ -9,7 +9,7 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/resolve" + "github.com/projectdiscovery/subfinder/v2/pkg/resolve" ) // OutPutter outputs content to writers. diff --git a/pkg/runner/runner.go b/v2/pkg/runner/runner.go similarity index 95% rename from pkg/runner/runner.go rename to v2/pkg/runner/runner.go index da262e3..e938b5f 100644 --- a/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -7,8 +7,8 @@ import ( "os" "path" - "github.com/projectdiscovery/subfinder/pkg/passive" - "github.com/projectdiscovery/subfinder/pkg/resolve" + "github.com/projectdiscovery/subfinder/v2/pkg/passive" + "github.com/projectdiscovery/subfinder/v2/pkg/resolve" ) // Runner is an instance of the subdomain enumeration diff --git a/pkg/runner/validate.go b/v2/pkg/runner/validate.go similarity index 100% rename from pkg/runner/validate.go rename to v2/pkg/runner/validate.go diff --git a/pkg/subscraping/agent.go b/v2/pkg/subscraping/agent.go similarity index 100% rename from pkg/subscraping/agent.go rename to v2/pkg/subscraping/agent.go diff --git a/pkg/subscraping/sources/alienvault/alienvault.go b/v2/pkg/subscraping/sources/alienvault/alienvault.go similarity index 96% rename from pkg/subscraping/sources/alienvault/alienvault.go rename to v2/pkg/subscraping/sources/alienvault/alienvault.go index a19fece..b249c5b 100644 --- a/pkg/subscraping/sources/alienvault/alienvault.go +++ b/v2/pkg/subscraping/sources/alienvault/alienvault.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type alienvaultResponse struct { diff --git a/pkg/subscraping/sources/anubis/anubis.go b/v2/pkg/subscraping/sources/anubis/anubis.go similarity index 95% rename from pkg/subscraping/sources/anubis/anubis.go rename to v2/pkg/subscraping/sources/anubis/anubis.go index e8056cc..50a4ba3 100644 --- a/pkg/subscraping/sources/anubis/anubis.go +++ b/v2/pkg/subscraping/sources/anubis/anubis.go @@ -5,7 +5,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/archiveis/archiveis.go b/v2/pkg/subscraping/sources/archiveis/archiveis.go similarity index 96% rename from pkg/subscraping/sources/archiveis/archiveis.go rename to v2/pkg/subscraping/sources/archiveis/archiveis.go index 71f5d26..c4e9d3a 100755 --- a/pkg/subscraping/sources/archiveis/archiveis.go +++ b/v2/pkg/subscraping/sources/archiveis/archiveis.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "regexp" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type agent struct { diff --git a/pkg/subscraping/sources/binaryedge/binaryedge.go b/v2/pkg/subscraping/sources/binaryedge/binaryedge.go similarity index 98% rename from pkg/subscraping/sources/binaryedge/binaryedge.go rename to v2/pkg/subscraping/sources/binaryedge/binaryedge.go index 57ca3a6..e19b4d7 100755 --- a/pkg/subscraping/sources/binaryedge/binaryedge.go +++ b/v2/pkg/subscraping/sources/binaryedge/binaryedge.go @@ -8,7 +8,7 @@ import ( "strconv" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) const ( diff --git a/pkg/subscraping/sources/bufferover/bufferover.go b/v2/pkg/subscraping/sources/bufferover/bufferover.go similarity index 97% rename from pkg/subscraping/sources/bufferover/bufferover.go rename to v2/pkg/subscraping/sources/bufferover/bufferover.go index 0294d43..b5672f8 100755 --- a/pkg/subscraping/sources/bufferover/bufferover.go +++ b/v2/pkg/subscraping/sources/bufferover/bufferover.go @@ -8,7 +8,7 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type response struct { diff --git a/pkg/subscraping/sources/cebaidu/cebaidu.go b/v2/pkg/subscraping/sources/cebaidu/cebaidu.go similarity index 96% rename from pkg/subscraping/sources/cebaidu/cebaidu.go rename to v2/pkg/subscraping/sources/cebaidu/cebaidu.go index 30c803a..1366cc7 100644 --- a/pkg/subscraping/sources/cebaidu/cebaidu.go +++ b/v2/pkg/subscraping/sources/cebaidu/cebaidu.go @@ -5,7 +5,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/censys/censys.go b/v2/pkg/subscraping/sources/censys/censys.go similarity index 97% rename from pkg/subscraping/sources/censys/censys.go rename to v2/pkg/subscraping/sources/censys/censys.go index 54c5587..afbf1f8 100644 --- a/pkg/subscraping/sources/censys/censys.go +++ b/v2/pkg/subscraping/sources/censys/censys.go @@ -6,7 +6,7 @@ import ( "strconv" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) const maxCensysPages = 10 diff --git a/pkg/subscraping/sources/certspotter/certspotter.go b/v2/pkg/subscraping/sources/certspotter/certspotter.go similarity index 97% rename from pkg/subscraping/sources/certspotter/certspotter.go rename to v2/pkg/subscraping/sources/certspotter/certspotter.go index 7cbe5fd..0b6d6ac 100755 --- a/pkg/subscraping/sources/certspotter/certspotter.go +++ b/v2/pkg/subscraping/sources/certspotter/certspotter.go @@ -5,7 +5,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type certspotterObject struct { diff --git a/pkg/subscraping/sources/certspotterold/certspotterold.go b/v2/pkg/subscraping/sources/certspotterold/certspotterold.go similarity index 96% rename from pkg/subscraping/sources/certspotterold/certspotterold.go rename to v2/pkg/subscraping/sources/certspotterold/certspotterold.go index 1768adb..4abed9b 100755 --- a/pkg/subscraping/sources/certspotterold/certspotterold.go +++ b/v2/pkg/subscraping/sources/certspotterold/certspotterold.go @@ -7,7 +7,7 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type errorResponse struct { diff --git a/pkg/subscraping/sources/chaos/chaos.go b/v2/pkg/subscraping/sources/chaos/chaos.go similarity index 94% rename from pkg/subscraping/sources/chaos/chaos.go rename to v2/pkg/subscraping/sources/chaos/chaos.go index c0a7614..324050e 100644 --- a/pkg/subscraping/sources/chaos/chaos.go +++ b/v2/pkg/subscraping/sources/chaos/chaos.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/projectdiscovery/chaos-client/pkg/chaos" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/commoncrawl/commoncrawl.go b/v2/pkg/subscraping/sources/commoncrawl/commoncrawl.go similarity index 97% rename from pkg/subscraping/sources/commoncrawl/commoncrawl.go rename to v2/pkg/subscraping/sources/commoncrawl/commoncrawl.go index 124283e..9901aa8 100755 --- a/pkg/subscraping/sources/commoncrawl/commoncrawl.go +++ b/v2/pkg/subscraping/sources/commoncrawl/commoncrawl.go @@ -8,7 +8,7 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) const indexURL = "https://index.commoncrawl.org/collinfo.json" diff --git a/pkg/subscraping/sources/crtsh/crtsh.go b/v2/pkg/subscraping/sources/crtsh/crtsh.go similarity index 97% rename from pkg/subscraping/sources/crtsh/crtsh.go rename to v2/pkg/subscraping/sources/crtsh/crtsh.go index 4e24bec..6e558f0 100755 --- a/pkg/subscraping/sources/crtsh/crtsh.go +++ b/v2/pkg/subscraping/sources/crtsh/crtsh.go @@ -9,7 +9,7 @@ import ( // postgres driver _ "github.com/lib/pq" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type subdomain struct { diff --git a/pkg/subscraping/sources/dnsdb/dnsdb.go b/v2/pkg/subscraping/sources/dnsdb/dnsdb.go similarity index 96% rename from pkg/subscraping/sources/dnsdb/dnsdb.go rename to v2/pkg/subscraping/sources/dnsdb/dnsdb.go index f8991ec..120ace3 100644 --- a/pkg/subscraping/sources/dnsdb/dnsdb.go +++ b/v2/pkg/subscraping/sources/dnsdb/dnsdb.go @@ -8,7 +8,7 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type dnsdbResponse struct { diff --git a/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go b/v2/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go similarity index 97% rename from pkg/subscraping/sources/dnsdumpster/dnsdumpster.go rename to v2/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go index 1ccbd90..8a3182d 100755 --- a/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go +++ b/v2/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // CSRFSubMatchLength CSRF regex submatch length diff --git a/pkg/subscraping/sources/github/github.go b/v2/pkg/subscraping/sources/github/github.go similarity index 98% rename from pkg/subscraping/sources/github/github.go rename to v2/pkg/subscraping/sources/github/github.go index 2ed34f8..d384de8 100644 --- a/pkg/subscraping/sources/github/github.go +++ b/v2/pkg/subscraping/sources/github/github.go @@ -16,7 +16,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" "github.com/tomnomnom/linkheader" ) diff --git a/pkg/subscraping/sources/github/tokenmanager.go b/v2/pkg/subscraping/sources/github/tokenmanager.go similarity index 100% rename from pkg/subscraping/sources/github/tokenmanager.go rename to v2/pkg/subscraping/sources/github/tokenmanager.go diff --git a/pkg/subscraping/sources/hackertarget/hackertarget.go b/v2/pkg/subscraping/sources/hackertarget/hackertarget.go similarity index 94% rename from pkg/subscraping/sources/hackertarget/hackertarget.go rename to v2/pkg/subscraping/sources/hackertarget/hackertarget.go index 430924c..b9bf03f 100755 --- a/pkg/subscraping/sources/hackertarget/hackertarget.go +++ b/v2/pkg/subscraping/sources/hackertarget/hackertarget.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/intelx/intelx.go b/v2/pkg/subscraping/sources/intelx/intelx.go similarity index 98% rename from pkg/subscraping/sources/intelx/intelx.go rename to v2/pkg/subscraping/sources/intelx/intelx.go index c0837fb..3bb7c5c 100644 --- a/pkg/subscraping/sources/intelx/intelx.go +++ b/v2/pkg/subscraping/sources/intelx/intelx.go @@ -8,7 +8,7 @@ import ( "io/ioutil" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type searchResponseType struct { diff --git a/pkg/subscraping/sources/ipv4info/ipv4info.go b/v2/pkg/subscraping/sources/ipv4info/ipv4info.go similarity index 98% rename from pkg/subscraping/sources/ipv4info/ipv4info.go rename to v2/pkg/subscraping/sources/ipv4info/ipv4info.go index a25475f..dfc4c65 100755 --- a/pkg/subscraping/sources/ipv4info/ipv4info.go +++ b/v2/pkg/subscraping/sources/ipv4info/ipv4info.go @@ -8,7 +8,7 @@ import ( "regexp" "strconv" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/passivetotal/passivetotal.go b/v2/pkg/subscraping/sources/passivetotal/passivetotal.go similarity index 96% rename from pkg/subscraping/sources/passivetotal/passivetotal.go rename to v2/pkg/subscraping/sources/passivetotal/passivetotal.go index fdca7c7..76495a3 100755 --- a/pkg/subscraping/sources/passivetotal/passivetotal.go +++ b/v2/pkg/subscraping/sources/passivetotal/passivetotal.go @@ -5,7 +5,7 @@ import ( "context" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type response struct { diff --git a/pkg/subscraping/sources/rapiddns/rapiddns.go b/v2/pkg/subscraping/sources/rapiddns/rapiddns.go similarity index 95% rename from pkg/subscraping/sources/rapiddns/rapiddns.go rename to v2/pkg/subscraping/sources/rapiddns/rapiddns.go index 0f01b07..01754e4 100644 --- a/pkg/subscraping/sources/rapiddns/rapiddns.go +++ b/v2/pkg/subscraping/sources/rapiddns/rapiddns.go @@ -5,7 +5,7 @@ import ( "context" "io/ioutil" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/recon/recon.go b/v2/pkg/subscraping/sources/recon/recon.go similarity index 95% rename from pkg/subscraping/sources/recon/recon.go rename to v2/pkg/subscraping/sources/recon/recon.go index 930c916..4e45ade 100644 --- a/pkg/subscraping/sources/recon/recon.go +++ b/v2/pkg/subscraping/sources/recon/recon.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type subdomain struct { diff --git a/pkg/subscraping/sources/riddler/riddler.go b/v2/pkg/subscraping/sources/riddler/riddler.go similarity index 94% rename from pkg/subscraping/sources/riddler/riddler.go rename to v2/pkg/subscraping/sources/riddler/riddler.go index 42b97b7..f369cf4 100644 --- a/pkg/subscraping/sources/riddler/riddler.go +++ b/v2/pkg/subscraping/sources/riddler/riddler.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/robtex/robtext.go b/v2/pkg/subscraping/sources/robtex/robtext.go similarity index 97% rename from pkg/subscraping/sources/robtex/robtext.go rename to v2/pkg/subscraping/sources/robtex/robtext.go index 28c8901..9d0ffaa 100644 --- a/pkg/subscraping/sources/robtex/robtext.go +++ b/v2/pkg/subscraping/sources/robtex/robtext.go @@ -7,7 +7,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) const ( diff --git a/pkg/subscraping/sources/securitytrails/securitytrails.go b/v2/pkg/subscraping/sources/securitytrails/securitytrails.go similarity index 96% rename from pkg/subscraping/sources/securitytrails/securitytrails.go rename to v2/pkg/subscraping/sources/securitytrails/securitytrails.go index 6f02102..2e525e0 100755 --- a/pkg/subscraping/sources/securitytrails/securitytrails.go +++ b/v2/pkg/subscraping/sources/securitytrails/securitytrails.go @@ -6,7 +6,7 @@ import ( "strings" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type response struct { diff --git a/pkg/subscraping/sources/shodan/shodan.go b/v2/pkg/subscraping/sources/shodan/shodan.go similarity index 96% rename from pkg/subscraping/sources/shodan/shodan.go rename to v2/pkg/subscraping/sources/shodan/shodan.go index a440c66..31c68f7 100644 --- a/pkg/subscraping/sources/shodan/shodan.go +++ b/v2/pkg/subscraping/sources/shodan/shodan.go @@ -5,7 +5,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/sitedossier/sitedossier.go b/v2/pkg/subscraping/sources/sitedossier/sitedossier.go similarity index 97% rename from pkg/subscraping/sources/sitedossier/sitedossier.go rename to v2/pkg/subscraping/sources/sitedossier/sitedossier.go index d68465d..c91c438 100755 --- a/pkg/subscraping/sources/sitedossier/sitedossier.go +++ b/v2/pkg/subscraping/sources/sitedossier/sitedossier.go @@ -9,7 +9,7 @@ import ( "regexp" "time" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // SleepRandIntn is the integer value to get the pseudo-random number diff --git a/pkg/subscraping/sources/spyse/spyse.go b/v2/pkg/subscraping/sources/spyse/spyse.go similarity index 96% rename from pkg/subscraping/sources/spyse/spyse.go rename to v2/pkg/subscraping/sources/spyse/spyse.go index bbe1c9a..347f2a6 100644 --- a/pkg/subscraping/sources/spyse/spyse.go +++ b/v2/pkg/subscraping/sources/spyse/spyse.go @@ -6,7 +6,7 @@ import ( "strconv" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type resultObject struct { diff --git a/pkg/subscraping/sources/sublist3r/subllist3r.go b/v2/pkg/subscraping/sources/sublist3r/subllist3r.go similarity index 95% rename from pkg/subscraping/sources/sublist3r/subllist3r.go rename to v2/pkg/subscraping/sources/sublist3r/subllist3r.go index 349eef1..1b89656 100644 --- a/pkg/subscraping/sources/sublist3r/subllist3r.go +++ b/v2/pkg/subscraping/sources/sublist3r/subllist3r.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/threatbook/threatbook.go b/v2/pkg/subscraping/sources/threatbook/threatbook.go similarity index 97% rename from pkg/subscraping/sources/threatbook/threatbook.go rename to v2/pkg/subscraping/sources/threatbook/threatbook.go index 02f3c8a..f7de108 100644 --- a/pkg/subscraping/sources/threatbook/threatbook.go +++ b/v2/pkg/subscraping/sources/threatbook/threatbook.go @@ -6,7 +6,7 @@ import ( "strconv" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type threatBookResponse struct { diff --git a/pkg/subscraping/sources/threatcrowd/threatcrowd.go b/v2/pkg/subscraping/sources/threatcrowd/threatcrowd.go similarity index 95% rename from pkg/subscraping/sources/threatcrowd/threatcrowd.go rename to v2/pkg/subscraping/sources/threatcrowd/threatcrowd.go index ff5bbbc..1de0d63 100755 --- a/pkg/subscraping/sources/threatcrowd/threatcrowd.go +++ b/v2/pkg/subscraping/sources/threatcrowd/threatcrowd.go @@ -6,7 +6,7 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type response struct { diff --git a/pkg/subscraping/sources/threatminer/threatminer.go b/v2/pkg/subscraping/sources/threatminer/threatminer.go similarity index 95% rename from pkg/subscraping/sources/threatminer/threatminer.go rename to v2/pkg/subscraping/sources/threatminer/threatminer.go index 7df82ae..20c41b8 100755 --- a/pkg/subscraping/sources/threatminer/threatminer.go +++ b/v2/pkg/subscraping/sources/threatminer/threatminer.go @@ -6,7 +6,7 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type response struct { diff --git a/pkg/subscraping/sources/virustotal/virustotal.go b/v2/pkg/subscraping/sources/virustotal/virustotal.go similarity index 95% rename from pkg/subscraping/sources/virustotal/virustotal.go rename to v2/pkg/subscraping/sources/virustotal/virustotal.go index b0d44f8..640698f 100755 --- a/pkg/subscraping/sources/virustotal/virustotal.go +++ b/v2/pkg/subscraping/sources/virustotal/virustotal.go @@ -5,7 +5,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) type response struct { diff --git a/pkg/subscraping/sources/waybackarchive/waybackarchive.go b/v2/pkg/subscraping/sources/waybackarchive/waybackarchive.go similarity index 95% rename from pkg/subscraping/sources/waybackarchive/waybackarchive.go rename to v2/pkg/subscraping/sources/waybackarchive/waybackarchive.go index e1993c7..8c36346 100755 --- a/pkg/subscraping/sources/waybackarchive/waybackarchive.go +++ b/v2/pkg/subscraping/sources/waybackarchive/waybackarchive.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/ximcx/ximcx.go b/v2/pkg/subscraping/sources/ximcx/ximcx.go similarity index 96% rename from pkg/subscraping/sources/ximcx/ximcx.go rename to v2/pkg/subscraping/sources/ximcx/ximcx.go index e282c99..7bee37d 100644 --- a/pkg/subscraping/sources/ximcx/ximcx.go +++ b/v2/pkg/subscraping/sources/ximcx/ximcx.go @@ -5,7 +5,7 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // Source is the passive scraping agent diff --git a/pkg/subscraping/sources/zoomeye/zoomeye.go b/v2/pkg/subscraping/sources/zoomeye/zoomeye.go similarity index 98% rename from pkg/subscraping/sources/zoomeye/zoomeye.go rename to v2/pkg/subscraping/sources/zoomeye/zoomeye.go index 690f1a8..4955fda 100644 --- a/pkg/subscraping/sources/zoomeye/zoomeye.go +++ b/v2/pkg/subscraping/sources/zoomeye/zoomeye.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "github.com/projectdiscovery/subfinder/pkg/subscraping" + "github.com/projectdiscovery/subfinder/v2/pkg/subscraping" ) // zoomAuth holds the ZoomEye credentials diff --git a/pkg/subscraping/types.go b/v2/pkg/subscraping/types.go similarity index 100% rename from pkg/subscraping/types.go rename to v2/pkg/subscraping/types.go diff --git a/pkg/subscraping/utils.go b/v2/pkg/subscraping/utils.go similarity index 100% rename from pkg/subscraping/utils.go rename to v2/pkg/subscraping/utils.go