Skip to content

Commit aa693c4

Browse files
julienloizeletjulienloizelet
committed
feat(*): Use package crowdsec/bouncer 1.0.0
1 parent b32e991 commit aa693c4

File tree

153 files changed

+4086
-2671
lines changed

Some content is hidden

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

153 files changed

+4086
-2671
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
},
2121
"require": {
22-
"crowdsec/bouncer": "0.36.0",
22+
"crowdsec/bouncer": "^1.0.0",
2323
"symfony/polyfill-mbstring": "1.20.0",
2424
"symfony/service-contracts": "2.4.1"
2525
},

‎composer.lock‎

Lines changed: 99 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎inc/Bouncer.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use CrowdSec\RemediationEngine\CacheStorage\CacheStorageException;
55
use CrowdSec\RemediationEngine\LapiRemediation;
6-
use CrowdSec\RemediationEngine\Logger\FileLog;
6+
use CrowdSec\Common\Logger\FileLog;
77
use CrowdSecBouncer\AbstractBouncer;
88
use CrowdSecBouncer\BouncerException;
99
use Psr\Log\LoggerInterface;
@@ -55,7 +55,8 @@ protected function specialcharsDecodeEntQuotes(string $value): string
5555

5656
/**
5757
* Prepare ready-to-use configs
58-
* @return
58+
* @param array $rawConfigs
59+
* @return array
5960
*/
6061
public function handleRawConfigs(array $rawConfigs): array
6162
{
@@ -296,11 +297,4 @@ public function shouldBounceCurrentIp(): bool
296297
}
297298
return true;
298299
}
299-
300-
301-
public function testCacheConnection(): void
302-
{
303-
$cache = $this->getRemediationEngine()->getCacheStorage();
304-
$cache->getItem($cache::CONFIG);
305-
}
306300
}

‎inc/Constants.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ class Constants extends LibConstants
1818
{
1919

2020
public const LOG_BASE_PATH = __DIR__ . '/../logs/';
21-
public const LOG_PATH = __DIR__ . '/../logs/prod.log';
22-
public const DEBUG_LOG_PATH = __DIR__ . '/../logs/debug.log';
2321
public const CACHE_PATH = __DIR__ . '/../.cache';
2422
public const CONFIG_PATH = __DIR__ . '/standalone-settings.php';
2523
public const VERSION = 'v2.0.0';

‎inc/standalone-bounce.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
// If there is any technical problem while bouncing, don't block the user.
1515
try {
16-
/** @var array $crowdSecJsonStandaloneConfig */
16+
/** @var $crowdSecJsonStandaloneConfig */
1717
$crowdSecConfigs = json_decode($crowdSecJsonStandaloneConfig, true);
1818
$bouncer = new Bouncer($crowdSecConfigs);
1919
$bouncer->run();

‎vendor/composer/autoload_classmap.php‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,35 @@
1616
'CrowdSecBouncer\\Fixes\\Gregwar\\Captcha\\CaptchaBuilder' => $vendorDir . '/crowdsec/bouncer/src/Fixes/Gregwar/Captcha/CaptchaBuilder.php',
1717
'CrowdSecBouncer\\StandaloneBouncer' => $vendorDir . '/crowdsec/bouncer/src/StandaloneBouncer.php',
1818
'CrowdSecBouncer\\Template' => $vendorDir . '/crowdsec/bouncer/src/Template.php',
19-
'CrowdSec\\CapiClient\\AbstractClient' => $vendorDir . '/crowdsec/capi-client/src/AbstractClient.php',
2019
'CrowdSec\\CapiClient\\ClientException' => $vendorDir . '/crowdsec/capi-client/src/ClientException.php',
21-
'CrowdSec\\CapiClient\\Configuration\\AbstractConfiguration' => $vendorDir . '/crowdsec/capi-client/src/Configuration/AbstractConfiguration.php',
2220
'CrowdSec\\CapiClient\\Configuration\\Signal' => $vendorDir . '/crowdsec/capi-client/src/Configuration/Signal.php',
2321
'CrowdSec\\CapiClient\\Configuration\\Signal\\Decisions' => $vendorDir . '/crowdsec/capi-client/src/Configuration/Signal/Decisions.php',
2422
'CrowdSec\\CapiClient\\Configuration\\Signal\\Source' => $vendorDir . '/crowdsec/capi-client/src/Configuration/Signal/Source.php',
2523
'CrowdSec\\CapiClient\\Configuration\\Watcher' => $vendorDir . '/crowdsec/capi-client/src/Configuration/Watcher.php',
2624
'CrowdSec\\CapiClient\\Constants' => $vendorDir . '/crowdsec/capi-client/src/Constants.php',
27-
'CrowdSec\\CapiClient\\HttpMessage\\AbstractMessage' => $vendorDir . '/crowdsec/capi-client/src/HttpMessage/AbstractMessage.php',
28-
'CrowdSec\\CapiClient\\HttpMessage\\Request' => $vendorDir . '/crowdsec/capi-client/src/HttpMessage/Request.php',
29-
'CrowdSec\\CapiClient\\HttpMessage\\Response' => $vendorDir . '/crowdsec/capi-client/src/HttpMessage/Response.php',
30-
'CrowdSec\\CapiClient\\Logger\\FileLog' => $vendorDir . '/crowdsec/capi-client/src/Logger/FileLog.php',
31-
'CrowdSec\\CapiClient\\RequestHandler\\AbstractRequestHandler' => $vendorDir . '/crowdsec/capi-client/src/RequestHandler/AbstractRequestHandler.php',
32-
'CrowdSec\\CapiClient\\RequestHandler\\Curl' => $vendorDir . '/crowdsec/capi-client/src/RequestHandler/Curl.php',
33-
'CrowdSec\\CapiClient\\RequestHandler\\FileGetContents' => $vendorDir . '/crowdsec/capi-client/src/RequestHandler/FileGetContents.php',
34-
'CrowdSec\\CapiClient\\RequestHandler\\RequestHandlerInterface' => $vendorDir . '/crowdsec/capi-client/src/RequestHandler/RequestHandlerInterface.php',
3525
'CrowdSec\\CapiClient\\Signal' => $vendorDir . '/crowdsec/capi-client/src/Signal.php',
3626
'CrowdSec\\CapiClient\\Storage\\FileStorage' => $vendorDir . '/crowdsec/capi-client/src/Storage/FileStorage.php',
3727
'CrowdSec\\CapiClient\\Storage\\StorageInterface' => $vendorDir . '/crowdsec/capi-client/src/Storage/StorageInterface.php',
3828
'CrowdSec\\CapiClient\\Watcher' => $vendorDir . '/crowdsec/capi-client/src/Watcher.php',
39-
'CrowdSec\\LapiClient\\AbstractClient' => $vendorDir . '/crowdsec/lapi-client/src/AbstractClient.php',
29+
'CrowdSec\\Common\\Client\\AbstractClient' => $vendorDir . '/crowdsec/common/src/Client/AbstractClient.php',
30+
'CrowdSec\\Common\\Client\\ClientException' => $vendorDir . '/crowdsec/common/src/Client/ClientException.php',
31+
'CrowdSec\\Common\\Client\\HttpMessage\\AbstractMessage' => $vendorDir . '/crowdsec/common/src/Client/HttpMessage/AbstractMessage.php',
32+
'CrowdSec\\Common\\Client\\HttpMessage\\Request' => $vendorDir . '/crowdsec/common/src/Client/HttpMessage/Request.php',
33+
'CrowdSec\\Common\\Client\\HttpMessage\\Response' => $vendorDir . '/crowdsec/common/src/Client/HttpMessage/Response.php',
34+
'CrowdSec\\Common\\Client\\RequestHandler\\AbstractRequestHandler' => $vendorDir . '/crowdsec/common/src/Client/RequestHandler/AbstractRequestHandler.php',
35+
'CrowdSec\\Common\\Client\\RequestHandler\\Curl' => $vendorDir . '/crowdsec/common/src/Client/RequestHandler/Curl.php',
36+
'CrowdSec\\Common\\Client\\RequestHandler\\FileGetContents' => $vendorDir . '/crowdsec/common/src/Client/RequestHandler/FileGetContents.php',
37+
'CrowdSec\\Common\\Client\\RequestHandler\\RequestHandlerInterface' => $vendorDir . '/crowdsec/common/src/Client/RequestHandler/RequestHandlerInterface.php',
38+
'CrowdSec\\Common\\Configuration\\AbstractConfiguration' => $vendorDir . '/crowdsec/common/src/Configuration/AbstractConfiguration.php',
39+
'CrowdSec\\Common\\Constants' => $vendorDir . '/crowdsec/common/src/Constants.php',
40+
'CrowdSec\\Common\\Exception' => $vendorDir . '/crowdsec/common/src/Exception.php',
41+
'CrowdSec\\Common\\Logger\\AbstractLog' => $vendorDir . '/crowdsec/common/src/Logger/AbstractLog.php',
42+
'CrowdSec\\Common\\Logger\\ConsoleLog' => $vendorDir . '/crowdsec/common/src/Logger/ConsoleLog.php',
43+
'CrowdSec\\Common\\Logger\\FileLog' => $vendorDir . '/crowdsec/common/src/Logger/FileLog.php',
4044
'CrowdSec\\LapiClient\\Bouncer' => $vendorDir . '/crowdsec/lapi-client/src/Bouncer.php',
4145
'CrowdSec\\LapiClient\\ClientException' => $vendorDir . '/crowdsec/lapi-client/src/ClientException.php',
4246
'CrowdSec\\LapiClient\\Configuration' => $vendorDir . '/crowdsec/lapi-client/src/Configuration.php',
4347
'CrowdSec\\LapiClient\\Constants' => $vendorDir . '/crowdsec/lapi-client/src/Constants.php',
44-
'CrowdSec\\LapiClient\\HttpMessage\\AbstractMessage' => $vendorDir . '/crowdsec/lapi-client/src/HttpMessage/AbstractMessage.php',
45-
'CrowdSec\\LapiClient\\HttpMessage\\Request' => $vendorDir . '/crowdsec/lapi-client/src/HttpMessage/Request.php',
46-
'CrowdSec\\LapiClient\\HttpMessage\\Response' => $vendorDir . '/crowdsec/lapi-client/src/HttpMessage/Response.php',
47-
'CrowdSec\\LapiClient\\Logger\\FileLog' => $vendorDir . '/crowdsec/lapi-client/src/Logger/FileLog.php',
48-
'CrowdSec\\LapiClient\\RequestHandler\\AbstractRequestHandler' => $vendorDir . '/crowdsec/lapi-client/src/RequestHandler/AbstractRequestHandler.php',
49-
'CrowdSec\\LapiClient\\RequestHandler\\Curl' => $vendorDir . '/crowdsec/lapi-client/src/RequestHandler/Curl.php',
50-
'CrowdSec\\LapiClient\\RequestHandler\\FileGetContents' => $vendorDir . '/crowdsec/lapi-client/src/RequestHandler/FileGetContents.php',
51-
'CrowdSec\\LapiClient\\RequestHandler\\RequestHandlerInterface' => $vendorDir . '/crowdsec/lapi-client/src/RequestHandler/RequestHandlerInterface.php',
5248
'CrowdSec\\RemediationEngine\\AbstractRemediation' => $vendorDir . '/crowdsec/remediation-engine/src/AbstractRemediation.php',
5349
'CrowdSec\\RemediationEngine\\CacheStorage\\AbstractCache' => $vendorDir . '/crowdsec/remediation-engine/src/CacheStorage/AbstractCache.php',
5450
'CrowdSec\\RemediationEngine\\CacheStorage\\CacheStorageException' => $vendorDir . '/crowdsec/remediation-engine/src/CacheStorage/CacheStorageException.php',
@@ -57,7 +53,6 @@
5753
'CrowdSec\\RemediationEngine\\CacheStorage\\Redis' => $vendorDir . '/crowdsec/remediation-engine/src/CacheStorage/Redis.php',
5854
'CrowdSec\\RemediationEngine\\CapiRemediation' => $vendorDir . '/crowdsec/remediation-engine/src/CapiRemediation.php',
5955
'CrowdSec\\RemediationEngine\\Configuration\\AbstractCache' => $vendorDir . '/crowdsec/remediation-engine/src/Configuration/AbstractCache.php',
60-
'CrowdSec\\RemediationEngine\\Configuration\\AbstractConfiguration' => $vendorDir . '/crowdsec/remediation-engine/src/Configuration/AbstractConfiguration.php',
6156
'CrowdSec\\RemediationEngine\\Configuration\\AbstractRemediation' => $vendorDir . '/crowdsec/remediation-engine/src/Configuration/AbstractRemediation.php',
6257
'CrowdSec\\RemediationEngine\\Configuration\\Cache\\Memcached' => $vendorDir . '/crowdsec/remediation-engine/src/Configuration/Cache/Memcached.php',
6358
'CrowdSec\\RemediationEngine\\Configuration\\Cache\\PhpFiles' => $vendorDir . '/crowdsec/remediation-engine/src/Configuration/Cache/PhpFiles.php',
@@ -68,7 +63,6 @@
6863
'CrowdSec\\RemediationEngine\\Decision' => $vendorDir . '/crowdsec/remediation-engine/src/Decision.php',
6964
'CrowdSec\\RemediationEngine\\Geolocation' => $vendorDir . '/crowdsec/remediation-engine/src/Geolocation.php',
7065
'CrowdSec\\RemediationEngine\\LapiRemediation' => $vendorDir . '/crowdsec/remediation-engine/src/LapiRemediation.php',
71-
'CrowdSec\\RemediationEngine\\Logger\\FileLog' => $vendorDir . '/crowdsec/remediation-engine/src/Logger/FileLog.php',
7266
'CrowdSec\\RemediationEngine\\RemediationException' => $vendorDir . '/crowdsec/remediation-engine/src/RemediationException.php',
7367
'GeoIp2\\Database\\Reader' => $vendorDir . '/geoip2/geoip2/src/Database/Reader.php',
7468
'GeoIp2\\Exception\\AddressNotFoundException' => $vendorDir . '/geoip2/geoip2/src/Exception/AddressNotFoundException.php',

0 commit comments

Comments
 (0)