diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9b0035e..8979bfb 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -1,17 +1,16 @@ -name: Build and test Caddy with WAF (test) +name: Build and test Caddy with WAF (all branches except main) permissions: contents: read pull-requests: write - on: push: - branches: - - test + branches-ignore: + - main pull_request: - branches: - - test + branches-ignore: + - main workflow_dispatch: jobs: @@ -41,9 +40,9 @@ jobs: exit 1 fi - - name: Clone caddy-waf Repository (test) + - name: Clone caddy-waf Repository run: | - git clone --branch test https://github.com/fabriziosalmi/caddy-waf.git + git clone --branch ${{ github.ref_name }} https://github.com/fabriziosalmi/caddy-waf.git cd caddy-waf - name: Validate Repository Cloning @@ -85,7 +84,7 @@ jobs: echo "Caddy build failed" exit 1 fi - + - name: Test Caddy Run and Validate WAF Provisioning run: | cd caddy-waf @@ -107,8 +106,18 @@ jobs: echo "Caddy WAF build and run successful with WAF middleware provisioned" + - name: Run Additional Tests + run: | + cd caddy-waf + # Example: Test WAF functionality with a simple HTTP request + curl -s http://localhost:8080 -o /dev/null -w "%{http_code}" + if [ $? -ne 0 ]; then + echo "HTTP request to Caddy failed" + exit 1 + fi + - name: Clean Up if: always() run: | pkill -f "caddy run" || true - echo "Cleaned up running Caddy instances" + echo "Cleaned up running Caddy instances" \ No newline at end of file diff --git a/tor_blacklist.txt b/tor_blacklist.txt index 4872539..7c03c05 100644 --- a/tor_blacklist.txt +++ b/tor_blacklist.txt @@ -294,6 +294,7 @@ 185.154.110.142 185.154.110.17 185.165.169.239 +185.165.169.42 185.165.171.84 185.170.114.25 185.183.157.214