oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Define a custom user-agent for wallabag

Browse source
This commit is contained in:
Adrien ERAUD 2025-02-18 12:22:36 +01:00
parent e90bbaf540
commit 1aa67747bb
No known key found for this signature in database
GPG key ID: A201CDCF5C64EA53
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/config/services.yml
View file

@ -31,6 +31,7 @@ services:
$supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')' $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
$fonts: '%wallabag.fonts%' $fonts: '%wallabag.fonts%'
$defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%' $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'
$defaultUserAgent: "%wallabag.user_agent%"
Wallabag\: Wallabag\:
resource: '../../src/*' resource: '../../src/*'
@ -206,6 +207,8 @@ services:
$config: $config:
error_message: '%wallabag.fetching_error_message%' error_message: '%wallabag.fetching_error_message%'
error_message_title: '%wallabag.fetching_error_message_title%' error_message_title: '%wallabag.fetching_error_message_title%'
http_client:
ua_browser: "%wallabag.user_agent%"
$client: '@psr18.wallabag.client' $client: '@psr18.wallabag.client'
calls: calls:
- [ setLogger, [ "@logger" ] ] - [ setLogger, [ "@logger" ] ]

1
app/config/wallabag.yml
View file

@ -183,3 +183,4 @@ parameters:
- 'text/html' - 'text/html'
- 'application/vnd.ms-excel' - 'application/vnd.ms-excel'
wallabag.resource_dir: "%kernel.project_dir%/web/uploads/import" wallabag.resource_dir: "%kernel.project_dir%/web/uploads/import"
wallabag.user_agent: "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.92 Safari/535.2"

5
src/SiteConfig/LoginFormAuthenticator.php
View file

@ -14,6 +14,7 @@ class LoginFormAuthenticator
public function __construct( public function __construct(
private readonly HttpBrowser $browser, private readonly HttpBrowser $browser,
AuthenticatorProvider $authenticatorProvider, AuthenticatorProvider $authenticatorProvider,
private readonly string $defaultUserAgent,
) { ) {
$this->expressionLanguage = new ExpressionLanguage(null, [$authenticatorProvider]); $this->expressionLanguage = new ExpressionLanguage(null, [$authenticatorProvider]);
} }
@ -84,6 +85,10 @@ class LoginFormAuthenticator
$headers["HTTP_$headerName"] = $headerValue; $headers["HTTP_$headerName"] = $headerValue;
} }
if (empty($headers['HTTP_user-agent'])) {
$headers['HTTP_user-agent'] = $this->defaultUserAgent;
}
return $headers; return $headers;
} }

12
tests/SiteConfig/LoginFormAuthenticatorTest.php
View file

@ -37,7 +37,7 @@ class LoginFormAuthenticatorTest extends TestCase
$requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]); $requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]);
$authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient); $authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient);
$auth = new LoginFormAuthenticator($browser, $authenticatorProvider); $auth = new LoginFormAuthenticator($browser, $authenticatorProvider, 'Wallabag (Symfony HttpClient/5)');
$res = $auth->login($siteConfig); $res = $auth->login($siteConfig);
@ -68,7 +68,7 @@ class LoginFormAuthenticatorTest extends TestCase
$requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]); $requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]);
$authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient); $authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient);
$auth = new LoginFormAuthenticator($browser, $authenticatorProvider); $auth = new LoginFormAuthenticator($browser, $authenticatorProvider, 'Wallabag (Symfony HttpClient/5)');
$res = $auth->login($siteConfig); $res = $auth->login($siteConfig);
@ -126,7 +126,7 @@ class LoginFormAuthenticatorTest extends TestCase
; ;
$authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient); $authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient);
$auth = new LoginFormAuthenticator($browser, $authenticatorProvider); $auth = new LoginFormAuthenticator($browser, $authenticatorProvider, 'Wallabag (Symfony HttpClient/5)');
$res = $auth->login($siteConfig); $res = $auth->login($siteConfig);
@ -151,7 +151,7 @@ class LoginFormAuthenticatorTest extends TestCase
$requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]); $requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]);
$authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient); $authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient);
$auth = new LoginFormAuthenticator($browser, $authenticatorProvider); $auth = new LoginFormAuthenticator($browser, $authenticatorProvider, 'Wallabag (Symfony HttpClient/5)');
$loginRequired = $auth->isLoginRequired($siteConfig, file_get_contents(__DIR__ . '/../fixtures/nextinpact-login.html')); $loginRequired = $auth->isLoginRequired($siteConfig, file_get_contents(__DIR__ . '/../fixtures/nextinpact-login.html'));
@ -177,7 +177,7 @@ class LoginFormAuthenticatorTest extends TestCase
$requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]); $requestHtmlFunctionClient = new MockHttpClient([$requestHtmlFunctionResponse]);
$authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient); $authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient);
$auth = new LoginFormAuthenticator($browser, $authenticatorProvider); $auth = new LoginFormAuthenticator($browser, $authenticatorProvider, 'Wallabag (Symfony HttpClient/5)');
$loginRequired = $auth->isLoginRequired($siteConfig, file_get_contents(__DIR__ . '/../fixtures/nextinpact-article.html')); $loginRequired = $auth->isLoginRequired($siteConfig, file_get_contents(__DIR__ . '/../fixtures/nextinpact-article.html'));
@ -235,7 +235,7 @@ class LoginFormAuthenticatorTest extends TestCase
; ;
$authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient); $authenticatorProvider = new AuthenticatorProvider($requestHtmlFunctionClient);
$auth = new LoginFormAuthenticator($browser, $authenticatorProvider); $auth = new LoginFormAuthenticator($browser, $authenticatorProvider, 'Wallabag (Symfony HttpClient/5)');
$res = $auth->login($siteConfig); $res = $auth->login($siteConfig);