Merge pull request #768 from projectdiscovery/dev

v2.5.6 (maintenance release)

.github/workflows/build-test.yml

@@ -1,6 +1,6 @@
 name: 🔨 Build Test
+
 on:
-  push:
   pull_request:
   workflow_dispatch:
 
@@ -10,12 +10,12 @@ 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
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Check out code
         uses: actions/checkout@v3
@@ -24,9 +24,12 @@ jobs:
         run: go build ./...
         working-directory: v2/
 
-      - name: Test
-        run: go test ./...
-        working-directory: v2/
+      - name: Run tests
+        uses: nick-invision/retry@v2
+        with:
+          timeout_seconds: 360
+          max_attempts: 3
+          command: cd v2; go test ./... -v
 
       - name: Integration Tests
         env:

.github/workflows/dockerhub-push.yml

@@ -9,16 +9,15 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
-
       - name: 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/subfinder/releases/latest" | jq -r .tag_name)"
+          curl --silent "https://api.github.com/repos/projectdiscovery/subfinder/releases/latest" | jq -r .tag_name | xargs -I {} echo TAG={} >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -33,9 +32,9 @@ 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
           push: true
-          tags: projectdiscovery/subfinder:latest,projectdiscovery/subfinder:${{ steps.meta.outputs.tag }}
+          tags: projectdiscovery/subfinder:latest,projectdiscovery/subfinder:${{ steps.meta.outputs.TAG }}

.github/workflows/lint-test.yml

@@ -1,20 +1,19 @@
 name: 🙏🏻 Lint Test
 on:
-  push:
   pull_request:
   workflow_dispatch:
 
 jobs:
   lint:
     name: Lint Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with: 
-          go-version: 1.18
+          go-version: 1.19
       - 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

.github/workflows/release-binary.yml

@@ -1,14 +1,14 @@
 name: 🎉 Release Binary
 
 on:
-  create:
+  push:
     tags:
       - v*
   workflow_dispatch:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - name: "Check out code"
         uses: actions/checkout@v3
@@ -18,7 +18,7 @@ jobs:
       - name: "Set up Go"
         uses: actions/setup-go@v3
         with: 
-          go-version: 1.18
+          go-version: 1.19
 
       - name: "Create release on GitHub"
         uses: goreleaser/goreleaser-action@v3
@@ -28,4 +28,6 @@ jobs:
           workdir: v2/
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"
+          SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"
+          DISCORD_WEBHOOK_ID: "${{ secrets.DISCORD_WEBHOOK_ID }}"
+          DISCORD_WEBHOOK_TOKEN: "${{ secrets.DISCORD_WEBHOOK_TOKEN }}"

.gitignore

@@ -7,3 +7,4 @@ v2/subfinder
 vendor/
 .idea
 .devcontainer
+dist

Dockerfile

@@ -1,11 +1,11 @@
 # Build
 
-FROM golang:1.19.2-alpine AS build-env
+FROM golang:1.20.1-alpine AS build-env
 RUN apk add build-base
 RUN go install -v github.com/projectdiscovery/subfinder/v2/cmd/subfinder@latest
 
 # Release
-FROM alpine:3.16.3
+FROM alpine:3.17.2
 RUN apk -U upgrade --no-cache \
     && apk add --no-cache bind-tools ca-certificates
 COPY --from=build-env /go/bin/subfinder /usr/local/bin/subfinder

v2/.goreleaser.yml

@@ -37,4 +37,8 @@ announce:
     enabled: true
     channel: '#release'
     username: GoReleaser
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
+    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 }}'

v2/go.mod

@@ -8,19 +8,20 @@ require (
 	github.com/json-iterator/go v1.1.12
 	github.com/lib/pq v1.10.7
 	github.com/projectdiscovery/chaos-client v0.3.0
-	github.com/projectdiscovery/dnsx v1.1.1
+	github.com/projectdiscovery/dnsx v1.1.2
 	github.com/projectdiscovery/fdmax v0.0.4
-	github.com/projectdiscovery/fileutil v0.0.3
-	github.com/projectdiscovery/gologger v1.1.5-0.20220817095646-8663411b1b0b
-	github.com/projectdiscovery/ratelimit v0.0.1
+	github.com/projectdiscovery/gologger v1.1.8
+	github.com/projectdiscovery/ratelimit v0.0.6
+	github.com/projectdiscovery/utils v0.0.10
 	github.com/rs/xid v1.4.0
 	github.com/stretchr/testify v1.8.1
 	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
+	golang.org/x/exp v0.0.0-20221230185412-738e83a70c30
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	github.com/Mzack9999/go-http-digest-auth-client v0.6.1-0.20220414142836-eb8883508809 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
@@ -30,23 +31,19 @@ require (
 	github.com/microcosm-cc/bluemonday v1.0.21 // indirect
 	github.com/nwaples/rardecode v1.1.0 // indirect
 	github.com/pierrec/lz4 v2.6.0+incompatible // indirect
-	github.com/projectdiscovery/blackrock v0.0.0-20220628111055-35616c71b2dc // indirect
 	github.com/projectdiscovery/cdncheck v0.0.3 // indirect
 	github.com/projectdiscovery/httputil v0.0.0-20210906072657-f3a099cb20bc // indirect
-	github.com/projectdiscovery/iputil v0.0.0-20220712175312-b9406f31cdd8 // indirect
-	github.com/projectdiscovery/mapcidr v1.0.1 // indirect
-	github.com/projectdiscovery/retryablehttp-go v1.0.2 // indirect
-	github.com/projectdiscovery/sliceutil v0.0.0-20220625085859-c3a4ecb669f4 // indirect
+	github.com/projectdiscovery/retryablehttp-go v1.0.10 // indirect
 	github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect
-	github.com/ulikunitz/xz v0.5.7 // indirect
+	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
-	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.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/tools v0.1.12 // indirect
-	gopkg.in/djherbis/times.v1 v1.2.0 // indirect
+	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/tools v0.2.0 // indirect
+	gopkg.in/djherbis/times.v1 v1.3.0 // indirect
 )
 
 require (
@@ -58,9 +55,8 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/projectdiscovery/goflags v0.1.3
-	github.com/projectdiscovery/retryabledns v1.0.15 // indirect
-	github.com/projectdiscovery/stringsutil v0.0.2 // indirect
-	golang.org/x/net v0.1.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
+	github.com/projectdiscovery/goflags v0.1.7
+	github.com/projectdiscovery/retryabledns v1.0.21 // indirect
+	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
 )