Merge pull request #331 from projectdiscovery/dev

dsnx v1.1.3

.github/workflows/build-test.yml

@@ -2,6 +2,9 @@ name: 🔨 Build Test
 
 on:
  pull_request:
+ paths:
+ - '**.go'
+ - '**.mod'
  workflow_dispatch:
 
 jobs:
@@ -10,7 +13,7 @@ jobs:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- os: [ubuntu-latest, windows-latest, macOS-latest]
+ os: [ubuntu-latest-16-cores, windows-latest-8-cores, macOS-latest]
  steps:
  - name: Set up Go
  uses: actions/setup-go@v3
@@ -35,7 +38,7 @@ jobs:
  working-directory: integration_tests/
 
  - name: Race Condition Tests
- run: go build -race .
+ run: go run -race .
  working-directory: cmd/dnsx/
 
 

.github/workflows/codeql-analysis.yml

@@ -3,6 +3,9 @@ name: 🚨 CodeQL Analysis
 on:
  workflow_dispatch:
  pull_request:
+ paths:
+ - '**.go'
+ - '**.mod'
  branches:
  - dev
 

.github/workflows/dockerhub-push.yml

@@ -9,15 +9,15 @@ on:
 
 jobs:
  docker:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-latest-16-cores
  steps:
  - name: Git Checkout
  uses: actions/checkout@v3
 
  - name: Get Github tag
  id: meta
  run: |
- echo "::set-output name=tag::$(curl --silent "https://api.github.com/repos/projectdiscovery/dnsx/releases/latest" | jq -r .tag_name)"
+ curl --silent "https://api.github.com/repos/projectdiscovery/dnsx/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/dnsx:latest,projectdiscovery/dnsx:${{ steps.meta.outputs.tag }}
+ tags: projectdiscovery/dnsx:latest,projectdiscovery/dnsx:${{ steps.meta.outputs.TAG }}

.github/workflows/functional-test.yml

@@ -10,7 +10,7 @@ jobs:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- os: [ubuntu-latest, windows-latest, macOS-latest]
+ os: [ubuntu-latest-16-cores, windows-latest-8-cores, macOS-latest]
  steps:
  - name: Set up Go
  uses: actions/setup-go@v3

.github/workflows/lint-test.yml

@@ -7,7 +7,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

.github/workflows/release-binary.yml

@@ -8,7 +8,7 @@ on:
 
 jobs: 
  release: 
- runs-on: ubuntu-latest
+ runs-on: ubuntu-latest-16-cores
  steps: 
  - name: "Check out code"
  uses: actions/checkout@v3

Dockerfile

@@ -1,8 +1,16 @@
-FROM golang:1.20-alpine3.17 AS build-env
+# Base
+FROM golang:1.20.2-alpine AS builder
+
 RUN apk add --no-cache build-base
-RUN go install -v github.com/projectdiscovery/dnsx/cmd/dnsx@latest
+WORKDIR /app
+COPY . /app
+RUN go mod download
+RUN go build ./cmd/dnsx
 
+# Release
 FROM alpine:3.17.2
-RUN apk add --no-cache bind-tools ca-certificates
-COPY --from=build-env /go/bin/dnsx /usr/local/bin/dnsx
-ENTRYPOINT ["dnsx"]
+RUN apk -U upgrade --no-cache \
+ && apk add --no-cache bind-tools ca-certificates
+COPY --from=builder /app/dnsx /usr/local/bin/
+
+ENTRYPOINT ["dnsx"]

README.md

@@ -95,6 +95,10 @@ RATE-LIMIT:
  -t, -threads int number of concurrent threads to use (default 100)
  -rl, -rate-limit int number of dns request/second to make (disabled as default) (default -1)
 
+UPDATE:
+ -up, -update update dnsx to latest version
+ -duc, -disable-update-check disable automatic dnsx update check
+
 OUTPUT:
  -o, -output string file to write output
  -json write output in JSONL(ines) format

go.mod

@@ -4,66 +4,67 @@ go 1.19
 
 require (
  github.com/logrusorgru/aurora v2.0.3+incompatible
- github.com/miekg/dns v1.1.50
+ github.com/miekg/dns v1.1.52
  github.com/pkg/errors v0.9.1
- github.com/projectdiscovery/asnmap v1.0.0
+ github.com/projectdiscovery/asnmap v1.0.2
  github.com/projectdiscovery/cdncheck v0.0.3
  github.com/projectdiscovery/clistats v0.0.12
- github.com/projectdiscovery/goconfig v0.0.0-20210804090219-f893ccd0c69c
- github.com/projectdiscovery/goflags v0.1.6
+ github.com/projectdiscovery/goconfig v0.0.1
+ github.com/projectdiscovery/goflags v0.1.8
  github.com/projectdiscovery/gologger v1.1.8
- github.com/projectdiscovery/hmap v0.0.8
+ github.com/projectdiscovery/hmap v0.0.10
  github.com/projectdiscovery/mapcidr v1.1.0
  github.com/projectdiscovery/ratelimit v0.0.6
  github.com/projectdiscovery/retryabledns v1.0.21
- github.com/projectdiscovery/utils v0.0.9
+ github.com/projectdiscovery/utils v0.0.16
  github.com/rs/xid v1.4.0
- github.com/stretchr/testify v1.8.1
+ github.com/stretchr/testify v1.8.2
 )
 
 require (
- github.com/DataDog/zstd v1.5.2 // indirect
+ aead.dev/minisign v0.2.0 // indirect
+ github.com/Masterminds/semver/v3 v3.2.0 // 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
- github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
+ github.com/alecthomas/chroma v0.10.0 // indirect
+ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
  github.com/aymerick/douceur v0.2.0 // indirect
- github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/charmbracelet/glamour v0.6.0 // indirect
+ github.com/cheggaaa/pb/v3 v3.1.2 // indirect
  github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 // 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/dlclark/regexp2 v1.8.1 // indirect
  github.com/dsnet/compress v0.0.1 // indirect
- github.com/getsentry/sentry-go v0.16.0 // indirect
- github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/fatih/color v1.14.1 // indirect
+ github.com/fsnotify/fsnotify v1.4.9 // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/golang/snappy v0.0.4 // indirect
+ github.com/google/go-github/v30 v30.1.0 // indirect
+ github.com/google/go-querystring v1.1.0 // indirect
  github.com/gorilla/css v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // 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/lucasb-eyer/go-colorful v1.2.0 // indirect
+ github.com/mattn/go-colorable v0.1.13 // indirect
+ github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-runewidth v0.0.14 // indirect
  github.com/mholt/archiver v3.1.1+incompatible // indirect
- github.com/microcosm-cc/bluemonday v1.0.21 // indirect
+ github.com/microcosm-cc/bluemonday v1.0.23 // indirect
+ github.com/minio/selfupdate v0.6.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  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/nxadm/tail v1.4.8 // indirect
+ github.com/olekukonko/tablewriter v0.0.5 // indirect
  github.com/pierrec/lz4 v2.6.0+incompatible // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/projectdiscovery/blackrock v0.0.0-20221025011524-9e4efe804fb4 // indirect
  github.com/projectdiscovery/freeport v0.0.4 // indirect
- github.com/projectdiscovery/reflectutil v0.0.0-20210804085554-4d90952bf92f // indirect
  github.com/projectdiscovery/retryablehttp-go v1.0.10 // 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/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/buntdb v1.2.10 // indirect
@@ -76,16 +77,21 @@ require (
  github.com/ulikunitz/xz v0.5.8 // 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
  go.uber.org/atomic v1.10.0 // indirect
  go.uber.org/multierr v1.8.0 // indirect
- golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 // indirect
- golang.org/x/mod v0.6.0 // indirect
- golang.org/x/net v0.5.0 // indirect
- golang.org/x/sys v0.4.0 // indirect
- golang.org/x/text v0.6.0 // indirect
- golang.org/x/tools v0.2.0 // indirect
- google.golang.org/protobuf v1.28.1 // indirect
+ golang.org/x/crypto v0.7.0 // indirect
+ golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
+ golang.org/x/mod v0.8.0 // indirect
+ golang.org/x/net v0.8.0 // indirect
+ golang.org/x/oauth2 v0.5.0 // indirect
+ golang.org/x/sys v0.6.0 // indirect
+ golang.org/x/text v0.8.0 // indirect
+ golang.org/x/tools v0.6.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
  gopkg.in/ini.v1 v1.67.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect