Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed disabling of avatar urls, Removed id from gravatar image name

Browse Source 
Included test to cover avatar url disabling.
Related to #1835
This commit is contained in:
Dan Brown 2022-07-26 12:10:19 +01:00
parent 2ec8a33927
commit d4a119b2aa
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Uploads/UserAvatars.php
View File

@ -6,6 +6,7 @@ use BookStack\Auth\User;
use BookStack\Exceptions\HttpFetchException; use BookStack\Exceptions\HttpFetchException;
use Exception; use Exception;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
class UserAvatars class UserAvatars
{ {
@ -93,7 +94,7 @@ class UserAvatars
*/ */
protected function createAvatarImageFromData(User $user, string $imageData, string $extension): Image protected function createAvatarImageFromData(User $user, string $imageData, string $extension): Image
{ {
$imageName = str_replace(' ', '-', $user->id . '-avatar.' . $extension); $imageName = Str::random(10) . '-avatar.' . $extension;
$image = $this->imageService->saveNew($imageName, $imageData, 'user', $user->id); $image = $this->imageService->saveNew($imageName, $imageData, 'user', $user->id);
$image->created_by = $user->id; $image->created_by = $user->id;
@ -134,7 +135,12 @@ class UserAvatars
*/ */
protected function getAvatarUrl(): string protected function getAvatarUrl(): string
{ {
$url = trim(config('services.avatar_url')); $configOption = config('services.avatar_url');
if ($configOption === false) {
return '';
}
$url = trim($configOption);
if (empty($url) && !config('services.disable_services')) { if (empty($url) && !config('services.disable_services')) {
$url = 'https://www.gravatar.com/avatar/${hash}?s=${size}&d=identicon'; $url = 'https://www.gravatar.com/avatar/${hash}?s=${size}&d=identicon';

15
tests/Uploads/AvatarTest.php
View File

@ -82,6 +82,21 @@ class AvatarTest extends TestCase
$this->createUserRequest($user); $this->createUserRequest($user);
} }
public function test_avatar_not_fetched_if_avatar_url_option_set_to_false()
{
config()->set([
'services.disable_services' => false,
'services.avatar_url' => false,
]);
$user = User::factory()->make();
$http = $this->mock(HttpFetcher::class);
$http->shouldNotReceive('fetch');
$this->createUserRequest($user);
}
public function test_no_failure_but_error_logged_on_failed_avatar_fetch() public function test_no_failure_but_error_logged_on_failed_avatar_fetch()
{ {
config()->set([ config()->set([