Merge pull request #108 from julienloizelet/feat/curl-and-0.26-lib

Feat/curl and 0.26 lib

Author: julienloizelet

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

@@ -76,6 +76,12 @@ jobs:
           sudo chmod -R 777 ${{ github.workspace }}/wp-content
           sudo chmod -R 777 ${{ github.workspace }}/my-own-modules
 
+      - name: Some DEBUG information
+        run: |
+          ddev --version
+          ddev exec php -v
+          ddev exec -s crowdsec crowdsec -version
+
       - name: Install WordPress ${{ matrix.wp-version }} with PHP ${{ matrix.php-version }}
         run: |
           wget https://wordpress.org/wordpress-${{ matrix.wp-version }}.tar.gz

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

@@ -76,6 +76,12 @@ jobs:
           sudo chmod -R 777 ${{ github.workspace }}/wp-content
           sudo chmod -R 777 ${{ github.workspace }}/my-own-modules
 
+      - name: Some DEBUG information
+        run: |
+          ddev --version
+          ddev exec php -v
+          ddev exec -s crowdsec crowdsec -version
+
       - name: Install WordPress ${{ matrix.wp-version }} with PHP ${{ matrix.php-version }}
         run: |
           wget https://wordpress.org/wordpress-${{ matrix.wp-version }}.tar.gz

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
                 uses: actions/checkout@v2
 
             -   name: Check version ${{ env.VERSION_NUMBER }} consistency in files
-                # Check crowdsec.php, readme.txt, inc/constants.php and CHANGELOG.md
+                # Check crowdsec.php, readme.txt, inc/Constants.php and CHANGELOG.md
                 run: |
                     CURRENT_DATE=$(date +'%Y-%m-%d')
                     CHANGELOG_VERSION=$(grep -o -E "## \[(.*)\] - $CURRENT_DATE"  CHANGELOG.md | head -1 | sed 's/ //g')
@@ -84,14 +84,14 @@ jobs:
                         echo "Stable tag in readme.txt: KO"
                         exit 1
                     fi
-                    CONSTANT_VERSION=$(grep -E "WordPress CrowdSec Bouncer/v(.*)"  inc/constants.php | sed 's/[\x27(),/ ]//g')
+                    CONSTANT_VERSION=$(grep -E "WordPress CrowdSec Bouncer/v(.*)"  inc/Constants.php | sed 's/[\x27(),/ ]//g')
                     echo $CONSTANT_VERSION
-                    echo "defineCROWDSEC_BOUNCER_USER_AGENTWordPressCrowdSecBouncerv${{ env.VERSION_NUMBER }}"
-                    if [[ $CONSTANT_VERSION == "defineCROWDSEC_BOUNCER_USER_AGENTWordPressCrowdSecBouncerv${{ env.VERSION_NUMBER }};" ]]
+                    echo "publicconstCROWDSEC_BOUNCER_USER_AGENTWordPressCrowdSecBouncerv${{ env.VERSION_NUMBER }}"
+                    if [[ $CONSTANT_VERSION == "publicconstCROWDSEC_BOUNCER_USER_AGENTWordPressCrowdSecBouncerv${{ env.VERSION_NUMBER }};" ]]
                     then
-                        echo "Version in inc/constants.php: OK"
+                        echo "Version in inc/Constants.php: OK"
                     else
-                        echo "Version in inc/constants.php: KO"
+                        echo "Version in inc/Constants.php: KO"
                         exit 1
                     fi
 

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+
+## [1.8.0] - 2022-08-04
+
+### Added
+- Add `use_curl` configuration: should be used if `allow_url_fopen` is disabled and `curl` is available
+- Add `disable_prod_log` configuration
+
+### Changed
+- Change log path to `wp-content/plugins/crowdsec/logs`
+- By default, the `bouncing_level` setting is `bouncing_disabled` (instead of `normal_bouncing`)
+
+
 ## [1.7.0] - 2022-07-21
 
 ### Added

composer.json

@@ -19,7 +19,7 @@
 		}
 	},
 	"require": {
-		"crowdsec/bouncer": "0.24.0",
+		"crowdsec/bouncer": "0.28.0",
 		"symfony/polyfill-mbstring": "1.20.0",
 		"symfony/service-contracts": "2.4.1"
 	},

composer.lock

@@ -4,7 +4,7 @@
  * Plugin URI: https://github.com/crowdsecurity/cs-wordpress-bouncer
  * Description: Safer Together. Protect your WordPress application with CrowdSec.
  * Tags: crowdsec-bouncer, wordpress, security, firewall, captcha, ip-scanner, ip-blocker, ip-blocking, ip-address, ip-database, ip-range-check, crowdsec, ban-hosts, ban-management, anti-hacking, hacker-protection, captcha-image, captcha-generator, captcha-generation, captcha-service
- * Version: 1.7.0
+ * Version: 1.8.0
  * Author: CrowdSec
  * Author URI: https://www.crowdsec.net/
  * Github: https://github.com/crowdsecurity/cs-wordpress-blocker
@@ -13,7 +13,7 @@
  * Requires PHP: 7.2
  * Requires at least: 4.9
  * Tested up to: 6.0
- * Stable tag: 1.7.0
+ * Stable tag: 1.8.0
  * Text Domain: crowdsec-wp
  * First release: 2021.
  */
@@ -24,9 +24,6 @@
 
 
 require_once __DIR__.'/inc/plugin-setup.php';
-require_once __DIR__.'/inc/constants.php';
-$crowdsecRandomLogFolder = get_option('crowdsec_random_log_folder') ?: '';
-crowdsecDefineConstants($crowdsecRandomLogFolder);
 require_once __DIR__.'/inc/scheduling.php';
 register_activation_hook(__FILE__, 'activate_crowdsec_plugin');
 register_deactivation_hook(__FILE__, 'deactivate_crowdsec_plugin');