8000 Update version strings to 3.4.0-dev by lifeforms · Pull Request #2100 · coreruleset/coreruleset · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update version strings to 3.4.0-dev #2100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2021
Merged

Update version strings to 3.4.0-dev #2100

merged 2 commits into from
May 24, 2021

Conversation

lifeforms
Copy link
Member

For the development branch, use "x.y.z-dev" notation.
Change made automatically in all rule files using Airween's cool tool from #2085:

python3 -m pip install --user --upgrade msc_pyparser
cd util/change-version
./change-version.py "../../rules/*.conf" ../../rules/ "OWASP_CRS/3.4.0-dev" "3.4.0-dev"

Also, the version number in crs-setup.conf.example (rule 900990) was updated manually.

For the development branch, use "x.y.z-dev" notation.
Change made automatically in all rule files using:

python3 -m pip install --user --upgrade msc_pyparser
cd util/change-version
./change-version.py "../../rules/*.conf" ../../rules/ "OWASP_CRS/3.4.0-dev" "3.4.0-dev"

Also, the version number in crs-setup.conf.example (rule 900990)
was updated manually.
@airween
Copy link
Contributor
airween commented May 24, 2021

Looks like the comment version still contains the old version here.

May be you should run the script this way to be sure:

python3 -m pip install --user --upgrade msc_pyparser
cd util/change-version
./change-version.py "../../crs-setup.conf.example" ../../ "OWASP_CRS/3.4.0-dev" "3.4.0-dev"

This will change the all occurrence of comment versions.

Done using:

./change-version.py "../../rules/*.conf.example" ../../rules/ "OWASP_CRS/3.4.0-dev" "3.4.0-dev"
./change-version.py "../../crs-setup.conf.example" ../../ "OWASP_CRS/3.4.0-dev" "3.4.0-dev"
@lifeforms
Copy link
Member Author

Thank you for spotting this!

I've now also ran:

./change-version.py "../../rules/*.conf.example" ../../rules/ "OWASP_CRS/3.4.0-dev" "3.4.0-dev"
./change-version.py "../../crs-setup.conf.example" ../../ "OWASP_CRS/3.4.0-dev" "3.4.0-dev"

pass,\
t:none,\
setvar:tx.crs_setup_version=330"
"id:900990,\
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha, msc_pyparser have set the indent :)

@@ -129,7 +129,7 @@ SecRule REQUEST_LINE "!@rx ^(?i:(?:[a-z]{3,10}\s+(?:\w{3,7}?://[\w\-\./]*(?::\d+
# The regex in the following enabled rule is not supported by non-PCRE
# regular expression engines (?<!re).
#
SecRule FILES_NAMES|FILES "@rx (?<!&(?:[aAoOuUyY]uml)|&(?:[aAeEiIoOuU]circ)|&(?:[eEiIoOuUyY]acute)|&(?:[aAeEiIoOuU]grave)|&(?:[cC]cedil)|&(?:[aAnNoO]tilde)|&(?:amp)|&(?:apos));|['\"=]" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm... here was also an extra space

@airween
Copy link
Contributor
airween commented May 24, 2021

When I made the tool, I was thinking about how we change the version string? I mean the script would expect the old and the new versions too, and replace the ver value only if the old value matches with the given value.

But now I see were some newer version string (eg. 3.4.0), which are changed to the 3.4.0-dev - so I think it was a good decision to ignore to ask the old version too.

The pleasant side-effect of the tool is it formats the rule set. I mean it sets the "correct" indentation (see here our "reference"). Note, that there is an example in msc_pyparser which does the same.

Btw: LGTM.

@lifeforms lifeforms merged commit ec22c77 into coreruleset:v3.4/dev May 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0