From 860d3402d73d99e7f082e82371b72165d1e62d53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 13:40:33 +0000 Subject: [PATCH 01/68] chore(deps): bump github.com/projectdiscovery/goflags in /v2 Bumps [github.com/projectdiscovery/goflags](https://github.com/projectdiscovery/goflags) from 0.1.1 to 0.1.2. - [Release notes](https://github.com/projectdiscovery/goflags/releases) - [Commits](https://github.com/projectdiscovery/goflags/compare/v0.1.1...v0.1.2) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/goflags dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 40cbaf73..c7a52ab2 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -10,7 +10,7 @@ require ( github.com/projectdiscovery/clistats v0.0.8 github.com/projectdiscovery/fdmax v0.0.3 github.com/projectdiscovery/fileutil v0.0.3 - github.com/projectdiscovery/goflags v0.1.1 + github.com/projectdiscovery/goflags v0.1.2 github.com/projectdiscovery/gologger v1.1.4 github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 github.com/projectdiscovery/networkpolicy v0.0.2-0.20220525172507-b844eafc878d diff --git a/v2/go.sum b/v2/go.sum index bc4d9d1c..ef2b7c4f 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -253,8 +253,8 @@ github.com/projectdiscovery/fileutil v0.0.3 h1:GSsoey4p8ZHIRxWF2VXh4mhLr+wfEkpJw github.com/projectdiscovery/fileutil v0.0.3/go.mod h1:GLejWd3YerG3RNYD/Hk2pJlytlYRgHdkWfWUAdCH2YQ= github.com/projectdiscovery/goflags v0.0.8-0.20220426153734-2ffbfbff923c/go.mod h1:uN+pHMLsWQoiZHUg/l0tqf/VdbX3+ecKfYz/H7b/+NA= github.com/projectdiscovery/goflags v0.0.8/go.mod h1:GDSkWyXa6kfQjpJu10SO64DN8lXuKXVENlBMk8N7H80= -github.com/projectdiscovery/goflags v0.1.1 h1:AEtT14D9OC10HWyZwDQaSLjuK8ZKoBrSYlsLItvMKZI= -github.com/projectdiscovery/goflags v0.1.1/go.mod h1:/YBPA+1igSkQbwD7a91o0HUIwMDlsmQDRZL2oSYSyEQ= +github.com/projectdiscovery/goflags v0.1.2 h1:osaVfg0VOMhEUvUCgAJLizwu3kFH1YeO2JiJYVJKLvg= +github.com/projectdiscovery/goflags v0.1.2/go.mod h1:hI/9sZpiIt+DE6RkNPTo98/u5OhR3EnoH5ozidT0HtY= github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= github.com/projectdiscovery/gologger v1.1.4 h1:qWxGUq7ukHWT849uGPkagPKF3yBPYAsTtMKunQ8O2VI= github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY= From 8ee5f4cddd4fb14b9b6af563cdb00dd96b79a45b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 13:46:35 +0000 Subject: [PATCH 02/68] chore(deps): bump github.com/projectdiscovery/goflags in /v2 Bumps [github.com/projectdiscovery/goflags](https://github.com/projectdiscovery/goflags) from 0.1.2 to 0.1.3. - [Release notes](https://github.com/projectdiscovery/goflags/releases) - [Commits](https://github.com/projectdiscovery/goflags/compare/v0.1.2...v0.1.3) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/goflags dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index c7a52ab2..d05e12ef 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -10,7 +10,7 @@ require ( github.com/projectdiscovery/clistats v0.0.8 github.com/projectdiscovery/fdmax v0.0.3 github.com/projectdiscovery/fileutil v0.0.3 - github.com/projectdiscovery/goflags v0.1.2 + github.com/projectdiscovery/goflags v0.1.3 github.com/projectdiscovery/gologger v1.1.4 github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 github.com/projectdiscovery/networkpolicy v0.0.2-0.20220525172507-b844eafc878d diff --git a/v2/go.sum b/v2/go.sum index ef2b7c4f..5e02f79f 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -253,8 +253,8 @@ github.com/projectdiscovery/fileutil v0.0.3 h1:GSsoey4p8ZHIRxWF2VXh4mhLr+wfEkpJw github.com/projectdiscovery/fileutil v0.0.3/go.mod h1:GLejWd3YerG3RNYD/Hk2pJlytlYRgHdkWfWUAdCH2YQ= github.com/projectdiscovery/goflags v0.0.8-0.20220426153734-2ffbfbff923c/go.mod h1:uN+pHMLsWQoiZHUg/l0tqf/VdbX3+ecKfYz/H7b/+NA= github.com/projectdiscovery/goflags v0.0.8/go.mod h1:GDSkWyXa6kfQjpJu10SO64DN8lXuKXVENlBMk8N7H80= -github.com/projectdiscovery/goflags v0.1.2 h1:osaVfg0VOMhEUvUCgAJLizwu3kFH1YeO2JiJYVJKLvg= -github.com/projectdiscovery/goflags v0.1.2/go.mod h1:hI/9sZpiIt+DE6RkNPTo98/u5OhR3EnoH5ozidT0HtY= +github.com/projectdiscovery/goflags v0.1.3 h1:dnJlg19VkDp1iYkpAod4Tv+OAngr7Mq61LMMpBQlO0M= +github.com/projectdiscovery/goflags v0.1.3/go.mod h1:/7ZAoY1SVfUcGobTP5QDvGQmrpPDDlBUDIMr7c+r94Q= github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= github.com/projectdiscovery/gologger v1.1.4 h1:qWxGUq7ukHWT849uGPkagPKF3yBPYAsTtMKunQ8O2VI= github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY= From 7fedc2edb6fa3e0d22473df305d60b0f34024e66 Mon Sep 17 00:00:00 2001 From: vrenzolaverace Date: Sun, 6 Nov 2022 21:23:59 +0100 Subject: [PATCH 03/68] Update helpers libraries (#466) * Use utils helpers libraries (#465) * Update utils --- .gitignore | 2 ++ integration_tests/run.sh | 0 v2/go.mod | 3 ++- v2/go.sum | 6 ++++++ v2/pkg/routing/router.go | 2 +- v2/pkg/routing/router_darwin.go | 4 ++-- v2/pkg/routing/router_windows.go | 2 +- v2/pkg/runner/healthcheck.go | 2 +- v2/pkg/runner/ips.go | 4 ++-- v2/pkg/runner/ips_test.go | 2 +- v2/pkg/runner/options.go | 2 +- v2/pkg/runner/resume.go | 2 +- v2/pkg/runner/runner.go | 6 +++--- v2/pkg/runner/targets.go | 4 ++-- v2/pkg/runner/util.go | 4 ++-- v2/pkg/runner/validate.go | 6 +++--- v2/pkg/scan/cdn.go | 2 +- v2/pkg/scan/icmp.go | 2 +- v2/pkg/scan/scan.go | 2 +- 19 files changed, 33 insertions(+), 24 deletions(-) mode change 100644 => 100755 integration_tests/run.sh diff --git a/.gitignore b/.gitignore index 5efc9978..7afb01a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ cmd/naabu/naabu* v2/cmd/naabu/naabu* vendor +integration_tests/naabu +integration_tests/integration-test v2/cmd/functional-test/naabu_dev v2/cmd/functional-test/functional-test v2/cmd/functional-test/naabu diff --git a/integration_tests/run.sh b/integration_tests/run.sh old mode 100644 new mode 100755 diff --git a/v2/go.mod b/v2/go.mod index d05e12ef..c4570963 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -69,12 +69,13 @@ require ( github.com/projectdiscovery/asnmap v0.0.1 // indirect github.com/projectdiscovery/hmap v0.0.2 // indirect github.com/projectdiscovery/retryabledns v1.0.15 // indirect + github.com/projectdiscovery/utils v0.0.2 // indirect github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect github.com/syndtr/goleveldb v1.0.0 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect go.etcd.io/bbolt v1.3.5 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0 // indirect + golang.org/x/exp v0.0.0-20221019170559-20944726eadf // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/text v0.4.0 // indirect golang.org/x/tools v0.1.12 // indirect diff --git a/v2/go.sum b/v2/go.sum index 5e02f79f..454ad459 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -294,6 +294,10 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v0.0.9 h1:cjdL98jZEx10+I/14o6QFsCX6FOucggtl8G5qD7fa10= github.com/projectdiscovery/uncover v0.0.9/go.mod h1:+ZJNjDcznffXM03Ijt3AVjJslCJSvgnR7dRV7ulFdac= +github.com/projectdiscovery/utils v0.0.1 h1:8jxai1EF3z/lpHeUCQEyNvEzs2Y53bzsMzEhoFjjwo0= +github.com/projectdiscovery/utils v0.0.1/go.mod h1:PEYYkpCedmtydQRUvfWLPw0VRWpaFms4GFqNAziBANI= +github.com/projectdiscovery/utils v0.0.2 h1:lif4OYBqd8jCf0glRBfSs2lT4nMtNjHjeysRw8HIW8M= +github.com/projectdiscovery/utils v0.0.2/go.mod h1:PEYYkpCedmtydQRUvfWLPw0VRWpaFms4GFqNAziBANI= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= @@ -373,6 +377,8 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0 h1:17k44ji3KFYG94XS5QEFC8pyuOlMh3IoR+vkmTZmJJs= golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/exp v0.0.0-20221019170559-20944726eadf h1:nFVjjKDgNY37+ZSYCJmtYf7tOlfQswHqplG2eosjOMg= +golang.org/x/exp v0.0.0-20221019170559-20944726eadf/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/v2/pkg/routing/router.go b/v2/pkg/routing/router.go index f48d2e58..7a07fe52 100644 --- a/v2/pkg/routing/router.go +++ b/v2/pkg/routing/router.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/projectdiscovery/iputil" + iputil "github.com/projectdiscovery/utils/ip" ) type RouteType string diff --git a/v2/pkg/routing/router_darwin.go b/v2/pkg/routing/router_darwin.go index c9276f71..13c52d3d 100644 --- a/v2/pkg/routing/router_darwin.go +++ b/v2/pkg/routing/router_darwin.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/sliceutil" - "github.com/projectdiscovery/stringsutil" + sliceutil "github.com/projectdiscovery/utils/slice" + stringsutil "github.com/projectdiscovery/utils/strings" "go.uber.org/multierr" ) diff --git a/v2/pkg/routing/router_windows.go b/v2/pkg/routing/router_windows.go index e2c8ff6c..9e3210f3 100644 --- a/v2/pkg/routing/router_windows.go +++ b/v2/pkg/routing/router_windows.go @@ -12,7 +12,7 @@ import ( "github.com/asaskevich/govalidator" "github.com/pkg/errors" - "github.com/projectdiscovery/stringsutil" + stringsutil "github.com/projectdiscovery/utils/strings" ) // New creates a routing engine for windows diff --git a/v2/pkg/runner/healthcheck.go b/v2/pkg/runner/healthcheck.go index f816fdd4..dc07b7cc 100644 --- a/v2/pkg/runner/healthcheck.go +++ b/v2/pkg/runner/healthcheck.go @@ -6,9 +6,9 @@ import ( "runtime" "strings" - "github.com/projectdiscovery/fileutil" "github.com/projectdiscovery/goflags" "github.com/projectdiscovery/naabu/v2/pkg/privileges" + fileutil "github.com/projectdiscovery/utils/file" ) func DoHealthCheck(options *Options, flagSet *goflags.FlagSet) string { diff --git a/v2/pkg/runner/ips.go b/v2/pkg/runner/ips.go index 68f71707..d364f7d0 100644 --- a/v2/pkg/runner/ips.go +++ b/v2/pkg/runner/ips.go @@ -3,8 +3,8 @@ package runner import ( "strings" - "github.com/projectdiscovery/fileutil" - "github.com/projectdiscovery/iputil" + fileutil "github.com/projectdiscovery/utils/file" + iputil "github.com/projectdiscovery/utils/ip" ) func parseExcludedIps(options *Options) ([]string, error) { diff --git a/v2/pkg/runner/ips_test.go b/v2/pkg/runner/ips_test.go index 360e8cf5..731545c3 100644 --- a/v2/pkg/runner/ips_test.go +++ b/v2/pkg/runner/ips_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/projectdiscovery/fileutil" + fileutil "github.com/projectdiscovery/utils/file" "github.com/stretchr/testify/assert" ) diff --git a/v2/pkg/runner/options.go b/v2/pkg/runner/options.go index 42f81ebe..933bbbbc 100644 --- a/v2/pkg/runner/options.go +++ b/v2/pkg/runner/options.go @@ -4,9 +4,9 @@ import ( "os" "time" - "github.com/projectdiscovery/fileutil" "github.com/projectdiscovery/naabu/v2/pkg/privileges" "github.com/projectdiscovery/naabu/v2/pkg/result" + fileutil "github.com/projectdiscovery/utils/file" "github.com/projectdiscovery/goflags" "github.com/projectdiscovery/gologger" diff --git a/v2/pkg/runner/resume.go b/v2/pkg/runner/resume.go index b49754c0..7bbd4021 100644 --- a/v2/pkg/runner/resume.go +++ b/v2/pkg/runner/resume.go @@ -6,8 +6,8 @@ import ( "path/filepath" "sync" - "github.com/projectdiscovery/fileutil" "github.com/projectdiscovery/gologger" + fileutil "github.com/projectdiscovery/utils/file" ) // Default resume file diff --git a/v2/pkg/runner/runner.go b/v2/pkg/runner/runner.go index 45af3dfd..56975d74 100644 --- a/v2/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -22,9 +22,7 @@ import ( "github.com/projectdiscovery/blackrock" "github.com/projectdiscovery/clistats" "github.com/projectdiscovery/dnsx/libs/dnsx" - "github.com/projectdiscovery/fileutil" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/iputil" "github.com/projectdiscovery/mapcidr" "github.com/projectdiscovery/mapcidr/asn" "github.com/projectdiscovery/naabu/v2/pkg/privileges" @@ -32,8 +30,10 @@ import ( "github.com/projectdiscovery/naabu/v2/pkg/scan" "github.com/projectdiscovery/ratelimit" "github.com/projectdiscovery/retryablehttp-go" - "github.com/projectdiscovery/sliceutil" "github.com/projectdiscovery/uncover/uncover/agent/shodanidb" + fileutil "github.com/projectdiscovery/utils/file" + iputil "github.com/projectdiscovery/utils/ip" + sliceutil "github.com/projectdiscovery/utils/slice" "github.com/remeh/sizedwaitgroup" ) diff --git a/v2/pkg/runner/targets.go b/v2/pkg/runner/targets.go index 696072c7..8823fdff 100644 --- a/v2/pkg/runner/targets.go +++ b/v2/pkg/runner/targets.go @@ -9,12 +9,12 @@ import ( "os" "strings" - "github.com/projectdiscovery/fileutil" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/iputil" "github.com/projectdiscovery/mapcidr/asn" "github.com/projectdiscovery/naabu/v2/pkg/privileges" "github.com/projectdiscovery/naabu/v2/pkg/scan" + fileutil "github.com/projectdiscovery/utils/file" + iputil "github.com/projectdiscovery/utils/ip" "github.com/remeh/sizedwaitgroup" ) diff --git a/v2/pkg/runner/util.go b/v2/pkg/runner/util.go index 819dd9a8..54e06fa1 100644 --- a/v2/pkg/runner/util.go +++ b/v2/pkg/runner/util.go @@ -5,8 +5,8 @@ import ( "runtime" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/iputil" - "github.com/projectdiscovery/sliceutil" + iputil "github.com/projectdiscovery/utils/ip" + sliceutil "github.com/projectdiscovery/utils/slice" ) func (r *Runner) host2ips(target string) (targetIPsV4 []string, targetIPsV6 []string, err error) { diff --git a/v2/pkg/runner/validate.go b/v2/pkg/runner/validate.go index 15c93ef2..fef73c13 100644 --- a/v2/pkg/runner/validate.go +++ b/v2/pkg/runner/validate.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/pkg/errors" - "github.com/projectdiscovery/fileutil" - "github.com/projectdiscovery/iputil" "github.com/projectdiscovery/naabu/v2/pkg/privileges" - "github.com/projectdiscovery/sliceutil" + fileutil "github.com/projectdiscovery/utils/file" + iputil "github.com/projectdiscovery/utils/ip" + sliceutil "github.com/projectdiscovery/utils/slice" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/gologger/formatter" diff --git a/v2/pkg/scan/cdn.go b/v2/pkg/scan/cdn.go index 5a78d4fb..a2f2229d 100644 --- a/v2/pkg/scan/cdn.go +++ b/v2/pkg/scan/cdn.go @@ -4,7 +4,7 @@ import ( "net" "github.com/pkg/errors" - "github.com/projectdiscovery/iputil" + iputil "github.com/projectdiscovery/utils/ip" ) // CdnCheck verifies if the given ip is part of Cdn ranges diff --git a/v2/pkg/scan/icmp.go b/v2/pkg/scan/icmp.go index 494005d3..4447e145 100644 --- a/v2/pkg/scan/icmp.go +++ b/v2/pkg/scan/icmp.go @@ -10,7 +10,7 @@ import ( "time" "github.com/projectdiscovery/gologger" - "github.com/projectdiscovery/iputil" + iputil "github.com/projectdiscovery/utils/ip" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" diff --git a/v2/pkg/scan/scan.go b/v2/pkg/scan/scan.go index d2a5f83a..688d9b54 100644 --- a/v2/pkg/scan/scan.go +++ b/v2/pkg/scan/scan.go @@ -15,11 +15,11 @@ import ( "github.com/projectdiscovery/cdncheck" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/ipranger" - "github.com/projectdiscovery/iputil" "github.com/projectdiscovery/naabu/v2/pkg/privileges" "github.com/projectdiscovery/naabu/v2/pkg/result" "github.com/projectdiscovery/naabu/v2/pkg/routing" "github.com/projectdiscovery/networkpolicy" + iputil "github.com/projectdiscovery/utils/ip" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" From 1023b6cabb575d5c4abde0b2d537dd8833f504ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 13:00:52 +0000 Subject: [PATCH 04/68] chore(deps): bump golang from 1.19.2-alpine to 1.19.3-alpine Bumps golang from 1.19.2-alpine to 1.19.3-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fbc4ee14..bc1c82a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.2-alpine AS builder +FROM golang:1.19.3-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest From e704d9c28b0edc90bada49714b77a4afef6f7454 Mon Sep 17 00:00:00 2001 From: shubhamrasal Date: Wed, 9 Nov 2022 17:28:28 +0530 Subject: [PATCH 05/68] Remove retries and resumeCfg as mandatory options for as lib use --- README.md | 2 -- v2/cmd/integration-test/library.go | 2 -- v2/pkg/runner/runner.go | 6 ++++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d12a64d1..7b5f7bd8 100644 --- a/README.md +++ b/README.md @@ -360,8 +360,6 @@ import ( func main() { options := runner.Options{ - ResumeCfg: &runner.ResumeCfg{}, - Retries: 1, Host: goflags.StringSlice{"scanme.sh"}, OnResult: func(hr *result.HostResult) { log.Println(hr.Host, hr.Ports) diff --git a/v2/cmd/integration-test/library.go b/v2/cmd/integration-test/library.go index 3b04362a..e9961d9b 100644 --- a/v2/cmd/integration-test/library.go +++ b/v2/cmd/integration-test/library.go @@ -25,8 +25,6 @@ func (h *httpxLibrary) Execute() error { options := runner.Options{ HostsFile: testFile, - ResumeCfg: &runner.ResumeCfg{}, - Retries: 1, Ports: "80", Passive: true, OnResult: func(hr *result.HostResult) {}, diff --git a/v2/pkg/runner/runner.go b/v2/pkg/runner/runner.go index 56975d74..3de1e22a 100644 --- a/v2/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -54,6 +54,12 @@ type Runner struct { // NewRunner creates a new runner struct instance by parsing // the configuration options, configuring sources, reading lists, etc func NewRunner(options *Options) (*Runner, error) { + if options.Retries == 0 { + options.Retries = DefaultRetriesSynScan + } + if options.ResumeCfg == nil { + options.ResumeCfg = NewResumeCfg() + } runner := &Runner{ options: options, asnClient: asn.New(), From b4d11b07d41e3b9da1fb8f67cc80a3a6f21a7133 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 13:07:10 +0000 Subject: [PATCH 06/68] chore(deps): bump golang.org/x/net from 0.1.0 to 0.2.0 in /v2 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.1.0 to 0.2.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.1.0...v0.2.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- v2/go.mod | 14 +++++++------- v2/go.sum | 10 ++++------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index c4570963..de171ee3 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -9,15 +9,15 @@ require ( github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb github.com/projectdiscovery/clistats v0.0.8 github.com/projectdiscovery/fdmax v0.0.3 - github.com/projectdiscovery/fileutil v0.0.3 + github.com/projectdiscovery/fileutil v0.0.3 // indirect github.com/projectdiscovery/goflags v0.1.3 github.com/projectdiscovery/gologger v1.1.4 - github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 + github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 // indirect github.com/projectdiscovery/networkpolicy v0.0.2-0.20220525172507-b844eafc878d github.com/remeh/sizedwaitgroup v1.0.0 //go.uber.org/ratelimit v0.2.0 // indirect - golang.org/x/net v0.1.0 - golang.org/x/sys v0.1.0 + golang.org/x/net v0.2.0 + golang.org/x/sys v0.2.0 ) require ( @@ -30,9 +30,8 @@ require ( github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/ratelimit v0.0.1 github.com/projectdiscovery/retryablehttp-go v1.0.2 - github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 - github.com/projectdiscovery/stringsutil v0.0.2 github.com/projectdiscovery/uncover v0.0.9 + github.com/projectdiscovery/utils v0.0.2 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.8.0 ) @@ -69,7 +68,8 @@ require ( github.com/projectdiscovery/asnmap v0.0.1 // indirect github.com/projectdiscovery/hmap v0.0.2 // indirect github.com/projectdiscovery/retryabledns v1.0.15 // indirect - github.com/projectdiscovery/utils v0.0.2 // indirect + github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 // indirect + github.com/projectdiscovery/stringsutil v0.0.2 // indirect github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect github.com/syndtr/goleveldb v1.0.0 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect diff --git a/v2/go.sum b/v2/go.sum index 454ad459..33e435c5 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -294,8 +294,6 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v0.0.9 h1:cjdL98jZEx10+I/14o6QFsCX6FOucggtl8G5qD7fa10= github.com/projectdiscovery/uncover v0.0.9/go.mod h1:+ZJNjDcznffXM03Ijt3AVjJslCJSvgnR7dRV7ulFdac= -github.com/projectdiscovery/utils v0.0.1 h1:8jxai1EF3z/lpHeUCQEyNvEzs2Y53bzsMzEhoFjjwo0= -github.com/projectdiscovery/utils v0.0.1/go.mod h1:PEYYkpCedmtydQRUvfWLPw0VRWpaFms4GFqNAziBANI= github.com/projectdiscovery/utils v0.0.2 h1:lif4OYBqd8jCf0glRBfSs2lT4nMtNjHjeysRw8HIW8M= github.com/projectdiscovery/utils v0.0.2/go.mod h1:PEYYkpCedmtydQRUvfWLPw0VRWpaFms4GFqNAziBANI= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -375,8 +373,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0 h1:17k44ji3KFYG94XS5QEFC8pyuOlMh3IoR+vkmTZmJJs= -golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/exp v0.0.0-20221019170559-20944726eadf h1:nFVjjKDgNY37+ZSYCJmtYf7tOlfQswHqplG2eosjOMg= golang.org/x/exp v0.0.0-20221019170559-20944726eadf/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -418,8 +414,9 @@ golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -461,8 +458,9 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= From 7c649f8d45458226da30b39a763c49f5b867d318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:52:57 +0530 Subject: [PATCH 07/68] chore(deps): bump alpine from 3.16.2 to 3.16.3 (#473) Bumps alpine from 3.16.2 to 3.16.3. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bc1c82a8..558e596d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.19.3-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest -FROM alpine:3.16.2 +FROM alpine:3.16.3 RUN apk add nmap libpcap-dev bind-tools ca-certificates nmap-scripts COPY --from=builder /go/bin/naabu /usr/local/bin/naabu ENTRYPOINT ["naabu"] From f8c210161dc5e5c2413a5e129b4eaca108c67255 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:53:21 +0530 Subject: [PATCH 08/68] chore(deps): bump github.com/projectdiscovery/clistats in /v2 (#475) Bumps [github.com/projectdiscovery/clistats](https://github.com/projectdiscovery/clistats) from 0.0.8 to 0.0.9. - [Release notes](https://github.com/projectdiscovery/clistats/releases) - [Commits](https://github.com/projectdiscovery/clistats/compare/v0.0.8...v0.0.9) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/clistats dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index de171ee3..ecf3ec76 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -7,7 +7,7 @@ require ( github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb - github.com/projectdiscovery/clistats v0.0.8 + github.com/projectdiscovery/clistats v0.0.9 github.com/projectdiscovery/fdmax v0.0.3 github.com/projectdiscovery/fileutil v0.0.3 // indirect github.com/projectdiscovery/goflags v0.1.3 diff --git a/v2/go.sum b/v2/go.sum index 33e435c5..d87ec7a9 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -238,8 +238,8 @@ github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc h1:jqZK github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc/go.mod h1:5tNGQP9kOfW+X5+40pZP8aqPYLHs45nJkFaSHLxdeH8= github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb h1:Q7tb/p2ts+dT+v4nQpxTR0DSng2C1Hlnrw/NE4tgGZw= github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb/go.mod h1:EevMeCG1ogBoUJYaa0Mv9R1VUboDm/DiynId7DboKy0= -github.com/projectdiscovery/clistats v0.0.8 h1:tjmWb15mqsPf/yrQXVHLe2ThZX/5+mgKSfZBKWWLh20= -github.com/projectdiscovery/clistats v0.0.8/go.mod h1:lV6jUHAv2bYWqrQstqW8iVIydKJhWlVaLl3Xo9ioVGg= +github.com/projectdiscovery/clistats v0.0.9 h1:8sA17+2qP+cTnY7LaaGURJW5stSM8UwQiygwHQjxHx4= +github.com/projectdiscovery/clistats v0.0.9/go.mod h1:7F1RdeGAoLf05rhsZesL0+qoXJpOA/vxuRj2JRIAzU4= github.com/projectdiscovery/dnsx v1.1.1-0.20220726121728-699bed01313a h1:x+/wTC4IEaSBtujl8JbdwWjprfAfLntSr8HTh7pPbbM= github.com/projectdiscovery/dnsx v1.1.1-0.20220726121728-699bed01313a/go.mod h1:jk2CjjLoxm5wZ14URcbi/OdvVy4MTtdpNAjDK3VWYF4= github.com/projectdiscovery/fdmax v0.0.3 h1:FM6lv9expZ/rEEBI9tkRh6tx3DV0gtpwzdc0h7bGPqg= @@ -368,7 +368,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -444,7 +443,6 @@ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201113233024-12cec1faf1ba/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From c2c7f334ce1fcffa559631f1426e79b9ae25ce0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:53:43 +0530 Subject: [PATCH 09/68] chore(deps): bump github.com/projectdiscovery/retryablehttp-go in /v2 (#477) Bumps [github.com/projectdiscovery/retryablehttp-go](https://github.com/projectdiscovery/retryablehttp-go) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/projectdiscovery/retryablehttp-go/releases) - [Commits](https://github.com/projectdiscovery/retryablehttp-go/compare/v1.0.2...v1.0.3) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/retryablehttp-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 3 ++- v2/go.sum | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index ecf3ec76..3b058efa 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -29,7 +29,7 @@ require ( github.com/projectdiscovery/ipranger v0.0.3 github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/ratelimit v0.0.1 - github.com/projectdiscovery/retryablehttp-go v1.0.2 + github.com/projectdiscovery/retryablehttp-go v1.0.3 github.com/projectdiscovery/uncover v0.0.9 github.com/projectdiscovery/utils v0.0.2 github.com/stretchr/testify v1.8.1 @@ -39,6 +39,7 @@ require ( require ( github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect github.com/DataDog/zstd v1.4.5 // indirect + github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 // indirect github.com/akrylysov/pogreb v0.10.1 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/cespare/xxhash v1.1.0 // indirect diff --git a/v2/go.sum b/v2/go.sum index d87ec7a9..c8887c49 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -11,6 +11,8 @@ github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= +github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 h1:ZbFL+BDfBqegi+/Ssh7im5+aQfBRx6it+kHnC7jaDU8= +github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809/go.mod h1:upgc3Zs45jBDnBT4tVRgRcgm26ABpaP7MoTSdgysca4= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= @@ -280,8 +282,9 @@ github.com/projectdiscovery/ratelimit v0.0.1 h1:GnCfbKmkLdDLXT3QS4KS0zCsuDGkoRQE github.com/projectdiscovery/ratelimit v0.0.1/go.mod h1:zenrIElIcKg0Y9h7pMfTlw5vaI/kCl8uxXm+PfgbBSw= github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= -github.com/projectdiscovery/retryablehttp-go v1.0.2 h1:LV1/KAQU+yeWhNVlvveaYFsjBYRwXlNEq0PvrezMV0U= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= +github.com/projectdiscovery/retryablehttp-go v1.0.3 h1:8kIb3LPnt6tdZvCcTmvq3cowYOed4S/B9q2Mgf/EuwI= +github.com/projectdiscovery/retryablehttp-go v1.0.3/go.mod h1:t4buiLTB0HtI+62iHfGDqQVTv/i+8OhAKwaX93TGsFE= github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= From 9550b286d2ff20128ec4131f3d37c5b24773263d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:53:58 +0530 Subject: [PATCH 10/68] chore(deps): bump golangci/golangci-lint-action from 3.3.0 to 3.3.1 (#472) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 6e90e4be..e5fbbfd1 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -21,7 +21,7 @@ jobs: run: sudo apt install libpcap-dev - name: Run golangci-lint - uses: golangci/golangci-lint-action@v3.3.0 + uses: golangci/golangci-lint-action@v3.3.1 with: version: latest args: --timeout 5m From d8110dd432ac05105d0fcbaeb9182f7b85a66fef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:54:17 +0530 Subject: [PATCH 11/68] chore(deps): bump github.com/projectdiscovery/utils in /v2 (#474) Bumps [github.com/projectdiscovery/utils](https://github.com/projectdiscovery/utils) from 0.0.2 to 0.0.3. - [Release notes](https://github.com/projectdiscovery/utils/releases) - [Commits](https://github.com/projectdiscovery/utils/compare/v0.0.2...v0.0.3) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/utils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 3b058efa..b32bc294 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -31,7 +31,7 @@ require ( github.com/projectdiscovery/ratelimit v0.0.1 github.com/projectdiscovery/retryablehttp-go v1.0.3 github.com/projectdiscovery/uncover v0.0.9 - github.com/projectdiscovery/utils v0.0.2 + github.com/projectdiscovery/utils v0.0.3 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.8.0 ) diff --git a/v2/go.sum b/v2/go.sum index c8887c49..d19175f5 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -297,8 +297,8 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v0.0.9 h1:cjdL98jZEx10+I/14o6QFsCX6FOucggtl8G5qD7fa10= github.com/projectdiscovery/uncover v0.0.9/go.mod h1:+ZJNjDcznffXM03Ijt3AVjJslCJSvgnR7dRV7ulFdac= -github.com/projectdiscovery/utils v0.0.2 h1:lif4OYBqd8jCf0glRBfSs2lT4nMtNjHjeysRw8HIW8M= -github.com/projectdiscovery/utils v0.0.2/go.mod h1:PEYYkpCedmtydQRUvfWLPw0VRWpaFms4GFqNAziBANI= +github.com/projectdiscovery/utils v0.0.3 h1:pAjZTGYpnATRc6uaNACdiHv4joZ0Ml7Wpu0dudpcGfM= +github.com/projectdiscovery/utils v0.0.3/go.mod h1:ne3eSlZlUKuhjHr8FfsfGcGteCzxcbJvFBx4VDBCxK0= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= From e962b9209195b74128bc1c08d3a894edcf640828 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:55:17 +0530 Subject: [PATCH 12/68] chore(deps): bump github.com/projectdiscovery/fdmax in /v2 (#476) Bumps [github.com/projectdiscovery/fdmax](https://github.com/projectdiscovery/fdmax) from 0.0.3 to 0.0.4. - [Release notes](https://github.com/projectdiscovery/fdmax/releases) - [Commits](https://github.com/projectdiscovery/fdmax/compare/v0.0.3...v0.0.4) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/fdmax dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index b32bc294..15fc9e4d 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -8,7 +8,7 @@ require ( github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb github.com/projectdiscovery/clistats v0.0.9 - github.com/projectdiscovery/fdmax v0.0.3 + github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/fileutil v0.0.3 // indirect github.com/projectdiscovery/goflags v0.1.3 github.com/projectdiscovery/gologger v1.1.4 diff --git a/v2/go.sum b/v2/go.sum index d19175f5..cb886ee9 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -244,8 +244,8 @@ github.com/projectdiscovery/clistats v0.0.9 h1:8sA17+2qP+cTnY7LaaGURJW5stSM8UwQi github.com/projectdiscovery/clistats v0.0.9/go.mod h1:7F1RdeGAoLf05rhsZesL0+qoXJpOA/vxuRj2JRIAzU4= github.com/projectdiscovery/dnsx v1.1.1-0.20220726121728-699bed01313a h1:x+/wTC4IEaSBtujl8JbdwWjprfAfLntSr8HTh7pPbbM= github.com/projectdiscovery/dnsx v1.1.1-0.20220726121728-699bed01313a/go.mod h1:jk2CjjLoxm5wZ14URcbi/OdvVy4MTtdpNAjDK3VWYF4= -github.com/projectdiscovery/fdmax v0.0.3 h1:FM6lv9expZ/rEEBI9tkRh6tx3DV0gtpwzdc0h7bGPqg= -github.com/projectdiscovery/fdmax v0.0.3/go.mod h1:NWRcaR7JTO7fC27H4jCl9n7Z+KIredwpgw1fV+4KrKI= +github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc= +github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I= github.com/projectdiscovery/fileutil v0.0.0-20210928100737-cab279c5d4b5/go.mod h1:U+QCpQnX8o2N2w0VUGyAzjM3yBAe4BKedVElxiImsx0= github.com/projectdiscovery/fileutil v0.0.0-20220308101036-16c79af1cf5d/go.mod h1:Pm0f+MWgDFMSSI9NBedNh48LyYPs8gD3Jd8DXGmp4aQ= github.com/projectdiscovery/fileutil v0.0.0-20220506114156-c4ab20801483/go.mod h1:wjS/oBWbzlayJ/aTK0KW0oOHGO03G8oEYzuN6stI8Ho= @@ -447,7 +447,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 6c558c7a7dee4d80d42222ca758f7b4fb6bc4e12 Mon Sep 17 00:00:00 2001 From: foxcores <116920930+foxcores@users.noreply.github.com> Date: Fri, 18 Nov 2022 13:26:40 +0100 Subject: [PATCH 13/68] Fix Replace freeport with pd fork #471 (#478) * Fix Replace freeport with pd fork #471 * Replacing freeport with pd fork --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- v2/pkg/scan/scan.go | 10 +++++----- v2/pkg/scan/scan_unix.go | 8 ++++++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 15fc9e4d..0f9950ce 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/google/gopacket v1.1.19 - github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 + github.com/projectdiscovery/freeport v0.0.3 github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb github.com/projectdiscovery/clistats v0.0.9 diff --git a/v2/go.sum b/v2/go.sum index cb886ee9..e1501f06 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -223,8 +223,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= -github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= +github.com/projectdiscovery/freeport v0.0.3 h1:9m8CNlpOFL6L3XR3KBd//aATwTsTSW3h6kGqwGPOQb0= +github.com/projectdiscovery/freeport v0.0.3/go.mod h1:xpZcU6Mv+EdeDW6Af2fl76dnsc83rzRZ8liasy4tf8g= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/v2/pkg/scan/scan.go b/v2/pkg/scan/scan.go index 688d9b54..0cf9a6d7 100644 --- a/v2/pkg/scan/scan.go +++ b/v2/pkg/scan/scan.go @@ -11,8 +11,8 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" - "github.com/phayes/freeport" "github.com/projectdiscovery/cdncheck" + "github.com/projectdiscovery/freeport" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/ipranger" "github.com/projectdiscovery/naabu/v2/pkg/privileges" @@ -511,7 +511,7 @@ func (s *Scanner) ACKPort(dstIP string, port int, timeout time.Duration) (bool, } defer conn.Close() - rawPort, err := freeport.GetFreePort() + rawPort, err := freeport.GetFreeTCPPort("") if err != nil { return false, err } @@ -543,7 +543,7 @@ func (s *Scanner) ACKPort(dstIP string, port int, timeout time.Duration) (bool, } tcp := layers.TCP{ - SrcPort: layers.TCPPort(rawPort), + SrcPort: layers.TCPPort(rawPort.Port), DstPort: layers.TCPPort(port), ACK: true, Window: 1024, @@ -583,9 +583,9 @@ func (s *Scanner) ACKPort(dstIP string, port int, timeout time.Duration) (bool, continue } // We consider only incoming packets - if tcp.DstPort != layers.TCPPort(rawPort) { + if tcp.DstPort != layers.TCPPort(rawPort.Port) { if s.debug { - gologger.Debug().Msgf("Discarding TCP packet from %s:%d not matching %s:%d port\n", addr.String(), tcp.DstPort, dstIP, rawPort) + gologger.Debug().Msgf("Discarding TCP packet from %s:%d not matching %s:%d port\n", addr.String(), tcp.DstPort, dstIP, rawPort.Port) } continue } else if tcp.RST { diff --git a/v2/pkg/scan/scan_unix.go b/v2/pkg/scan/scan_unix.go index 6a95fc35..e7651cc9 100644 --- a/v2/pkg/scan/scan_unix.go +++ b/v2/pkg/scan/scan_unix.go @@ -14,7 +14,7 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" "github.com/google/gopacket/pcap" - "github.com/phayes/freeport" + "github.com/projectdiscovery/freeport" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/naabu/v2/pkg/routing" "golang.org/x/net/icmp" @@ -35,7 +35,11 @@ type Handlers struct { } func getFreePort() (int, error) { - return freeport.GetFreePort() + rawPort, err := freeport.GetFreeTCPPort("") + if err != nil { + return 0, err + } + return rawPort.Port, nil } func NewScannerUnix(scanner *Scanner) error { From 20bc2f544a445e78c00ec7414bceed1acca9ca90 Mon Sep 17 00:00:00 2001 From: xm1k3 Date: Mon, 21 Nov 2022 18:23:18 +0100 Subject: [PATCH 14/68] Failing race condition (#485) * updating go mod * removing sudo * removing push from gh events --- .github/workflows/build-test.yml | 3 +- .github/workflows/codeql-analysis.yml | 1 - .github/workflows/functional-test.yml | 1 - .github/workflows/lint-test.yml | 1 - v2/go.mod | 45 ++++++++-------- v2/go.sum | 74 ++++++++++++++++----------- 6 files changed, 69 insertions(+), 56 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index fe2033b6..dc937517 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -1,6 +1,5 @@ name: ๐Ÿ”จ Build Test on: - push: pull_request: workflow_dispatch: @@ -38,7 +37,7 @@ jobs: - name: Race Condition Tests run: | - sudo go run -race . -host scanme.sh + go run -race . -host scanme.sh working-directory: v2/cmd/naabu/ build-mac: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 403f537d..3b03ce6c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,7 +2,6 @@ name: ๐Ÿšจ CodeQL Analysis on: workflow_dispatch: - push: pull_request: branches: - dev diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml index a156ee3d..cc684716 100644 --- a/.github/workflows/functional-test.yml +++ b/.github/workflows/functional-test.yml @@ -1,6 +1,5 @@ name: ๐Ÿงช Functional Test on: - push: pull_request: workflow_dispatch: diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index e5fbbfd1..2df07b18 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -1,6 +1,5 @@ name: ๐Ÿ™๐Ÿป Lint Test on: - push: pull_request: workflow_dispatch: diff --git a/v2/go.mod b/v2/go.mod index 0f9950ce..c91cd7d2 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -2,38 +2,32 @@ module github.com/projectdiscovery/naabu/v2 go 1.18 -require ( - github.com/google/gopacket v1.1.19 - github.com/projectdiscovery/freeport v0.0.3 - github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc - github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb - github.com/projectdiscovery/clistats v0.0.9 - github.com/projectdiscovery/fdmax v0.0.4 - github.com/projectdiscovery/fileutil v0.0.3 // indirect - github.com/projectdiscovery/goflags v0.1.3 - github.com/projectdiscovery/gologger v1.1.4 - github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 // indirect - github.com/projectdiscovery/networkpolicy v0.0.2-0.20220525172507-b844eafc878d - github.com/remeh/sizedwaitgroup v1.0.0 - //go.uber.org/ratelimit v0.2.0 // indirect - golang.org/x/net v0.2.0 - golang.org/x/sys v0.2.0 -) - require ( github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d + github.com/google/gopacket v1.1.19 github.com/logrusorgru/aurora v2.0.3+incompatible github.com/miekg/dns v1.1.50 github.com/pkg/errors v0.9.1 - github.com/projectdiscovery/dnsx v1.1.1-0.20220726121728-699bed01313a - github.com/projectdiscovery/ipranger v0.0.3 + github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c + github.com/projectdiscovery/cdncheck v0.0.3 + github.com/projectdiscovery/clistats v0.0.9 + github.com/projectdiscovery/dnsx v1.1.1 + github.com/projectdiscovery/fdmax v0.0.4 + github.com/projectdiscovery/freeport v0.0.4 + github.com/projectdiscovery/goflags v0.1.4 + github.com/projectdiscovery/gologger v1.1.5 + github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 + github.com/projectdiscovery/networkpolicy v0.0.2 github.com/projectdiscovery/ratelimit v0.0.1 github.com/projectdiscovery/retryablehttp-go v1.0.3 github.com/projectdiscovery/uncover v0.0.9 github.com/projectdiscovery/utils v0.0.3 + github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.8.0 + golang.org/x/net v0.2.0 + golang.org/x/sys v0.2.0 ) require ( @@ -53,6 +47,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgraph-io/badger v1.6.2 // indirect github.com/dgraph-io/ristretto v0.0.3 // indirect + github.com/dsnet/compress v0.0.1 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect @@ -62,17 +57,24 @@ require ( github.com/klauspost/compress v1.11.7 // indirect github.com/kr/pretty v0.2.1 // indirect github.com/kr/text v0.2.0 // indirect + github.com/mholt/archiver v3.1.1+incompatible // indirect github.com/microcosm-cc/bluemonday v1.0.21 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nwaples/rardecode v1.1.0 // indirect + github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/projectdiscovery/asnmap v0.0.1 // indirect + github.com/projectdiscovery/fileutil v0.0.1 // indirect github.com/projectdiscovery/hmap v0.0.2 // indirect + github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 // indirect github.com/projectdiscovery/retryabledns v1.0.15 // indirect github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 // indirect - github.com/projectdiscovery/stringsutil v0.0.2 // indirect + github.com/projectdiscovery/stringsutil v0.0.1 // indirect github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect github.com/syndtr/goleveldb v1.0.0 // indirect + github.com/ulikunitz/xz v0.5.7 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect go.etcd.io/bbolt v1.3.5 // indirect go.uber.org/atomic v1.10.0 // indirect @@ -81,5 +83,6 @@ require ( golang.org/x/text v0.4.0 // indirect golang.org/x/tools v0.1.12 // indirect google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/djherbis/times.v1 v1.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/v2/go.sum b/v2/go.sum index e1501f06..0924d1c0 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -67,6 +67,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q= +github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= +github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= @@ -77,6 +80,8 @@ github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHj github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= +github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -114,7 +119,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -123,6 +128,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -162,10 +168,12 @@ github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiD github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -188,9 +196,12 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= +github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU= +github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= github.com/microcosm-cc/bluemonday v1.0.19/go.mod h1:QNzV2UbLK2/53oIIwTOyLUSABMkjZ4tqiyC1g/DyqxE= +github.com/microcosm-cc/bluemonday v1.0.20/go.mod h1:yfBmMi8mxvaZut3Yytv+jTXRY8mxyjJ0/kQBTElld50= github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg= github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= @@ -208,6 +219,8 @@ github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOA github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7MQ= +github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -223,8 +236,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/projectdiscovery/freeport v0.0.3 h1:9m8CNlpOFL6L3XR3KBd//aATwTsTSW3h6kGqwGPOQb0= -github.com/projectdiscovery/freeport v0.0.3/go.mod h1:xpZcU6Mv+EdeDW6Af2fl76dnsc83rzRZ8liasy4tf8g= +github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= +github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -235,49 +248,46 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/projectdiscovery/asnmap v0.0.1 h1:n4YCz1ljUaDA3dOUCkjI/bUOtiS7ge1KJ39qpURCd/o= github.com/projectdiscovery/asnmap v0.0.1/go.mod h1:CjCVDhQPVtmlE247L6YFeIVX9c4m8pOX8V8BmB0JkX8= github.com/projectdiscovery/blackrock v0.0.0-20210415162320-b38689ae3a2e/go.mod h1:/IsapnEYiWG+yEDPXp0e8NWj3npzB9Ccy9lXEUJwMZs= -github.com/projectdiscovery/blackrock v0.0.0-20210903102120-5a9d2412d21d/go.mod h1:/IsapnEYiWG+yEDPXp0e8NWj3npzB9Ccy9lXEUJwMZs= -github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc h1:jqZK68yPOnNNRmwuXqytl+T9EbwneEUCvMDRjLe0J04= github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc/go.mod h1:5tNGQP9kOfW+X5+40pZP8aqPYLHs45nJkFaSHLxdeH8= -github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb h1:Q7tb/p2ts+dT+v4nQpxTR0DSng2C1Hlnrw/NE4tgGZw= -github.com/projectdiscovery/cdncheck v0.0.4-0.20220322144854-b2d8ce308abb/go.mod h1:EevMeCG1ogBoUJYaa0Mv9R1VUboDm/DiynId7DboKy0= +github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c h1:H15I86gQcoi7w7gA0kG/LzxoYprrudJYXmQueMBpNUA= +github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss= +github.com/projectdiscovery/cdncheck v0.0.3 h1:li2/rUJmhVXSqRFyhJMqi6pdBX6ZxMnwzBfE0Kifj/g= +github.com/projectdiscovery/cdncheck v0.0.3/go.mod h1:EevMeCG1ogBoUJYaa0Mv9R1VUboDm/DiynId7DboKy0= github.com/projectdiscovery/clistats v0.0.9 h1:8sA17+2qP+cTnY7LaaGURJW5stSM8UwQiygwHQjxHx4= github.com/projectdiscovery/clistats v0.0.9/go.mod h1:7F1RdeGAoLf05rhsZesL0+qoXJpOA/vxuRj2JRIAzU4= -github.com/projectdiscovery/dnsx v1.1.1-0.20220726121728-699bed01313a h1:x+/wTC4IEaSBtujl8JbdwWjprfAfLntSr8HTh7pPbbM= -github.com/projectdiscovery/dnsx v1.1.1-0.20220726121728-699bed01313a/go.mod h1:jk2CjjLoxm5wZ14URcbi/OdvVy4MTtdpNAjDK3VWYF4= +github.com/projectdiscovery/dnsx v1.1.1 h1:yGYEH1vfVN7YdvdOtPzPvrc6JuHCi8wBTAkStP/f2QI= +github.com/projectdiscovery/dnsx v1.1.1/go.mod h1:DVvc+ePRCknahLpz4Y8nMppYOGUZhkEmYsTPuYx1a5w= github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc= github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I= github.com/projectdiscovery/fileutil v0.0.0-20210928100737-cab279c5d4b5/go.mod h1:U+QCpQnX8o2N2w0VUGyAzjM3yBAe4BKedVElxiImsx0= github.com/projectdiscovery/fileutil v0.0.0-20220308101036-16c79af1cf5d/go.mod h1:Pm0f+MWgDFMSSI9NBedNh48LyYPs8gD3Jd8DXGmp4aQ= -github.com/projectdiscovery/fileutil v0.0.0-20220506114156-c4ab20801483/go.mod h1:wjS/oBWbzlayJ/aTK0KW0oOHGO03G8oEYzuN6stI8Ho= github.com/projectdiscovery/fileutil v0.0.0-20220609150212-453ac591c36c/go.mod h1:g8wsrb0S5NtEN0JgVyyPeb3FQdArx+UMESmFX94bcGY= github.com/projectdiscovery/fileutil v0.0.0-20220705195237-01becc2a8963/go.mod h1:DaY7wmLPMleyHDCD/14YApPCDtrARY4J8Eny2ZGsG/g= -github.com/projectdiscovery/fileutil v0.0.3 h1:GSsoey4p8ZHIRxWF2VXh4mhLr+wfEkpJwvF0Dxpn/gg= -github.com/projectdiscovery/fileutil v0.0.3/go.mod h1:GLejWd3YerG3RNYD/Hk2pJlytlYRgHdkWfWUAdCH2YQ= -github.com/projectdiscovery/goflags v0.0.8-0.20220426153734-2ffbfbff923c/go.mod h1:uN+pHMLsWQoiZHUg/l0tqf/VdbX3+ecKfYz/H7b/+NA= +github.com/projectdiscovery/fileutil v0.0.1 h1:3K3UqCDOan3LsvWhV0nyvVuMWSwCloNPUJIGcXsi1os= +github.com/projectdiscovery/fileutil v0.0.1/go.mod h1:Oo6ZEvXmQz/xPF0YukzmwpdW2LYinWCSEmzZOQsJCLg= +github.com/projectdiscovery/freeport v0.0.4 h1:H4VrK/7hUcC1zbg46zv9iSMBACBDpUqcHkV+FUyXISw= +github.com/projectdiscovery/freeport v0.0.4/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= github.com/projectdiscovery/goflags v0.0.8/go.mod h1:GDSkWyXa6kfQjpJu10SO64DN8lXuKXVENlBMk8N7H80= -github.com/projectdiscovery/goflags v0.1.3 h1:dnJlg19VkDp1iYkpAod4Tv+OAngr7Mq61LMMpBQlO0M= -github.com/projectdiscovery/goflags v0.1.3/go.mod h1:/7ZAoY1SVfUcGobTP5QDvGQmrpPDDlBUDIMr7c+r94Q= +github.com/projectdiscovery/goflags v0.1.4 h1:PtlWYSMkRZq/TsHuQ7B36s9PiNnlznPqKRsrXnqkTOw= +github.com/projectdiscovery/goflags v0.1.4/go.mod h1:mms5rLXW0+jjbFFTyl/4t9VwtP5TCE+1Y1pReezluAI= github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= -github.com/projectdiscovery/gologger v1.1.4 h1:qWxGUq7ukHWT849uGPkagPKF3yBPYAsTtMKunQ8O2VI= github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY= +github.com/projectdiscovery/gologger v1.1.5 h1:CT2Jrpzusca+dwNREMMz4RnAreJ0RqaISRU4SBcZC+M= +github.com/projectdiscovery/gologger v1.1.5/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= github.com/projectdiscovery/hmap v0.0.1/go.mod h1:VDEfgzkKQdq7iGTKz8Ooul0NuYHQ8qiDs6r8bPD1Sb0= github.com/projectdiscovery/hmap v0.0.2 h1:fe3k0b6tj95mn9a1phD3JXvAAOmmWAh/Upg1Bf0Tfos= github.com/projectdiscovery/hmap v0.0.2/go.mod h1:YU3TeNTDmLW2dtb4LvuEtDsPTsQ06XMnmOeD3KOuU6c= github.com/projectdiscovery/ipranger v0.0.2/go.mod h1:kcAIk/lo5rW+IzUrFkeYyXnFJ+dKwYooEOHGVPP/RWE= -github.com/projectdiscovery/ipranger v0.0.3 h1:U60Dp6gHJ08PLMsKAWzHlnjE+8q01BhnUiDfjAjc7Gk= -github.com/projectdiscovery/ipranger v0.0.3/go.mod h1:pb7qOZyXI6n9Z5izLZmkTiunaBBbdqYEh6+y435b6CU= -github.com/projectdiscovery/iputil v0.0.0-20210414194613-4b4d2517acf0/go.mod h1:PQAqn5h5NXsQTF4ZA00ZTYLRzGCjOtcCq8llAqrsd1A= -github.com/projectdiscovery/iputil v0.0.0-20220625072148-037479960416/go.mod h1:bst7imnXn0ckAw4sToXLHLm62HisFGnS4QlxOkE4mYQ= +github.com/projectdiscovery/ipranger v0.0.4 h1:zYlsSYdl0702DyM+Af2ipMRs2pv7bPiVgV72jsbHAPY= +github.com/projectdiscovery/ipranger v0.0.4/go.mod h1:myfz4wwq86IOltKb3XJkiuJVVKtK4bNXSIRlHKrwSXM= github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 h1:HRqev12wKvcwK1fe4pSlMfQdPHo9LfTxuFeRN4f3tS4= github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8/go.mod h1:vHRC+9exsfSbEngMKDl0xiWqkxlLk3lHQZpbS2yFT8U= github.com/projectdiscovery/mapcidr v0.0.4/go.mod h1:ALOIj6ptkWujNoX8RdQwB2mZ+kAmKuLJBq9T5gR5wG0= -github.com/projectdiscovery/mapcidr v0.0.6/go.mod h1:ZEBhMmBU3laUl3g9QGTrzJku1VJOzjdFwW01f/zVVzM= -github.com/projectdiscovery/mapcidr v1.0.0/go.mod h1:5QkKrV6rNQQurCZI3nNedFsAOYp04mRDkC5yht+znYA= github.com/projectdiscovery/mapcidr v1.0.1/go.mod h1:/qxlpxXZQFFjHynSc9u5O0kUPzH46VskECiwLiz7/vw= github.com/projectdiscovery/mapcidr v1.0.3 h1:SGtOOEz0AxthVO7ZonMvhrJ/AQkHIXCVgyZqJdY0cAY= github.com/projectdiscovery/mapcidr v1.0.3/go.mod h1:/0lEXlu/q0t5u34vIVF6odHR+JCdD3CIHNsMXo7nwrU= -github.com/projectdiscovery/networkpolicy v0.0.2-0.20220525172507-b844eafc878d h1:QXaK3yzoEWI8n+hLAqEgTJEWhkp1WZM8ThbKwrlXFks= -github.com/projectdiscovery/networkpolicy v0.0.2-0.20220525172507-b844eafc878d/go.mod h1:asvdg5wMy3LPVMGALatebKeOYH5n5fV5RCTv6DbxpIs= +github.com/projectdiscovery/networkpolicy v0.0.2 h1:M/BFxF1Jn9SAmfRLWBbxuYQ7abjOaSHYUzV9TAYMnnY= +github.com/projectdiscovery/networkpolicy v0.0.2/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= github.com/projectdiscovery/ratelimit v0.0.1 h1:GnCfbKmkLdDLXT3QS4KS0zCsuDGkoRQE0YDbTqzQmS8= github.com/projectdiscovery/ratelimit v0.0.1/go.mod h1:zenrIElIcKg0Y9h7pMfTlw5vaI/kCl8uxXm+PfgbBSw= github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= @@ -293,8 +303,8 @@ github.com/projectdiscovery/stringsutil v0.0.0-20220208075244-7c05502ca8e9/go.mo github.com/projectdiscovery/stringsutil v0.0.0-20220422150559-b54fb5dc6833/go.mod h1:oTRc18WBv9t6BpaN9XBY+QmG28PUpsyDzRht56Qf49I= github.com/projectdiscovery/stringsutil v0.0.0-20220612082425-0037ce9f89f3/go.mod h1:mF5sh4jTghoGWwgUb9qWi5waTFklClDbtrqtJU93awc= github.com/projectdiscovery/stringsutil v0.0.0-20220731064040-4b67f194751e/go.mod h1:32NYmKyHkKsmisAOAaWrR15lz2ysz2M8x3KMeeoRHoU= -github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA= -github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= +github.com/projectdiscovery/stringsutil v0.0.1 h1:a6TCMT+D1aUsoZxNiYf9O30wiDOoLOHDwj89HBjr5BQ= +github.com/projectdiscovery/stringsutil v0.0.1/go.mod h1:TDi2LEqR3OML0BxGoMbbfAHSk5AdfHX762Oc302sgmM= github.com/projectdiscovery/uncover v0.0.9 h1:cjdL98jZEx10+I/14o6QFsCX6FOucggtl8G5qD7fa10= github.com/projectdiscovery/uncover v0.0.9/go.mod h1:+ZJNjDcznffXM03Ijt3AVjJslCJSvgnR7dRV7ulFdac= github.com/projectdiscovery/utils v0.0.3 h1:pAjZTGYpnATRc6uaNACdiHv4joZ0Ml7Wpu0dudpcGfM= @@ -339,6 +349,9 @@ github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFd github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4= +github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= @@ -347,6 +360,8 @@ github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= +github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= github.com/yl2chen/cidranger v1.0.2 h1:lbOWZVCG1tCRX4u24kuM1Tb4nHqWkDxwLdoS+SevawU= @@ -415,8 +430,7 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -458,12 +472,10 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -516,6 +528,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/djherbis/times.v1 v1.3.0 h1:uxMS4iMtH6Pwsxog094W0FYldiNnfY/xba00vq6C2+o= +gopkg.in/djherbis/times.v1 v1.3.0/go.mod h1:AQlg6unIsrsCEdQYhTzERy542dz6SFdQFZFv6mUY0P8= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= From 9eeb6b15ca58e2a05bf23649a244ce3084f99b96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 20:41:17 +0530 Subject: [PATCH 15/68] chore(deps): bump github.com/projectdiscovery/goflags in /v2 (#488) Bumps [github.com/projectdiscovery/goflags](https://github.com/projectdiscovery/goflags) from 0.1.4 to 0.1.5. - [Release notes](https://github.com/projectdiscovery/goflags/releases) - [Commits](https://github.com/projectdiscovery/goflags/compare/v0.1.4...v0.1.5) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/goflags dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index c91cd7d2..f453389e 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -14,7 +14,7 @@ require ( github.com/projectdiscovery/dnsx v1.1.1 github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.4 - github.com/projectdiscovery/goflags v0.1.4 + github.com/projectdiscovery/goflags v0.1.5 github.com/projectdiscovery/gologger v1.1.5 github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 diff --git a/v2/go.sum b/v2/go.sum index 0924d1c0..a13cc8a9 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -268,8 +268,8 @@ github.com/projectdiscovery/fileutil v0.0.1/go.mod h1:Oo6ZEvXmQz/xPF0YukzmwpdW2L github.com/projectdiscovery/freeport v0.0.4 h1:H4VrK/7hUcC1zbg46zv9iSMBACBDpUqcHkV+FUyXISw= github.com/projectdiscovery/freeport v0.0.4/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= github.com/projectdiscovery/goflags v0.0.8/go.mod h1:GDSkWyXa6kfQjpJu10SO64DN8lXuKXVENlBMk8N7H80= -github.com/projectdiscovery/goflags v0.1.4 h1:PtlWYSMkRZq/TsHuQ7B36s9PiNnlznPqKRsrXnqkTOw= -github.com/projectdiscovery/goflags v0.1.4/go.mod h1:mms5rLXW0+jjbFFTyl/4t9VwtP5TCE+1Y1pReezluAI= +github.com/projectdiscovery/goflags v0.1.5 h1:zqZvIKAdSC62e5jv5UDgBWyP61KrLHxxUXjH/MAJlB4= +github.com/projectdiscovery/goflags v0.1.5/go.mod h1:mms5rLXW0+jjbFFTyl/4t9VwtP5TCE+1Y1pReezluAI= github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY= github.com/projectdiscovery/gologger v1.1.5 h1:CT2Jrpzusca+dwNREMMz4RnAreJ0RqaISRU4SBcZC+M= From b1bd3ae1dc0ca60e1997865b8874b49bf57d6673 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Tue, 29 Nov 2022 09:15:13 +0100 Subject: [PATCH 16/68] Adding udp scan (#460) * Adding udp scan (connect with empty probe) * adding support for udp empty probes * fixing lint errors * fixing tests * adding unprivileged race condition test * adding comments * updating readme * go mod update * removing deprecated iputil Co-authored-by: Sandeep Singh Co-authored-by: sandeep <8293321+ehsandeep@users.noreply.github.com> --- .github/workflows/build-test.yml | 2 + README.md | 10 +- v2/go.mod | 2 +- v2/pkg/port/port.go | 17 ++ v2/pkg/protocol/protocol.go | 22 +++ v2/pkg/result/results.go | 35 ++-- v2/pkg/result/results_test.go | 30 ++-- v2/pkg/runner/healthcheck.go | 22 ++- v2/pkg/runner/nmap.go | 4 +- v2/pkg/runner/nmap_test.go | 4 +- v2/pkg/runner/options.go | 9 + v2/pkg/runner/output.go | 34 ++-- v2/pkg/runner/output_test.go | 12 +- v2/pkg/runner/ports.go | 93 ++++++---- v2/pkg/runner/ports_test.go | 21 ++- v2/pkg/runner/runner.go | 68 +++---- v2/pkg/scan/connect.go | 13 +- v2/pkg/scan/connect_test.go | 13 +- v2/pkg/scan/scan.go | 299 +++++++++++++++++++++++++------ v2/pkg/scan/scan_unix.go | 181 +++++++++++-------- 20 files changed, 621 insertions(+), 270 deletions(-) create mode 100644 v2/pkg/port/port.go create mode 100644 v2/pkg/protocol/protocol.go diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index dc937517..e76c2fef 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -73,6 +73,7 @@ jobs: - name: Race Condition Tests run: | + go run -race . -host scanme.sh sudo go run -race . -host scanme.sh working-directory: v2/cmd/naabu/ @@ -99,4 +100,5 @@ jobs: # Known issue: https://github.com/golang/go/issues/46099 run: | # go run -race . -host scanme.sh + # sudo go run -race . -host scanme.sh working-directory: v2/cmd/naabu/ diff --git a/README.md b/README.md index 7b5f7bd8..8e08254d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Discord

-Naabu is a port scanning tool written in Go that allows you to enumerate valid ports for hosts in a fast and reliable manner. It is a really simple tool that does fast SYN/CONNECT scans on the host/list of hosts and lists +Naabu is a port scanning tool written in Go that allows you to enumerate valid ports for hosts in a fast and reliable manner. It is a really simple tool that does fast SYN/CONNECT/UDP scans on the host/list of hosts and lists all ports that return a reply. # Features @@ -33,7 +33,7 @@ all ports that return a reply.
- - Fast And Simple **SYN/CONNECT** probe based scanning + - Fast And Simple **SYN/CONNECT/UDP** probe based scanning - Optimized for ease of use and **lightweight** on resources - **DNS** Port scan - **Automatic IP Deduplication** for DNS port scan @@ -63,7 +63,7 @@ INPUT: -exclude-file, -ef string list of hosts to exclude from scan (file) PORT: - -port, -p string ports to scan (80,443, 100-200) + -port, -p string ports to scan (80,443,100-200,u:53) -top-ports, -tp string top ports to scan (default 100) -exclude-ports, -ep string ports to exclude from scan (comma-separated) -ports-file, -pf string list of ports to scan (file) @@ -174,10 +174,10 @@ hackerone.com:8443 hackerone.com:8080 ``` -The ports to scan for on the host can be specified via `-p` parameter. It takes nmap format ports and runs enumeration on them. +The ports to scan for on the host can be specified via `-p` parameter (udp ports must be expressed as `u:port`). It takes nmap format ports and runs enumeration on them. ```sh -naabu -p 80,443,21-23 -host hackerone.com +naabu -p 80,443,21-23,u:53 -host hackerone.com ``` By default, the Naabu checks for nmap's `Top 100` ports. It supports following in-built port lists - diff --git a/v2/go.mod b/v2/go.mod index f453389e..efb02f40 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -26,6 +26,7 @@ require ( github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.8.0 + golang.org/x/exp v0.0.0-20221019170559-20944726eadf golang.org/x/net v0.2.0 golang.org/x/sys v0.2.0 ) @@ -78,7 +79,6 @@ require ( github.com/yl2chen/cidranger v1.0.2 // indirect go.etcd.io/bbolt v1.3.5 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/exp v0.0.0-20221019170559-20944726eadf // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/text v0.4.0 // indirect golang.org/x/tools v0.1.12 // indirect diff --git a/v2/pkg/port/port.go b/v2/pkg/port/port.go new file mode 100644 index 00000000..e2b84830 --- /dev/null +++ b/v2/pkg/port/port.go @@ -0,0 +1,17 @@ +package port + +import ( + "fmt" + + "github.com/projectdiscovery/naabu/v2/pkg/protocol" +) + +type Port struct { + Port int + Protocol protocol.Protocol + TLS bool +} + +func (p *Port) String() string { + return fmt.Sprintf("%d-%d-%v", p.Port, p.Protocol, p.TLS) +} diff --git a/v2/pkg/protocol/protocol.go b/v2/pkg/protocol/protocol.go new file mode 100644 index 00000000..043ebedf --- /dev/null +++ b/v2/pkg/protocol/protocol.go @@ -0,0 +1,22 @@ +package protocol + +type Protocol int + +const ( + TCP Protocol = iota + UDP + ARP +) + +func (p Protocol) String() string { + switch p { + case TCP: + return "tcp" + case UDP: + return "udp" + case ARP: + return "arp" + default: + panic("uknown type") + } +} diff --git a/v2/pkg/result/results.go b/v2/pkg/result/results.go index 2ffc004d..2c03d173 100644 --- a/v2/pkg/result/results.go +++ b/v2/pkg/result/results.go @@ -3,26 +3,27 @@ package result import ( "sync" - "github.com/projectdiscovery/naabu/v2/pkg/utils" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "golang.org/x/exp/maps" ) type HostResult struct { Host string IP string - Ports []int + Ports []*port.Port } // Result of the scan type Result struct { sync.RWMutex - ipPorts map[string]map[int]struct{} + ipPorts map[string]map[string]*port.Port ips map[string]struct{} skipped map[string]struct{} } // NewResult structure func NewResult() *Result { - ipPorts := make(map[string]map[int]struct{}) + ipPorts := make(map[string]map[string]*port.Port) ips := make(map[string]struct{}) skipped := make(map[string]struct{}) return &Result{ipPorts: ipPorts, ips: ips, skipped: skipped} @@ -67,7 +68,7 @@ func (r *Result) GetIPsPorts() chan *HostResult { if r.HasSkipped(ip) { continue } - out <- &HostResult{IP: ip, Ports: utils.MapKeysToSliceInt(ports)} + out <- &HostResult{IP: ip, Ports: maps.Values(ports)} } }() @@ -82,43 +83,43 @@ func (r *Result) HasIPsPorts() bool { } // AddPort to a specific ip -func (r *Result) AddPort(k string, v int) { +func (r *Result) AddPort(ip string, p *port.Port) { r.Lock() defer r.Unlock() - if _, ok := r.ipPorts[k]; !ok { - r.ipPorts[k] = make(map[int]struct{}) + if _, ok := r.ipPorts[ip]; !ok { + r.ipPorts[ip] = make(map[string]*port.Port) } - r.ipPorts[k][v] = struct{}{} - r.ips[k] = struct{}{} + r.ipPorts[ip][p.String()] = p + r.ips[ip] = struct{}{} } // SetPorts for a specific ip -func (r *Result) SetPorts(ip string, ports []int) { +func (r *Result) SetPorts(ip string, ports []*port.Port) { r.Lock() defer r.Unlock() if _, ok := r.ipPorts[ip]; !ok { - r.ipPorts[ip] = make(map[int]struct{}) + r.ipPorts[ip] = make(map[string]*port.Port) } - for _, port := range ports { - r.ipPorts[ip][port] = struct{}{} + for _, p := range ports { + r.ipPorts[ip][p.String()] = p } r.ips[ip] = struct{}{} } // IPHasPort checks if an ip has a specific port -func (r *Result) IPHasPort(k string, v int) bool { +func (r *Result) IPHasPort(ip string, p *port.Port) bool { r.RLock() defer r.RUnlock() - vv, hasports := r.ipPorts[k] + ipPorts, hasports := r.ipPorts[ip] if !hasports { return false } - _, hasport := vv[v] + _, hasport := ipPorts[p.String()] return hasport } diff --git a/v2/pkg/result/results_test.go b/v2/pkg/result/results_test.go index 780d7081..90fc07c6 100644 --- a/v2/pkg/result/results_test.go +++ b/v2/pkg/result/results_test.go @@ -3,46 +3,54 @@ package result import ( "testing" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/stretchr/testify/assert" ) func TestAddPort(t *testing.T) { targetIP := "127.0.0.1" - targetPort := 8080 - targetPorts := map[int]struct{}{targetPort: {}} + targetPort := &port.Port{Port: 8080, Protocol: protocol.TCP} + targetPorts := map[string]*port.Port{targetPort.String(): targetPort} res := NewResult() res.AddPort(targetIP, targetPort) expectedIPS := map[string]struct{}{targetIP: {}} - assert.Equal(t, res.ips, expectedIPS) + assert.Equal(t, expectedIPS, res.ips) - expectedIPSPorts := map[string]map[int]struct{}{targetIP: targetPorts} + expectedIPSPorts := map[string]map[string]*port.Port{targetIP: targetPorts} assert.Equal(t, res.ipPorts, expectedIPSPorts) } func TestSetPorts(t *testing.T) { targetIP := "127.0.0.1" - targetPorts := map[int]struct{}{80: {}, 8080: {}} + port80 := &port.Port{Port: 80, Protocol: protocol.TCP} + port443 := &port.Port{Port: 443, Protocol: protocol.TCP} + targetPorts := map[string]*port.Port{ + port80.String(): port80, + port443.String(): port443, + } res := NewResult() - res.SetPorts(targetIP, []int{80, 8080}) + res.SetPorts(targetIP, []*port.Port{port80, port443}) expectedIPS := map[string]struct{}{targetIP: {}} assert.Equal(t, res.ips, expectedIPS) - expectedIPSPorts := map[string]map[int]struct{}{targetIP: targetPorts} + expectedIPSPorts := map[string]map[string]*port.Port{targetIP: targetPorts} assert.Equal(t, res.ipPorts, expectedIPSPorts) } func TestIPHasPort(t *testing.T) { targetIP := "127.0.0.1" - targetPort := 8080 + expectedPort := &port.Port{Port: 8080, Protocol: protocol.TCP} + unexpectedPort := &port.Port{Port: 8081, Protocol: protocol.TCP} res := NewResult() - res.AddPort(targetIP, targetPort) - assert.True(t, res.IPHasPort(targetIP, targetPort)) - assert.False(t, res.IPHasPort(targetIP, 1111)) + res.AddPort(targetIP, expectedPort) + assert.True(t, res.IPHasPort(targetIP, expectedPort)) + assert.False(t, res.IPHasPort(targetIP, unexpectedPort)) } func TestAddIP(t *testing.T) { diff --git a/v2/pkg/runner/healthcheck.go b/v2/pkg/runner/healthcheck.go index dc07b7cc..2126a0f5 100644 --- a/v2/pkg/runner/healthcheck.go +++ b/v2/pkg/runner/healthcheck.go @@ -57,7 +57,7 @@ func DoHealthCheck(options *Options, flagSet *goflags.FlagSet) string { if err != nil { testResult = fmt.Sprintf("Ko (%s)", err) } - test.WriteString(fmt.Sprintf("IPv4 connectivity to scanme.sh:80 => %s\n", testResult)) + test.WriteString(fmt.Sprintf("TCP IPv4 connectivity to scanme.sh:80 => %s\n", testResult)) c6, err := net.Dial("tcp6", "scanme.sh:80") if err == nil && c6 != nil { c6.Close() @@ -66,7 +66,25 @@ func DoHealthCheck(options *Options, flagSet *goflags.FlagSet) string { if err != nil { testResult = fmt.Sprintf("Ko (%s)", err) } - test.WriteString(fmt.Sprintf("IPv6 connectivity to scanme.sh:80 => %s\n", testResult)) + test.WriteString(fmt.Sprintf("TCP IPv6 connectivity to scanme.sh:80 => %s\n", testResult)) + u4, err := net.Dial("udp4", "scanme.sh:53") + if err == nil && c4 != nil { + u4.Close() + } + testResult = "Ok" + if err != nil { + testResult = fmt.Sprintf("Ko (%s)", err) + } + test.WriteString(fmt.Sprintf("UDP IPv4 connectivity to scanme.sh:80 => %s\n", testResult)) + u6, err := net.Dial("udp6", "scanme.sh:80") + if err == nil && c6 != nil { + u6.Close() + } + testResult = "Ok" + if err != nil { + testResult = fmt.Sprintf("Ko (%s)", err) + } + test.WriteString(fmt.Sprintf("UDP IPv6 connectivity to scanme.sh:80 => %s\n", testResult)) return test.String() } diff --git a/v2/pkg/runner/nmap.go b/v2/pkg/runner/nmap.go index 1f77daca..a9ff4b3c 100644 --- a/v2/pkg/runner/nmap.go +++ b/v2/pkg/runner/nmap.go @@ -62,11 +62,11 @@ func (r *Runner) handleNmap() error { for _, ipPorts := range rang { ips = append(ips, ipPorts.IP) for _, pp := range ipPorts.Ports { - allports[pp] = struct{}{} + allports[pp.Port] = struct{}{} } } for p := range allports { - ports = append(ports, fmt.Sprintf("%d", p)) + ports = append(ports, fmt.Sprint(p)) } // if we have no open ports we avoid running nmap diff --git a/v2/pkg/runner/nmap_test.go b/v2/pkg/runner/nmap_test.go index 0017ddf0..fbf221ae 100644 --- a/v2/pkg/runner/nmap_test.go +++ b/v2/pkg/runner/nmap_test.go @@ -3,6 +3,8 @@ package runner import ( "testing" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/projectdiscovery/naabu/v2/pkg/result" "github.com/projectdiscovery/naabu/v2/pkg/scan" "github.com/stretchr/testify/assert" @@ -19,6 +21,6 @@ func TestHandleNmap(t *testing.T) { assert.Nil(t, r.handleNmap()) // nmap syntax error (this test might fail if nmap is not installed on the box) assert.Nil(t, r.handleNmap()) - r.scanner.ScanResults.SetPorts("127.0.0.1", []int{8080}) + r.scanner.ScanResults.SetPorts("127.0.0.1", []*port.Port{{Port: 8080, Protocol: protocol.TCP}}) assert.Nil(t, r.handleNmap()) } diff --git a/v2/pkg/runner/options.go b/v2/pkg/runner/options.go index 933bbbbc..4dbcd7e0 100644 --- a/v2/pkg/runner/options.go +++ b/v2/pkg/runner/options.go @@ -81,6 +81,10 @@ type Options struct { // HostDiscoveryIgnoreRST bool - planned InputReadTimeout time.Duration DisableStdin bool + // ServiceDiscovery enables service discovery on found open ports (matches port number with service) + ServiceDiscovery bool + // ServiceVersion attempts to discover service running on open ports with active/passive probes + ServiceVersion bool } // OnResultCallback (hostResult) @@ -157,6 +161,11 @@ func ParseOptions() *Options { // flagSet.BoolVarP(&options.HostDiscoveryIgnoreRST, "discovery-ignore-rst", "irst", false, "Ignore RST packets during host discovery"), ) + flagSet.CreateGroup("services-discovery", "Services-Discovery", + flagSet.BoolVarP(&options.ServiceDiscovery, "service-discovery", "sD", false, "Service Discovery"), + flagSet.BoolVarP(&options.ServiceVersion, "service-version", "sV", false, "Service Version"), + ) + flagSet.CreateGroup("optimization", "Optimization", flagSet.IntVar(&options.Retries, "retries", DefaultRetriesSynScan, "number of retries for the port scan"), flagSet.IntVar(&options.Timeout, "timeout", DefaultPortTimeoutSynScan, "millisecond to wait before timing out"), diff --git a/v2/pkg/runner/output.go b/v2/pkg/runner/output.go index a702fdb5..94bce748 100644 --- a/v2/pkg/runner/output.go +++ b/v2/pkg/runner/output.go @@ -12,16 +12,17 @@ import ( "time" "github.com/pkg/errors" + "github.com/projectdiscovery/naabu/v2/pkg/port" ) // Result contains the result for a host type Result struct { - Host string `json:"host,omitempty" csv:"host"` - IP string `json:"ip,omitempty" csv:"ip"` - Port int `json:"port" csv:"port"` - IsCDNIP bool `json:"cdn,omitempty" csv:"cdn"` - CDNName string `json:"cdn-name,omitempty" csv:"cdn-name"` - TimeStamp time.Time `json:"timestamp" csv:"timestamp"` + Host string `json:"host,omitempty" csv:"host"` + IP string `json:"ip,omitempty" csv:"ip"` + Port *port.Port `json:"port" csv:"port"` + IsCDNIP bool `json:"cdn,omitempty" csv:"cdn"` + CDNName string `json:"cdn-name,omitempty" csv:"cdn-name"` + TimeStamp time.Time `json:"timestamp" csv:"timestamp"` } func (r *Result) JSON() ([]byte, error) { @@ -55,14 +56,14 @@ func (r *Result) CSVFields() ([]string, error) { } // WriteHostOutput writes the output list of host ports to an io.Writer -func WriteHostOutput(host string, ports []int, cdnName string, writer io.Writer) error { +func WriteHostOutput(host string, ports []*port.Port, cdnName string, writer io.Writer) error { bufwriter := bufio.NewWriter(writer) sb := &strings.Builder{} - for _, port := range ports { + for _, p := range ports { sb.WriteString(host) sb.WriteString(":") - sb.WriteString(strconv.Itoa(port)) + sb.WriteString(strconv.Itoa(p.Port)) if cdnName != "" { sb.WriteString(" [" + cdnName + "]") } @@ -79,7 +80,7 @@ func WriteHostOutput(host string, ports []int, cdnName string, writer io.Writer) } // WriteJSONOutput writes the output list of subdomain in JSON to an io.Writer -func WriteJSONOutput(host, ip string, ports []int, isCdn bool, cdnName string, writer io.Writer) error { +func WriteJSONOutput(host, ip string, ports []*port.Port, isCdn bool, cdnName string, writer io.Writer) error { encoder := json.NewEncoder(writer) data := Result{TimeStamp: time.Now().UTC()} if host != ip { @@ -88,10 +89,9 @@ func WriteJSONOutput(host, ip string, ports []int, isCdn bool, cdnName string, w data.IP = ip data.IsCDNIP = isCdn data.CDNName = cdnName - for _, port := range ports { - data.Port = port - err := encoder.Encode(&data) - if err != nil { + for _, p := range ports { + data.Port = p + if err := encoder.Encode(&data); err != nil { return err } } @@ -99,7 +99,7 @@ func WriteJSONOutput(host, ip string, ports []int, isCdn bool, cdnName string, w } // WriteCsvOutput writes the output list of subdomain in csv format to an io.Writer -func WriteCsvOutput(host, ip string, ports []int, isCdn bool, cdnName string, header bool, writer io.Writer) error { +func WriteCsvOutput(host, ip string, ports []*port.Port, isCdn bool, cdnName string, header bool, writer io.Writer) error { encoder := csv.NewWriter(writer) data := &Result{TimeStamp: time.Now().UTC()} if header { @@ -111,8 +111,8 @@ func WriteCsvOutput(host, ip string, ports []int, isCdn bool, cdnName string, he data.IP = ip data.IsCDNIP = isCdn data.CDNName = cdnName - for _, port := range ports { - data.Port = port + for _, p := range ports { + data.Port = p writeCSVRow(data, encoder) } encoder.Flush() diff --git a/v2/pkg/runner/output_test.go b/v2/pkg/runner/output_test.go index b0cfc6d7..0372e651 100644 --- a/v2/pkg/runner/output_test.go +++ b/v2/pkg/runner/output_test.go @@ -5,12 +5,17 @@ import ( "strings" "testing" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/stretchr/testify/assert" ) func TestWriteHostOutput(t *testing.T) { host := "127.0.0.1" - ports := []int{80, 8080} + ports := []*port.Port{ + {Port: 80, Protocol: protocol.TCP}, + {Port: 8080, Protocol: protocol.TCP}, + } var s string buf := bytes.NewBufferString(s) assert.Nil(t, WriteHostOutput(host, ports, "", buf)) @@ -21,7 +26,10 @@ func TestWriteHostOutput(t *testing.T) { func TestWriteJSONOutput(t *testing.T) { host := "localhost" ip := "127.0.0.1" - ports := []int{80, 8080} + ports := []*port.Port{ + {Port: 80, Protocol: protocol.TCP}, + {Port: 8080, Protocol: protocol.TCP}, + } var s string buf := bytes.NewBufferString(s) assert.Nil(t, WriteJSONOutput(host, ip, ports, false, "", buf)) diff --git a/v2/pkg/runner/ports.go b/v2/pkg/runner/ports.go index 0884eabd..b8442537 100644 --- a/v2/pkg/runner/ports.go +++ b/v2/pkg/runner/ports.go @@ -3,11 +3,12 @@ package runner import ( "fmt" "os" - "sort" "strconv" "strings" "github.com/pkg/errors" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" ) const portListStrParts = 2 @@ -20,11 +21,8 @@ const ( ) // ParsePorts parses the list of ports and creates a port map -func ParsePorts(options *Options) ([]int, error) { - portsFileMap := make(map[int]struct{}) - portsCLIMap := make(map[int]struct{}) - topPortsCLIMap := make(map[int]struct{}) - var portsConfigList []map[int]struct{} +func ParsePorts(options *Options) ([]*port.Port, error) { + var portsFileMap, portsCLIMap, topPortsCLIMap, portsConfigList []*port.Port // If the user has specfied a ports file, use it if options.PortsFile != "" { @@ -96,8 +94,7 @@ func ParsePorts(options *Options) ([]int, error) { } // merge all the specified ports (meaningless if "all" is used) - portsConfigMap := merge(portsConfigList...) - ports := merge(portsFileMap, portsCLIMap, topPortsCLIMap, portsConfigMap) + ports := merge(portsFileMap, portsCLIMap, topPortsCLIMap, portsConfigList) // By default scan top 100 ports only if len(ports) == 0 { @@ -109,35 +106,54 @@ func ParsePorts(options *Options) ([]int, error) { if err != nil { return nil, err } - return flatten(m), nil + return m, nil } - return flatten(ports), nil + return ports, nil } // excludePorts excludes the list of ports from the exclusion list -func excludePorts(options *Options, ports map[int]struct{}) (map[int]struct{}, error) { +func excludePorts(options *Options, ports []*port.Port) ([]*port.Port, error) { if options.ExcludePorts == "" { return ports, nil } + var filteredPorts []*port.Port + // Exclude the ports specified by the user in exclusion list excludedPortsCLI, err := parsePortsList(options.ExcludePorts) if err != nil { return nil, fmt.Errorf("could not read exclusion ports: %s", err) } - for p := range excludedPortsCLI { - delete(ports, p) + for _, port := range ports { + found := false + for _, excludedPort := range excludedPortsCLI { + if excludedPort.Port == port.Port && excludedPort.Protocol == port.Protocol { + found = true + break + } + } + if !found { + continue + } + + filteredPorts = append(filteredPorts, port) } - return ports, nil + return filteredPorts, nil } -func parsePortsList(data string) (map[int]struct{}, error) { - ports := make(map[int]struct{}) - ranges := strings.Split(data, ",") +func parsePortsSlice(ranges []string) ([]*port.Port, error) { + var ports []*port.Port for _, r := range ranges { r = strings.TrimSpace(r) + + portProtocol := protocol.TCP + if strings.HasPrefix(r, "u:") { + portProtocol = protocol.UDP + r = strings.TrimPrefix(r, "u:") + } + if strings.Contains(r, "-") { parts := strings.Split(r, "-") if len(parts) != portListStrParts { @@ -159,36 +175,41 @@ func parsePortsList(data string) (map[int]struct{}, error) { } for i := p1; i <= p2; i++ { - ports[i] = struct{}{} + port := &port.Port{Port: i, Protocol: portProtocol} + ports = append(ports, port) } } else { - port, err := strconv.Atoi(r) + portNumber, err := strconv.Atoi(r) if err != nil { return nil, fmt.Errorf("invalid port number: '%s'", r) } - ports[port] = struct{}{} + port := &port.Port{Port: portNumber, Protocol: portProtocol} + ports = append(ports, port) } } - return ports, nil -} - -// merge maps in a new one -func merge(maps ...map[int]struct{}) (m map[int]struct{}) { - m = make(map[int]struct{}) - for _, mp := range maps { - for p := range mp { - m[p] = struct{}{} + // dedupe ports + seen := make(map[string]struct{}) + var dedupedPorts []*port.Port + for _, port := range ports { + if _, ok := seen[port.String()]; ok { + continue } + seen[port.String()] = struct{}{} + dedupedPorts = append(dedupedPorts, port) } - return + + return dedupedPorts, nil } -func flatten(m map[int]struct{}) (s []int) { - for k := range m { - s = append(s, k) - } +func parsePortsList(data string) ([]*port.Port, error) { + return parsePortsSlice(strings.Split(data, ",")) +} - sort.Ints(s) - return +func merge(slices ...[]*port.Port) []*port.Port { + var result []*port.Port + for _, slice := range slices { + result = append(result, slice...) + } + return result } diff --git a/v2/pkg/runner/ports_test.go b/v2/pkg/runner/ports_test.go index 207f9602..7559e4bc 100644 --- a/v2/pkg/runner/ports_test.go +++ b/v2/pkg/runner/ports_test.go @@ -4,18 +4,20 @@ import ( "reflect" "testing" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/stretchr/testify/assert" ) func TestParsePortsList(t *testing.T) { tests := []struct { args string - want map[int]struct{} + want []*port.Port wantErr bool }{ - {"1,2,3,4", map[int]struct{}{1: {}, 2: {}, 3: {}, 4: {}}, false}, - {"1-3,10", map[int]struct{}{1: {}, 2: {}, 3: {}, 10: {}}, false}, - {"17,17,17,18", map[int]struct{}{17: {}, 18: {}}, false}, + {"1,2,3,4", []*port.Port{{Port: 1, Protocol: protocol.TCP}, {Port: 2, Protocol: protocol.TCP}, {Port: 3, Protocol: protocol.TCP}, {Port: 4, Protocol: protocol.TCP}}, false}, + {"1-3,10", []*port.Port{{Port: 1, Protocol: protocol.TCP}, {Port: 2, Protocol: protocol.TCP}, {Port: 3, Protocol: protocol.TCP}, {Port: 10, Protocol: protocol.TCP}}, false}, + {"17,17,17,18", []*port.Port{{Port: 17, Protocol: protocol.TCP}, {Port: 18, Protocol: protocol.TCP}}, false}, {"a", nil, true}, } for _, tt := range tests { @@ -34,14 +36,17 @@ func TestParsePortsList(t *testing.T) { func TestExcludePorts(t *testing.T) { var options Options - ports := map[int]struct{}{1: {}, 10: {}} + ports := []*port.Port{ + {Port: 1, Protocol: protocol.TCP}, + {Port: 10, Protocol: protocol.TCP}, + } // no filtering filteredPorts, err := excludePorts(&options, ports) assert.Nil(t, err) assert.EqualValues(t, filteredPorts, ports) - // invalida filter + // invalid filter options.ExcludePorts = "a" _, err = excludePorts(&options, ports) assert.NotNil(t, err) @@ -50,7 +55,9 @@ func TestExcludePorts(t *testing.T) { options.ExcludePorts = "1" filteredPorts, err = excludePorts(&options, ports) assert.Nil(t, err) - expectedPorts := map[int]struct{}{10: {}} + expectedPorts := []*port.Port{ + {Port: 1, Protocol: protocol.TCP}, + } assert.EqualValues(t, expectedPorts, filteredPorts) } diff --git a/v2/pkg/runner/runner.go b/v2/pkg/runner/runner.go index 3de1e22a..bfe07587 100644 --- a/v2/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -25,7 +25,9 @@ import ( "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/mapcidr" "github.com/projectdiscovery/mapcidr/asn" + "github.com/projectdiscovery/naabu/v2/pkg/port" "github.com/projectdiscovery/naabu/v2/pkg/privileges" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/projectdiscovery/naabu/v2/pkg/result" "github.com/projectdiscovery/naabu/v2/pkg/scan" "github.com/projectdiscovery/ratelimit" @@ -279,8 +281,8 @@ func (r *Runner) RunEnumeration() error { return } - for _, port := range data.Ports { - r.scanner.ScanResults.AddPort(ip, port) + for _, p := range data.Ports { + r.scanner.ScanResults.AddPort(ip, &port.Port{Port: p, Protocol: protocol.TCP}) } }(ip) } @@ -366,7 +368,7 @@ func (r *Runner) RunEnumeration() error { resumeCfgIndex := r.options.ResumeCfg.Index r.options.ResumeCfg.RUnlock() if index < resumeCfgIndex { - gologger.Debug().Msgf("Skipping \"%s:%d\": Resume - Port scan already completed\n", ip, port) + gologger.Debug().Msgf("Skipping \"%s:%d\": Resume - Port scan already completed\n", ip, port.Port) continue } @@ -493,7 +495,7 @@ func (r *Runner) PickSubnetIP(network *net.IPNet, index int64) string { return ip.String() } -func (r *Runner) PickPort(index int) int { +func (r *Runner) PickPort(index int) *port.Port { return r.scanner.Ports[index] } @@ -527,13 +529,24 @@ func (r *Runner) RawSocketHostDiscovery(ip string) { r.handleHostDiscovery(ip) } -func (r *Runner) RawSocketEnumeration(ip string, port int) { - // skip invalid combinations - r.handleHostPortSyn(ip, port) +func (r *Runner) RawSocketEnumeration(ip string, p *port.Port) { + // performs cdn scan exclusions checks + if !r.canIScanIfCDN(ip, p) { + gologger.Debug().Msgf("Skipping cdn target: %s:%d\n", ip, p.Port) + return + } + + r.limiter.Take() + switch p.Protocol { + case protocol.TCP: + r.scanner.EnqueueTCP(ip, scan.Syn, p) + case protocol.UDP: + r.scanner.EnqueueUDP(ip, p) + } } // check if an ip can be scanned in case CDN exclusions are enabled -func (r *Runner) canIScanIfCDN(host string, port int) bool { +func (r *Runner) canIScanIfCDN(host string, port *port.Port) bool { // if CDN ips are not excluded all scans are allowed if !r.options.ExcludeCDN { return true @@ -545,26 +558,26 @@ func (r *Runner) canIScanIfCDN(host string, port int) bool { } // If the cdn is part of the CDN ips range - only ports 80 and 443 are allowed - return port == 80 || port == 443 + return port.Port == 80 || port.Port == 443 } -func (r *Runner) handleHostPort(host string, port int) { +func (r *Runner) handleHostPort(host string, p *port.Port) { defer r.wgscan.Done() // performs cdn scan exclusions checks - if !r.canIScanIfCDN(host, port) { - gologger.Debug().Msgf("Skipping cdn target: %s:%d\n", host, port) + if !r.canIScanIfCDN(host, p) { + gologger.Debug().Msgf("Skipping cdn target: %s:%d\n", host, p.Port) return } - if r.scanner.ScanResults.IPHasPort(host, port) { + if r.scanner.ScanResults.IPHasPort(host, p) { return } r.limiter.Take() - open, err := r.scanner.ConnectPort(host, port, time.Duration(r.options.Timeout)*time.Millisecond) + open, err := r.scanner.ConnectPort(host, p, time.Duration(r.options.Timeout)*time.Millisecond) if open && err == nil { - r.scanner.ScanResults.AddPort(host, port) + r.scanner.ScanResults.AddPort(host, p) } } @@ -589,12 +602,12 @@ func (r *Runner) handleHostDiscovery(host string) { } // Syn Probes if len(r.options.TcpSynPingProbes) > 0 { - ports, _ := sliceutil.ToInt(r.options.TcpSynPingProbes) + ports, _ := parsePortsSlice(r.options.TcpSynPingProbes) r.scanner.EnqueueTCP(host, scan.Syn, ports...) } // Ack Probes if len(r.options.TcpAckPingProbes) > 0 { - ports, _ := sliceutil.ToInt(r.options.TcpAckPingProbes) + ports, _ := parsePortsSlice(r.options.TcpAckPingProbes) r.scanner.EnqueueTCP(host, scan.Ack, ports...) } // IPv6-ND (for now we broadcast ICMPv6 to ff02::1) @@ -603,17 +616,6 @@ func (r *Runner) handleHostDiscovery(host string) { } } -func (r *Runner) handleHostPortSyn(host string, port int) { - // performs cdn scan exclusions checks - if !r.canIScanIfCDN(host, port) { - gologger.Debug().Msgf("Skipping cdn target: %s:%d\n", host, port) - return - } - - r.limiter.Take() - r.scanner.EnqueueTCP(host, scan.Syn, port) -} - func (r *Runner) SetSourceIP(sourceIP string) error { ip := net.ParseIP(sourceIP) if ip == nil { @@ -712,8 +714,8 @@ func (r *Runner) handleOutput(scanResults *result.Result) { if host != hostResult.IP { data.Host = host } - for _, port := range hostResult.Ports { - data.Port = port + for _, p := range hostResult.Ports { + data.Port = p if r.options.JSON { b, marshallErr := data.JSON() if marshallErr != nil { @@ -735,11 +737,11 @@ func (r *Runner) handleOutput(scanResults *result.Result) { writer.Flush() gologger.Silent().Msgf("%s", buffer.String()) } else { - for _, port := range hostResult.Ports { + for _, p := range hostResult.Ports { if r.options.OutputCDN && isCDNIP { - gologger.Silent().Msgf("%s:%d [%s]\n", host, port, cdnName) + gologger.Silent().Msgf("%s:%d [%s]\n", host, p.Port, cdnName) } else { - gologger.Silent().Msgf("%s:%d\n", host, port) + gologger.Silent().Msgf("%s:%d\n", host, p.Port) } } } diff --git a/v2/pkg/scan/connect.go b/v2/pkg/scan/connect.go index 8c49c4bb..adac9507 100644 --- a/v2/pkg/scan/connect.go +++ b/v2/pkg/scan/connect.go @@ -5,19 +5,20 @@ import ( "net" "github.com/projectdiscovery/gologger" + "github.com/projectdiscovery/naabu/v2/pkg/port" ) // ConnectVerify is used to verify if ports are accurate using a connect request -func (s *Scanner) ConnectVerify(host string, ports []int) []int { - var verifiedPorts []int - for _, port := range ports { - conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", host, port), s.timeout) +func (s *Scanner) ConnectVerify(host string, ports []*port.Port) []*port.Port { + var verifiedPorts []*port.Port + for _, p := range ports { + conn, err := net.DialTimeout(p.Protocol.String(), fmt.Sprintf("%s:%d", host, p.Port), s.timeout) if err != nil { continue } - gologger.Debug().Msgf("Validated active port %d on %s\n", port, host) + gologger.Debug().Msgf("Validated active port %d on %s\n", p.Port, host) conn.Close() - verifiedPorts = append(verifiedPorts, port) + verifiedPorts = append(verifiedPorts, p) } return verifiedPorts } diff --git a/v2/pkg/scan/connect_test.go b/v2/pkg/scan/connect_test.go index d7e9c87b..ef2cabbf 100644 --- a/v2/pkg/scan/connect_test.go +++ b/v2/pkg/scan/connect_test.go @@ -4,6 +4,8 @@ import ( "net" "testing" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/stretchr/testify/assert" ) @@ -26,7 +28,14 @@ func TestConnectVerify(t *testing.T) { s, err := NewScanner(&Options{}) assert.Nil(t, err) - wanted := []int{17895} - got := s.ConnectVerify("localhost", []int{17895, 17896}) + wanted := []*port.Port{ + {Port: 17895, Protocol: protocol.TCP}, + } + + targetPorts := []*port.Port{ + {Port: 17895, Protocol: protocol.TCP}, + {Port: 17896, Protocol: protocol.TCP}, + } + got := s.ConnectVerify("localhost", targetPorts) assert.EqualValues(t, wanted, got) } diff --git a/v2/pkg/scan/scan.go b/v2/pkg/scan/scan.go index 0cf9a6d7..41a5c5be 100644 --- a/v2/pkg/scan/scan.go +++ b/v2/pkg/scan/scan.go @@ -3,8 +3,10 @@ package scan import ( "errors" "fmt" + "io" "math/rand" "net" + "os" "strings" "sync" "time" @@ -15,7 +17,9 @@ import ( "github.com/projectdiscovery/freeport" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/ipranger" + "github.com/projectdiscovery/naabu/v2/pkg/port" "github.com/projectdiscovery/naabu/v2/pkg/privileges" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/projectdiscovery/naabu/v2/pkg/result" "github.com/projectdiscovery/naabu/v2/pkg/routing" "github.com/projectdiscovery/networkpolicy" @@ -78,20 +82,14 @@ const ( Ndp ) -type Protocol int - -const ( - TCP Protocol = iota - UDP - ARP -) - type Scanner struct { Router routing.Router SourceIP4 net.IP SourceIP6 net.IP - tcpPacketlistener4 net.PacketConn - tcpPacketlistener6 net.PacketConn + tcpPacketListener4 net.PacketConn + udpPacketListener4 net.PacketConn + tcpPacketListener6 net.PacketConn + udpPacketListener6 net.PacketConn icmpPacketListener4 net.PacketConn icmpPacketListener6 net.PacketConn retries int @@ -101,13 +99,14 @@ type Scanner struct { timeout time.Duration proxyDialer proxy.Dialer - Ports []int + Ports []*port.Port IPRanger *ipranger.IPRanger - tcpPacketSend chan *PkgSend + transportPacketSend chan *PkgSend icmpPacketSend chan *PkgSend ethernetPacketSend chan *PkgSend tcpChan chan *PkgResult + udpChan chan *PkgResult hostDiscoveryChan chan *PkgResult Phase Phase HostDiscoveryResults *result.Result @@ -124,7 +123,7 @@ type Scanner struct { // PkgSend is a TCP package type PkgSend struct { ip string - port int + port *port.Port flag PkgFlag SourceIP string } @@ -132,12 +131,12 @@ type PkgSend struct { // PkgResult contains the results of sending TCP packages type PkgResult struct { ip string - port int + port *port.Port } var ( newScannerCallback func(s *Scanner) error - setupHandlerCallback func(s *Scanner, interfaceName, bpfFilter string, protocol Protocol) error + setupHandlerCallback func(s *Scanner, interfaceName, bpfFilter string, protocols ...protocol.Protocol) error tcpReadWorkerPCAPCallback func(s *Scanner) cleanupHandlersCallback func(s *Scanner) pingIcmpEchoRequestCallback func(ip string, timeout time.Duration) bool //nolint @@ -224,8 +223,10 @@ func NewScanner(options *Options) (*Scanner, error) { // Close the scanner and terminate all workers func (s *Scanner) Close() { s.CleanupHandlers() - s.tcpPacketlistener4.Close() - s.tcpPacketlistener6.Close() + s.tcpPacketListener4.Close() + s.udpPacketListener4.Close() + s.tcpPacketListener6.Close() + s.udpPacketListener6.Close() } // StartWorkers of the scanner @@ -233,30 +234,73 @@ func (s *Scanner) StartWorkers() { go s.ICMPReadWorker() go s.ICMPWriteWorker() go s.ICMPResultWorker() - go s.TCPReadWorker() + go s.TCPReadWorker4() + go s.TCPReadWorker6() + go s.UDPReadWorker4() + go s.UDPReadWorker6() go s.TCPReadWorkerPCAP() - go s.TCPWriteWorker() + go s.TransportWriteWorker() go s.TCPResultWorker() + go s.UDPResultWorker() go s.EthernetWriteWorker() } -// TCPWriteWorker that sends out TCP packets -func (s *Scanner) TCPWriteWorker() { - for pkg := range s.tcpPacketSend { +// TCPWriteWorker that sends out TCP|UDP packets +func (s *Scanner) TransportWriteWorker() { + for pkg := range s.transportPacketSend { s.SendAsyncPkg(pkg.ip, pkg.port, pkg.flag) } } -// TCPReadWorker reads and parse incoming TCP packets -func (s *Scanner) TCPReadWorker() { - defer s.tcpPacketlistener4.Close() +// TCPReadWorker4 reads and parse incoming TCP packets +func (s *Scanner) TCPReadWorker4() { + defer s.tcpPacketListener4.Close() + data := make([]byte, 4096) + for { + if s.Phase.Is(Done) { + break + } + // nolint:errcheck // just empty the buffer + s.tcpPacketListener4.ReadFrom(data) + } +} + +// TCPReadWorker4 reads and parse incoming TCP packets +func (s *Scanner) TCPReadWorker6() { + defer s.tcpPacketListener6.Close() + data := make([]byte, 4096) + for { + if s.Phase.Is(Done) { + break + } + // nolint:errcheck // just empty the buffer + s.tcpPacketListener6.ReadFrom(data) + } +} + +// UDPReadWorker4 reads and parse incoming ipv4 UDP packets +func (s *Scanner) UDPReadWorker4() { + defer s.udpPacketListener4.Close() + data := make([]byte, 4096) + for { + if s.Phase.Is(Done) { + break + } + // nolint:errcheck // just empty the buffer + s.udpPacketListener4.ReadFrom(data) + } +} + +// UDPReadWorker6 reads and parse incoming ipv6 UDP packets +func (s *Scanner) UDPReadWorker6() { + defer s.udpPacketListener6.Close() data := make([]byte, 4096) for { if s.Phase.Is(Done) { break } // nolint:errcheck // just empty the buffer - s.tcpPacketlistener4.ReadFrom(data) + s.udpPacketListener6.ReadFrom(data) } } @@ -284,9 +328,9 @@ func (s *Scanner) EnqueueEthernet(ip string, pkgtype PkgFlag) { } // EnqueueTCP outgoing TCP packets -func (s *Scanner) EnqueueTCP(ip string, pkgtype PkgFlag, ports ...int) { +func (s *Scanner) EnqueueTCP(ip string, pkgtype PkgFlag, ports ...*port.Port) { for _, port := range ports { - s.tcpPacketSend <- &PkgSend{ + s.transportPacketSend <- &PkgSend{ ip: ip, port: port, flag: pkgtype, @@ -294,6 +338,16 @@ func (s *Scanner) EnqueueTCP(ip string, pkgtype PkgFlag, ports ...int) { } } +// EnqueueTCP outgoing TCP packets +func (s *Scanner) EnqueueUDP(ip string, ports ...*port.Port) { + for _, port := range ports { + s.transportPacketSend <- &PkgSend{ + ip: ip, + port: port, + } + } +} + // ICMPWriteWorker writes packet to the network layer func (s *Scanner) ICMPWriteWorker() { for pkg := range s.icmpPacketSend { @@ -320,12 +374,13 @@ func (s *Scanner) EthernetWriteWorker() { } } +// ICMPReadWorker starts the ip4 and ip6 workers func (s *Scanner) ICMPReadWorker() { go s.ICMPReadWorker4() go s.ICMPReadWorker6() } -// ICMPReadWorker reads packets from the network layer +// ICMPReadWorker4 reads packets from the network layer func (s *Scanner) ICMPReadWorker4() { defer s.icmpPacketListener4.Close() @@ -355,6 +410,7 @@ func (s *Scanner) ICMPReadWorker4() { } } +// ICMPReadWorker6 reads packets from the network layer func (s *Scanner) ICMPReadWorker6() { defer s.icmpPacketListener6.Close() @@ -407,10 +463,23 @@ func (s *Scanner) ICMPResultWorker() { func (s *Scanner) TCPResultWorker() { for ip := range s.tcpChan { if s.Phase.Is(HostDiscovery) { - gologger.Debug().Msgf("Received TCP probe response from %s:%d\n", ip.ip, ip.port) + gologger.Debug().Msgf("Received Transport (TCP|UDP) probe response from %s:%d\n", ip.ip, ip.port.Port) + s.HostDiscoveryResults.AddIp(ip.ip) + } else if s.Phase.Is(Scan) || s.stream { + gologger.Debug().Msgf("Received Transport (TCP) scan response from %s:%d\n", ip.ip, ip.port.Port) + s.ScanResults.AddPort(ip.ip, ip.port) + } + } +} + +// UDPResultWorker handles probes and scan results +func (s *Scanner) UDPResultWorker() { + for ip := range s.udpChan { + if s.Phase.Is(HostDiscovery) { + gologger.Debug().Msgf("Received UDP probe response from %s:%d\n", ip.ip, ip.port.Port) s.HostDiscoveryResults.AddIp(ip.ip) } else if s.Phase.Is(Scan) || s.stream { - gologger.Debug().Msgf("Received TCP scan response from %s:%d\n", ip.ip, ip.port) + gologger.Debug().Msgf("Received Transport (UDP) scan response from %s:%d\n", ip.ip, ip.port.Port) s.ScanResults.AddPort(ip.ip, ip.port) } } @@ -482,24 +551,45 @@ func GetInterfaceFromIP(ip net.IP) (*net.Interface, error) { } // ConnectPort a single host and port -func (s *Scanner) ConnectPort(host string, port int, timeout time.Duration) (bool, error) { - hostport := net.JoinHostPort(host, fmt.Sprint(port)) +func (s *Scanner) ConnectPort(host string, p *port.Port, timeout time.Duration) (bool, error) { + hostport := net.JoinHostPort(host, fmt.Sprint(p.Port)) var ( err error conn net.Conn ) if s.proxyDialer != nil { - conn, err = s.proxyDialer.Dial("tcp", hostport) + conn, err = s.proxyDialer.Dial(p.Protocol.String(), hostport) if err != nil { return false, err } } else { - conn, err = net.DialTimeout("tcp", hostport, timeout) + conn, err = net.DialTimeout(p.Protocol.String(), hostport, timeout) } if err != nil { return false, err } - conn.Close() + defer conn.Close() + + // udp needs data probe + switch p.Protocol { + case protocol.UDP: + if err := conn.SetWriteDeadline(time.Now().Add(timeout)); err != nil { + return false, err + } + if _, err := conn.Write(nil); err != nil { + return false, err + } + if err := conn.SetReadDeadline(time.Now().Add(timeout)); err != nil { + return false, err + } + n, _ := io.Copy(io.Discard, conn) + // ignore timeout errors + if err != nil && !os.IsTimeout(err) { + return false, err + } + return n > 0, nil + } + return true, err } @@ -601,16 +691,24 @@ func (s *Scanner) ACKPort(dstIP string, port int, timeout time.Duration) (bool, } // SendAsyncPkg sends a single packet to a port -func (s *Scanner) SendAsyncPkg(ip string, port int, pkgFlag PkgFlag) { +func (s *Scanner) SendAsyncPkg(ip string, p *port.Port, pkgFlag PkgFlag) { + isIP4 := iputil.IsIPv4(ip) + isIP6 := iputil.IsIPv6(ip) + isTCP := p.Protocol == protocol.TCP + isUDP := p.Protocol == protocol.UDP switch { - case iputil.IsIPv4(ip): - s.sendAsync4(ip, port, pkgFlag) - case iputil.IsIPv6(ip): - s.sendAsync6(ip, port, pkgFlag) + case isIP4 && isTCP: + s.sendAsyncTCP4(ip, p, pkgFlag) + case isIP4 && isUDP: + s.sendAsyncUDP4(ip, p, pkgFlag) + case isIP6 && isTCP: + s.sendAsyncTCP6(ip, p, pkgFlag) + case isIP6 && isUDP: + s.sendAsyncUDP6(ip, p, pkgFlag) } } -func (s *Scanner) sendAsync4(ip string, port int, pkgFlag PkgFlag) { +func (s *Scanner) sendAsyncTCP4(ip string, p *port.Port, pkgFlag PkgFlag) { // Construct all the network layers we need. ip4 := layers.IPv4{ DstIP: net.ParseIP(ip), @@ -623,10 +721,10 @@ func (s *Scanner) sendAsync4(ip string, port int, pkgFlag PkgFlag) { } else { _, _, sourceIP, err := s.Router.Route(ip4.DstIP) if err != nil { - gologger.Debug().Msgf("could not find route to host %s:%d: %s\n", ip, port, err) + gologger.Debug().Msgf("could not find route to host %s:%d: %s\n", ip, p.Port, err) return } else if sourceIP == nil { - gologger.Debug().Msgf("could not find correct source ipv4 for %s:%d\n", ip, port) + gologger.Debug().Msgf("could not find correct source ipv4 for %s:%d\n", ip, p.Port) return } ip4.SrcIP = sourceIP @@ -640,7 +738,7 @@ func (s *Scanner) sendAsync4(ip string, port int, pkgFlag PkgFlag) { tcp := layers.TCP{ SrcPort: layers.TCPPort(s.SourcePort), - DstPort: layers.TCPPort(port), + DstPort: layers.TCPPort(p.Port), Window: 1024, Seq: s.tcpsequencer.Next(), Options: []layers.TCPOption{tcpOption}, @@ -655,19 +753,61 @@ func (s *Scanner) sendAsync4(ip string, port int, pkgFlag PkgFlag) { err := tcp.SetNetworkLayerForChecksum(&ip4) if err != nil { if s.debug { - gologger.Debug().Msgf("Can not set network layer for %s:%d port: %s\n", ip, port, err) + gologger.Debug().Msgf("Can not set network layer for %s:%d port: %s\n", ip, p.Port, err) + } + } else { + err = s.send(ip, s.tcpPacketListener4, &tcp) + if err != nil { + if s.debug { + gologger.Debug().Msgf("Can not send packet to %s:%d port: %s\n", ip, p.Port, err) + } + } + } +} + +func (s *Scanner) sendAsyncUDP4(ip string, p *port.Port, pkgFlag PkgFlag) { + // Construct all the network layers we need. + ip4 := layers.IPv4{ + DstIP: net.ParseIP(ip), + Version: 4, + TTL: 255, + Protocol: layers.IPProtocolUDP, + } + if s.SourceIP4 != nil { + ip4.SrcIP = s.SourceIP4 + } else { + _, _, sourceIP, err := s.Router.Route(ip4.DstIP) + if err != nil { + gologger.Debug().Msgf("could not find route to host %s:%d: %s\n", ip, p.Port, err) + return + } else if sourceIP == nil { + gologger.Debug().Msgf("could not find correct source ipv4 for %s:%d\n", ip, p.Port) + return + } + ip4.SrcIP = sourceIP + } + + udp := layers.UDP{ + SrcPort: layers.UDPPort(s.SourcePort), + DstPort: layers.UDPPort(p.Port), + } + + err := udp.SetNetworkLayerForChecksum(&ip4) + if err != nil { + if s.debug { + gologger.Debug().Msgf("Can not set network layer for %s:%d port: %s\n", ip, p.Port, err) } } else { - err = s.send(ip, s.tcpPacketlistener4, &tcp) + err = s.send(ip, s.udpPacketListener4, &udp) if err != nil { if s.debug { - gologger.Debug().Msgf("Can not send packet to %s:%d port: %s\n", ip, port, err) + gologger.Debug().Msgf("Can not send packet to %s:%d port: %s\n", ip, p.Port, err) } } } } -func (s *Scanner) sendAsync6(ip string, port int, pkgFlag PkgFlag) { +func (s *Scanner) sendAsyncTCP6(ip string, p *port.Port, pkgFlag PkgFlag) { // Construct all the network layers we need. ip6 := layers.IPv6{ DstIP: net.ParseIP(ip), @@ -681,10 +821,10 @@ func (s *Scanner) sendAsync6(ip string, port int, pkgFlag PkgFlag) { } else { _, _, sourceIP, err := s.Router.Route(ip6.DstIP) if err != nil { - gologger.Debug().Msgf("could not find route to host %s:%d: %s\n", ip, port, err) + gologger.Debug().Msgf("could not find route to host %s:%d: %s\n", ip, p.Port, err) return } else if sourceIP == nil { - gologger.Debug().Msgf("could not find correct source ipv6 for %s:%d\n", ip, port) + gologger.Debug().Msgf("could not find correct source ipv6 for %s:%d\n", ip, p.Port) return } ip6.SrcIP = sourceIP @@ -698,7 +838,7 @@ func (s *Scanner) sendAsync6(ip string, port int, pkgFlag PkgFlag) { tcp := layers.TCP{ SrcPort: layers.TCPPort(s.SourcePort), - DstPort: layers.TCPPort(port), + DstPort: layers.TCPPort(p.Port), Window: 1024, Seq: s.tcpsequencer.Next(), Options: []layers.TCPOption{tcpOption}, @@ -713,13 +853,56 @@ func (s *Scanner) sendAsync6(ip string, port int, pkgFlag PkgFlag) { err := tcp.SetNetworkLayerForChecksum(&ip6) if err != nil { if s.debug { - gologger.Debug().Msgf("Can not set network layer for %s:%d port: %s\n", ip, port, err) + gologger.Debug().Msgf("Can not set network layer for %s:%d port: %s\n", ip, p.Port, err) + } + } else { + err = s.send(ip, s.tcpPacketListener6, &tcp) + if err != nil { + if s.debug { + gologger.Debug().Msgf("Can not send packet to %s:%d port: %s\n", ip, p.Port, err) + } + } + } +} + +func (s *Scanner) sendAsyncUDP6(ip string, p *port.Port, pkgFlag PkgFlag) { + // Construct all the network layers we need. + ip6 := layers.IPv6{ + DstIP: net.ParseIP(ip), + Version: 6, + HopLimit: 255, + NextHeader: layers.IPProtocolUDP, + } + + if s.SourceIP6 != nil { + ip6.SrcIP = s.SourceIP6 + } else { + _, _, sourceIP, err := s.Router.Route(ip6.DstIP) + if err != nil { + gologger.Debug().Msgf("could not find route to host %s:%d: %s\n", ip, p.Port, err) + return + } else if sourceIP == nil { + gologger.Debug().Msgf("could not find correct source ipv6 for %s:%d\n", ip, p.Port) + return + } + ip6.SrcIP = sourceIP + } + + udp := layers.UDP{ + SrcPort: layers.UDPPort(s.SourcePort), + DstPort: layers.UDPPort(p.Port), + } + + err := udp.SetNetworkLayerForChecksum(&ip6) + if err != nil { + if s.debug { + gologger.Debug().Msgf("Can not set network layer for %s:%d port: %s\n", ip, p.Port, err) } } else { - err = s.send(ip, s.tcpPacketlistener6, &tcp) + err = s.send(ip, s.udpPacketListener6, &udp) if err != nil { if s.debug { - gologger.Debug().Msgf("Can not send packet to %s:%d port: %s\n", ip, port, err) + gologger.Debug().Msgf("Can not send packet to %s:%d port: %s\n", ip, p.Port, err) } } } @@ -752,9 +935,9 @@ func (s *Scanner) SetupHandlers() error { // SetupHandler to listen on the specified interface func (s *Scanner) SetupHandler(interfaceName string) error { - bpfFilter := fmt.Sprintf("tcp and dst port %d", s.SourcePort) + bpfFilter := fmt.Sprintf("dst port %d and (tcp or udp)", s.SourcePort) if setupHandlerCallback != nil { - err := setupHandlerCallback(s, interfaceName, bpfFilter, TCP) + err := setupHandlerCallback(s, interfaceName, bpfFilter, protocol.TCP) if err != nil { return err } @@ -764,7 +947,7 @@ func (s *Scanner) SetupHandler(interfaceName string) error { // (arp[6:2] = 2) and dst host host and ether dst mac bpfFilter = "arp" if setupHandlerCallback != nil { - err := setupHandlerCallback(s, interfaceName, bpfFilter, ARP) + err := setupHandlerCallback(s, interfaceName, bpfFilter, protocol.ARP) if err != nil { return err } diff --git a/v2/pkg/scan/scan_unix.go b/v2/pkg/scan/scan_unix.go index e7651cc9..70ee3448 100644 --- a/v2/pkg/scan/scan_unix.go +++ b/v2/pkg/scan/scan_unix.go @@ -16,6 +16,8 @@ import ( "github.com/google/gopacket/pcap" "github.com/projectdiscovery/freeport" "github.com/projectdiscovery/gologger" + "github.com/projectdiscovery/naabu/v2/pkg/port" + "github.com/projectdiscovery/naabu/v2/pkg/protocol" "github.com/projectdiscovery/naabu/v2/pkg/routing" "golang.org/x/net/icmp" ) @@ -23,15 +25,16 @@ import ( func init() { newScannerCallback = NewScannerUnix setupHandlerCallback = SetupHandlerUnix - tcpReadWorkerPCAPCallback = TCPReadWorkerPCAPUnix + tcpReadWorkerPCAPCallback = TransportReadWorkerPCAPUnix cleanupHandlersCallback = CleanupHandlersUnix } +// Handlers contains the list of pcap handlers type Handlers struct { - TcpActive []*pcap.Handle - TcpInactive []*pcap.InactiveHandle - EthernetActive []*pcap.Handle - EthernetInactive []*pcap.InactiveHandle + TransportActive []*pcap.Handle + TransportInactive []*pcap.InactiveHandle + EthernetActive []*pcap.Handle + EthernetInactive []*pcap.InactiveHandle } func getFreePort() (int, error) { @@ -42,6 +45,7 @@ func getFreePort() (int, error) { return rawPort.Port, nil } +// NewScannerUnix creates a new instance specific for unix OS func NewScannerUnix(scanner *Scanner) error { if scanner.SourcePort <= 0 { rawport, err := getFreePort() @@ -55,18 +59,32 @@ func NewScannerUnix(scanner *Scanner) error { if err != nil { return err } - scanner.tcpPacketlistener4 = tcpConn4 + scanner.tcpPacketListener4 = tcpConn4 + + udpConn4, err := net.ListenIP("ip4:udp", &net.IPAddr{IP: net.ParseIP(fmt.Sprintf("0.0.0.0:%d", scanner.SourcePort))}) + if err != nil { + return err + } + scanner.udpPacketListener4 = udpConn4 tcpConn6, err := net.ListenIP("ip6:tcp", &net.IPAddr{IP: net.ParseIP(fmt.Sprintf(":::%d", scanner.SourcePort))}) if err != nil { return err } - scanner.tcpPacketlistener6 = tcpConn6 + scanner.tcpPacketListener6 = tcpConn6 + + udpConn6, err := net.ListenIP("ip6:udp", &net.IPAddr{IP: net.ParseIP(fmt.Sprintf(":::%d", scanner.SourcePort))}) + if err != nil { + return err + } + scanner.udpPacketListener6 = udpConn6 var handlers Handlers scanner.handlers = handlers + scanner.tcpChan = make(chan *PkgResult, chanSize) - scanner.tcpPacketSend = make(chan *PkgSend, packetSendSize) + scanner.udpChan = make(chan *PkgResult, chanSize) + scanner.transportPacketSend = make(chan *PkgSend, packetSendSize) icmpConn4, err := icmp.ListenPacket("ip4:icmp", "0.0.0.0") if err != nil { @@ -89,64 +107,72 @@ func NewScannerUnix(scanner *Scanner) error { return err } -func SetupHandlerUnix(s *Scanner, interfaceName, bpfFilter string, protocol Protocol) error { - inactive, err := pcap.NewInactiveHandle(interfaceName) - if err != nil { - return err - } +// SetupHandlerUnix on unix OS +func SetupHandlerUnix(s *Scanner, interfaceName, bpfFilter string, protocols ...protocol.Protocol) error { + for _, proto := range protocols { + inactive, err := pcap.NewInactiveHandle(interfaceName) + if err != nil { + return err + } - err = inactive.SetSnapLen(snaplen) - if err != nil { - return err - } + err = inactive.SetSnapLen(snaplen) + if err != nil { + return err + } - readTimeout := time.Duration(readtimeout) * time.Millisecond - if err = inactive.SetTimeout(readTimeout); err != nil { - s.CleanupHandlers() - return err - } - err = inactive.SetImmediateMode(true) - if err != nil { - return err - } + readTimeout := time.Duration(readtimeout) * time.Millisecond + if err = inactive.SetTimeout(readTimeout); err != nil { + s.CleanupHandlers() + return err + } + err = inactive.SetImmediateMode(true) + if err != nil { + return err + } - handlers, ok := s.handlers.(Handlers) - if !ok { - return errors.New("couldn't create handlers") - } + handlers, ok := s.handlers.(Handlers) + if !ok { + return errors.New("couldn't create handlers") + } - switch protocol { - case TCP: - handlers.TcpInactive = append(handlers.TcpInactive, inactive) - case ARP: - handlers.EthernetInactive = append(handlers.EthernetInactive, inactive) - } + switch proto { + case protocol.TCP, protocol.UDP: + handlers.TransportInactive = append(handlers.TransportInactive, inactive) + case protocol.ARP: + handlers.EthernetInactive = append(handlers.EthernetInactive, inactive) + default: + panic("protocol not supported") + } - handle, err := inactive.Activate() - if err != nil { - s.CleanupHandlers() - return err - } + handle, err := inactive.Activate() + if err != nil { + s.CleanupHandlers() + return err + } - // Strict BPF filter - // + Destination port equals to sender socket source port - err = handle.SetBPFFilter(bpfFilter) - if err != nil { - return err - } + // Strict BPF filter + // + Destination port equals to sender socket source port + err = handle.SetBPFFilter(bpfFilter) + if err != nil { + return err + } - switch protocol { - case TCP: - handlers.TcpActive = append(handlers.TcpActive, handle) - case ARP: - handlers.EthernetActive = append(handlers.EthernetActive, handle) + switch proto { + case protocol.TCP, protocol.UDP: + handlers.TransportActive = append(handlers.TransportActive, handle) + case protocol.ARP: + handlers.EthernetActive = append(handlers.EthernetActive, handle) + default: + panic("protocol not supported") + } + s.handlers = handlers } - s.handlers = handlers return nil } -func TCPReadWorkerPCAPUnix(s *Scanner) { +// TransportReadWorkerPCAPUnix for TCP and UDP +func TransportReadWorkerPCAPUnix(s *Scanner) { defer s.CleanupHandlers() var wgread sync.WaitGroup @@ -156,8 +182,8 @@ func TCPReadWorkerPCAPUnix(s *Scanner) { return } - // Tcp Readers - for _, handler := range handlers.TcpActive { + // Transport Readers (TCP|UDP) + for _, handler := range handlers.TransportActive { wgread.Add(1) go func(handler *pcap.Handle) { defer wgread.Done() @@ -167,17 +193,21 @@ func TCPReadWorkerPCAPUnix(s *Scanner) { ip4 layers.IPv4 ip6 layers.IPv6 tcp layers.TCP + udp layers.UDP ) // Interfaces with MAC (Physical + Virtualized) - parser4Mac := gopacket.NewDecodingLayerParser(layers.LayerTypeEthernet, ð, &ip4, &tcp) - parser6Mac := gopacket.NewDecodingLayerParser(layers.LayerTypeEthernet, ð, &ip6, &tcp) + parser4Mac := gopacket.NewDecodingLayerParser(layers.LayerTypeEthernet, ð, &ip4, &tcp, &udp) + parser6Mac := gopacket.NewDecodingLayerParser(layers.LayerTypeEthernet, ð, &ip6, &tcp, &udp) // Interfaces without MAC (TUN/TAP) - parser4NoMac := gopacket.NewDecodingLayerParser(layers.LayerTypeIPv4, &ip4, &tcp) - parser6NoMac := gopacket.NewDecodingLayerParser(layers.LayerTypeIPv6, &ip6, &tcp) + parser4NoMac := gopacket.NewDecodingLayerParser(layers.LayerTypeIPv4, &ip4, &tcp, &udp) + parser6NoMac := gopacket.NewDecodingLayerParser(layers.LayerTypeIPv6, &ip6, &tcp, &udp) var parsers []*gopacket.DecodingLayerParser - parsers = append(parsers, parser4Mac, parser6Mac, parser4NoMac, parser6NoMac) + parsers = append(parsers, + parser4Mac, parser6Mac, + parser4NoMac, parser6NoMac, + ) decoded := []gopacket.LayerType{} @@ -195,7 +225,7 @@ func TCPReadWorkerPCAPUnix(s *Scanner) { continue } for _, layerType := range decoded { - if layerType == layers.LayerTypeTCP { + if layerType == layers.LayerTypeTCP || layerType == layers.LayerTypeUDP { srcIP4 := ip4.SrcIP.String() isIP4InRange := s.IPRanger.Contains(srcIP4) srcIP6 := ip6.SrcIP.String() @@ -206,17 +236,28 @@ func TCPReadWorkerPCAPUnix(s *Scanner) { } else if isIP6InRange { ip = srcIP6 } else { - gologger.Debug().Msgf("Discarding TCP packet from non target ips: ip4=%s ip6=%s\n", srcIP4, srcIP6) + gologger.Debug().Msgf("Discarding Transport packet from non target ips: ip4=%s ip6=%s\n", srcIP4, srcIP6) continue } // We consider only incoming packets - if tcp.DstPort != layers.TCPPort(s.SourcePort) { + tcpPortMatches := tcp.DstPort == layers.TCPPort(s.SourcePort) + udpPortMatches := udp.DstPort == layers.UDPPort(s.SourcePort) + sourcePortMatches := tcpPortMatches || udpPortMatches + switch { + case !sourcePortMatches: + gologger.Debug().Msgf("Discarding Transport packet from non target ips: ip4=%s ip6=%s tcp_dport=%d udp_dport=%d\n", srcIP4, srcIP6, tcp.DstPort, udp.DstPort) continue - } else if s.Phase.Is(HostDiscovery) { - s.tcpChan <- &PkgResult{ip: ip, port: int(tcp.SrcPort)} - } else if tcp.SYN && tcp.ACK { - s.tcpChan <- &PkgResult{ip: ip, port: int(tcp.SrcPort)} + case s.Phase.Is(HostDiscovery): + proto := protocol.TCP + if udpPortMatches { + proto = protocol.UDP + } + s.hostDiscoveryChan <- &PkgResult{ip: ip, port: &port.Port{Port: int(tcp.SrcPort), Protocol: proto}} + case tcpPortMatches && tcp.SYN && tcp.ACK: + s.tcpChan <- &PkgResult{ip: ip, port: &port.Port{Port: int(tcp.SrcPort), Protocol: protocol.TCP}} + case udpPortMatches && udp.Length > 0: // needs a better matching of udp payloads + s.udpChan <- &PkgResult{ip: ip, port: &port.Port{Port: int(udp.SrcPort), Protocol: protocol.UDP}} } } } @@ -295,10 +336,10 @@ func TCPReadWorkerPCAPUnix(s *Scanner) { // CleanupHandlers for all interfaces func CleanupHandlersUnix(s *Scanner) { if handlers, ok := s.handlers.(Handlers); ok { - for _, handler := range append(handlers.TcpActive, handlers.EthernetActive...) { + for _, handler := range append(handlers.TransportActive, handlers.EthernetActive...) { handler.Close() } - for _, inactiveHandler := range append(handlers.TcpInactive, handlers.EthernetInactive...) { + for _, inactiveHandler := range append(handlers.TransportInactive, handlers.EthernetInactive...) { inactiveHandler.CleanUp() } } From 3422d68ef43f00491ac0d134434be1943ce21c16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 14:07:55 +0530 Subject: [PATCH 17/68] chore(deps): bump github.com/projectdiscovery/networkpolicy in /v2 (#490) Bumps [github.com/projectdiscovery/networkpolicy](https://github.com/projectdiscovery/networkpolicy) from 0.0.2 to 0.0.3. - [Release notes](https://github.com/projectdiscovery/networkpolicy/releases) - [Commits](https://github.com/projectdiscovery/networkpolicy/compare/v0.0.2...v0.0.3) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/networkpolicy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index efb02f40..a56bcd17 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -18,7 +18,7 @@ require ( github.com/projectdiscovery/gologger v1.1.5 github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 - github.com/projectdiscovery/networkpolicy v0.0.2 + github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.1 github.com/projectdiscovery/retryablehttp-go v1.0.3 github.com/projectdiscovery/uncover v0.0.9 diff --git a/v2/go.sum b/v2/go.sum index a13cc8a9..71b5b936 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -286,8 +286,8 @@ github.com/projectdiscovery/mapcidr v0.0.4/go.mod h1:ALOIj6ptkWujNoX8RdQwB2mZ+kA github.com/projectdiscovery/mapcidr v1.0.1/go.mod h1:/qxlpxXZQFFjHynSc9u5O0kUPzH46VskECiwLiz7/vw= github.com/projectdiscovery/mapcidr v1.0.3 h1:SGtOOEz0AxthVO7ZonMvhrJ/AQkHIXCVgyZqJdY0cAY= github.com/projectdiscovery/mapcidr v1.0.3/go.mod h1:/0lEXlu/q0t5u34vIVF6odHR+JCdD3CIHNsMXo7nwrU= -github.com/projectdiscovery/networkpolicy v0.0.2 h1:M/BFxF1Jn9SAmfRLWBbxuYQ7abjOaSHYUzV9TAYMnnY= -github.com/projectdiscovery/networkpolicy v0.0.2/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= +github.com/projectdiscovery/networkpolicy v0.0.3 h1:OZFPkMVY6SJxc1ncuRXB2VlT6xlzJl5eWDkvpWn/GMM= +github.com/projectdiscovery/networkpolicy v0.0.3/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= github.com/projectdiscovery/ratelimit v0.0.1 h1:GnCfbKmkLdDLXT3QS4KS0zCsuDGkoRQE0YDbTqzQmS8= github.com/projectdiscovery/ratelimit v0.0.1/go.mod h1:zenrIElIcKg0Y9h7pMfTlw5vaI/kCl8uxXm+PfgbBSw= github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= From 8ee3ed07790ac32f8bee867f9e60b5883a6d4270 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 14:22:41 +0530 Subject: [PATCH 18/68] chore(deps): bump github.com/projectdiscovery/retryablehttp-go in /v2 (#492) Bumps [github.com/projectdiscovery/retryablehttp-go](https://github.com/projectdiscovery/retryablehttp-go) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/projectdiscovery/retryablehttp-go/releases) - [Commits](https://github.com/projectdiscovery/retryablehttp-go/compare/v1.0.3...v1.0.4) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/retryablehttp-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index a56bcd17..0c4b433e 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -20,7 +20,7 @@ require ( github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.1 - github.com/projectdiscovery/retryablehttp-go v1.0.3 + github.com/projectdiscovery/retryablehttp-go v1.0.4 github.com/projectdiscovery/uncover v0.0.9 github.com/projectdiscovery/utils v0.0.3 github.com/remeh/sizedwaitgroup v1.0.0 diff --git a/v2/go.sum b/v2/go.sum index 71b5b936..2baec1f3 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -293,8 +293,8 @@ github.com/projectdiscovery/ratelimit v0.0.1/go.mod h1:zenrIElIcKg0Y9h7pMfTlw5va github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= -github.com/projectdiscovery/retryablehttp-go v1.0.3 h1:8kIb3LPnt6tdZvCcTmvq3cowYOed4S/B9q2Mgf/EuwI= -github.com/projectdiscovery/retryablehttp-go v1.0.3/go.mod h1:t4buiLTB0HtI+62iHfGDqQVTv/i+8OhAKwaX93TGsFE= +github.com/projectdiscovery/retryablehttp-go v1.0.4 h1:FtRhBhyOnbCL1aDCTml+DzktAolHIbkozUkrbvzWPpY= +github.com/projectdiscovery/retryablehttp-go v1.0.4/go.mod h1:t4buiLTB0HtI+62iHfGDqQVTv/i+8OhAKwaX93TGsFE= github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= From ba384ea0a3bba5df134efae5815916fe224826cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 14:23:03 +0530 Subject: [PATCH 19/68] chore(deps): bump alpine from 3.16.3 to 3.17.0 (#489) Bumps alpine from 3.16.3 to 3.17.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 558e596d..e0d615c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.19.3-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest -FROM alpine:3.16.3 +FROM alpine:3.17.0 RUN apk add nmap libpcap-dev bind-tools ca-certificates nmap-scripts COPY --from=builder /go/bin/naabu /usr/local/bin/naabu ENTRYPOINT ["naabu"] From e8b86dd1944c6bf84bff8958603059e21d2c14f6 Mon Sep 17 00:00:00 2001 From: xm1k3 Date: Thu, 1 Dec 2022 18:01:25 +0100 Subject: [PATCH 20/68] Issue with nmap flag input (#487) * managed with nmap binary * better management for nmap + check on win * testcases * fix on log --- v2/cmd/functional-test/testcases.txt | 4 ++-- v2/pkg/runner/nmap.go | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/v2/cmd/functional-test/testcases.txt b/v2/cmd/functional-test/testcases.txt index 6a72c257..d6636cce 100644 --- a/v2/cmd/functional-test/testcases.txt +++ b/v2/cmd/functional-test/testcases.txt @@ -3,8 +3,8 @@ 127.0.0.1 {{binary}} -tp 100 127.0.0.1 {{binary}} -ep 80 -p 8000 127.0.0.1 {{binary}} -c 25 -p 8000 -127.0.0.1 {{binary}} -nmap-cli 'nmap -Pn -sT' -p 8000 +127.0.0.1 {{binary}} -nmap-cli '-Pn -sT' -p 8000 127.0.0.1 {{binary}} -json -127.0.0.1 {{binary}} -nmap-cli 'nmap -sT' +127.0.0.1 {{binary}} -nmap-cli '-sT' scanme.sh {{binary}} -stream -passive scanme.sh {{binary}} -stream -passive -verify diff --git a/v2/pkg/runner/nmap.go b/v2/pkg/runner/nmap.go index a9ff4b3c..7ddb7786 100644 --- a/v2/pkg/runner/nmap.go +++ b/v2/pkg/runner/nmap.go @@ -86,7 +86,22 @@ func (r *Runner) handleNmap() error { // if requested via config file or via cli if (r.options.Nmap || hasCLI) && commandCanBeExecuted { gologger.Info().Msgf("Running nmap command: %s -p %s %s", command, portsStr, ipsStr) - cmd := exec.Command(args[0], args[1:]...) + // check when user type '-nmap-cli "nmap -sV"' + // automatically remove nmap + posArgs := 0 + // nmapCommand helps to check if user is on a Windows machine + nmapCommand := "nmap" + if args[0] == "nmap" || args[0] == "nmap.exe" { + posArgs = 1 + } + + // if it's windows search for the executable + if isWindows() { + nmapCommand = "nmap.exe" + } + + cmd := exec.Command(nmapCommand, args[posArgs:]...) + cmd.Stdout = os.Stdout err := cmd.Run() if err != nil { From 84b7768213fc8e4a949b351b14da712bbe58bc6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 21:26:43 +0100 Subject: [PATCH 21/68] chore(deps): bump golang.org/x/sys from 0.2.0 to 0.3.0 in /v2 (#504) Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.2.0 to 0.3.0. - [Release notes](https://github.com/golang/sys/releases) - [Commits](https://github.com/golang/sys/compare/v0.2.0...v0.3.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 0c4b433e..7c600ade 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -28,7 +28,7 @@ require ( go.uber.org/multierr v1.8.0 golang.org/x/exp v0.0.0-20221019170559-20944726eadf golang.org/x/net v0.2.0 - golang.org/x/sys v0.2.0 + golang.org/x/sys v0.3.0 ) require ( diff --git a/v2/go.sum b/v2/go.sum index 2baec1f3..ae9840eb 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -472,8 +472,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From a1a6b621bdb6887012434e7ccaf0408f2a70897b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 21:32:38 +0100 Subject: [PATCH 22/68] chore(deps): bump golang from 1.19.3-alpine to 1.19.4-alpine (#506) Bumps golang from 1.19.3-alpine to 1.19.4-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e0d615c4..4c87568a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.3-alpine AS builder +FROM golang:1.19.4-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest From 95c0076bf6f97972299a62babc5fe759bc782f61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 21:32:53 +0100 Subject: [PATCH 23/68] chore(deps): bump golang.org/x/net from 0.2.0 to 0.4.0 in /v2 (#503) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.2.0 to 0.4.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.2.0...v0.4.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 4 ++-- v2/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 7c600ade..1cefc759 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -27,7 +27,7 @@ require ( github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.8.0 golang.org/x/exp v0.0.0-20221019170559-20944726eadf - golang.org/x/net v0.2.0 + golang.org/x/net v0.4.0 golang.org/x/sys v0.3.0 ) @@ -80,7 +80,7 @@ require ( go.etcd.io/bbolt v1.3.5 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/text v0.4.0 // indirect + golang.org/x/text v0.5.0 // indirect golang.org/x/tools v0.1.12 // indirect google.golang.org/protobuf v1.26.0 // indirect gopkg.in/djherbis/times.v1 v1.3.0 // indirect diff --git a/v2/go.sum b/v2/go.sum index ae9840eb..08268ff8 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -431,8 +431,8 @@ golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -481,8 +481,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From a140b0f8cce4d92555c622353314a6a63239eb13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 21:35:25 +0100 Subject: [PATCH 24/68] chore(deps): bump github.com/projectdiscovery/retryablehttp-go from 1.0.4 to 1.0.7 in /v2 (#507) * chore(deps): bump github.com/projectdiscovery/retryablehttp-go in /v2 Bumps [github.com/projectdiscovery/retryablehttp-go](https://github.com/projectdiscovery/retryablehttp-go) from 1.0.4 to 1.0.7. - [Release notes](https://github.com/projectdiscovery/retryablehttp-go/releases) - [Commits](https://github.com/projectdiscovery/retryablehttp-go/compare/v1.0.4...v1.0.7) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/retryablehttp-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * fixing syntax Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mzack9999 --- v2/go.mod | 4 ++-- v2/go.sum | 8 ++++---- v2/pkg/runner/targets.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 1cefc759..ef4b4757 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -20,9 +20,9 @@ require ( github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.1 - github.com/projectdiscovery/retryablehttp-go v1.0.4 + github.com/projectdiscovery/retryablehttp-go v1.0.7 github.com/projectdiscovery/uncover v0.0.9 - github.com/projectdiscovery/utils v0.0.3 + github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.8.0 diff --git a/v2/go.sum b/v2/go.sum index 08268ff8..fb57706e 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -293,8 +293,8 @@ github.com/projectdiscovery/ratelimit v0.0.1/go.mod h1:zenrIElIcKg0Y9h7pMfTlw5va github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= -github.com/projectdiscovery/retryablehttp-go v1.0.4 h1:FtRhBhyOnbCL1aDCTml+DzktAolHIbkozUkrbvzWPpY= -github.com/projectdiscovery/retryablehttp-go v1.0.4/go.mod h1:t4buiLTB0HtI+62iHfGDqQVTv/i+8OhAKwaX93TGsFE= +github.com/projectdiscovery/retryablehttp-go v1.0.7 h1:4Nd87QN+3yUMxYwQQgG/v+BLQt1fYqXu9PjEoar8LGs= +github.com/projectdiscovery/retryablehttp-go v1.0.7/go.mod h1:ODXs70i/PgqfqFvycLfQG6QCqWqZMLoX8X68wu6Bg8M= github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= @@ -307,8 +307,8 @@ github.com/projectdiscovery/stringsutil v0.0.1 h1:a6TCMT+D1aUsoZxNiYf9O30wiDOoLO github.com/projectdiscovery/stringsutil v0.0.1/go.mod h1:TDi2LEqR3OML0BxGoMbbfAHSk5AdfHX762Oc302sgmM= github.com/projectdiscovery/uncover v0.0.9 h1:cjdL98jZEx10+I/14o6QFsCX6FOucggtl8G5qD7fa10= github.com/projectdiscovery/uncover v0.0.9/go.mod h1:+ZJNjDcznffXM03Ijt3AVjJslCJSvgnR7dRV7ulFdac= -github.com/projectdiscovery/utils v0.0.3 h1:pAjZTGYpnATRc6uaNACdiHv4joZ0Ml7Wpu0dudpcGfM= -github.com/projectdiscovery/utils v0.0.3/go.mod h1:ne3eSlZlUKuhjHr8FfsfGcGteCzxcbJvFBx4VDBCxK0= +github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3 h1:sOvfN3xHLiBMb6GJ3yDxBmPnN0dh3xllaQXQYo7CFUo= +github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= diff --git a/v2/pkg/runner/targets.go b/v2/pkg/runner/targets.go index 8823fdff..8420708c 100644 --- a/v2/pkg/runner/targets.go +++ b/v2/pkg/runner/targets.go @@ -13,8 +13,8 @@ import ( "github.com/projectdiscovery/mapcidr/asn" "github.com/projectdiscovery/naabu/v2/pkg/privileges" "github.com/projectdiscovery/naabu/v2/pkg/scan" - fileutil "github.com/projectdiscovery/utils/file" iputil "github.com/projectdiscovery/utils/ip" + readerutil "github.com/projectdiscovery/utils/reader" "github.com/remeh/sizedwaitgroup" ) @@ -66,7 +66,7 @@ func (r *Runner) mergeToFile() (string, error) { // targets from STDIN if r.options.Stdin { - timeoutReader := fileutil.TimeoutReader{Reader: os.Stdin, Timeout: r.options.InputReadTimeout} + timeoutReader := readerutil.TimeoutReader{Reader: os.Stdin, Timeout: r.options.InputReadTimeout} if _, err := io.Copy(tempInput, timeoutReader); err != nil { return "", err } From 082c6af07402a0fa98e0f5990261ea2a3165a683 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 21:50:20 +0100 Subject: [PATCH 25/68] chore(deps): bump github.com/projectdiscovery/uncover from 0.0.9 to 1.0.1 in /v2 (#501) * chore(deps): bump github.com/projectdiscovery/uncover in /v2 Bumps [github.com/projectdiscovery/uncover](https://github.com/projectdiscovery/uncover) from 0.0.9 to 1.0.1. - [Release notes](https://github.com/projectdiscovery/uncover/releases) - [Changelog](https://github.com/projectdiscovery/uncover/blob/main/.goreleaser.yml) - [Commits](https://github.com/projectdiscovery/uncover/compare/v0.0.9...v1.0.1) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/uncover dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * fixing syntax Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mzack9999 --- v2/go.mod | 10 +++++----- v2/go.sum | 21 +++++++++++---------- v2/pkg/runner/runner.go | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index ef4b4757..95d852c1 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -19,9 +19,9 @@ require ( github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 - github.com/projectdiscovery/ratelimit v0.0.1 + github.com/projectdiscovery/ratelimit v0.0.2 github.com/projectdiscovery/retryablehttp-go v1.0.7 - github.com/projectdiscovery/uncover v0.0.9 + github.com/projectdiscovery/uncover v1.0.1 github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 @@ -68,13 +68,13 @@ require ( github.com/projectdiscovery/asnmap v0.0.1 // indirect github.com/projectdiscovery/fileutil v0.0.1 // indirect github.com/projectdiscovery/hmap v0.0.2 // indirect - github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 // indirect + github.com/projectdiscovery/iputil v0.0.2 // indirect github.com/projectdiscovery/retryabledns v1.0.15 // indirect github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 // indirect - github.com/projectdiscovery/stringsutil v0.0.1 // indirect + github.com/projectdiscovery/stringsutil v0.0.2 // indirect github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect github.com/syndtr/goleveldb v1.0.0 // indirect - github.com/ulikunitz/xz v0.5.7 // indirect + github.com/ulikunitz/xz v0.5.10 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect go.etcd.io/bbolt v1.3.5 // indirect diff --git a/v2/go.sum b/v2/go.sum index fb57706e..ac72e26c 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -201,7 +201,6 @@ github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= github.com/microcosm-cc/bluemonday v1.0.19/go.mod h1:QNzV2UbLK2/53oIIwTOyLUSABMkjZ4tqiyC1g/DyqxE= -github.com/microcosm-cc/bluemonday v1.0.20/go.mod h1:yfBmMi8mxvaZut3Yytv+jTXRY8mxyjJ0/kQBTElld50= github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg= github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= @@ -280,16 +279,17 @@ github.com/projectdiscovery/hmap v0.0.2/go.mod h1:YU3TeNTDmLW2dtb4LvuEtDsPTsQ06X github.com/projectdiscovery/ipranger v0.0.2/go.mod h1:kcAIk/lo5rW+IzUrFkeYyXnFJ+dKwYooEOHGVPP/RWE= github.com/projectdiscovery/ipranger v0.0.4 h1:zYlsSYdl0702DyM+Af2ipMRs2pv7bPiVgV72jsbHAPY= github.com/projectdiscovery/ipranger v0.0.4/go.mod h1:myfz4wwq86IOltKb3XJkiuJVVKtK4bNXSIRlHKrwSXM= -github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 h1:HRqev12wKvcwK1fe4pSlMfQdPHo9LfTxuFeRN4f3tS4= github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8/go.mod h1:vHRC+9exsfSbEngMKDl0xiWqkxlLk3lHQZpbS2yFT8U= +github.com/projectdiscovery/iputil v0.0.2 h1:f6IGnZF4RImJLysPSPG3D84jyTH34q3lihCFeP+eZzI= +github.com/projectdiscovery/iputil v0.0.2/go.mod h1:J3Pcz1q51pi4/JL871mQztg0KOzyWDPxnPLOYJm2pVQ= github.com/projectdiscovery/mapcidr v0.0.4/go.mod h1:ALOIj6ptkWujNoX8RdQwB2mZ+kAmKuLJBq9T5gR5wG0= github.com/projectdiscovery/mapcidr v1.0.1/go.mod h1:/qxlpxXZQFFjHynSc9u5O0kUPzH46VskECiwLiz7/vw= github.com/projectdiscovery/mapcidr v1.0.3 h1:SGtOOEz0AxthVO7ZonMvhrJ/AQkHIXCVgyZqJdY0cAY= github.com/projectdiscovery/mapcidr v1.0.3/go.mod h1:/0lEXlu/q0t5u34vIVF6odHR+JCdD3CIHNsMXo7nwrU= github.com/projectdiscovery/networkpolicy v0.0.3 h1:OZFPkMVY6SJxc1ncuRXB2VlT6xlzJl5eWDkvpWn/GMM= github.com/projectdiscovery/networkpolicy v0.0.3/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= -github.com/projectdiscovery/ratelimit v0.0.1 h1:GnCfbKmkLdDLXT3QS4KS0zCsuDGkoRQE0YDbTqzQmS8= -github.com/projectdiscovery/ratelimit v0.0.1/go.mod h1:zenrIElIcKg0Y9h7pMfTlw5vaI/kCl8uxXm+PfgbBSw= +github.com/projectdiscovery/ratelimit v0.0.2 h1:vRscyCcmTWndd16Ed3lC51196eKYena+xpYfrDomjMg= +github.com/projectdiscovery/ratelimit v0.0.2/go.mod h1:WBz8N1P+CyxnfUoGfVCqah4NZ2SreSX7v9dY8wIlK70= github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= @@ -303,10 +303,10 @@ github.com/projectdiscovery/stringsutil v0.0.0-20220208075244-7c05502ca8e9/go.mo github.com/projectdiscovery/stringsutil v0.0.0-20220422150559-b54fb5dc6833/go.mod h1:oTRc18WBv9t6BpaN9XBY+QmG28PUpsyDzRht56Qf49I= github.com/projectdiscovery/stringsutil v0.0.0-20220612082425-0037ce9f89f3/go.mod h1:mF5sh4jTghoGWwgUb9qWi5waTFklClDbtrqtJU93awc= github.com/projectdiscovery/stringsutil v0.0.0-20220731064040-4b67f194751e/go.mod h1:32NYmKyHkKsmisAOAaWrR15lz2ysz2M8x3KMeeoRHoU= -github.com/projectdiscovery/stringsutil v0.0.1 h1:a6TCMT+D1aUsoZxNiYf9O30wiDOoLOHDwj89HBjr5BQ= -github.com/projectdiscovery/stringsutil v0.0.1/go.mod h1:TDi2LEqR3OML0BxGoMbbfAHSk5AdfHX762Oc302sgmM= -github.com/projectdiscovery/uncover v0.0.9 h1:cjdL98jZEx10+I/14o6QFsCX6FOucggtl8G5qD7fa10= -github.com/projectdiscovery/uncover v0.0.9/go.mod h1:+ZJNjDcznffXM03Ijt3AVjJslCJSvgnR7dRV7ulFdac= +github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA= +github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= +github.com/projectdiscovery/uncover v1.0.1 h1:bhP+EW4d+e4cAizOWAEz7jeyKZGkDYYTsZlXsd11t+w= +github.com/projectdiscovery/uncover v1.0.1/go.mod h1:/D9qxgN2iZ/C2M8eo+pNQMnTaMhTZUu40Vat/LgSIxU= github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3 h1:sOvfN3xHLiBMb6GJ3yDxBmPnN0dh3xllaQXQYo7CFUo= github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -350,8 +350,9 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4= github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= +github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= @@ -430,7 +431,7 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= diff --git a/v2/pkg/runner/runner.go b/v2/pkg/runner/runner.go index bfe07587..e0a938e8 100644 --- a/v2/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -169,7 +169,7 @@ func (r *Runner) RunEnumeration() error { // Scan workers r.wgscan = sizedwaitgroup.New(r.options.Rate) - r.limiter = ratelimit.New(context.Background(), int64(r.options.Rate), time.Second) + r.limiter = ratelimit.New(context.Background(), uint(r.options.Rate), time.Second) shouldDiscoverHosts := r.options.shouldDiscoverHosts() shouldUseRawPackets := r.options.shouldUseRawPackets() @@ -502,7 +502,7 @@ func (r *Runner) PickPort(index int) *port.Port { func (r *Runner) ConnectVerification() { r.scanner.Phase.Set(scan.Scan) var swg sync.WaitGroup - limiter := ratelimit.New(context.Background(), int64(r.options.Rate), time.Second) + limiter := ratelimit.New(context.Background(), uint(r.options.Rate), time.Second) verifiedResult := result.NewResult() From e361548cae26f2227a4f50b5e121093e147f9ed7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 21:51:21 +0100 Subject: [PATCH 26/68] chore(deps): bump github.com/projectdiscovery/ratelimit from 0.0.1 to 0.0.2 in /v2 (#491) * chore(deps): bump github.com/projectdiscovery/ratelimit in /v2 Bumps [github.com/projectdiscovery/ratelimit](https://github.com/projectdiscovery/ratelimit) from 0.0.1 to 0.0.2. - [Release notes](https://github.com/projectdiscovery/ratelimit/releases) - [Commits](https://github.com/projectdiscovery/ratelimit/compare/v0.0.1...v0.0.2) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/ratelimit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * fixing syntax Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mzack9999 From be86653e3f89b2a7ea743e63354d4d774485b3f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 19:42:47 +0530 Subject: [PATCH 27/68] chore(deps): bump go.uber.org/multierr from 1.8.0 to 1.9.0 in /v2 (#508) Bumps [go.uber.org/multierr](https://github.com/uber-go/multierr) from 1.8.0 to 1.9.0. - [Release notes](https://github.com/uber-go/multierr/releases) - [Changelog](https://github.com/uber-go/multierr/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber-go/multierr/compare/v1.8.0...v1.9.0) --- updated-dependencies: - dependency-name: go.uber.org/multierr dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 95d852c1..34179040 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -25,7 +25,7 @@ require ( github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 - go.uber.org/multierr v1.8.0 + go.uber.org/multierr v1.9.0 golang.org/x/exp v0.0.0-20221019170559-20944726eadf golang.org/x/net v0.4.0 golang.org/x/sys v0.3.0 diff --git a/v2/go.sum b/v2/go.sum index ac72e26c..b2dc4591 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -380,8 +380,9 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= From aeff6d1474a2a93842dc10a8191fd47b8977d80e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 19:42:57 +0530 Subject: [PATCH 28/68] chore(deps): bump goreleaser/goreleaser-action from 3 to 4 (#510) Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 3 to 4. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](https://github.com/goreleaser/goreleaser-action/compare/v3...v4) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-binary.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 105b5956..c5b1612b 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -21,7 +21,7 @@ jobs: - name: Install Dependences run: brew install libpcap - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v3 + uses: goreleaser/goreleaser-action@v4 with: version: latest args: release -f .goreleaser/mac.yml --rm-dist @@ -44,7 +44,7 @@ jobs: run: sudo apt install libpcap-dev - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v3 + uses: goreleaser/goreleaser-action@v4 with: version: latest args: release -f .goreleaser/linux.yml --rm-dist @@ -65,7 +65,7 @@ jobs: with: go-version: 1.18 - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v3 + uses: goreleaser/goreleaser-action@v4 with: version: latest args: release -f .goreleaser/windows.yml --rm-dist From fc3c4ea74bff739e9cd3430c2f2271a45073123f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 19:43:10 +0530 Subject: [PATCH 29/68] chore(deps): bump github.com/projectdiscovery/goflags in /v2 (#512) Bumps [github.com/projectdiscovery/goflags](https://github.com/projectdiscovery/goflags) from 0.1.5 to 0.1.6. - [Release notes](https://github.com/projectdiscovery/goflags/releases) - [Commits](https://github.com/projectdiscovery/goflags/compare/v0.1.5...v0.1.6) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/goflags dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 7 ++++--- v2/go.sum | 14 +++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 34179040..cce6b045 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -14,7 +14,7 @@ require ( github.com/projectdiscovery/dnsx v1.1.1 github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.4 - github.com/projectdiscovery/goflags v0.1.5 + github.com/projectdiscovery/goflags v0.1.6 github.com/projectdiscovery/gologger v1.1.5 github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 @@ -22,7 +22,7 @@ require ( github.com/projectdiscovery/ratelimit v0.0.2 github.com/projectdiscovery/retryablehttp-go v1.0.7 github.com/projectdiscovery/uncover v1.0.1 - github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3 + github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 @@ -56,7 +56,7 @@ require ( github.com/gorilla/css v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.11.7 // indirect - github.com/kr/pretty v0.2.1 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/mholt/archiver v3.1.1+incompatible // indirect github.com/microcosm-cc/bluemonday v1.0.21 // indirect @@ -72,6 +72,7 @@ require ( github.com/projectdiscovery/retryabledns v1.0.15 // indirect github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 // indirect github.com/projectdiscovery/stringsutil v0.0.2 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect github.com/syndtr/goleveldb v1.0.0 // indirect github.com/ulikunitz/xz v0.5.10 // indirect diff --git a/v2/go.sum b/v2/go.sum index b2dc4591..4aa40f4a 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -177,8 +177,9 @@ github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -239,6 +240,7 @@ github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDm github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -267,8 +269,8 @@ github.com/projectdiscovery/fileutil v0.0.1/go.mod h1:Oo6ZEvXmQz/xPF0YukzmwpdW2L github.com/projectdiscovery/freeport v0.0.4 h1:H4VrK/7hUcC1zbg46zv9iSMBACBDpUqcHkV+FUyXISw= github.com/projectdiscovery/freeport v0.0.4/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= github.com/projectdiscovery/goflags v0.0.8/go.mod h1:GDSkWyXa6kfQjpJu10SO64DN8lXuKXVENlBMk8N7H80= -github.com/projectdiscovery/goflags v0.1.5 h1:zqZvIKAdSC62e5jv5UDgBWyP61KrLHxxUXjH/MAJlB4= -github.com/projectdiscovery/goflags v0.1.5/go.mod h1:mms5rLXW0+jjbFFTyl/4t9VwtP5TCE+1Y1pReezluAI= +github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhNgdGvfg+Z4= +github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY= github.com/projectdiscovery/gologger v1.1.5 h1:CT2Jrpzusca+dwNREMMz4RnAreJ0RqaISRU4SBcZC+M= @@ -307,11 +309,13 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v1.0.1 h1:bhP+EW4d+e4cAizOWAEz7jeyKZGkDYYTsZlXsd11t+w= github.com/projectdiscovery/uncover v1.0.1/go.mod h1:/D9qxgN2iZ/C2M8eo+pNQMnTaMhTZUu40Vat/LgSIxU= -github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3 h1:sOvfN3xHLiBMb6GJ3yDxBmPnN0dh3xllaQXQYo7CFUo= -github.com/projectdiscovery/utils v0.0.4-0.20221201124851-f8524345b6d3/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= +github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 h1:/fZvw6gT1fzdmMLMBBw75OrJ0Z6g7dulQrxM9FRp1qU= +github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI= From 7604286ad519de88920eac24f749e8a5417bbef3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 19:45:07 +0530 Subject: [PATCH 30/68] chore(deps): bump github.com/projectdiscovery/ratelimit in /v2 (#516) Bumps [github.com/projectdiscovery/ratelimit](https://github.com/projectdiscovery/ratelimit) from 0.0.2 to 0.0.4. - [Release notes](https://github.com/projectdiscovery/ratelimit/releases) - [Commits](https://github.com/projectdiscovery/ratelimit/compare/v0.0.2...v0.0.4) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/ratelimit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 8 ++++---- v2/go.sum | 14 ++++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index cce6b045..cf41acae 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -19,14 +19,14 @@ require ( github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 - github.com/projectdiscovery/ratelimit v0.0.2 + github.com/projectdiscovery/ratelimit v0.0.4 github.com/projectdiscovery/retryablehttp-go v1.0.7 github.com/projectdiscovery/uncover v1.0.1 github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 - golang.org/x/exp v0.0.0-20221019170559-20944726eadf + golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 golang.org/x/net v0.4.0 golang.org/x/sys v0.3.0 ) @@ -80,9 +80,9 @@ require ( github.com/yl2chen/cidranger v1.0.2 // indirect go.etcd.io/bbolt v1.3.5 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/mod v0.6.0 // indirect golang.org/x/text v0.5.0 // indirect - golang.org/x/tools v0.1.12 // indirect + golang.org/x/tools v0.2.0 // indirect google.golang.org/protobuf v1.26.0 // indirect gopkg.in/djherbis/times.v1 v1.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/v2/go.sum b/v2/go.sum index 4aa40f4a..46dcd33d 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -290,8 +290,8 @@ github.com/projectdiscovery/mapcidr v1.0.3 h1:SGtOOEz0AxthVO7ZonMvhrJ/AQkHIXCVgy github.com/projectdiscovery/mapcidr v1.0.3/go.mod h1:/0lEXlu/q0t5u34vIVF6odHR+JCdD3CIHNsMXo7nwrU= github.com/projectdiscovery/networkpolicy v0.0.3 h1:OZFPkMVY6SJxc1ncuRXB2VlT6xlzJl5eWDkvpWn/GMM= github.com/projectdiscovery/networkpolicy v0.0.3/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= -github.com/projectdiscovery/ratelimit v0.0.2 h1:vRscyCcmTWndd16Ed3lC51196eKYena+xpYfrDomjMg= -github.com/projectdiscovery/ratelimit v0.0.2/go.mod h1:WBz8N1P+CyxnfUoGfVCqah4NZ2SreSX7v9dY8wIlK70= +github.com/projectdiscovery/ratelimit v0.0.4 h1:2TOAhuOUMlKrzwissru2mFnSd8eg2WddIQKcAyYEkGs= +github.com/projectdiscovery/ratelimit v0.0.4/go.mod h1:QK9+yt3ArGWINdj6unGjehtJA/NdlAiF59gaj2FtfEs= github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= @@ -396,8 +396,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20221019170559-20944726eadf h1:nFVjjKDgNY37+ZSYCJmtYf7tOlfQswHqplG2eosjOMg= -golang.org/x/exp v0.0.0-20221019170559-20944726eadf/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 h1:5oN1Pz/eDhCpbMbLstvIPa0b/BEQo6g6nwV3pLjfM6w= +golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -410,8 +410,9 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -505,8 +506,9 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 440d01e91e0724f58bd24411d65fcbda6d0ff521 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 09:37:48 +0100 Subject: [PATCH 31/68] chore(deps): bump github.com/projectdiscovery/uncover in /v2 (#521) Bumps [github.com/projectdiscovery/uncover](https://github.com/projectdiscovery/uncover) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/projectdiscovery/uncover/releases) - [Changelog](https://github.com/projectdiscovery/uncover/blob/main/.goreleaser.yml) - [Commits](https://github.com/projectdiscovery/uncover/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/uncover dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index cf41acae..ca3076c6 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -21,7 +21,7 @@ require ( github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.4 github.com/projectdiscovery/retryablehttp-go v1.0.7 - github.com/projectdiscovery/uncover v1.0.1 + github.com/projectdiscovery/uncover v1.0.2 github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 diff --git a/v2/go.sum b/v2/go.sum index 46dcd33d..21569223 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -307,8 +307,8 @@ github.com/projectdiscovery/stringsutil v0.0.0-20220612082425-0037ce9f89f3/go.mo github.com/projectdiscovery/stringsutil v0.0.0-20220731064040-4b67f194751e/go.mod h1:32NYmKyHkKsmisAOAaWrR15lz2ysz2M8x3KMeeoRHoU= github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA= github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= -github.com/projectdiscovery/uncover v1.0.1 h1:bhP+EW4d+e4cAizOWAEz7jeyKZGkDYYTsZlXsd11t+w= -github.com/projectdiscovery/uncover v1.0.1/go.mod h1:/D9qxgN2iZ/C2M8eo+pNQMnTaMhTZUu40Vat/LgSIxU= +github.com/projectdiscovery/uncover v1.0.2 h1:mRFzflYyvwKkHd3XKufMlDRrb6p1mjFZTSHoNAUpFwo= +github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY= github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 h1:/fZvw6gT1fzdmMLMBBw75OrJ0Z6g7dulQrxM9FRp1qU= github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= From cc4cedb812a1788122871dad703cd0f6cced5749 Mon Sep 17 00:00:00 2001 From: MiracleLau Date: Wed, 4 Jan 2023 16:16:00 +0800 Subject: [PATCH 32/68] Fixing wrong boolean check on verify condition (#519) * fix issue #509 * merging if conditions Co-authored-by: Mzack9999 --- v2/pkg/runner/validate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/pkg/runner/validate.go b/v2/pkg/runner/validate.go index fef73c13..2a1fe50c 100644 --- a/v2/pkg/runner/validate.go +++ b/v2/pkg/runner/validate.go @@ -96,7 +96,7 @@ func (options *Options) validateOptions() error { } // stream passive - if options.Verify && !options.Passive { + if options.Verify && options.Stream && !options.Passive { return errors.New("verify not supported in stream active mode") } From 554e0c8d42813460cd697825b70fad5dd31743b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 18:40:42 +0530 Subject: [PATCH 33/68] chore(deps): bump golang.org/x/sys from 0.3.0 to 0.4.0 in /v2 (#523) Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/golang/sys/releases) - [Commits](https://github.com/golang/sys/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index ca3076c6..faf56015 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -28,7 +28,7 @@ require ( go.uber.org/multierr v1.9.0 golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 golang.org/x/net v0.4.0 - golang.org/x/sys v0.3.0 + golang.org/x/sys v0.4.0 ) require ( diff --git a/v2/go.sum b/v2/go.sum index 21569223..69e7248e 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -479,8 +479,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 27feb6e9624e2816413d544e1afb55fdccf6d867 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 14:28:57 +0530 Subject: [PATCH 34/68] chore(deps): bump github.com/projectdiscovery/gologger in /v2 (#526) Bumps [github.com/projectdiscovery/gologger](https://github.com/projectdiscovery/gologger) from 1.1.5 to 1.1.7. - [Release notes](https://github.com/projectdiscovery/gologger/releases) - [Commits](https://github.com/projectdiscovery/gologger/compare/v1.1.5...v1.1.7) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/gologger dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index faf56015..80750989 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -15,7 +15,7 @@ require ( github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.4 github.com/projectdiscovery/goflags v0.1.6 - github.com/projectdiscovery/gologger v1.1.5 + github.com/projectdiscovery/gologger v1.1.7 github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 diff --git a/v2/go.sum b/v2/go.sum index 69e7248e..6d669eaa 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -273,8 +273,8 @@ github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhN github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY= -github.com/projectdiscovery/gologger v1.1.5 h1:CT2Jrpzusca+dwNREMMz4RnAreJ0RqaISRU4SBcZC+M= -github.com/projectdiscovery/gologger v1.1.5/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= +github.com/projectdiscovery/gologger v1.1.7 h1:QeByO4NR8vlZ5ZM2XIOJARRj5WOOU5Ix35FBQ1iH5Rk= +github.com/projectdiscovery/gologger v1.1.7/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= github.com/projectdiscovery/hmap v0.0.1/go.mod h1:VDEfgzkKQdq7iGTKz8Ooul0NuYHQ8qiDs6r8bPD1Sb0= github.com/projectdiscovery/hmap v0.0.2 h1:fe3k0b6tj95mn9a1phD3JXvAAOmmWAh/Upg1Bf0Tfos= github.com/projectdiscovery/hmap v0.0.2/go.mod h1:YU3TeNTDmLW2dtb4LvuEtDsPTsQ06XMnmOeD3KOuU6c= From 1ed5990518066d9b4069dc545830e24da67a87ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 14:29:09 +0530 Subject: [PATCH 35/68] chore(deps): bump golang.org/x/net from 0.4.0 to 0.5.0 in /v2 (#524) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 4 ++-- v2/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 80750989..d7846991 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -27,7 +27,7 @@ require ( github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 - golang.org/x/net v0.4.0 + golang.org/x/net v0.5.0 golang.org/x/sys v0.4.0 ) @@ -81,7 +81,7 @@ require ( go.etcd.io/bbolt v1.3.5 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/mod v0.6.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.2.0 // indirect google.golang.org/protobuf v1.26.0 // indirect gopkg.in/djherbis/times.v1 v1.3.0 // indirect diff --git a/v2/go.sum b/v2/go.sum index 6d669eaa..611f611c 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -438,8 +438,8 @@ golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -488,8 +488,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 08eea18c957603fd3a415845d2fb84aa306f266f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 13:30:53 +0530 Subject: [PATCH 36/68] chore(deps): bump github.com/projectdiscovery/retryablehttp-go in /v2 (#528) Bumps [github.com/projectdiscovery/retryablehttp-go](https://github.com/projectdiscovery/retryablehttp-go) from 1.0.7 to 1.0.8. - [Release notes](https://github.com/projectdiscovery/retryablehttp-go/releases) - [Commits](https://github.com/projectdiscovery/retryablehttp-go/compare/v1.0.7...v1.0.8) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/retryablehttp-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index d7846991..7f3a1b7c 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -20,7 +20,7 @@ require ( github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.4 - github.com/projectdiscovery/retryablehttp-go v1.0.7 + github.com/projectdiscovery/retryablehttp-go v1.0.8 github.com/projectdiscovery/uncover v1.0.2 github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 github.com/remeh/sizedwaitgroup v1.0.0 diff --git a/v2/go.sum b/v2/go.sum index 611f611c..0286acf5 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -295,8 +295,8 @@ github.com/projectdiscovery/ratelimit v0.0.4/go.mod h1:QK9+yt3ArGWINdj6unGjehtJA github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= -github.com/projectdiscovery/retryablehttp-go v1.0.7 h1:4Nd87QN+3yUMxYwQQgG/v+BLQt1fYqXu9PjEoar8LGs= -github.com/projectdiscovery/retryablehttp-go v1.0.7/go.mod h1:ODXs70i/PgqfqFvycLfQG6QCqWqZMLoX8X68wu6Bg8M= +github.com/projectdiscovery/retryablehttp-go v1.0.8 h1:F4UZ+3NkIPDj+tobHZY+sgvDVmiVCX/CUUh/jrKq7Oc= +github.com/projectdiscovery/retryablehttp-go v1.0.8/go.mod h1:tD5TNOXKNuvqrUHHGoP6xJmVZTjSkLGsqcyD7gCsc3I= github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= From c4a89629be43188254cd13cb81fa0c3efa3c5b14 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Tue, 10 Jan 2023 16:36:23 +0100 Subject: [PATCH 37/68] Reducing duplicate debug messages on scanned ips (#522) * using cache with auto-prune * reverting - using native ipranger * removing unused instruction --- v2/pkg/runner/runner.go | 4 ++-- v2/pkg/runner/targets.go | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/v2/pkg/runner/runner.go b/v2/pkg/runner/runner.go index e0a938e8..5f137f59 100644 --- a/v2/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -467,8 +467,8 @@ func (r *Runner) ShowScanResultOnExit() { // Close runner instance func (r *Runner) Close() { - os.RemoveAll(r.targetsFile) - r.scanner.IPRanger.Hosts.Close() + _ = os.RemoveAll(r.targetsFile) + _ = r.scanner.IPRanger.Hosts.Close() } // PickIP randomly diff --git a/v2/pkg/runner/targets.go b/v2/pkg/runner/targets.go index 8420708c..76639d0e 100644 --- a/v2/pkg/runner/targets.go +++ b/v2/pkg/runner/targets.go @@ -229,7 +229,9 @@ func (r *Runner) resolveFQDN(target string) ([]string, error) { } for _, hostIP := range hostIPS { - gologger.Debug().Msgf("Using host %s for enumeration\n", hostIP) + if !r.scanner.IPRanger.Contains(hostIP) { + gologger.Debug().Msgf("Using host %s for enumeration\n", hostIP) + } // dedupe all the hosts and also keep track of ip => host for the output - just append new hostname if err := r.scanner.IPRanger.AddHostWithMetadata(hostIP, target); err != nil { gologger.Warning().Msgf("%s\n", err) From 241f6cd974fb244a740126c9d8a47e706ade7fdc Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Sun, 15 Jan 2023 17:08:37 +0100 Subject: [PATCH 38/68] automatic connect scan with proxy (#529) --- v2/pkg/runner/validate.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/v2/pkg/runner/validate.go b/v2/pkg/runner/validate.go index 2a1fe50c..09ad1fb5 100644 --- a/v2/pkg/runner/validate.go +++ b/v2/pkg/runner/validate.go @@ -129,6 +129,11 @@ func (options *Options) validateOptions() error { return errors.New("port threshold must be between 0 and 65535") } + if options.Proxy != "" && options.ScanType == SynScan { + gologger.Warning().Msgf("Syn Scan can't be used with socks proxy: falling back to connect scan") + options.ScanType = ConnectScan + } + return nil } From a4ff4de5c05f4e7f79a0182d6dc41e238aecb5ed Mon Sep 17 00:00:00 2001 From: xm1k3 Date: Thu, 19 Jan 2023 08:47:57 +0100 Subject: [PATCH 39/68] removed utils from naabu (#534) --- v2/pkg/utils/util.go | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 v2/pkg/utils/util.go diff --git a/v2/pkg/utils/util.go b/v2/pkg/utils/util.go deleted file mode 100644 index 0c759ae9..00000000 --- a/v2/pkg/utils/util.go +++ /dev/null @@ -1,8 +0,0 @@ -package utils - -func MapKeysToSliceInt(m map[int]struct{}) (s []int) { - for k := range m { - s = append(s, k) - } - return -} From 5d112f71f99f91d11c720e04669c72b33ce73902 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 17:47:24 +0100 Subject: [PATCH 40/68] chore(deps): bump github.com/projectdiscovery/ratelimit in /v2 (#537) Bumps [github.com/projectdiscovery/ratelimit](https://github.com/projectdiscovery/ratelimit) from 0.0.4 to 0.0.5. - [Release notes](https://github.com/projectdiscovery/ratelimit/releases) - [Commits](https://github.com/projectdiscovery/ratelimit/compare/v0.0.4...v0.0.5) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/ratelimit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 7f3a1b7c..f448a5b3 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -19,7 +19,7 @@ require ( github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 - github.com/projectdiscovery/ratelimit v0.0.4 + github.com/projectdiscovery/ratelimit v0.0.5 github.com/projectdiscovery/retryablehttp-go v1.0.8 github.com/projectdiscovery/uncover v1.0.2 github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 diff --git a/v2/go.sum b/v2/go.sum index 0286acf5..2f7c14be 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -290,8 +290,8 @@ github.com/projectdiscovery/mapcidr v1.0.3 h1:SGtOOEz0AxthVO7ZonMvhrJ/AQkHIXCVgy github.com/projectdiscovery/mapcidr v1.0.3/go.mod h1:/0lEXlu/q0t5u34vIVF6odHR+JCdD3CIHNsMXo7nwrU= github.com/projectdiscovery/networkpolicy v0.0.3 h1:OZFPkMVY6SJxc1ncuRXB2VlT6xlzJl5eWDkvpWn/GMM= github.com/projectdiscovery/networkpolicy v0.0.3/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= -github.com/projectdiscovery/ratelimit v0.0.4 h1:2TOAhuOUMlKrzwissru2mFnSd8eg2WddIQKcAyYEkGs= -github.com/projectdiscovery/ratelimit v0.0.4/go.mod h1:QK9+yt3ArGWINdj6unGjehtJA/NdlAiF59gaj2FtfEs= +github.com/projectdiscovery/ratelimit v0.0.5 h1:QAWtECH5MJtqen448fHr6ikV8NTBdebmZBLrX9oqaic= +github.com/projectdiscovery/ratelimit v0.0.5/go.mod h1:QK9+yt3ArGWINdj6unGjehtJA/NdlAiF59gaj2FtfEs= github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= From 9a5ac043bcfa3a248ab0fc5f5fb06e871454a1c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 17:47:44 +0100 Subject: [PATCH 41/68] chore(deps): bump alpine from 3.17.0 to 3.17.1 (#531) Bumps alpine from 3.17.0 to 3.17.1. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4c87568a..783f6b2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.19.4-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest -FROM alpine:3.17.0 +FROM alpine:3.17.1 RUN apk add nmap libpcap-dev bind-tools ca-certificates nmap-scripts COPY --from=builder /go/bin/naabu /usr/local/bin/naabu ENTRYPOINT ["naabu"] From a8e12e9883e07a4abed16612d89d89e9edcd639f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 17:47:52 +0100 Subject: [PATCH 42/68] chore(deps): bump golang from 1.19.4-alpine to 1.19.5-alpine (#532) Bumps golang from 1.19.4-alpine to 1.19.5-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 783f6b2a..ce305ab2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.4-alpine AS builder +FROM golang:1.19.5-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest From ec2183e20260b5782c66dc7fc8c6f15b75e43351 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 17:59:11 +0100 Subject: [PATCH 43/68] chore(deps): bump github.com/projectdiscovery/retryablehttp-go in /v2 (#536) Bumps [github.com/projectdiscovery/retryablehttp-go](https://github.com/projectdiscovery/retryablehttp-go) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/projectdiscovery/retryablehttp-go/releases) - [Commits](https://github.com/projectdiscovery/retryablehttp-go/compare/v1.0.8...v1.0.9) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/retryablehttp-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 4 ++-- v2/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index f448a5b3..253b5c2f 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -20,9 +20,9 @@ require ( github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.5 - github.com/projectdiscovery/retryablehttp-go v1.0.8 + github.com/projectdiscovery/retryablehttp-go v1.0.9 github.com/projectdiscovery/uncover v1.0.2 - github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 + github.com/projectdiscovery/utils v0.0.4-0.20230117135930-7371ae6a739d github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 diff --git a/v2/go.sum b/v2/go.sum index 2f7c14be..d56bc6fc 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -295,8 +295,8 @@ github.com/projectdiscovery/ratelimit v0.0.5/go.mod h1:QK9+yt3ArGWINdj6unGjehtJA github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= -github.com/projectdiscovery/retryablehttp-go v1.0.8 h1:F4UZ+3NkIPDj+tobHZY+sgvDVmiVCX/CUUh/jrKq7Oc= -github.com/projectdiscovery/retryablehttp-go v1.0.8/go.mod h1:tD5TNOXKNuvqrUHHGoP6xJmVZTjSkLGsqcyD7gCsc3I= +github.com/projectdiscovery/retryablehttp-go v1.0.9 h1:pzSmLQR++5Y4Hprxko4ZBPuXgw6yy3aUn+fe6+mgOjA= +github.com/projectdiscovery/retryablehttp-go v1.0.9/go.mod h1:a5bmSbaxgHvC0P80csOymMOwKaJirMnsS6otRUH/vcU= github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= @@ -309,8 +309,8 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v1.0.2 h1:mRFzflYyvwKkHd3XKufMlDRrb6p1mjFZTSHoNAUpFwo= github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY= -github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 h1:/fZvw6gT1fzdmMLMBBw75OrJ0Z6g7dulQrxM9FRp1qU= -github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= +github.com/projectdiscovery/utils v0.0.4-0.20230117135930-7371ae6a739d h1:iB/n2/NL4oh1IaEcqX6pBxj0WHfYN7finzNOKVNVISM= +github.com/projectdiscovery/utils v0.0.4-0.20230117135930-7371ae6a739d/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= From 1695ff60dcaa755af6dff0f850a27ec469fb488f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 18:03:41 +0100 Subject: [PATCH 44/68] chore(deps): bump github.com/projectdiscovery/clistats from 0.0.9 to 0.0.11 in /v2 (#533) * chore(deps): bump github.com/projectdiscovery/clistats in /v2 Bumps [github.com/projectdiscovery/clistats](https://github.com/projectdiscovery/clistats) from 0.0.9 to 0.0.11. - [Release notes](https://github.com/projectdiscovery/clistats/releases) - [Commits](https://github.com/projectdiscovery/clistats/compare/v0.0.9...v0.0.11) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/clistats dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * bump go version Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mzack9999 Co-authored-by: mzack --- .github/workflows/build-test.yml | 6 +++--- .github/workflows/functional-test.yml | 2 +- .github/workflows/lint-test.yml | 2 +- .github/workflows/release-binary.yml | 6 +++--- .github/workflows/sonarcloud.yml | 2 +- v2/go.mod | 4 ++-- v2/go.sum | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e76c2fef..ef7bf450 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 @@ -46,7 +46,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 @@ -83,7 +83,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml index cc684716..16e0373d 100644 --- a/.github/workflows/functional-test.yml +++ b/.github/workflows/functional-test.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Check out code uses: actions/checkout@v3 diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 2df07b18..a35dd064 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Install Dependences run: sudo apt install libpcap-dev diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index c5b1612b..3c8dfdcb 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Install Dependences run: brew install libpcap - name: Run GoReleaser @@ -39,7 +39,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Install Dependences run: sudo apt install libpcap-dev @@ -63,7 +63,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 with: diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 29757d83..a0c9eeae 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -20,7 +20,7 @@ jobs: - name: "Set up Go" uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Install Dependences run: sudo apt install libpcap-dev diff --git a/v2/go.mod b/v2/go.mod index 253b5c2f..66aa4cd8 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -1,6 +1,6 @@ module github.com/projectdiscovery/naabu/v2 -go 1.18 +go 1.19 require ( github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d @@ -10,7 +10,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c github.com/projectdiscovery/cdncheck v0.0.3 - github.com/projectdiscovery/clistats v0.0.9 + github.com/projectdiscovery/clistats v0.0.11 github.com/projectdiscovery/dnsx v1.1.1 github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.4 diff --git a/v2/go.sum b/v2/go.sum index d56bc6fc..eb2ea9e5 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -254,8 +254,8 @@ github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c h1:H15I github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss= github.com/projectdiscovery/cdncheck v0.0.3 h1:li2/rUJmhVXSqRFyhJMqi6pdBX6ZxMnwzBfE0Kifj/g= github.com/projectdiscovery/cdncheck v0.0.3/go.mod h1:EevMeCG1ogBoUJYaa0Mv9R1VUboDm/DiynId7DboKy0= -github.com/projectdiscovery/clistats v0.0.9 h1:8sA17+2qP+cTnY7LaaGURJW5stSM8UwQiygwHQjxHx4= -github.com/projectdiscovery/clistats v0.0.9/go.mod h1:7F1RdeGAoLf05rhsZesL0+qoXJpOA/vxuRj2JRIAzU4= +github.com/projectdiscovery/clistats v0.0.11 h1:0tx2eff4OtoA8kw9AqFieAUEaFNVCLJWiFigsDeAIRU= +github.com/projectdiscovery/clistats v0.0.11/go.mod h1:9luKJj+7Hjq3+a7g129sKWRYx4SbTdkUWZQxabn3H5Y= github.com/projectdiscovery/dnsx v1.1.1 h1:yGYEH1vfVN7YdvdOtPzPvrc6JuHCi8wBTAkStP/f2QI= github.com/projectdiscovery/dnsx v1.1.1/go.mod h1:DVvc+ePRCknahLpz4Y8nMppYOGUZhkEmYsTPuYx1a5w= github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc= From 155db2fe2766974631e78abed860327b04f41a6c Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Thu, 26 Jan 2023 18:08:42 +0100 Subject: [PATCH 45/68] closing stats on exit (#538) --- v2/pkg/runner/runner.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/v2/pkg/runner/runner.go b/v2/pkg/runner/runner.go index 5f137f59..584a51ac 100644 --- a/v2/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -469,6 +469,9 @@ func (r *Runner) ShowScanResultOnExit() { func (r *Runner) Close() { _ = os.RemoveAll(r.targetsFile) _ = r.scanner.IPRanger.Hosts.Close() + if r.options.EnableProgressBar { + _ = r.stats.Stop() + } } // PickIP randomly From 8c664da3a89ad90443b4833e30e26ac8ed012348 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Thu, 9 Feb 2023 10:46:37 +0100 Subject: [PATCH 46/68] Adding support for optional reverse ptr (#530) * Adding support for optional reverse ptr * updating readme * using iputil helper --- README.md | 1 + v2/go.mod | 2 +- v2/go.sum | 4 ++-- v2/pkg/runner/options.go | 3 +++ v2/pkg/runner/targets.go | 16 ++++++++++++++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8e08254d..7006acf0 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ HOST-DISCOVERY: -pm, -probe-icmp-address-mask ICMP address mask request Ping (host discovery needs to be enabled) -arp, -arp-ping ARP ping (host discovery needs to be enabled) -nd, -nd-ping IPv6 Neighbor Discovery (host discovery needs to be enabled) + -rev-ptr Reverse PTR lookup for input ips OPTIMIZATION: -retries int number of retries for the port scan (default 3) diff --git a/v2/go.mod b/v2/go.mod index 66aa4cd8..7528d649 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -22,7 +22,7 @@ require ( github.com/projectdiscovery/ratelimit v0.0.5 github.com/projectdiscovery/retryablehttp-go v1.0.9 github.com/projectdiscovery/uncover v1.0.2 - github.com/projectdiscovery/utils v0.0.4-0.20230117135930-7371ae6a739d + github.com/projectdiscovery/utils v0.0.8 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 diff --git a/v2/go.sum b/v2/go.sum index eb2ea9e5..abc40daf 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -309,8 +309,8 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v1.0.2 h1:mRFzflYyvwKkHd3XKufMlDRrb6p1mjFZTSHoNAUpFwo= github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY= -github.com/projectdiscovery/utils v0.0.4-0.20230117135930-7371ae6a739d h1:iB/n2/NL4oh1IaEcqX6pBxj0WHfYN7finzNOKVNVISM= -github.com/projectdiscovery/utils v0.0.4-0.20230117135930-7371ae6a739d/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= +github.com/projectdiscovery/utils v0.0.8 h1:yPl/DwhW0IGnWNjapcw03g97ria8ZM8fH5PbcX4QFUo= +github.com/projectdiscovery/utils v0.0.8/go.mod h1:dZqlayNwgCGn2HgYfKrI71RjBEyKsEPovrU+UDfpQWw= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= diff --git a/v2/pkg/runner/options.go b/v2/pkg/runner/options.go index 4dbcd7e0..0569509b 100644 --- a/v2/pkg/runner/options.go +++ b/v2/pkg/runner/options.go @@ -85,6 +85,8 @@ type Options struct { ServiceDiscovery bool // ServiceVersion attempts to discover service running on open ports with active/passive probes ServiceVersion bool + // ReversePTR lookup for ips + ReversePTR bool } // OnResultCallback (hostResult) @@ -154,6 +156,7 @@ func ParseOptions() *Options { flagSet.BoolVarP(&options.IcmpAddressMaskRequestProbe, "probe-icmp-address-mask", "pm", false, "ICMP address mask request Ping (host discovery needs to be enabled)"), flagSet.BoolVarP(&options.ArpPing, "arp-ping", "arp", false, "ARP ping (host discovery needs to be enabled)"), flagSet.BoolVarP(&options.IPv6NeighborDiscoveryPing, "nd-ping", "nd", false, "IPv6 Neighbor Discovery (host discovery needs to be enabled)"), + flagSet.BoolVar(&options.ReversePTR, "rev-ptr", false, "Reverse PTR lookup for input ips"), // The following flags are left as placeholder // flagSet.StringSliceVarP(&options.IpProtocolPingProbes, "probe-ip-protocol", "po", []string{}, "IP Protocol Ping"), // flagSet.StringSliceVarP(&options.UdpPingProbes, "probe-udp", "pu", []string{}, "UDP Ping"), diff --git a/v2/pkg/runner/targets.go b/v2/pkg/runner/targets.go index 76639d0e..7738c454 100644 --- a/v2/pkg/runner/targets.go +++ b/v2/pkg/runner/targets.go @@ -142,8 +142,20 @@ func (r *Runner) AddTarget(target string) error { } if r.options.Stream { r.streamChannel <- iputil.ToCidr(target) - } else if err := r.scanner.IPRanger.AddHostWithMetadata(target, "ip"); err != nil { - gologger.Warning().Msgf("%s\n", err) + } else { + metadata := "ip" + if r.options.ReversePTR { + names, err := iputil.ToFQDN(target) + if err != nil { + gologger.Debug().Msgf("reverse ptr failed for %s: %s\n", target, err) + } else { + metadata = strings.Trim(names[0], ".") + } + } + err := r.scanner.IPRanger.AddHostWithMetadata(target, metadata) + if err != nil { + gologger.Warning().Msgf("%s\n", err) + } } return nil } From 43ee3f8042bcbd5798b4179809d898a7e728b76b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:47:02 +0100 Subject: [PATCH 47/68] chore(deps): bump golangci/golangci-lint-action from 3.3.1 to 3.4.0 (#540) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v3.3.1...v3.4.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index a35dd064..1ccc185c 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -20,7 +20,7 @@ jobs: run: sudo apt install libpcap-dev - name: Run golangci-lint - uses: golangci/golangci-lint-action@v3.3.1 + uses: golangci/golangci-lint-action@v3.4.0 with: version: latest args: --timeout 5m From 824a58dce223cf1f2a508d91670e2365aabb2b06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:47:12 +0100 Subject: [PATCH 48/68] chore(deps): bump github.com/projectdiscovery/retryablehttp-go in /v2 (#541) Bumps [github.com/projectdiscovery/retryablehttp-go](https://github.com/projectdiscovery/retryablehttp-go) from 1.0.9 to 1.0.10. - [Release notes](https://github.com/projectdiscovery/retryablehttp-go/releases) - [Commits](https://github.com/projectdiscovery/retryablehttp-go/compare/v1.0.9...v1.0.10) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/retryablehttp-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 7528d649..0865f1ad 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -20,7 +20,7 @@ require ( github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.5 - github.com/projectdiscovery/retryablehttp-go v1.0.9 + github.com/projectdiscovery/retryablehttp-go v1.0.10 github.com/projectdiscovery/uncover v1.0.2 github.com/projectdiscovery/utils v0.0.8 github.com/remeh/sizedwaitgroup v1.0.0 diff --git a/v2/go.sum b/v2/go.sum index abc40daf..111774fd 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -295,8 +295,8 @@ github.com/projectdiscovery/ratelimit v0.0.5/go.mod h1:QK9+yt3ArGWINdj6unGjehtJA github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= -github.com/projectdiscovery/retryablehttp-go v1.0.9 h1:pzSmLQR++5Y4Hprxko4ZBPuXgw6yy3aUn+fe6+mgOjA= -github.com/projectdiscovery/retryablehttp-go v1.0.9/go.mod h1:a5bmSbaxgHvC0P80csOymMOwKaJirMnsS6otRUH/vcU= +github.com/projectdiscovery/retryablehttp-go v1.0.10 h1:A8tsJZhzpijgnvHT41JNrhiXtn8F8s7TWMC5ZxLV/Cg= +github.com/projectdiscovery/retryablehttp-go v1.0.10/go.mod h1:a5bmSbaxgHvC0P80csOymMOwKaJirMnsS6otRUH/vcU= github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= From 8a292e76e816aed09facb99f6ecb3196954f3327 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:55:29 +0100 Subject: [PATCH 49/68] chore(deps): bump golang from 1.19.5-alpine to 1.20.0-alpine (#546) Bumps golang from 1.19.5-alpine to 1.20.0-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce305ab2..ac26ddb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.5-alpine AS builder +FROM golang:1.20.0-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest From b1591d8a5f77d6c12fd5e80bab5e87d04284bc02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:55:40 +0100 Subject: [PATCH 50/68] chore(deps): bump docker/build-push-action from 3 to 4 (#545) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dockerhub-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub-push.yml b/.github/workflows/dockerhub-push.yml index 0388b8a3..9053b84b 100644 --- a/.github/workflows/dockerhub-push.yml +++ b/.github/workflows/dockerhub-push.yml @@ -32,7 +32,7 @@ jobs: password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: context: . platforms: linux/amd64,linux/arm64,linux/arm From 1d134af98542e27b77fbbb0795e69b6a0b9052d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:55:52 +0100 Subject: [PATCH 51/68] chore(deps): bump github.com/projectdiscovery/ratelimit in /v2 (#544) Bumps [github.com/projectdiscovery/ratelimit](https://github.com/projectdiscovery/ratelimit) from 0.0.5 to 0.0.6. - [Release notes](https://github.com/projectdiscovery/ratelimit/releases) - [Commits](https://github.com/projectdiscovery/ratelimit/compare/v0.0.5...v0.0.6) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/ratelimit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 0865f1ad..cc9fa4f9 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -19,7 +19,7 @@ require ( github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 - github.com/projectdiscovery/ratelimit v0.0.5 + github.com/projectdiscovery/ratelimit v0.0.6 github.com/projectdiscovery/retryablehttp-go v1.0.10 github.com/projectdiscovery/uncover v1.0.2 github.com/projectdiscovery/utils v0.0.8 diff --git a/v2/go.sum b/v2/go.sum index 111774fd..8f72cff9 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -290,8 +290,8 @@ github.com/projectdiscovery/mapcidr v1.0.3 h1:SGtOOEz0AxthVO7ZonMvhrJ/AQkHIXCVgy github.com/projectdiscovery/mapcidr v1.0.3/go.mod h1:/0lEXlu/q0t5u34vIVF6odHR+JCdD3CIHNsMXo7nwrU= github.com/projectdiscovery/networkpolicy v0.0.3 h1:OZFPkMVY6SJxc1ncuRXB2VlT6xlzJl5eWDkvpWn/GMM= github.com/projectdiscovery/networkpolicy v0.0.3/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= -github.com/projectdiscovery/ratelimit v0.0.5 h1:QAWtECH5MJtqen448fHr6ikV8NTBdebmZBLrX9oqaic= -github.com/projectdiscovery/ratelimit v0.0.5/go.mod h1:QK9+yt3ArGWINdj6unGjehtJA/NdlAiF59gaj2FtfEs= +github.com/projectdiscovery/ratelimit v0.0.6 h1:SAD2ArdT9F8NmbkAIZpl7DjNnbiXdUQLnMZt5dbVmZ0= +github.com/projectdiscovery/ratelimit v0.0.6/go.mod h1:WFL6gIggPLTwYwDbxqQODuWrz/lcMP2E5ofKSAz3YwI= github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= From aba7cf985caa36b307445bc61695a590ee53e9d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:56:54 +0100 Subject: [PATCH 52/68] chore(deps): bump golang.org/x/sys from 0.4.0 to 0.5.0 in /v2 (#548) Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/golang/sys/releases) - [Commits](https://github.com/golang/sys/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index cc9fa4f9..a8533c74 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -28,7 +28,7 @@ require ( go.uber.org/multierr v1.9.0 golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 golang.org/x/net v0.5.0 - golang.org/x/sys v0.4.0 + golang.org/x/sys v0.5.0 ) require ( diff --git a/v2/go.sum b/v2/go.sum index 8f72cff9..c491658d 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -479,8 +479,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 5c507afb60236d85045d61ee2b6ed07467438885 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:57:48 +0100 Subject: [PATCH 53/68] chore(deps): bump github.com/projectdiscovery/clistats in /v2 (#547) Bumps [github.com/projectdiscovery/clistats](https://github.com/projectdiscovery/clistats) from 0.0.11 to 0.0.12. - [Release notes](https://github.com/projectdiscovery/clistats/releases) - [Commits](https://github.com/projectdiscovery/clistats/compare/v0.0.11...v0.0.12) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/clistats dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index a8533c74..b93782c8 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -10,7 +10,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c github.com/projectdiscovery/cdncheck v0.0.3 - github.com/projectdiscovery/clistats v0.0.11 + github.com/projectdiscovery/clistats v0.0.12 github.com/projectdiscovery/dnsx v1.1.1 github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.4 diff --git a/v2/go.sum b/v2/go.sum index c491658d..097eb735 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -254,8 +254,8 @@ github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c h1:H15I github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss= github.com/projectdiscovery/cdncheck v0.0.3 h1:li2/rUJmhVXSqRFyhJMqi6pdBX6ZxMnwzBfE0Kifj/g= github.com/projectdiscovery/cdncheck v0.0.3/go.mod h1:EevMeCG1ogBoUJYaa0Mv9R1VUboDm/DiynId7DboKy0= -github.com/projectdiscovery/clistats v0.0.11 h1:0tx2eff4OtoA8kw9AqFieAUEaFNVCLJWiFigsDeAIRU= -github.com/projectdiscovery/clistats v0.0.11/go.mod h1:9luKJj+7Hjq3+a7g129sKWRYx4SbTdkUWZQxabn3H5Y= +github.com/projectdiscovery/clistats v0.0.12 h1:KLYJxpiwEFidduU4PbcwEcCQ2L7c5wrf7DI5IN5fZ+8= +github.com/projectdiscovery/clistats v0.0.12/go.mod h1:9luKJj+7Hjq3+a7g129sKWRYx4SbTdkUWZQxabn3H5Y= github.com/projectdiscovery/dnsx v1.1.1 h1:yGYEH1vfVN7YdvdOtPzPvrc6JuHCi8wBTAkStP/f2QI= github.com/projectdiscovery/dnsx v1.1.1/go.mod h1:DVvc+ePRCknahLpz4Y8nMppYOGUZhkEmYsTPuYx1a5w= github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc= From 4e5fc954a3255b14e48704119a61e3ed952bc4eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 08:16:47 +0100 Subject: [PATCH 54/68] chore(deps): bump golang.org/x/net from 0.5.0 to 0.6.0 in /v2 (#550) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 4 ++-- v2/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index b93782c8..46ecb9bc 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -27,7 +27,7 @@ require ( github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 - golang.org/x/net v0.5.0 + golang.org/x/net v0.6.0 golang.org/x/sys v0.5.0 ) @@ -81,7 +81,7 @@ require ( go.etcd.io/bbolt v1.3.5 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/mod v0.6.0 // indirect - golang.org/x/text v0.6.0 // indirect + golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.2.0 // indirect google.golang.org/protobuf v1.26.0 // indirect gopkg.in/djherbis/times.v1 v1.3.0 // indirect diff --git a/v2/go.sum b/v2/go.sum index 097eb735..99376166 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -438,8 +438,8 @@ golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -488,8 +488,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 5c12a72348ff8f27908e670c24030c3b01bcf67e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 08:16:58 +0100 Subject: [PATCH 55/68] chore(deps): bump github.com/projectdiscovery/utils in /v2 (#552) Bumps [github.com/projectdiscovery/utils](https://github.com/projectdiscovery/utils) from 0.0.8 to 0.0.9. - [Release notes](https://github.com/projectdiscovery/utils/releases) - [Commits](https://github.com/projectdiscovery/utils/compare/v0.0.8...v0.0.9) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/utils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 46ecb9bc..ffd34486 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -22,7 +22,7 @@ require ( github.com/projectdiscovery/ratelimit v0.0.6 github.com/projectdiscovery/retryablehttp-go v1.0.10 github.com/projectdiscovery/uncover v1.0.2 - github.com/projectdiscovery/utils v0.0.8 + github.com/projectdiscovery/utils v0.0.9 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 diff --git a/v2/go.sum b/v2/go.sum index 99376166..862c16b4 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -309,8 +309,8 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v1.0.2 h1:mRFzflYyvwKkHd3XKufMlDRrb6p1mjFZTSHoNAUpFwo= github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY= -github.com/projectdiscovery/utils v0.0.8 h1:yPl/DwhW0IGnWNjapcw03g97ria8ZM8fH5PbcX4QFUo= -github.com/projectdiscovery/utils v0.0.8/go.mod h1:dZqlayNwgCGn2HgYfKrI71RjBEyKsEPovrU+UDfpQWw= +github.com/projectdiscovery/utils v0.0.9 h1:+bmjtRU1IWt5dKg9+9TbIaRkw/kN05myCXDOhCQRX7g= +github.com/projectdiscovery/utils v0.0.9/go.mod h1:dZqlayNwgCGn2HgYfKrI71RjBEyKsEPovrU+UDfpQWw= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= From 99110273e875a7fe6c60c20549d0d765bb12e0da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 08:17:11 +0100 Subject: [PATCH 56/68] chore(deps): bump github.com/projectdiscovery/retryablehttp-go in /v2 (#551) Bumps [github.com/projectdiscovery/retryablehttp-go](https://github.com/projectdiscovery/retryablehttp-go) from 1.0.10 to 1.0.11. - [Release notes](https://github.com/projectdiscovery/retryablehttp-go/releases) - [Commits](https://github.com/projectdiscovery/retryablehttp-go/compare/v1.0.10...v1.0.11) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/retryablehttp-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index ffd34486..94315f80 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -20,7 +20,7 @@ require ( github.com/projectdiscovery/mapcidr v1.0.3 github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.6 - github.com/projectdiscovery/retryablehttp-go v1.0.10 + github.com/projectdiscovery/retryablehttp-go v1.0.11 github.com/projectdiscovery/uncover v1.0.2 github.com/projectdiscovery/utils v0.0.9 github.com/remeh/sizedwaitgroup v1.0.0 diff --git a/v2/go.sum b/v2/go.sum index 862c16b4..eafad9bd 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -295,8 +295,8 @@ github.com/projectdiscovery/ratelimit v0.0.6/go.mod h1:WFL6gIggPLTwYwDbxqQODuWrz github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= -github.com/projectdiscovery/retryablehttp-go v1.0.10 h1:A8tsJZhzpijgnvHT41JNrhiXtn8F8s7TWMC5ZxLV/Cg= -github.com/projectdiscovery/retryablehttp-go v1.0.10/go.mod h1:a5bmSbaxgHvC0P80csOymMOwKaJirMnsS6otRUH/vcU= +github.com/projectdiscovery/retryablehttp-go v1.0.11 h1:dxJy/qR+4uOQ7th4rq8nIrW7EegvkB8JfaoKCyoz6zo= +github.com/projectdiscovery/retryablehttp-go v1.0.11/go.mod h1:RWViUDjf9NTx1j8HatkstoSj2hE4xrrDIum1SsQqZfE= github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= From 6d736a88a09758752b57975c9a823eccd1d00679 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Tue, 14 Feb 2023 16:21:42 +0100 Subject: [PATCH 57/68] Bumping mapcidr + asnmap versions (#559) * Bumping mapcidr + asnmap versions * fixing go.sum --- v2/go.mod | 51 ++++--- v2/go.sum | 266 ++++++++++++++++++---------------- v2/pkg/runner/runner.go | 5 +- v2/pkg/runner/targets.go | 2 +- v2/pkg/runner/targets_test.go | 6 +- 5 files changed, 174 insertions(+), 156 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 94315f80..f0665182 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -17,7 +17,7 @@ require ( github.com/projectdiscovery/goflags v0.1.6 github.com/projectdiscovery/gologger v1.1.7 github.com/projectdiscovery/ipranger v0.0.4 - github.com/projectdiscovery/mapcidr v1.0.3 + github.com/projectdiscovery/mapcidr v1.1.0 github.com/projectdiscovery/networkpolicy v0.0.3 github.com/projectdiscovery/ratelimit v0.0.6 github.com/projectdiscovery/retryablehttp-go v1.0.11 @@ -26,38 +26,35 @@ require ( github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 - golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 + golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 golang.org/x/net v0.6.0 golang.org/x/sys v0.5.0 ) require ( - github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect - github.com/DataDog/zstd v1.4.5 // indirect + github.com/DataDog/zstd v1.5.2 // indirect github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 // indirect github.com/akrylysov/pogreb v0.10.1 // indirect github.com/aymerick/douceur v0.2.0 // indirect - github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 // indirect - github.com/cockroachdb/errors v1.8.1 // indirect - github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect - github.com/cockroachdb/pebble v0.0.0-20210728210723-48179f1d4dae // indirect - github.com/cockroachdb/redact v1.0.8 // indirect - github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect + github.com/cockroachdb/errors v1.9.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect + github.com/cockroachdb/pebble v0.0.0-20221229212011-811a8c0e741b // indirect + github.com/cockroachdb/redact v1.1.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dgraph-io/badger v1.6.2 // indirect - github.com/dgraph-io/ristretto v0.0.3 // indirect github.com/dsnet/compress v0.0.1 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect + github.com/getsentry/sentry-go v0.16.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gorilla/css v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.11.7 // indirect + github.com/klauspost/compress v1.15.13 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mholt/archiver v3.1.1+incompatible // indirect github.com/microcosm-cc/bluemonday v1.0.21 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -65,25 +62,35 @@ require ( github.com/nwaples/rardecode v1.1.0 // indirect github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/projectdiscovery/asnmap v0.0.1 // indirect - github.com/projectdiscovery/fileutil v0.0.1 // indirect - github.com/projectdiscovery/hmap v0.0.2 // indirect + github.com/projectdiscovery/asnmap v1.0.0 // indirect + github.com/projectdiscovery/hmap v0.0.6 // indirect github.com/projectdiscovery/iputil v0.0.2 // indirect - github.com/projectdiscovery/retryabledns v1.0.15 // indirect - github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 // indirect + github.com/projectdiscovery/retryabledns v1.0.20 // indirect github.com/projectdiscovery/stringsutil v0.0.2 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.39.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect github.com/syndtr/goleveldb v1.0.0 // indirect + github.com/tidwall/btree v1.4.3 // indirect + github.com/tidwall/buntdb v1.2.10 // indirect + github.com/tidwall/gjson v1.14.3 // indirect + github.com/tidwall/grect v0.1.4 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect + github.com/tidwall/rtred v0.1.2 // indirect + github.com/tidwall/tinyqueue v0.1.1 // indirect github.com/ulikunitz/xz v0.5.10 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect - go.etcd.io/bbolt v1.3.5 // indirect + go.etcd.io/bbolt v1.3.6 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.2.0 // indirect - google.golang.org/protobuf v1.26.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/djherbis/times.v1 v1.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/v2/go.sum b/v2/go.sum index eafad9bd..18af24de 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -1,21 +1,16 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M= -github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= -github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= +github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= +github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 h1:ZbFL+BDfBqegi+/Ssh7im5+aQfBRx6it+kHnC7jaDU8= github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809/go.mod h1:upgc3Zs45jBDnBT4tVRgRcgm26ABpaP7MoTSdgysca4= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= -github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/akrylysov/pogreb v0.10.1 h1:FqlR8VR7uCbJdfUob916tPM+idpKgeESDXOA1K0DK4w= @@ -26,28 +21,33 @@ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:W github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bits-and-blooms/bitset v1.3.1 h1:y+qrlmq3XsWi+xZqSaueaE8ry8Y127iMxlMfqcK8p0g= +github.com/bits-and-blooms/bloom/v3 v3.3.1 h1:K2+A19bXT8gJR5mU7y+1yW6hsKfNCjcP2uNfLFKncjQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 h1:ox2F0PSMlrAAiAdknSRMDrAr8mfxPCfSZolH+/qQnyQ= github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08/go.mod h1:pCxVEbcm3AMg7ejXyorUXi6HQCzOIBf7zEDVPtw0/U4= -github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cockroachdb/datadriven v1.0.1-0.20211007161720-b558070c3be0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7/go.mod h1:hi0MtSY3AYDQNDi83kDkMH5/yqM/CsIrsOITkSoH7KI= +github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= -github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y= -github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= +github.com/cockroachdb/errors v1.8.8/go.mod h1:z6VnEL3hZ/2ONZEvG7S5Ym0bU2AqPcEKnIiA1wbsSu0= +github.com/cockroachdb/errors v1.9.0 h1:B48dYem5SlAY7iU8AKsgedb4gH6mo+bDkbtLIvM/a88= +github.com/cockroachdb/errors v1.9.0/go.mod h1:vaNcEYYqbIqB5JhKBhFV9CneUqeuEbB2OYJBK4GBNYQ= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/cockroachdb/pebble v0.0.0-20210728210723-48179f1d4dae h1:rH4i31f3O0yEQy1Ho6DuUqf0+0Pq4MIflc8TBZEMvUI= -github.com/cockroachdb/pebble v0.0.0-20210728210723-48179f1d4dae/go.mod h1:JXfQr3d+XO4bL1pxGwKKo09xylQSdZ/mpZ9b2wfVcPs= -github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= -github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/pebble v0.0.0-20221229212011-811a8c0e741b h1:6TtBvyITBhpkL8EvEEZdS9om8egSxP/mUML01aM3pyY= +github.com/cockroachdb/pebble v0.0.0-20221229212011-811a8c0e741b/go.mod h1:JsehdjcR1QgLZkqBeYrbVdE3cdxbdrycA/PN+Cg+RNw= +github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= +github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= @@ -58,23 +58,17 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= -github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8= -github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE= -github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgraph-io/ristretto v0.0.3 h1:jh22xisGBjrEVnRZ1DVTpBVQm0Xndu8sMl0CWDzSIBI= -github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= -github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q= github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= @@ -86,41 +80,45 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= -github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= +github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= +github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= +github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= @@ -128,30 +126,37 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru/v2 v2.0.1 h1:5pv5N1lT1fjLg2VQ5KWc7kmucp2x/kvFOnxuVTqZ6x4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= +github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= +github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= +github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -160,24 +165,29 @@ github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVE github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= +github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= +github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE= github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= +github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE= github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= +github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro= +github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg= -github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.15.13 h1:NFn1Wr8cfnenSJSA46lLq4wHCcBzKTSjnBIexDMMOV0= +github.com/klauspost/compress v1.15.13/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -185,23 +195,28 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= +github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= +github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU= github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= -github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= -github.com/microcosm-cc/bluemonday v1.0.19/go.mod h1:QNzV2UbLK2/53oIIwTOyLUSABMkjZ4tqiyC1g/DyqxE= github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg= github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= @@ -216,24 +231,25 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7MQ= github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= @@ -246,10 +262,8 @@ 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/asnmap v0.0.1 h1:n4YCz1ljUaDA3dOUCkjI/bUOtiS7ge1KJ39qpURCd/o= -github.com/projectdiscovery/asnmap v0.0.1/go.mod h1:CjCVDhQPVtmlE247L6YFeIVX9c4m8pOX8V8BmB0JkX8= -github.com/projectdiscovery/blackrock v0.0.0-20210415162320-b38689ae3a2e/go.mod h1:/IsapnEYiWG+yEDPXp0e8NWj3npzB9Ccy9lXEUJwMZs= -github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc/go.mod h1:5tNGQP9kOfW+X5+40pZP8aqPYLHs45nJkFaSHLxdeH8= +github.com/projectdiscovery/asnmap v1.0.0 h1:h9aUEHT3gEWgeTxDCd0UMxBw1yPthDwL1ogqUWnkBXo= +github.com/projectdiscovery/asnmap v1.0.0/go.mod h1:m+qedSAZERz7Ds942hWANjU9kg4ADAikFHfwSXN1Ey8= github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c h1:H15I86gQcoi7w7gA0kG/LzxoYprrudJYXmQueMBpNUA= github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss= github.com/projectdiscovery/cdncheck v0.0.3 h1:li2/rUJmhVXSqRFyhJMqi6pdBX6ZxMnwzBfE0Kifj/g= @@ -260,74 +274,60 @@ github.com/projectdiscovery/dnsx v1.1.1 h1:yGYEH1vfVN7YdvdOtPzPvrc6JuHCi8wBTAkSt github.com/projectdiscovery/dnsx v1.1.1/go.mod h1:DVvc+ePRCknahLpz4Y8nMppYOGUZhkEmYsTPuYx1a5w= github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc= github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I= -github.com/projectdiscovery/fileutil v0.0.0-20210928100737-cab279c5d4b5/go.mod h1:U+QCpQnX8o2N2w0VUGyAzjM3yBAe4BKedVElxiImsx0= -github.com/projectdiscovery/fileutil v0.0.0-20220308101036-16c79af1cf5d/go.mod h1:Pm0f+MWgDFMSSI9NBedNh48LyYPs8gD3Jd8DXGmp4aQ= -github.com/projectdiscovery/fileutil v0.0.0-20220609150212-453ac591c36c/go.mod h1:g8wsrb0S5NtEN0JgVyyPeb3FQdArx+UMESmFX94bcGY= -github.com/projectdiscovery/fileutil v0.0.0-20220705195237-01becc2a8963/go.mod h1:DaY7wmLPMleyHDCD/14YApPCDtrARY4J8Eny2ZGsG/g= -github.com/projectdiscovery/fileutil v0.0.1 h1:3K3UqCDOan3LsvWhV0nyvVuMWSwCloNPUJIGcXsi1os= -github.com/projectdiscovery/fileutil v0.0.1/go.mod h1:Oo6ZEvXmQz/xPF0YukzmwpdW2LYinWCSEmzZOQsJCLg= github.com/projectdiscovery/freeport v0.0.4 h1:H4VrK/7hUcC1zbg46zv9iSMBACBDpUqcHkV+FUyXISw= github.com/projectdiscovery/freeport v0.0.4/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= -github.com/projectdiscovery/goflags v0.0.8/go.mod h1:GDSkWyXa6kfQjpJu10SO64DN8lXuKXVENlBMk8N7H80= github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhNgdGvfg+Z4= github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= -github.com/projectdiscovery/gologger v1.0.1/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE= -github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY= github.com/projectdiscovery/gologger v1.1.7 h1:QeByO4NR8vlZ5ZM2XIOJARRj5WOOU5Ix35FBQ1iH5Rk= github.com/projectdiscovery/gologger v1.1.7/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= -github.com/projectdiscovery/hmap v0.0.1/go.mod h1:VDEfgzkKQdq7iGTKz8Ooul0NuYHQ8qiDs6r8bPD1Sb0= -github.com/projectdiscovery/hmap v0.0.2 h1:fe3k0b6tj95mn9a1phD3JXvAAOmmWAh/Upg1Bf0Tfos= -github.com/projectdiscovery/hmap v0.0.2/go.mod h1:YU3TeNTDmLW2dtb4LvuEtDsPTsQ06XMnmOeD3KOuU6c= -github.com/projectdiscovery/ipranger v0.0.2/go.mod h1:kcAIk/lo5rW+IzUrFkeYyXnFJ+dKwYooEOHGVPP/RWE= +github.com/projectdiscovery/hmap v0.0.6 h1:nwF553wjvDdFF6QtlVfB80koojn8WfJGOQvkW0dzDuk= +github.com/projectdiscovery/hmap v0.0.6/go.mod h1:xXSxFWk/zyiBrreQqgLTEnGYhufafVcCSXESBnqKOBU= github.com/projectdiscovery/ipranger v0.0.4 h1:zYlsSYdl0702DyM+Af2ipMRs2pv7bPiVgV72jsbHAPY= github.com/projectdiscovery/ipranger v0.0.4/go.mod h1:myfz4wwq86IOltKb3XJkiuJVVKtK4bNXSIRlHKrwSXM= -github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8/go.mod h1:vHRC+9exsfSbEngMKDl0xiWqkxlLk3lHQZpbS2yFT8U= github.com/projectdiscovery/iputil v0.0.2 h1:f6IGnZF4RImJLysPSPG3D84jyTH34q3lihCFeP+eZzI= github.com/projectdiscovery/iputil v0.0.2/go.mod h1:J3Pcz1q51pi4/JL871mQztg0KOzyWDPxnPLOYJm2pVQ= -github.com/projectdiscovery/mapcidr v0.0.4/go.mod h1:ALOIj6ptkWujNoX8RdQwB2mZ+kAmKuLJBq9T5gR5wG0= -github.com/projectdiscovery/mapcidr v1.0.1/go.mod h1:/qxlpxXZQFFjHynSc9u5O0kUPzH46VskECiwLiz7/vw= -github.com/projectdiscovery/mapcidr v1.0.3 h1:SGtOOEz0AxthVO7ZonMvhrJ/AQkHIXCVgyZqJdY0cAY= -github.com/projectdiscovery/mapcidr v1.0.3/go.mod h1:/0lEXlu/q0t5u34vIVF6odHR+JCdD3CIHNsMXo7nwrU= +github.com/projectdiscovery/mapcidr v1.1.0 h1:Yeb+CGVsRYvHmZ9YSHb9iy4tzY9YuOm3oTFX/xzGhVU= +github.com/projectdiscovery/mapcidr v1.1.0/go.mod h1:hck0bWXka5ZkUaBG+TWt99bzLy+4hAg9oANhEmm3GNs= github.com/projectdiscovery/networkpolicy v0.0.3 h1:OZFPkMVY6SJxc1ncuRXB2VlT6xlzJl5eWDkvpWn/GMM= github.com/projectdiscovery/networkpolicy v0.0.3/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= github.com/projectdiscovery/ratelimit v0.0.6 h1:SAD2ArdT9F8NmbkAIZpl7DjNnbiXdUQLnMZt5dbVmZ0= github.com/projectdiscovery/ratelimit v0.0.6/go.mod h1:WFL6gIggPLTwYwDbxqQODuWrz/lcMP2E5ofKSAz3YwI= -github.com/projectdiscovery/retryabledns v1.0.15 h1:3Nn119UwYsfUPC3g0q57ftz0Wb5Zl5ppvw8R0Xu0DEI= -github.com/projectdiscovery/retryabledns v1.0.15/go.mod h1:3YbsQVqP7jbQ3CDmarhyVtkJaJ8XcB7S19vMeyMxZxk= -github.com/projectdiscovery/retryablehttp-go v1.0.2/go.mod h1:dx//aY9V247qHdsRf0vdWHTBZuBQ2vm6Dq5dagxrDYI= +github.com/projectdiscovery/retryabledns v1.0.20 h1:grRyh4EzuyqsaK07iNkJKgrGLu/qDJwfDJ+83SBo6yo= +github.com/projectdiscovery/retryabledns v1.0.20/go.mod h1:97Et22Kw2iPyvz/Vn41/i3dSbhLMHfeWP/S7EaLgmtg= github.com/projectdiscovery/retryablehttp-go v1.0.11 h1:dxJy/qR+4uOQ7th4rq8nIrW7EegvkB8JfaoKCyoz6zo= github.com/projectdiscovery/retryablehttp-go v1.0.11/go.mod h1:RWViUDjf9NTx1j8HatkstoSj2hE4xrrDIum1SsQqZfE= -github.com/projectdiscovery/sliceutil v0.0.0-20220617151003-15892688e1d6/go.mod h1:9YZb6LRjLYAvSOm65v787dwauurixSyjlqXyYa4rTTA= -github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 h1:C04j5gVVMXqFyBIetAz92SyPRYCpkFgIwZw0L/pps9Q= -github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4/go.mod h1:RxDaccMjPzIuF7F8XbdGl1yOcqxN4YPiHr9xHpfCkGI= -github.com/projectdiscovery/stringsutil v0.0.0-20210804142656-fd3c28dbaafe/go.mod h1:oTRc18WBv9t6BpaN9XBY+QmG28PUpsyDzRht56Qf49I= -github.com/projectdiscovery/stringsutil v0.0.0-20220208075244-7c05502ca8e9/go.mod h1:oTRc18WBv9t6BpaN9XBY+QmG28PUpsyDzRht56Qf49I= -github.com/projectdiscovery/stringsutil v0.0.0-20220422150559-b54fb5dc6833/go.mod h1:oTRc18WBv9t6BpaN9XBY+QmG28PUpsyDzRht56Qf49I= -github.com/projectdiscovery/stringsutil v0.0.0-20220612082425-0037ce9f89f3/go.mod h1:mF5sh4jTghoGWwgUb9qWi5waTFklClDbtrqtJU93awc= -github.com/projectdiscovery/stringsutil v0.0.0-20220731064040-4b67f194751e/go.mod h1:32NYmKyHkKsmisAOAaWrR15lz2ysz2M8x3KMeeoRHoU= github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA= github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v1.0.2 h1:mRFzflYyvwKkHd3XKufMlDRrb6p1mjFZTSHoNAUpFwo= github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY= github.com/projectdiscovery/utils v0.0.9 h1:+bmjtRU1IWt5dKg9+9TbIaRkw/kN05myCXDOhCQRX7g= github.com/projectdiscovery/utils v0.0.9/go.mod h1:dZqlayNwgCGn2HgYfKrI71RjBEyKsEPovrU+UDfpQWw= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= +github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI= github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= @@ -341,18 +341,36 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf 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/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.7.3/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/tidwall/assert v0.1.0 h1:aWcKyRBUAdLoVebxo95N7+YZVTFF/ASTr7BN4sLP6XI= +github.com/tidwall/btree v1.4.3 h1:Lf5U/66bk0ftNppOBjVoy/AIPBrLMkheBp4NnSNiYOo= +github.com/tidwall/btree v1.4.3/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= +github.com/tidwall/buntdb v1.2.10 h1:U/ebfkmYPBnyiNZIirUiWFcxA/mgzjbKlyPynFsPtyM= +github.com/tidwall/buntdb v1.2.10/go.mod h1:lZZrZUWzlyDJKlLQ6DKAy53LnG7m5kHyrEHvvcDmBpU= +github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= +github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/grect v0.1.4 h1:dA3oIgNgWdSspFzn1kS4S/RDpZFLrIxAZOdJKjYapOg= +github.com/tidwall/grect v0.1.4/go.mod h1:9FBsaYRaR0Tcy4UwefBX/UDcDcDy9V5jUcxHzv2jd5Q= +github.com/tidwall/lotsa v1.0.2 h1:dNVBH5MErdaQ/xd9s769R31/n2dXavsQ0Yf4TMEHHw8= +github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= +github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= +github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tidwall/rtred v0.1.2 h1:exmoQtOLvDoO8ud++6LwVsAMTu0KPzLTUrMln8u1yu8= +github.com/tidwall/rtred v0.1.2/go.mod h1:hd69WNXQ5RP9vHd7dqekAz+RIdtfBogmglkZSRxCHFQ= +github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE= +github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= @@ -361,6 +379,7 @@ github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKn github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= @@ -377,40 +396,32 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 h1:5oN1Pz/eDhCpbMbLstvIPa0b/BEQo6g6nwV3pLjfM6w= -golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 h1:m9O6OTJ627iFnN2JIWfdqlZCzneRO6EEBsHXI25P8ws= +golang.org/x/exp v0.0.0-20221230185412-738e83a70c30/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -424,61 +435,55 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/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-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210414194228-064579744ee0/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210521195947-fe42d452be8f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -486,10 +491,12 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -501,12 +508,10 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -518,29 +523,40 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/djherbis/times.v1 v1.3.0 h1:uxMS4iMtH6Pwsxog094W0FYldiNnfY/xba00vq6C2+o= gopkg.in/djherbis/times.v1 v1.3.0/go.mod h1:AQlg6unIsrsCEdQYhTzERy542dz6SFdQFZFv6mUY0P8= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -549,7 +565,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/v2/pkg/runner/runner.go b/v2/pkg/runner/runner.go index 584a51ac..152b6e9a 100644 --- a/v2/pkg/runner/runner.go +++ b/v2/pkg/runner/runner.go @@ -24,7 +24,6 @@ import ( "github.com/projectdiscovery/dnsx/libs/dnsx" "github.com/projectdiscovery/gologger" "github.com/projectdiscovery/mapcidr" - "github.com/projectdiscovery/mapcidr/asn" "github.com/projectdiscovery/naabu/v2/pkg/port" "github.com/projectdiscovery/naabu/v2/pkg/privileges" "github.com/projectdiscovery/naabu/v2/pkg/protocol" @@ -50,7 +49,6 @@ type Runner struct { dnsclient *dnsx.DNSX stats *clistats.Statistics streamChannel chan *net.IPNet - asnClient asn.ASNClient } // NewRunner creates a new runner struct instance by parsing @@ -63,8 +61,7 @@ func NewRunner(options *Options) (*Runner, error) { options.ResumeCfg = NewResumeCfg() } runner := &Runner{ - options: options, - asnClient: asn.New(), + options: options, } runner.streamChannel = make(chan *net.IPNet) diff --git a/v2/pkg/runner/targets.go b/v2/pkg/runner/targets.go index 7738c454..840f8153 100644 --- a/v2/pkg/runner/targets.go +++ b/v2/pkg/runner/targets.go @@ -113,7 +113,7 @@ func (r *Runner) AddTarget(target string) error { } if asn.IsASN(target) { // Get CIDRs for ASN - cidrs, err := r.asnClient.GetCIDRsForASNNum(target) + cidrs, err := asn.GetCIDRsForASNNum(target) if err != nil { return err } diff --git a/v2/pkg/runner/targets_test.go b/v2/pkg/runner/targets_test.go index 620a5a35..7791f5c5 100644 --- a/v2/pkg/runner/targets_test.go +++ b/v2/pkg/runner/targets_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/projectdiscovery/ipranger" - "github.com/projectdiscovery/mapcidr/asn" "github.com/projectdiscovery/naabu/v2/pkg/scan" "github.com/stretchr/testify/require" ) @@ -14,9 +13,8 @@ func Test_AddTarget(t *testing.T) { defer ipranger.Close() r := &Runner{ - options: &Options{}, - scanner: &scan.Scanner{IPRanger: ipranger}, - asnClient: asn.New(), + options: &Options{}, + scanner: &scan.Scanner{IPRanger: ipranger}, } // IPV6 Compressed should generate a warning From abd175e798ebf8f6d0f07339c8a001957c0437d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:23:23 +0100 Subject: [PATCH 58/68] chore(deps): bump alpine from 3.17.1 to 3.17.2 (#553) Bumps alpine from 3.17.1 to 3.17.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac26ddb4..36344c8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.20.0-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest -FROM alpine:3.17.1 +FROM alpine:3.17.2 RUN apk add nmap libpcap-dev bind-tools ca-certificates nmap-scripts COPY --from=builder /go/bin/naabu /usr/local/bin/naabu ENTRYPOINT ["naabu"] From 10078a617de72a169920fbda03b559b4eed0a688 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:40:24 +0100 Subject: [PATCH 59/68] chore(deps): bump github.com/projectdiscovery/gologger in /v2 (#557) Bumps [github.com/projectdiscovery/gologger](https://github.com/projectdiscovery/gologger) from 1.1.7 to 1.1.8. - [Release notes](https://github.com/projectdiscovery/gologger/releases) - [Commits](https://github.com/projectdiscovery/gologger/compare/v1.1.7...v1.1.8) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/gologger dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index f0665182..30ca62f5 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -15,7 +15,7 @@ require ( github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.4 github.com/projectdiscovery/goflags v0.1.6 - github.com/projectdiscovery/gologger v1.1.7 + github.com/projectdiscovery/gologger v1.1.8 github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.1.0 github.com/projectdiscovery/networkpolicy v0.0.3 diff --git a/v2/go.sum b/v2/go.sum index 18af24de..e1976289 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -278,8 +278,8 @@ github.com/projectdiscovery/freeport v0.0.4 h1:H4VrK/7hUcC1zbg46zv9iSMBACBDpUqcH github.com/projectdiscovery/freeport v0.0.4/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhNgdGvfg+Z4= github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= -github.com/projectdiscovery/gologger v1.1.7 h1:QeByO4NR8vlZ5ZM2XIOJARRj5WOOU5Ix35FBQ1iH5Rk= -github.com/projectdiscovery/gologger v1.1.7/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= +github.com/projectdiscovery/gologger v1.1.8 h1:CFlCzGlqAhPqWIrAXBt1OVh5jkMs1qgoR/z4xhdzLNE= +github.com/projectdiscovery/gologger v1.1.8/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= github.com/projectdiscovery/hmap v0.0.6 h1:nwF553wjvDdFF6QtlVfB80koojn8WfJGOQvkW0dzDuk= github.com/projectdiscovery/hmap v0.0.6/go.mod h1:xXSxFWk/zyiBrreQqgLTEnGYhufafVcCSXESBnqKOBU= github.com/projectdiscovery/ipranger v0.0.4 h1:zYlsSYdl0702DyM+Af2ipMRs2pv7bPiVgV72jsbHAPY= From ae267b7d1d802c90f3b24b6ad70f7e65f6790e8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:40:39 +0100 Subject: [PATCH 60/68] chore(deps): bump github.com/projectdiscovery/freeport in /v2 (#556) Bumps [github.com/projectdiscovery/freeport](https://github.com/projectdiscovery/freeport) from 0.0.4 to 0.0.5. - [Release notes](https://github.com/projectdiscovery/freeport/releases) - [Commits](https://github.com/projectdiscovery/freeport/compare/v0.0.4...v0.0.5) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/freeport dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 30ca62f5..f242a2e8 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -13,7 +13,7 @@ require ( github.com/projectdiscovery/clistats v0.0.12 github.com/projectdiscovery/dnsx v1.1.1 github.com/projectdiscovery/fdmax v0.0.4 - github.com/projectdiscovery/freeport v0.0.4 + github.com/projectdiscovery/freeport v0.0.5 github.com/projectdiscovery/goflags v0.1.6 github.com/projectdiscovery/gologger v1.1.8 github.com/projectdiscovery/ipranger v0.0.4 diff --git a/v2/go.sum b/v2/go.sum index e1976289..45f32ea8 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -274,8 +274,8 @@ github.com/projectdiscovery/dnsx v1.1.1 h1:yGYEH1vfVN7YdvdOtPzPvrc6JuHCi8wBTAkSt github.com/projectdiscovery/dnsx v1.1.1/go.mod h1:DVvc+ePRCknahLpz4Y8nMppYOGUZhkEmYsTPuYx1a5w= github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc= github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I= -github.com/projectdiscovery/freeport v0.0.4 h1:H4VrK/7hUcC1zbg46zv9iSMBACBDpUqcHkV+FUyXISw= -github.com/projectdiscovery/freeport v0.0.4/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= +github.com/projectdiscovery/freeport v0.0.5 h1:jnd3Oqsl4S8n0KuFkE5Hm8WGDP24ITBvmyw5pFTHS8Q= +github.com/projectdiscovery/freeport v0.0.5/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhNgdGvfg+Z4= github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= github.com/projectdiscovery/gologger v1.1.8 h1:CFlCzGlqAhPqWIrAXBt1OVh5jkMs1qgoR/z4xhdzLNE= From f0d6e71070b1b7fa118e8310ed839455415480a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:52:54 +0100 Subject: [PATCH 61/68] chore(deps): bump github.com/projectdiscovery/networkpolicy in /v2 (#555) Bumps [github.com/projectdiscovery/networkpolicy](https://github.com/projectdiscovery/networkpolicy) from 0.0.3 to 0.0.4. - [Release notes](https://github.com/projectdiscovery/networkpolicy/releases) - [Commits](https://github.com/projectdiscovery/networkpolicy/compare/v0.0.3...v0.0.4) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/networkpolicy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index f242a2e8..5c2eaf14 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -18,7 +18,7 @@ require ( github.com/projectdiscovery/gologger v1.1.8 github.com/projectdiscovery/ipranger v0.0.4 github.com/projectdiscovery/mapcidr v1.1.0 - github.com/projectdiscovery/networkpolicy v0.0.3 + github.com/projectdiscovery/networkpolicy v0.0.4 github.com/projectdiscovery/ratelimit v0.0.6 github.com/projectdiscovery/retryablehttp-go v1.0.11 github.com/projectdiscovery/uncover v1.0.2 diff --git a/v2/go.sum b/v2/go.sum index 45f32ea8..1a4f4246 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -288,8 +288,8 @@ github.com/projectdiscovery/iputil v0.0.2 h1:f6IGnZF4RImJLysPSPG3D84jyTH34q3lihC github.com/projectdiscovery/iputil v0.0.2/go.mod h1:J3Pcz1q51pi4/JL871mQztg0KOzyWDPxnPLOYJm2pVQ= github.com/projectdiscovery/mapcidr v1.1.0 h1:Yeb+CGVsRYvHmZ9YSHb9iy4tzY9YuOm3oTFX/xzGhVU= github.com/projectdiscovery/mapcidr v1.1.0/go.mod h1:hck0bWXka5ZkUaBG+TWt99bzLy+4hAg9oANhEmm3GNs= -github.com/projectdiscovery/networkpolicy v0.0.3 h1:OZFPkMVY6SJxc1ncuRXB2VlT6xlzJl5eWDkvpWn/GMM= -github.com/projectdiscovery/networkpolicy v0.0.3/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= +github.com/projectdiscovery/networkpolicy v0.0.4 h1:zcGjEqZbyECZEdyCy1jVuwOS7Ww1mzgCefQU75XqdJA= +github.com/projectdiscovery/networkpolicy v0.0.4/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= github.com/projectdiscovery/ratelimit v0.0.6 h1:SAD2ArdT9F8NmbkAIZpl7DjNnbiXdUQLnMZt5dbVmZ0= github.com/projectdiscovery/ratelimit v0.0.6/go.mod h1:WFL6gIggPLTwYwDbxqQODuWrz/lcMP2E5ofKSAz3YwI= github.com/projectdiscovery/retryabledns v1.0.20 h1:grRyh4EzuyqsaK07iNkJKgrGLu/qDJwfDJ+83SBo6yo= From 965eb896de31fb0db4daa81b4c67be09a1b4c3f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:53:05 +0100 Subject: [PATCH 62/68] chore(deps): bump github.com/projectdiscovery/ipranger in /v2 (#554) Bumps [github.com/projectdiscovery/ipranger](https://github.com/projectdiscovery/ipranger) from 0.0.4 to 0.0.5. - [Release notes](https://github.com/projectdiscovery/ipranger/releases) - [Commits](https://github.com/projectdiscovery/ipranger/compare/v0.0.4...v0.0.5) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/ipranger dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- v2/go.mod | 4 ++-- v2/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 5c2eaf14..b6d5a90e 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -16,7 +16,7 @@ require ( github.com/projectdiscovery/freeport v0.0.5 github.com/projectdiscovery/goflags v0.1.6 github.com/projectdiscovery/gologger v1.1.8 - github.com/projectdiscovery/ipranger v0.0.4 + github.com/projectdiscovery/ipranger v0.0.5 github.com/projectdiscovery/mapcidr v1.1.0 github.com/projectdiscovery/networkpolicy v0.0.4 github.com/projectdiscovery/ratelimit v0.0.6 @@ -63,7 +63,7 @@ require ( github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/projectdiscovery/asnmap v1.0.0 // indirect - github.com/projectdiscovery/hmap v0.0.6 // indirect + github.com/projectdiscovery/hmap v0.0.7 // indirect github.com/projectdiscovery/iputil v0.0.2 // indirect github.com/projectdiscovery/retryabledns v1.0.20 // indirect github.com/projectdiscovery/stringsutil v0.0.2 // indirect diff --git a/v2/go.sum b/v2/go.sum index 1a4f4246..00bb9606 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -280,10 +280,10 @@ github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhN github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= github.com/projectdiscovery/gologger v1.1.8 h1:CFlCzGlqAhPqWIrAXBt1OVh5jkMs1qgoR/z4xhdzLNE= github.com/projectdiscovery/gologger v1.1.8/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= -github.com/projectdiscovery/hmap v0.0.6 h1:nwF553wjvDdFF6QtlVfB80koojn8WfJGOQvkW0dzDuk= -github.com/projectdiscovery/hmap v0.0.6/go.mod h1:xXSxFWk/zyiBrreQqgLTEnGYhufafVcCSXESBnqKOBU= -github.com/projectdiscovery/ipranger v0.0.4 h1:zYlsSYdl0702DyM+Af2ipMRs2pv7bPiVgV72jsbHAPY= -github.com/projectdiscovery/ipranger v0.0.4/go.mod h1:myfz4wwq86IOltKb3XJkiuJVVKtK4bNXSIRlHKrwSXM= +github.com/projectdiscovery/hmap v0.0.7 h1:pGNR+XLEOEDM3He3P0PXzszA0vCxNocXHLGeuA4Gf28= +github.com/projectdiscovery/hmap v0.0.7/go.mod h1:xXSxFWk/zyiBrreQqgLTEnGYhufafVcCSXESBnqKOBU= +github.com/projectdiscovery/ipranger v0.0.5 h1:CQy6cRjlmEy42ka/zMo7YTHPKxmOdAIwEvnFllr50L0= +github.com/projectdiscovery/ipranger v0.0.5/go.mod h1:e++Vf4mdC3IlsEgVva5bJGfAX+FDcm74tB1xvtnnPLI= github.com/projectdiscovery/iputil v0.0.2 h1:f6IGnZF4RImJLysPSPG3D84jyTH34q3lihCFeP+eZzI= github.com/projectdiscovery/iputil v0.0.2/go.mod h1:J3Pcz1q51pi4/JL871mQztg0KOzyWDPxnPLOYJm2pVQ= github.com/projectdiscovery/mapcidr v1.1.0 h1:Yeb+CGVsRYvHmZ9YSHb9iy4tzY9YuOm3oTFX/xzGhVU= From 23e56d52c9275e85231af62eda432ad6d9494d7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 14:02:38 +0000 Subject: [PATCH 63/68] chore(deps): bump github.com/projectdiscovery/dnsx in /v2 Bumps [github.com/projectdiscovery/dnsx](https://github.com/projectdiscovery/dnsx) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/projectdiscovery/dnsx/releases) - [Changelog](https://github.com/projectdiscovery/dnsx/blob/main/.goreleaser.yml) - [Commits](https://github.com/projectdiscovery/dnsx/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/dnsx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- v2/go.mod | 8 ++++---- v2/go.sum | 19 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index b6d5a90e..6547dac3 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -11,7 +11,7 @@ require ( github.com/projectdiscovery/blackrock v0.0.0-20221117191031-9e84f9d7a54c github.com/projectdiscovery/cdncheck v0.0.3 github.com/projectdiscovery/clistats v0.0.12 - github.com/projectdiscovery/dnsx v1.1.1 + github.com/projectdiscovery/dnsx v1.1.2 github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.5 github.com/projectdiscovery/goflags v0.1.6 @@ -63,9 +63,9 @@ require ( github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/projectdiscovery/asnmap v1.0.0 // indirect - github.com/projectdiscovery/hmap v0.0.7 // indirect + github.com/projectdiscovery/hmap v0.0.8 // indirect github.com/projectdiscovery/iputil v0.0.2 // indirect - github.com/projectdiscovery/retryabledns v1.0.20 // indirect + github.com/projectdiscovery/retryabledns v1.0.21 // indirect github.com/projectdiscovery/stringsutil v0.0.2 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect @@ -85,7 +85,7 @@ require ( github.com/ulikunitz/xz v0.5.10 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect - go.etcd.io/bbolt v1.3.6 // indirect + go.etcd.io/bbolt v1.3.7 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/text v0.7.0 // indirect diff --git a/v2/go.sum b/v2/go.sum index 00bb9606..b325ae4f 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -239,8 +239,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7MQ= github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -270,8 +270,8 @@ github.com/projectdiscovery/cdncheck v0.0.3 h1:li2/rUJmhVXSqRFyhJMqi6pdBX6ZxMnwz github.com/projectdiscovery/cdncheck v0.0.3/go.mod h1:EevMeCG1ogBoUJYaa0Mv9R1VUboDm/DiynId7DboKy0= github.com/projectdiscovery/clistats v0.0.12 h1:KLYJxpiwEFidduU4PbcwEcCQ2L7c5wrf7DI5IN5fZ+8= github.com/projectdiscovery/clistats v0.0.12/go.mod h1:9luKJj+7Hjq3+a7g129sKWRYx4SbTdkUWZQxabn3H5Y= -github.com/projectdiscovery/dnsx v1.1.1 h1:yGYEH1vfVN7YdvdOtPzPvrc6JuHCi8wBTAkStP/f2QI= -github.com/projectdiscovery/dnsx v1.1.1/go.mod h1:DVvc+ePRCknahLpz4Y8nMppYOGUZhkEmYsTPuYx1a5w= +github.com/projectdiscovery/dnsx v1.1.2 h1:xGP2yK+uoQoO0k4+9C+LKr3ltmXPSJx/ivrS0E41G8c= +github.com/projectdiscovery/dnsx v1.1.2/go.mod h1:W23Ll7a8Iwk6TGN0YvvINMvriCF+pn6E4gdgd/XWJak= github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUdeVcmhmc= github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I= github.com/projectdiscovery/freeport v0.0.5 h1:jnd3Oqsl4S8n0KuFkE5Hm8WGDP24ITBvmyw5pFTHS8Q= @@ -280,8 +280,8 @@ github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhN github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= github.com/projectdiscovery/gologger v1.1.8 h1:CFlCzGlqAhPqWIrAXBt1OVh5jkMs1qgoR/z4xhdzLNE= github.com/projectdiscovery/gologger v1.1.8/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= -github.com/projectdiscovery/hmap v0.0.7 h1:pGNR+XLEOEDM3He3P0PXzszA0vCxNocXHLGeuA4Gf28= -github.com/projectdiscovery/hmap v0.0.7/go.mod h1:xXSxFWk/zyiBrreQqgLTEnGYhufafVcCSXESBnqKOBU= +github.com/projectdiscovery/hmap v0.0.8 h1:4Jn3H0gHeibJAvJuyVIZMszzALOurd8PKmgRrXfuhLc= +github.com/projectdiscovery/hmap v0.0.8/go.mod h1:6V6eZru59wNZVtJB/NeiGUaZxBIR8vD97Ok2o9mXsyk= github.com/projectdiscovery/ipranger v0.0.5 h1:CQy6cRjlmEy42ka/zMo7YTHPKxmOdAIwEvnFllr50L0= github.com/projectdiscovery/ipranger v0.0.5/go.mod h1:e++Vf4mdC3IlsEgVva5bJGfAX+FDcm74tB1xvtnnPLI= github.com/projectdiscovery/iputil v0.0.2 h1:f6IGnZF4RImJLysPSPG3D84jyTH34q3lihCFeP+eZzI= @@ -292,8 +292,8 @@ github.com/projectdiscovery/networkpolicy v0.0.4 h1:zcGjEqZbyECZEdyCy1jVuwOS7Ww1 github.com/projectdiscovery/networkpolicy v0.0.4/go.mod h1:DIXwKs3sQyfCoWHKRLQiRrEorSQW4Zrh4ftu7oDVK6w= github.com/projectdiscovery/ratelimit v0.0.6 h1:SAD2ArdT9F8NmbkAIZpl7DjNnbiXdUQLnMZt5dbVmZ0= github.com/projectdiscovery/ratelimit v0.0.6/go.mod h1:WFL6gIggPLTwYwDbxqQODuWrz/lcMP2E5ofKSAz3YwI= -github.com/projectdiscovery/retryabledns v1.0.20 h1:grRyh4EzuyqsaK07iNkJKgrGLu/qDJwfDJ+83SBo6yo= -github.com/projectdiscovery/retryabledns v1.0.20/go.mod h1:97Et22Kw2iPyvz/Vn41/i3dSbhLMHfeWP/S7EaLgmtg= +github.com/projectdiscovery/retryabledns v1.0.21 h1:vOpPQR1q8Z824uoA8JXCI/RyvDAssPeD68Onz9hP/ds= +github.com/projectdiscovery/retryabledns v1.0.21/go.mod h1:6oTPKMRlKZ7lIIEzTH723K6RvNRjmm6fe9br4Dom3UI= github.com/projectdiscovery/retryablehttp-go v1.0.11 h1:dxJy/qR+4uOQ7th4rq8nIrW7EegvkB8JfaoKCyoz6zo= github.com/projectdiscovery/retryablehttp-go v1.0.11/go.mod h1:RWViUDjf9NTx1j8HatkstoSj2hE4xrrDIum1SsQqZfE= github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZAja8BH3LqqJXMA= @@ -396,8 +396,8 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= @@ -471,7 +471,6 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From cb507b87630ec50110d971b45d67b8125fe7d03a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 14:02:49 +0000 Subject: [PATCH 64/68] chore(deps): bump golang.org/x/net from 0.6.0 to 0.7.0 in /v2 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index b6d5a90e..08cd929e 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -27,7 +27,7 @@ require ( github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 - golang.org/x/net v0.6.0 + golang.org/x/net v0.7.0 golang.org/x/sys v0.5.0 ) diff --git a/v2/go.sum b/v2/go.sum index 00bb9606..4f50e9b8 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -444,8 +444,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From c8d27c72ee8b81f8c6f34d49c5e1881879ab4bfd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 13:57:02 +0000 Subject: [PATCH 65/68] chore(deps): bump golang from 1.20.0-alpine to 1.20.1-alpine Bumps golang from 1.20.0-alpine to 1.20.1-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 36344c8d..acd26af2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.0-alpine AS builder +FROM golang:1.20.1-alpine AS builder RUN apk add build-base libpcap-dev RUN go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest From 68aa3fceadba19d30a3da6f4477620c1f7a084b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 14:15:53 +0000 Subject: [PATCH 66/68] chore(deps): bump github.com/projectdiscovery/utils in /v2 Bumps [github.com/projectdiscovery/utils](https://github.com/projectdiscovery/utils) from 0.0.9 to 0.0.10. - [Release notes](https://github.com/projectdiscovery/utils/releases) - [Commits](https://github.com/projectdiscovery/utils/compare/v0.0.9...v0.0.10) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/utils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index eb0be4cf..6e319b73 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -22,7 +22,7 @@ require ( github.com/projectdiscovery/ratelimit v0.0.6 github.com/projectdiscovery/retryablehttp-go v1.0.11 github.com/projectdiscovery/uncover v1.0.2 - github.com/projectdiscovery/utils v0.0.9 + github.com/projectdiscovery/utils v0.0.10 github.com/remeh/sizedwaitgroup v1.0.0 github.com/stretchr/testify v1.8.1 go.uber.org/multierr v1.9.0 diff --git a/v2/go.sum b/v2/go.sum index 0bc28228..0f5c2e8f 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -300,8 +300,8 @@ github.com/projectdiscovery/stringsutil v0.0.2 h1:uzmw3IVLJSMW1kEg8eCStG/cGbYYZA github.com/projectdiscovery/stringsutil v0.0.2/go.mod h1:EJ3w6bC5fBYjVou6ryzodQq37D5c6qbAYQpGmAy+DC0= github.com/projectdiscovery/uncover v1.0.2 h1:mRFzflYyvwKkHd3XKufMlDRrb6p1mjFZTSHoNAUpFwo= github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY= -github.com/projectdiscovery/utils v0.0.9 h1:+bmjtRU1IWt5dKg9+9TbIaRkw/kN05myCXDOhCQRX7g= -github.com/projectdiscovery/utils v0.0.9/go.mod h1:dZqlayNwgCGn2HgYfKrI71RjBEyKsEPovrU+UDfpQWw= +github.com/projectdiscovery/utils v0.0.10 h1:WU/sJJgE4RrXuhooKk+PKcIaTc/MT9B+ohdnK6hgpsE= +github.com/projectdiscovery/utils v0.0.10/go.mod h1:dZqlayNwgCGn2HgYfKrI71RjBEyKsEPovrU+UDfpQWw= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= From 9ca7c12c42112cce6e46eead57a4563427de753e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 14:16:12 +0000 Subject: [PATCH 67/68] chore(deps): bump github.com/projectdiscovery/goflags in /v2 Bumps [github.com/projectdiscovery/goflags](https://github.com/projectdiscovery/goflags) from 0.1.6 to 0.1.7. - [Release notes](https://github.com/projectdiscovery/goflags/releases) - [Commits](https://github.com/projectdiscovery/goflags/compare/v0.1.6...v0.1.7) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/goflags dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index eb0be4cf..823539e8 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -14,7 +14,7 @@ require ( github.com/projectdiscovery/dnsx v1.1.2 github.com/projectdiscovery/fdmax v0.0.4 github.com/projectdiscovery/freeport v0.0.5 - github.com/projectdiscovery/goflags v0.1.6 + github.com/projectdiscovery/goflags v0.1.7 github.com/projectdiscovery/gologger v1.1.8 github.com/projectdiscovery/ipranger v0.0.5 github.com/projectdiscovery/mapcidr v1.1.0 diff --git a/v2/go.sum b/v2/go.sum index 0bc28228..eb6f6203 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -276,8 +276,8 @@ github.com/projectdiscovery/fdmax v0.0.4 h1:K9tIl5MUZrEMzjvwn/G4drsHms2aufTn1xUd github.com/projectdiscovery/fdmax v0.0.4/go.mod h1:oZLqbhMuJ5FmcoaalOm31B1P4Vka/CqP50nWjgtSz+I= github.com/projectdiscovery/freeport v0.0.5 h1:jnd3Oqsl4S8n0KuFkE5Hm8WGDP24ITBvmyw5pFTHS8Q= github.com/projectdiscovery/freeport v0.0.5/go.mod h1:PY0bxSJ34HVy67LHIeF3uIutiCSDwOqKD8ruBkdiCwE= -github.com/projectdiscovery/goflags v0.1.6 h1:EXigzX4lJmn/fLMnULdc03O7WW+DjiYZhNgdGvfg+Z4= -github.com/projectdiscovery/goflags v0.1.6/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= +github.com/projectdiscovery/goflags v0.1.7 h1:KvMs1KnXMWRhJiJj6K+cWurTWpbDYYlo+1cyGvf1YCc= +github.com/projectdiscovery/goflags v0.1.7/go.mod h1:yILgA7gbrHuTpIvMfikbivzoxkyxBD1Y5/PRHiGTIFk= github.com/projectdiscovery/gologger v1.1.8 h1:CFlCzGlqAhPqWIrAXBt1OVh5jkMs1qgoR/z4xhdzLNE= github.com/projectdiscovery/gologger v1.1.8/go.mod h1:bNyVaC1U/NpJtFkJltcesn01NR3K8Hg6RsLVce6yvrw= github.com/projectdiscovery/hmap v0.0.8 h1:4Jn3H0gHeibJAvJuyVIZMszzALOurd8PKmgRrXfuhLc= From 1f533d0a052a1d1e4969a510128b0bee46b7d188 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Thu, 23 Feb 2023 20:22:37 +0530 Subject: [PATCH 68/68] workflow update (#570) * workflow update * added stale config * workflow fix --- .github/stale.yml | 27 +++++++++++++++++ .github/workflows/build-test.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dockerhub-push.yml | 6 ++-- .github/workflows/functional-test.yml | 2 +- .github/workflows/lint-test.yml | 2 +- .github/workflows/release-binary.yml | 6 ++-- .github/workflows/sonarcloud.yml | 43 --------------------------- v2/.goreleaser/linux.yml | 6 +++- v2/pkg/runner/banners.go | 7 ++--- 10 files changed, 45 insertions(+), 58 deletions(-) create mode 100644 .github/stale.yml delete mode 100644 .github/workflows/sonarcloud.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 00000000..75d7ee02 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,27 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 7 + +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 7 + +# Issues with these labels will never be considered stale +# exemptLabels: +# - pinned +# - security + +# Only issues or pull requests with all of these labels are check if stale. +onlyLabels: + - "Status: Abandoned" + - "Type: Question" + +# Label to use when marking as stale +staleLabel: stale + +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. + +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false \ No newline at end of file diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ef7bf450..ddef6c94 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -5,7 +5,7 @@ on: jobs: build-linux: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores steps: - name: Set up Go uses: actions/setup-go@v3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3b03ce6c..a75d0e71 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,7 +9,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores permissions: actions: read contents: read diff --git a/.github/workflows/dockerhub-push.yml b/.github/workflows/dockerhub-push.yml index 9053b84b..fd678247 100644 --- a/.github/workflows/dockerhub-push.yml +++ b/.github/workflows/dockerhub-push.yml @@ -9,7 +9,7 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores steps: - name: Checkout uses: actions/checkout@v3 @@ -17,7 +17,7 @@ jobs: - name: Get Github tag id: meta run: | - echo "::set-output name=tag::$(curl --silent "https://api.github.com/repos/projectdiscovery/naabu/releases/latest" | jq -r .tag_name)" + curl --silent "https://api.github.com/repos/projectdiscovery/naabu/releases/latest" | jq -r .tag_name | xargs -I {} echo TAG={} >> $GITHUB_OUTPUT - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -37,4 +37,4 @@ jobs: context: . platforms: linux/amd64,linux/arm64,linux/arm push: true - tags: projectdiscovery/naabu:latest,projectdiscovery/naabu:${{ steps.meta.outputs.tag }} + tags: projectdiscovery/naabu:latest,projectdiscovery/naabu:${{ steps.meta.outputs.TAG }} diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml index 16e0373d..06b35eea 100644 --- a/.github/workflows/functional-test.yml +++ b/.github/workflows/functional-test.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] # Todo: windows-latest, macOS-latest + os: [ubuntu-latest-16-cores] # Todo: windows-latest, macOS-latest steps: - name: Set up Go diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 1ccc185c..5e3a004d 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -6,7 +6,7 @@ on: jobs: lint: name: Lint Test - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 3c8dfdcb..1d8c49eb 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -30,7 +30,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-linux: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores steps: - name: Code checkout uses: actions/checkout@v3 @@ -52,9 +52,11 @@ jobs: 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 }}" build-windows: - runs-on: windows-latest + runs-on: windows-latest-8-cores steps: - name: Code checkout uses: actions/checkout@v3 diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml deleted file mode 100644 index a0c9eeae..00000000 --- a/.github/workflows/sonarcloud.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: ๐Ÿ‘ฎ๐Ÿผโ€โ™‚๏ธ Sonarcloud -on: - push: - branches: - - master - - dev - pull_request: - types: [opened, synchronize, reopened] - workflow_dispatch: - -jobs: - sonarcloud: - name: SonarCloud - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - - name: "Set up Go" - uses: actions/setup-go@v3 - with: - go-version: 1.19 - - - name: Install Dependences - run: sudo apt install libpcap-dev - - - name: Run unit Tests - working-directory: v2/ - run: | - go test -coverprofile=cov.out ./... - - - name: Run Gosec Security Scanner - working-directory: v2/ - run: | - go install github.com/securego/gosec/cmd/gosec@latest - gosec -no-fail -fmt=sonarqube -out report.json ./... - - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file diff --git a/v2/.goreleaser/linux.yml b/v2/.goreleaser/linux.yml index 3da8f476..e61d9dd7 100644 --- a/v2/.goreleaser/linux.yml +++ b/v2/.goreleaser/linux.yml @@ -27,4 +27,8 @@ announce: enabled: true channel: '#release' username: GoReleaser - message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}' \ No newline at end of file + message_template: 'New Release: {{ .ProjectName }} {{.Tag}} is published! Check it out at {{ .ReleaseURL }}' + + discord: + enabled: true + message_template: '**New Release: {{ .ProjectName }} {{.Tag}}** is published! Check it out at {{ .ReleaseURL }}' \ No newline at end of file diff --git a/v2/pkg/runner/banners.go b/v2/pkg/runner/banners.go index af432d34..4372469f 100644 --- a/v2/pkg/runner/banners.go +++ b/v2/pkg/runner/banners.go @@ -13,19 +13,16 @@ const banner = ` __ ___ ___ ___ _/ / __ __ / _ \/ _ \/ _ \/ _ \/ // / -/_//_/\_,_/\_,_/_.__/\_,_/ v2.1.1 +/_//_/\_,_/\_,_/_.__/\_,_/ v2.1.2 ` // Version is the current version of naabu -const Version = `2.1.1` +const Version = `2.1.2` // showBanner is used to show the banner to the user func showBanner() { gologger.Print().Msgf("%s\n", banner) gologger.Print().Msgf("\t\tprojectdiscovery.io\n\n") - - gologger.Print().Msgf("Use with caution. You are responsible for your actions\n") - gologger.Print().Msgf("Developers assume no liability and are not responsible for any misuse or damage.\n") } // showNetworkCapabilities shows the network capabilities/scan types possible with the running user