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.
"javibravo/simpleue": "^1.0",
"symfony/dom-crawler": "^3.1",
"friendsofsymfony/jsrouting-bundle": "^1.6",
- "bdunogier/guzzle-site-authenticator": "dev-master"
+ "bdunogier/guzzle-site-authenticator": "dev-callback_forms"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "~2.2",
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;
}
/**
$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,
'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);
+
+ // do not leak password in log
+ $parameters['password'] = '**masked**';
- return new SiteConfig($parameters);
+ $this->logger->debug('Auth: add parameters.', ['host' => $host, 'parameters' => $parameters]);
+
+ return $config;
}
/**
if (strpos($extraField, '=') === false) {
continue;
}
+
list($fieldName, $fieldValue) = explode('=', $extraField, 2);
$extraFields[$fieldName] = $fieldValue;
}
$this->cookieJar->clear();
// need to set the (shared) cookie jar
$client = new Client(['handler' => new SafeCurlHandler(), 'defaults' => ['cookies' => $this->cookieJar]]);
+
foreach ($this->subscribers as $subscriber) {
$client->getEmitter()->attach($subscriber);
}
arguments:
- "@wallabag_core.graby.config_builder"
- "%sites_credentials%"
+ - '@logger'
+ tags:
+ - { name: monolog.logger, channel: graby }
# service alias override
bd_guzzle_site_authenticator.site_config_builder:
namespace Tests\Wallabag\CoreBundle\GuzzleSiteAuthenticator;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfig;
use Graby\SiteConfig\SiteConfig as GrabySiteConfig;
use PHPUnit_Framework_TestCase;
->with('example.com')
->will($this->returnValue($grabySiteConfig));
+ $logger = new Logger('foo');
+ $handler = new TestHandler();
+ $logger->pushHandler($handler);
+
$this->builder = new GrabySiteConfigBuilder(
$grabyConfigBuilderMock,
- ['example.com' => ['username' => 'foo', 'password' => 'bar']]
+ ['example.com' => ['username' => 'foo', 'password' => 'bar']],
+ $logger
);
$config = $this->builder->buildForHost('example.com');
- self::assertEquals(
+ $this->assertEquals(
new SiteConfig([
'host' => 'example.com',
'requiresLogin' => true,
]),
$config
);
+
+ $records = $handler->getRecords();
+
+ $this->assertCount(1, $records, 'One log was recorded');
}
public function testBuildConfigDoesntExist()
->with('unknown.com')
->will($this->returnValue(new GrabySiteConfig()));
- $this->builder = new GrabySiteConfigBuilder($grabyConfigBuilderMock, []);
+ $logger = new Logger('foo');
+ $handler = new TestHandler();
+ $logger->pushHandler($handler);
+
+ $this->builder = new GrabySiteConfigBuilder(
+ $grabyConfigBuilderMock,
+ [],
+ $logger
+ );
$config = $this->builder->buildForHost('unknown.com');
- self::assertEquals(
- new SiteConfig([
- 'host' => 'unknown.com',
- 'requiresLogin' => false,
- 'username' => null,
- 'password' => null,
- 'extraFields' => [],
- ]),
- $config
- );
+ $this->assertFalse($config);
+
+ $records = $handler->getRecords();
+
+ $this->assertCount(1, $records, 'One log was recorded');
}
}