pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Skip auth when no credentials are found

Browse Source 
If we can’t find a credential for the current host, even if it required login, we won’t add them and website will be fetched without any login.
This commit is contained in:
Jeremy Benoist
2017-05-09 22:25:18 +02:00
parent 0eb8220204
commit 94b232bbb8
5 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
View File

@ -6,28 +6,35 @@ use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfig;
use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfigBuilder;
use Graby\SiteConfig\ConfigBuilder;
use OutOfRangeException;
use Psr\Log\LoggerInterface;
class GrabySiteConfigBuilder implements SiteConfigBuilder
{
/**
* @var \Graby\SiteConfig\ConfigBuilder
* @var ConfigBuilder
*/
private $grabyConfigBuilder;
/**
* @var array
*/
private $credentials;
/**
* @var LoggerInterface
*/
private $logger;
/**
* GrabySiteConfigBuilder constructor.
*
* @param \Graby\SiteConfig\ConfigBuilder $grabyConfigBuilder
* @param array $credentials
* @param ConfigBuilder $grabyConfigBuilder
* @param array $credentials
* @param LoggerInterface $logger
*/
public function __construct(ConfigBuilder $grabyConfigBuilder, array $credentials = [])
public function __construct(ConfigBuilder $grabyConfigBuilder, array $credentials, LoggerInterface $logger)
{
$this->grabyConfigBuilder = $grabyConfigBuilder;
$this->credentials = $credentials;
$this->logger = $logger;
}
/**
@ -47,6 +54,12 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
$host = substr($host, 4);
}
if (!isset($this->credentials[$host])) {
$this->logger->debug('Auth: no credentials available for host.', ['host' => $host]);
return false;
}
$config = $this->grabyConfigBuilder->buildForHost($host);
$parameters = [
'host' => $host,
@ -56,14 +69,18 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
'passwordField' => $config->login_password_field ?: null,
'extraFields' => $this->processExtraFields($config->login_extra_fields),
'notLoggedInXpath' => $config->not_logged_in_xpath ?: null,
'username' => $this->credentials[$host]['username'],
'password' => $this->credentials[$host]['password'],
];
if (isset($this->credentials[$host])) {
$parameters['username'] = $this->credentials[$host]['username'];
$parameters['password'] = $this->credentials[$host]['password'];
}
$config = new SiteConfig($parameters);
return new SiteConfig($parameters);
// do not leak password in log
$parameters['password'] = '**masked**';
$this->logger->debug('Auth: add parameters.', ['host' => $host, 'parameters' => $parameters]);
return $config;
}
/**
@ -85,6 +102,7 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
if (strpos($extraField, '=') === false) {
continue;
}
list($fieldName, $fieldValue) = explode('=', $extraField, 2);
$extraFields[$fieldName] = $fieldValue;
}