Merge pull request #172 from projectdiscovery/dev

Bugfix release

Author: ehsandeep

.github/workflows/release-binary.yml

@@ -1,8 +1,9 @@
 name: 🎉 Release Binary
+
 on:
-  push:
+  create:
     tags:
-      - '*'
+      - v*
   workflow_dispatch:
 
 jobs:
@@ -25,5 +26,6 @@ jobs:
           args: "release --rm-dist"
           version: latest
           workdir: .
-        env: 
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"

.github/workflows/sonarcloud.yml

@@ -27,9 +27,9 @@ jobs:
           go test -coverprofile=./cov.out ./...
 
       - name: Run Gosec Security Scanner
-        run: |
-          go install github.com/securego/gosec/cmd/gosec@latest
-          gosec -no-fail -fmt=sonarqube -out report.json ./...
+        uses: securego/gosec@master
+        with:
+          args: '-no-fail -fmt=sonarqube -out report.json ./...'
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master

.gitignore

@@ -4,3 +4,4 @@ cmd/proxify/logs/*
 .DS_Store
 cmd/replay/replay
 cmd/mitmrelay/mitmrelay
+*.exe

.goreleaser.yml

@@ -14,6 +14,11 @@ builds:
         - 386
         - arm
         - arm64
+      ignore:
+        - goos: windows
+          goarch: 'arm'
+        - goos: windows
+          goarch: 'arm64'
       id: proxify
 
     - binary: replay
@@ -27,6 +32,11 @@ builds:
         - 386
         - arm
         - arm64
+      ignore:
+        - goos: windows
+          goarch: 'arm'
+        - goos: windows
+          goarch: 'arm64'
       id: replay
 
     - binary: mitmrelay
@@ -40,6 +50,11 @@ builds:
         - 386
         - arm
         - arm64
+      ignore:
+        - goos: windows
+          goarch: 'arm'
+        - goos: windows
+          goarch: 'arm64'
       id: mitmrelay
 
 archives:
@@ -49,3 +64,10 @@ archives:
 
 checksum:
   algorithm: sha256
+
+announce:
+  slack:
+    enabled: true
+    channel: '#release'
+    username: GoReleaser
+    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'

Dockerfile

@@ -1,10 +1,10 @@
 # Base
-FROM golang:1.18.3-alpine AS builder
+FROM golang:1.19.2-alpine AS builder
 
 RUN apk add --no-cache git
 RUN go install -v github.com/projectdiscovery/proxify/cmd/proxify@latest
 
-FROM alpine:3.16.0
+FROM alpine:3.16.2
 RUN apk -U upgrade --no-cache \
     && apk add --no-cache bind-tools ca-certificates
 COPY --from=builder /go/bin/proxify /usr/local/bin/

README.md

@@ -106,10 +106,11 @@ CONFIGURATION:
    -deny string          Denied list of IP/CIDR's to be proxied
 
 DEBUG:
-   -silent         Silent
-   -nc, -no-color  No Color (default true)
-   -version        Version
-   -v, -verbose    Verbose
+   -nc, -no-color       No Color (default true)
+   -version             Version
+   -silent              Silent
+   -v, -verbose         Verbose
+   -vv, -very-verbose   Very Verbose
 ```
 
 ### Running Proxify

go.mod

@@ -3,53 +3,53 @@ module github.com/projectdiscovery/proxify
 go 1.17
 
 require (
+	github.com/Knetic/govaluate v3.0.0+incompatible
 	github.com/Mzack9999/roundrobin v0.0.0-20211108110706-e876335f5ad4
-	github.com/Shopify/sarama v1.34.1
+	github.com/Shopify/sarama v1.37.2
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/elastic/go-elasticsearch/v7 v7.17.1
 	github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/haxii/fastproxy v0.5.37
 	github.com/pkg/errors v0.9.1
-	github.com/projectdiscovery/dsl v0.0.2
+	github.com/projectdiscovery/dsl v0.0.3
 	github.com/projectdiscovery/fastdialer v0.0.15
 	github.com/projectdiscovery/goflags v0.0.8-0.20220304165250-2530b305a4a9
 	github.com/projectdiscovery/gologger v1.1.4
 	github.com/projectdiscovery/mapsutil v0.0.2-0.20220531112119-e205a582729c
 	github.com/projectdiscovery/stringsutil v0.0.0-20220208075244-7c05502ca8e9
 	github.com/projectdiscovery/tinydns v0.0.1
 	github.com/rs/xid v1.4.0
-	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2
+	golang.org/x/net v0.0.0-20220927171203-f486391704dc
 )
 
 require (
-	github.com/Knetic/govaluate v3.0.0+incompatible // indirect
 	github.com/akrylysov/pogreb v0.10.1 // indirect
 	github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
-	github.com/eapache/go-resiliency v1.2.0 // indirect
+	github.com/eapache/go-resiliency v1.3.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/elazarl/goproxy/ext v0.0.0-20210110162100-a92cc753f88e // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-uuid v1.0.2 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
-	github.com/jcmturner/gofork v1.0.0 // indirect
-	github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
+	github.com/jcmturner/gofork v1.7.6 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/karrick/godirwalk v1.16.1 // indirect
-	github.com/klauspost/compress v1.15.6 // indirect
+	github.com/klauspost/compress v1.15.11 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/miekg/dns v1.1.49 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pierrec/lz4/v4 v4.1.14 // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/projectdiscovery/blackrock v0.0.0-20210415162320-b38689ae3a2e // indirect
 	github.com/projectdiscovery/cryptoutil v0.0.0-20210805184155-b5d2512f9345 // indirect
 	github.com/projectdiscovery/fileutil v0.0.0-20220215113056-ba188a0c8abc // indirect
@@ -68,12 +68,12 @@ require (
 	github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521 // indirect
 	github.com/zmap/zcrypto v0.0.0-20211005224000-2d0ffdec8a9b // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
-	golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
 	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+	golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )