Merge pull request #654 from projectdiscovery/dev

naabu v2.1.6

.github/workflows/build-test.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build-linux:
-    runs-on: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     steps:
       - name: Set up Go
         uses: actions/setup-go@v4
@@ -45,7 +45,7 @@ jobs:
         working-directory: v2/cmd/naabu/
 
   build-mac:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - name: Set up Go
         uses: actions/setup-go@v4

.github/workflows/lint-test.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   lint:
     name: Lint Test
-    runs-on: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.github/workflows/release-binary.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-mac:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - name: Code checkout
         uses: actions/checkout@v3

Dockerfile

@@ -1,5 +1,5 @@
 # Build
-FROM golang:1.20.2-alpine AS builder
+FROM golang:1.20.3-alpine AS builder
 RUN apk add build-base libpcap-dev
 WORKDIR /app
 COPY . /app
@@ -8,7 +8,7 @@ RUN go mod download
 RUN go build ./cmd/naabu
 
 # Release
-FROM alpine:3.17.2
+FROM alpine:3.17.3
 RUN apk add nmap libpcap-dev bind-tools ca-certificates nmap-scripts
 COPY --from=builder /app/v2/naabu /usr/local/bin/
 ENTRYPOINT ["naabu"]

README.md

@@ -124,8 +124,9 @@ DEBUG:
    -no-color, -nc            disable colors in CLI output
    -silent                   display only results in output
    -version                  display version of naabu
-   -stats                    display stats of the running scan
-   -si, -stats-interval int  number of seconds to wait between showing a statistics update (default 5)
+   -stats                    display stats of the running scan (deprecated)
+   -si, -stats-interval int  number of seconds to wait between showing a statistics update (default 5) (deprecated)
+   -mp, -metrics-port int    port to expose nuclei metrics on (default 63636)
 ```
 
 # Installation Instructions
@@ -345,6 +346,9 @@ Naabu also supports excluding CDN IPs being port scanned. If used, only `80` and
 
 Currently `cloudflare`, `akamai`, `incapsula` and `sucuri` IPs are supported for exclusions.
 
+# Scan Status
+Naabu exposes json scan info on a local port bound to localhost at `http://localhost:63636` (the port can be changed via the `-metrics-port` flag)
+
 # Using naabu as library
 The following sample program scan the port `80` of `scanme.sh`. The results are returned via the `OnResult` callback:
 

v2/go.mod

@@ -6,34 +6,34 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
 	github.com/google/gopacket v1.1.19
 	github.com/logrusorgru/aurora v2.0.3+incompatible
-	github.com/miekg/dns v1.1.52
+	github.com/miekg/dns v1.1.53
 	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/blackrock v0.0.1
+	github.com/projectdiscovery/cdncheck v1.0.1
 	github.com/projectdiscovery/clistats v0.0.15
-	github.com/projectdiscovery/dnsx v1.1.3
+	github.com/projectdiscovery/dnsx v1.1.4
 	github.com/projectdiscovery/fdmax v0.0.4
 	github.com/projectdiscovery/freeport v0.0.5
 	github.com/projectdiscovery/goflags v0.1.8
 	github.com/projectdiscovery/gologger v1.1.8
-	github.com/projectdiscovery/ipranger v0.0.5
+	github.com/projectdiscovery/ipranger v0.0.6
 	github.com/projectdiscovery/mapcidr v1.1.1
 	github.com/projectdiscovery/networkpolicy v0.0.5
 	github.com/projectdiscovery/ratelimit v0.0.6
-	github.com/projectdiscovery/retryablehttp-go v1.0.14
+	github.com/projectdiscovery/retryablehttp-go v1.0.15
 	github.com/projectdiscovery/uncover v1.0.3
-	github.com/projectdiscovery/utils v0.0.18
+	github.com/projectdiscovery/utils v0.0.25
 	github.com/remeh/sizedwaitgroup v1.0.0
 	github.com/stretchr/testify v1.8.2
-	go.uber.org/multierr v1.10.0
-	golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0
-	golang.org/x/net v0.8.0
-	golang.org/x/sys v0.6.0
+	go.uber.org/multierr v1.11.0
+	golang.org/x/exp v0.0.0-20230420155640-133eef4313cb
+	golang.org/x/net v0.9.0
+	golang.org/x/sys v0.7.0
 )
 
 require (
 	aead.dev/minisign v0.2.0 // indirect
-	github.com/Masterminds/semver/v3 v3.2.0 // indirect
+	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/akrylysov/pogreb v0.10.1 // indirect
@@ -64,35 +64,36 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.15.1 // indirect
-	github.com/nwaples/rardecode v1.1.0 // indirect
+	github.com/nwaples/rardecode v1.1.3 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/pierrec/lz4 v2.6.0+incompatible // indirect
+	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/projectdiscovery/asnmap v1.0.2 // indirect
-	github.com/projectdiscovery/hmap v0.0.10 // indirect
-	github.com/projectdiscovery/retryabledns v1.0.21 // indirect
+	github.com/projectdiscovery/asnmap v1.0.3 // indirect
+	github.com/projectdiscovery/hmap v0.0.11 // indirect
+	github.com/projectdiscovery/retryabledns v1.0.23 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
-	github.com/tidwall/btree v1.4.3 // indirect
+	github.com/tidwall/btree v1.6.0 // indirect
 	github.com/tidwall/buntdb v1.2.10 // indirect
-	github.com/tidwall/gjson v1.14.3 // indirect
+	github.com/tidwall/gjson v1.14.4 // 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/pretty v1.2.1 // 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/ulikunitz/xz v0.5.11 // indirect
+	github.com/weppos/publicsuffix-go v0.30.0 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/yl2chen/cidranger v1.0.2 // indirect
 	github.com/yuin/goldmark v1.5.4 // indirect
 	github.com/yuin/goldmark-emoji v1.0.1 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
 	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/mod v0.9.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/oauth2 v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/tools v0.8.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.29.1 // indirect
 	gopkg.in/djherbis/times.v1 v1.3.0 // indirect