mirror_php/LinkAce
1
0
Fork 0
mirror of https://github.com/Kovah/LinkAce.git synced 2025-01-29 10:59:49 +01:00
Code Issues Releases Wiki Activity

Add new option to set custom User Agent with APP_USER_AGENT (#334)

Browse Source
This commit is contained in:
Kovah 2022-01-14 12:31:07 +01:00
parent 26b8ac9650
commit d9e82be485
No known key found for this signature in database
GPG Key ID: AAAA031BA9830D7B
6 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Console/Commands/CheckLinksCommand.php
View File

@ -144,7 +144,12 @@ class CheckLinksCommand extends Command
}
try {
$response = Http::timeout(20)->head($link->url);
$request = Http::timeout(20);
if (config('html-meta.user_agents', false)) {
$agents = config('html-meta.user_agents');
$request->withHeaders(['User-Agent' => $agents[array_rand($agents)]]);
}
$response = $request->head($link->url);
$statusCode = $response->status();
} catch (Exception $e) {
// Set status code to null so the link will be marked as broken

7
app/Helper/UpdateHelper.php
View File

@ -66,7 +66,12 @@ class UpdateHelper
*/
protected static function getCurrentVersionFromAPI(): ?string
{
$response = Http::get(self::RELEASE_API_URL);
$request = Http::timeout(5);
if (config('html-meta.user_agents', false)) {
$agents = config('html-meta.user_agents');
$request->withHeaders(['User-Agent' => $agents[array_rand($agents)]]);
}
$response = $request->get(self::RELEASE_API_URL);
return $response->successful() ? $response->body() : null;
}

7
app/Helper/WaybackMachine.php
View File

@ -25,7 +25,12 @@ class WaybackMachine
$archiveUrl = self::$baseUrl . '/save/' . $url;
$response = Http::head($archiveUrl);
$request = Http::timeout(10);
if (config('html-meta.user_agents', false)) {
$agents = config('html-meta.user_agents');
$request->withHeaders(['User-Agent' => $agents[array_rand($agents)]]);
}
$response = $request->head($archiveUrl);
try {
$response->throw();

7
app/Http/Controllers/FetchController.php
View File

@ -130,7 +130,12 @@ class FetchController extends Controller
]);
$url = $request->input('url');
$response = Http::timeout(3)->get($url);
$newRequest = Http::timeout(3);
if (config('html-meta.user_agents', false)) {
$agents = config('html-meta.user_agents');
$newRequest->withHeaders(['User-Agent' => $agents[array_rand($agents)]]);
}
$response = $newRequest->get($url);
if ($response->successful()) {
return response($response->body());

35
composer.lock generated
View File

@ -1922,23 +1922,23 @@
},
{
"name": "kovah/laravel-html-meta",
"version": "v2.0.0",
"version": "v2.1.0",
"source": {
"type": "git",
"url": "https://github.com/Kovah/laravel-html-meta.git",
"reference": "fde1e35a25d1ca6efaa1ca45bb1cf0fcf94fa6a8"
"reference": "7bb873ba811adb849319178b6276562cfb098c95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Kovah/laravel-html-meta/zipball/fde1e35a25d1ca6efaa1ca45bb1cf0fcf94fa6a8",
"reference": "fde1e35a25d1ca6efaa1ca45bb1cf0fcf94fa6a8",
"url": "https://api.github.com/repos/Kovah/laravel-html-meta/zipball/7bb873ba811adb849319178b6276562cfb098c95",
"reference": "7bb873ba811adb849319178b6276562cfb098c95",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^7.2",
"illuminate/http": "^7.0 | ^8.0",
"illuminate/support": "^7.0 | ^8.0",
"php": "^7.3 | ^8.0"
"php": "^7.4 | ^8.0 | ^8.1"
},
"require-dev": {
"mockery/mockery": "^1.4.2",
@ -1983,7 +1983,7 @@
],
"support": {
"issues": "https://github.com/Kovah/laravel-html-meta/issues",
"source": "https://github.com/Kovah/laravel-html-meta/tree/v2.0.0"
"source": "https://github.com/Kovah/laravel-html-meta/tree/v2.1.0"
},
"funding": [
{
@ -1991,7 +1991,7 @@
"type": "github"
}
],
"time": "2021-05-10T09:59:33+00:00"
"time": "2022-01-14T11:05:20+00:00"
},
{
"name": "laracasts/flash",
@ -4708,16 +4708,16 @@
},
{
"name": "sentry/sentry",
"version": "3.3.5",
"version": "3.3.6",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
"reference": "c186c44c32899ad0cf5b4e942d71035f01b87b64"
"reference": "1b1c35a3f5afe5c7c17d572205a7733b33ab5c87"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/c186c44c32899ad0cf5b4e942d71035f01b87b64",
"reference": "c186c44c32899ad0cf5b4e942d71035f01b87b64",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/1b1c35a3f5afe5c7c17d572205a7733b33ab5c87",
"reference": "1b1c35a3f5afe5c7c17d572205a7733b33ab5c87",
"shasum": ""
},
"require": {
@ -4744,17 +4744,18 @@
"raven/raven": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.17",
"friendsofphp/php-cs-fixer": "^2.19|3.4.*",
"http-interop/http-factory-guzzle": "^1.0",
"monolog/monolog": "^1.3|^2.0",
"nikic/php-parser": "^4.10.3",
"php-http/mock-client": "^1.3",
"phpbench/phpbench": "^1.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan": "^1.3",
"phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^8.5.14|^9.4",
"symfony/phpunit-bridge": "^5.2|^6.0",
"vimeo/psalm": "^4.2"
"vimeo/psalm": "^4.17"
},
"suggest": {
"monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
@ -4796,7 +4797,7 @@
],
"support": {
"issues": "https://github.com/getsentry/sentry-php/issues",
"source": "https://github.com/getsentry/sentry-php/tree/3.3.5"
"source": "https://github.com/getsentry/sentry-php/tree/3.3.6"
},
"funding": [
{
@ -4808,7 +4809,7 @@
"type": "custom"
}
],
"time": "2021-12-27T12:31:24+00:00"
"time": "2022-01-14T09:05:19+00:00"
},
{
"name": "sentry/sentry-laravel",

3
config/html-meta.php
View File

@ -2,4 +2,7 @@
return [
'timeout' => 10,
'parser' => \Kovah\HtmlMeta\HtmlMetaParser::class,
'user_agents' => [
env('APP_USER_AGENT', 'LinkAce/1 (https://github.com/Kovah/LinkAce)'),
],
];