Skip to content
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.

Sign up for GitHub

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

feat(log): Allow symfony v7 and monolog v3 #136

Merged
merged 1 commit into from
Jan 31, 2025
Merged

feat(log): Allow symfony v7 and monolog v3 #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,24 @@ As far as possible, we try to adhere to [Symfony guidelines](https://symfony.com

---

## [4.2.0](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v4.1.0) - 2025-01-31
[_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v4.1.0...v4.2.0)


### Changed

- Allow Monolog 3 package and Symfony 7 packages

---


## [4.1.0](https://github.com/crowdsecurity/php-cs-bouncer/releases/tag/v4.1.0) - 2025-01-10
[_Compare with previous release_](https://github.com/crowdsecurity/php-cs-bouncer/compare/v4.0.0...v4.1.0)


### Changed

- Do not save origins count when the bouncer does not bounce the IP, due to business logic. This avoids sending a
- Do not save origins count when the bouncer does not bounce the IP, due to business logic. This avoids sending a
"processed" usage metrics to the LAPI when the IP is not bounced at all.

---
Expand Down
15 changes: 11 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,25 @@
],
"require": {
"php": ">=7.2.5",
"crowdsec/remediation-engine": "^4.0.0",
"crowdsec/common": "^2.3.2",
"symfony/config": "^4.4.27 || ^5.2 || ^6.0",
"crowdsec/remediation-engine": "^4.2.0",
"crowdsec/lapi-client": "^3.6.0",
"crowdsec/common": "^3.0.0",
"symfony/config": "^4.4.27 || ^5.2 || ^6.0 || ^7.2",
"monolog/monolog": "^1.17 || ^2.1 || ^3.8",
"psr/log": "^1.0 || ^2.0 || ^3.0",
"twig/twig": "^3.4.2",
"gregwar/captcha": "^1.2.1",
"mlocati/ip-lib": "^1.18",
"ext-json": "*",
"ext-gd": "*"
},
"suggest": {
"ext-curl": "*"
},
"require-dev": {
"phpunit/phpunit": "^8.5.30 || ^9.3",
"mikey179/vfsstream": "^1.6.11",
"nikic/php-parser": "^4.18"
"nikic/php-parser": "^4.18",
"ext-curl": "*"
}
}
2 changes: 1 addition & 1 deletion src/Constants.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Constants extends RemConstants
/** @var string Path for html templates folder (e.g. ban and captcha wall) */
public const TEMPLATES_DIR = __DIR__ . '/templates';
/** @var string The last version of this library */
public const VERSION = 'v4.1.0';
public const VERSION = 'v4.2.0';
/** @var string The "disabled" x-forwarded-for setting */
public const X_FORWARDED_DISABLED = 'no_forward';
}
2 changes: 1 addition & 1 deletion tests/Integration/AbstractBouncerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ protected function setUp(): void
$currentDate = date('Y-m-d');
$this->debugFile = 'debug-' . $currentDate . '.log';
$this->prodFile = 'prod-' . $currentDate . '.log';
$this->logger = new FileLog(['log_directory_path' => $this->root->url(), 'debug_mode' => true]);
$this->logger = new FileLog(['log_directory_path' => $this->root->url(), 'debug_mode' => true, 'log_rotator' => true]);

$bouncerConfigs = [
'auth_type' => $this->useTls ? \CrowdSec\LapiClient\Constants::AUTH_TLS : Constants::AUTH_KEY,
Expand Down
Loading