Skip to content

Commit c7269d8

Browse files
Merge pull request #122 from julienloizelet/feat/use-lib-with-remediation-engine
Feat/use lib with remediation engine
2 parents 4485617 + b63e447 commit c7269d8

File tree

289 files changed

+25489
-5226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+25489
-5226
lines changed

.github/workflows/end-to-end-auto-prepend-test-suite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ jobs:
103103
- name: Prepare for playwright test
104104
run: |
105105
cd ${{ github.workspace }}
106+
cp .ddev/custom_files/crowdsec/php/cache-actions.php cache-actions.php
106107
cp -r .ddev/custom_files/crowdsec/cfssl/* my-own-modules/${{ env.EXTENSION_PATH }}/tls
107108
cd my-own-modules/${{ env.EXTENSION_PATH }}
108109
docker cp "tls" ddev-${{ env.WP_VERSION_CODE }}-playwright://var/www/html/wp-content/plugins/crowdsec

.github/workflows/end-to-end-test-suite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ jobs:
103103
- name: Prepare for playwright test
104104
run: |
105105
cd ${{ github.workspace }}
106+
cp .ddev/custom_files/crowdsec/php/cache-actions.php cache-actions.php
106107
cp -r .ddev/custom_files/crowdsec/cfssl/* my-own-modules/${{ env.EXTENSION_PATH }}/tls
107108
cd my-own-modules/${{ env.EXTENSION_PATH }}
108109
docker cp "tls" ddev-${{ env.WP_VERSION_CODE }}-playwright://var/www/html/wp-content/plugins/crowdsec

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
echo "Version in CHANGELOG.md: KO"
5555
exit 1
5656
fi
57-
COMPARISON=$(grep -oP "\/compare\/\K(.*)$" CHANGELOG.md | head -1)
57+
COMPARISON=$(grep -oP "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/compare/\K(.*)$" CHANGELOG.md | head -1)
5858
LAST_TAG=$(curl -Ls -o /dev/null -w %{url_effective} $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/latest | grep -oP "\/tag\/\K(.*)$")
5959
if [[ $COMPARISON == "$LAST_TAG...v${{ env.VERSION_NUMBER }})" ]]
6060
then
@@ -65,10 +65,10 @@ jobs:
6565
echo "$LAST_TAG...v${{ env.VERSION_NUMBER }})"
6666
exit 1
6767
fi
68-
CROWDSEC_VERSION=$(grep -E "Version: (.*)" crowdsec.php | sed 's/ //g')
69-
echo $CROWDSEC_VERSION
68+
VERSION=$(grep -E "Version: (.*)" crowdsec.php | sed 's/ //g')
69+
echo $VERSION
7070
echo "*Version:${{ env.VERSION_NUMBER }}"
71-
if [[ $CROWDSEC_VERSION == "*Version:${{ env.VERSION_NUMBER }}" ]]
71+
if [[ $VERSION == "*Version:${{ env.VERSION_NUMBER }}" ]]
7272
then
7373
echo "Version in crowdsec.php: OK"
7474
else
@@ -95,10 +95,10 @@ jobs:
9595
echo "Stable tag in readme.txt: KO"
9696
exit 1
9797
fi
98-
CONSTANT_VERSION=$(grep -E "WordPress CrowdSec Bouncer/v(.*)" inc/Constants.php | sed 's/[\x27(),/ ]//g')
98+
CONSTANT_VERSION=$(grep -E "VERSION = 'v(.*)" inc/Constants.php | sed 's/[\x27(),/ ]//g')
9999
echo $CONSTANT_VERSION
100-
echo "publicconstCROWDSEC_BOUNCER_USER_AGENT=WordPressCrowdSecBouncerv${{ env.VERSION_NUMBER }};"
101-
if [[ $CONSTANT_VERSION == "publicconstCROWDSEC_BOUNCER_USER_AGENT=WordPressCrowdSecBouncerv${{ env.VERSION_NUMBER }};" ]]
100+
echo "publicconstVERSION=v${{ env.VERSION_NUMBER }};"
101+
if [[ $CONSTANT_VERSION == "publicconstVERSION=v${{ env.VERSION_NUMBER }};" ]]
102102
then
103103
echo "Version in inc/Constants.php: OK"
104104
else

.wordpress-org/screenshot-1.jpg

-13.5 KB
Loading

.wordpress-org/screenshot-2.jpg

-39.4 KB
Loading

.wordpress-org/screenshot-3.jpg

-90 KB
Loading

.wordpress-org/screenshot-4.jpg

-25.4 KB
Loading

.wordpress-org/screenshot-5.jpg

-13.3 KB
Loading

.wordpress-org/screenshot-6.jpg

-55.5 KB
Loading

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en)
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77

8+
## [2.0.0](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v2.0.0) - 2023-02-09
9+
[_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v1.11.0...v2.0.0)
10+
11+
### Changed
12+
- All source code has been refactored using new CrowdSec PHP librairies:
13+
- Logs messages have been changed
14+
- User Agent sent to CrowdSec LAPI has been changed to `csphplapi_WordPress/vX.Y.Z`
15+
16+
### Removed
17+
18+
- Remove `Geolocation save result` setting. To disable Geolocation result saving, we can set 0 in the `Geolocation
19+
cache lifetime` setting
20+
---
21+
822
## [1.11.0](https://github.com/crowdsecurity/cs-wordpress-bouncer/releases/tag/v1.11.0) - 2022-12-22
923
[_Compare with previous release_](https://github.com/crowdsecurity/cs-wordpress-bouncer/compare/v1.10.0...v1.11.0)
1024

0 commit comments

Comments
 (0)