Skip to content

Commit

Permalink
Merge pull request #3 from coreruleset/refactor/split-cli-methods
Browse files Browse the repository at this point in the history
refactor: split cli methods to easy testing
  • Loading branch information
fzipi authored Feb 15, 2025
2 parents aa63464 + 4499dbb commit 076b968
Show file tree
Hide file tree
Showing 8 changed files with 1,003 additions and 700 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
---
name: Regression Tests

on: [push, pull_request]
on:
push:
branches:
- main
pull_request:
branches:
- main


jobs:
regression:
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
crs-version: ['4.10.0']
# renovate: datasource=github-releases depName=coreruleset/coreruleset
crs-version: ['4.11.0']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
Expand All @@ -20,7 +28,6 @@ jobs:
uses: astral-sh/setup-uv@v5
with:
enable-cache: true
cache-dependency-glob: "uv.lock"

- name: Set up Python 3
uses: actions/setup-python@v5
Expand All @@ -37,6 +44,6 @@ jobs:
- name: "Run crs linter tests for ${{ matrix.crs-version }}"
run: |
curl -SLs https://github.com/coreruleset/coreruleset/archive/refs/tags/v${{ matrix.crs-version }}.tar.gz -o - | \
tar xzvf - --strip-components=1 --wildcards "*/rules/*" --wildcards "*/crs-setup.conf.example" --wildcards "*/util/APPROVED_TAGS"
uv run crs-linter --output=github -r crs-setup.conf.example -r rules/*.conf -t util/APPROVED_TAGS -v ${{ matrix.crs-version }}
curl -sSL https://github.com/coreruleset/coreruleset/archive/refs/tags/v${{ matrix.crs-version }}.tar.gz -o - | \
tar xzvf - --strip-components=1 --wildcards "*/rules/*" "*/crs-setup.conf.example"
uv run crs-linter --debug -o github -d . -r crs-setup.conf.example -r 'rules/*.conf' -t APPROVED_TAGS -v ${{ matrix.crs-version }}
97 changes: 97 additions & 0 deletions APPROVED_TAGS
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
OWASP_CRS
PCI/12.1
PCI/6.5.1
PCI/6.5.10
PCI/6.5.2
PCI/6.5.4
PCI/6.5.6
anomaly-evaluation
application-multi
attack-deprecated-header
attack-disclosure
attack-fixation
attack-generic
attack-injection-generic
attack-injection-java
attack-injection-php
attack-lfi
attack-multipart-header
attack-protocol
attack-rce
attack-reputation-scanner
attack-rfi
attack-sqli
attack-ssrf
attack-xss
capec/1/180/77
capec/1000/118/116
capec/1000/118/116/54
capec/1000/118/116/54/127
capec/1000/118/224/541/310
capec/1000/152
capec/1000/152/137/15/460
capec/1000/152/137/6
capec/1000/152/175/253
capec/1000/152/242
capec/1000/152/242/63
capec/1000/152/248
capec/1000/152/248/136
capec/1000/152/248/66
capec/1000/152/248/88
capec/1000/153/267
capec/1000/210/272
capec/1000/210/272/220
capec/1000/210/272/220/273
capec/1000/210/272/220/274
capec/1000/210/272/220/33
capec/1000/210/272/220/34
capec/1000/225/122/17/650
capec/1000/225/21/593/61
capec/1000/225/664
capec/1000/255/153
capec/1000/255/153/126
capec/1000/255/153/267
capec/1000/255/153/267/120
capec/1000/255/153/267/72
capec/137/134
capec/272/220
header-allowlist
language-aspnet
language-java
language-javascript
language-ldap
language-multi
language-perl
language-php
language-powershell
language-ruby
language-shell
paranoia-level/1
paranoia-level/2
paranoia-level/3
paranoia-level/4
platform-apache
platform-db2
platform-emc
platform-firebird
platform-frontbase
platform-hsqldb
platform-iis
platform-informix
platform-ingres
platform-interbase
platform-internet-explorer
platform-maxdb
platform-msaccess
platform-mssql
platform-multi
platform-mysql
platform-oracle
platform-pgsql
platform-sqlite
platform-sybase
platform-tomcat
platform-unix
platform-windows
reporting
xss-perf-disable
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ packages = [
dependencies = [
"msc_pyparser >=1.2.1",
"dulwich (>=0.22.7,<0.23.0)",
"semver (>=3.0.2,<4.0.0)"
"semver (>=3.0.2,<4.0.0)",
"github-action-utils>=1.1.0,<2.0.0",
]

[project.scripts]
Expand Down
Loading

0 comments on commit 076b968

Please sign in to comment.