Merge pull request #532 from projectdiscovery/dev

v1.2.0 Release

.github/dependabot.yml

@@ -15,16 +15,20 @@ updates:
     commit-message:
       prefix: "chore"
       include: "scope"
+    labels:
+      - "Type: Maintenance"
 
   # Maintain dependencies for go modules
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
     target-branch: "dev"
     commit-message:
       prefix: "chore"
       include: "scope"
+    labels:
+      - "Type: Maintenance"
 
   # Maintain dependencies for docker
   - package-ecosystem: "docker"
@@ -34,4 +38,6 @@ updates:
     target-branch: "dev"
     commit-message:
       prefix: "chore"
-      include: "scope"
+      include: "scope"
+    labels:
+      - "Type: Maintenance"

.github/workflows/build-test.yml

@@ -5,25 +5,45 @@ on:
   pull_request:
   workflow_dispatch:
 
-
 jobs:
   build:
     name: Test Builds
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-go@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
         with:
           go-version: 1.17
 
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Build
+        run: go build .
+        working-directory: cmd/httpx/
+
       - name: Test
         run: go test ./...
+        working-directory: .
 
-      - name: Integration Tests
+      - name: Integration Tests Linux, macOS
+        if: runner.os == 'Linux' || runner.os == 'macOS'
+        env:
+          GH_ACTION: true
         run: bash run.sh
         working-directory: integration_tests/
-
-      - name: Build
-        run: go build .
+
+      - name: Integration Tests Windows
+        if: runner.os == 'Windows'
+        env:
+          GH_ACTION: true
+          MSYS_NO_PATHCONV: true
+        run: bash run.sh
+        working-directory: integration_tests/
+
+      - name: Race Condition Tests
+        run: go build -race .
         working-directory: cmd/httpx/

.github/workflows/codeql-analysis.yml

@@ -2,6 +2,7 @@ name: 🚨 CodeQL Analysis
 
 on:
   workflow_dispatch:
+  push:
   pull_request:
     branches:
       - dev

.github/workflows/functional-test.yml

@@ -4,11 +4,13 @@ on:
   pull_request:
   workflow_dispatch:
 
-
 jobs:  
   functional:
     name: Functional Test
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Set up Go
         uses: actions/setup-go@v2
@@ -21,5 +23,5 @@ jobs:
       - name: Functional Tests
         run: |
           chmod +x run.sh
-          bash run.sh
+          bash run.sh ${{ matrix.os }}
         working-directory: cmd/functional-test

.github/workflows/lint-test.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.1.0
         with:
           version: latest
           args: --timeout 5m

.github/workflows/release-binary.yml

@@ -9,18 +9,21 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-go@v2
-        with:
+      - name: "Check out code"
+        uses: actions/checkout@v2
+        with: 
+          fetch-depth: 0
+
+      - name: "Set up Go"
+        uses: actions/setup-go@v2
+        with: 
           go-version: 1.17
-
-      -
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        name: "Create release on GitHub"
+
+      - name: "Create release on GitHub"
         uses: goreleaser/goreleaser-action@v2
-        with:
+        with: 
           args: "release --rm-dist"
           version: latest
           workdir: .
+        env: 
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/sonarcloud.yml

@@ -0,0 +1,38 @@
+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@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: "Set up Go"
+        uses: actions/setup-go@v2
+        with: 
+          go-version: 1.17
+
+      - name: Run unit Tests
+        run: |
+          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 ./...
+     
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17.6-alpine AS builder
+FROM golang:1.17.7-alpine AS builder
 RUN apk add --no-cache git
 RUN go install -v github.com/projectdiscovery/httpx/cmd/httpx@latest