Merge pull request #264 from projectdiscovery/dev

katana v0.0.3

.github/dependabot.yml

@@ -22,7 +22,7 @@ updates:
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     target-branch: "dev"
     commit-message:
       prefix: "chore"

.github/workflows/build-test.yml

@@ -12,13 +12,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-
+        os: [ubuntu-latest, windows-latest, macOS-12]
+        go-version: [1.18.x, 1.19.x]
     steps:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: ${{ matrix.go-version }}
 
       - name: Check out code
         uses: actions/checkout@v3
@@ -31,6 +31,12 @@ jobs:
         run: go build .
         working-directory: cmd/katana/
 
+      - name: Integration Tests
+        env:
+          GH_ACTION: true
+        run: bash run.sh
+        working-directory: integration_tests/
+
       - name: Install
         run: go install
         working-directory: cmd/katana/

.github/workflows/dockerhub-push.yml

@@ -35,6 +35,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64,linux/arm
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: projectdiscovery/katana:latest,projectdiscovery/katana:${{ steps.meta.outputs.tag }}

.github/workflows/lint-test.yml

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

.github/workflows/release-binary.yml

@@ -1,7 +1,7 @@
 name: 🎉 Release Binary
 
 on:
-  create:
+  push:
     tags:
       - v*
   workflow_dispatch:
@@ -21,11 +21,13 @@ jobs:
           go-version: 1.18
 
       - name: "Create release on GitHub"
-        uses: goreleaser/goreleaser-action@v3
+        uses: goreleaser/goreleaser-action@v4
         with: 
           args: "release --rm-dist"
           version: latest
           workdir: .
         env: 
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"
+          DISCORD_WEBHOOK_ID: "${{ secrets.DISCORD_WEBHOOK_ID }}"
+          DISCORD_WEBHOOK_TOKEN: "${{ secrets.DISCORD_WEBHOOK_TOKEN }}"

.gitignore

@@ -1,4 +1,6 @@
 security-crawl-maze/
 cmd/katana/katana
 katana
-*.exe
+*.exe
+katana_*/
+katana_*/

.goreleaser.yml

@@ -39,4 +39,8 @@ announce:
     enabled: true
     channel: '#release'
     username: GoReleaser
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
+    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
+
+  discord:
+    enabled: true
+    message_template: '**New Release: {{ .ProjectName }} {{.Tag}}** is published! Check it out at {{ .ReleaseURL }}'

Dockerfile

@@ -1,8 +1,8 @@
-FROM golang:1.19.3-alpine AS builder
+FROM golang:1.19.4-alpine AS builder
 RUN apk add --no-cache git
 RUN go install -v github.com/projectdiscovery/katana/cmd/katana@latest
 
-FROM alpine:3.16.2
+FROM alpine:3.17.0
 RUN apk -U upgrade --no-cache \
     && apk add --no-cache bind-tools ca-certificates chromium
 COPY --from=builder /go/bin/katana /usr/local/bin/

Makefile

@@ -0,0 +1,22 @@
+# Go parameters
+GOCMD=go
+GOBUILD=$(GOCMD) build
+GOMOD=$(GOCMD) mod
+GOTEST=$(GOCMD) test
+GOFLAGS := -v
+# This should be disabled if the binary uses pprof
+LDFLAGS := -s -w
+
+ifneq ($(shell go env GOOS),darwin)
+LDFLAGS := -extldflags "-static"
+endif
+
+all: build
+build:
+	$(GOBUILD) $(GOFLAGS) -ldflags '$(LDFLAGS)' -o "katana" cmd/katana/main.go
+test:
+	$(GOTEST) $(GOFLAGS) ./...
+integration:
+	cd integration_tests; bash run.sh cd ..
+tidy:
+	$(GOMOD) tidy