mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-10-02 08:11:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2869 from wallabag/log-restricted-access

Browse source 
Log restricted access value
This commit is contained in:
Thomas Citharel 2017-02-13 14:55:55 +01:00 committed by GitHub
commit 4a953a250c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Wallabag/CoreBundle/Helper/HttpClientFactory.php
View file

@ -6,6 +6,7 @@ use Graby\Ring\Client\SafeCurlHandler;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Cookie\CookieJar; use GuzzleHttp\Cookie\CookieJar;
use GuzzleHttp\Event\SubscriberInterface; use GuzzleHttp\Event\SubscriberInterface;
use Psr\Log\LoggerInterface;
/** /**
* Builds and configures the Guzzle HTTP client. * Builds and configures the Guzzle HTTP client.
@ -19,6 +20,7 @@ class HttpClientFactory
private $cookieJar; private $cookieJar;
private $restrictedAccess; private $restrictedAccess;
private $logger;
/** /**
* HttpClientFactory constructor. * HttpClientFactory constructor.
@ -26,12 +28,14 @@ class HttpClientFactory
* @param \GuzzleHttp\Event\SubscriberInterface $authenticatorSubscriber * @param \GuzzleHttp\Event\SubscriberInterface $authenticatorSubscriber
* @param \GuzzleHttp\Cookie\CookieJar $cookieJar * @param \GuzzleHttp\Cookie\CookieJar $cookieJar
* @param string $restrictedAccess this param is a kind of boolean. Values: 0 or 1 * @param string $restrictedAccess this param is a kind of boolean. Values: 0 or 1
* @param LoggerInterface $logger
*/ */
public function __construct(SubscriberInterface $authenticatorSubscriber, CookieJar $cookieJar, $restrictedAccess) public function __construct(SubscriberInterface $authenticatorSubscriber, CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
{ {
$this->authenticatorSubscriber = $authenticatorSubscriber; $this->authenticatorSubscriber = $authenticatorSubscriber;
$this->cookieJar = $cookieJar; $this->cookieJar = $cookieJar;
$this->restrictedAccess = $restrictedAccess; $this->restrictedAccess = $restrictedAccess;
$this->logger = $logger;
} }
/** /**
@ -39,8 +43,10 @@ class HttpClientFactory
*/ */
public function buildHttpClient() public function buildHttpClient()
{ {
$this->logger->log('debug', 'Restricted access config enabled?', array('enabled' => (int) $this->restrictedAccess));
if (0 === (int) $this->restrictedAccess) { if (0 === (int) $this->restrictedAccess) {
return null; return;
} }
// we clear the cookie to avoid websites who use cookies for analytics // we clear the cookie to avoid websites who use cookies for analytics

1
src/Wallabag/CoreBundle/Resources/config/services.yml
View file

@ -74,6 +74,7 @@ services:
- "@bd_guzzle_site_authenticator.authenticator_subscriber" - "@bd_guzzle_site_authenticator.authenticator_subscriber"
- "@wallabag_core.guzzle.cookie_jar" - "@wallabag_core.guzzle.cookie_jar"
- '@=service(''craue_config'').get(''restricted_access'')' - '@=service(''craue_config'').get(''restricted_access'')'
- '@logger'
wallabag_core.guzzle.cookie_jar: wallabag_core.guzzle.cookie_jar:
class: GuzzleHttp\Cookie\FileCookieJar class: GuzzleHttp\Cookie\FileCookieJar