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

Removed http fetching from image base64 generation

Browse Source
This commit is contained in:
Dan Brown 2020-12-06 14:24:22 +00:00
parent 7d38c96a23
commit 8911e3f441
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/Uploads/ImageService.php
View File

@ -418,36 +418,25 @@ class ImageService
/** /**
* Convert a image URI to a Base64 encoded string. * Convert a image URI to a Base64 encoded string.
* Attempts to find locally via set storage method first. * Attempts to convert the URL to a system storage url then
* fetch the data from the disk or storage location.
* Returns null if the image data cannot be fetched from storage.
* @throws FileNotFoundException * @throws FileNotFoundException
*/ */
public function imageUriToBase64(string $uri): ?string public function imageUriToBase64(string $uri): ?string
{ {
$isLocal = strpos(trim($uri), 'http') !== 0; $storagePath = $this->imageUrlToStoragePath($uri);
if (empty($uri) || is_null($storagePath)) {
// Attempt to find local files even if url not absolute return null;
$base = url('/');
if (!$isLocal && strpos($uri, $base) === 0) {
$isLocal = true;
$uri = str_replace($base, '', $uri);
} }
$storage = $this->getStorage();
$imageData = null; $imageData = null;
if ($storage->exists($storagePath)) {
if ($isLocal) { $imageData = $storage->get($storagePath);
$uri = trim($uri, '/');
$storage = $this->getStorage();
if ($storage->exists($uri)) {
$imageData = $storage->get($uri);
}
} else {
try {
$imageData = $this->http->fetch($uri);
} catch (Exception $e) {
}
} }
if ($imageData === null) { if (is_null($imageData)) {
return null; return null;
} }
@ -459,6 +448,36 @@ class ImageService
return 'data:image/' . $extension . ';base64,' . base64_encode($imageData); return 'data:image/' . $extension . ';base64,' . base64_encode($imageData);
} }
/**
* Get a storage path for the given image URL.
* Returns null if the url cannot be resolved to a local URL.
*/
private function imageUrlToStoragePath(string $url): ?string
{
$url = trim($url);
// Handle potential relative paths
$isRelative = strpos($url, 'http') !== 0;
if ($isRelative) {
return trim($url, '/');
}
// Handle local images based on paths on the same domain
$potentialHostPaths = [
url('/'),
$this->getPublicUrl('/'),
];
foreach ($potentialHostPaths as $potentialBasePath) {
$potentialBasePath = strtolower($potentialBasePath);
if (strpos(strtolower($url), $potentialBasePath) === 0) {
return trim(substr($url, strlen($potentialBasePath)), '/');
}
}
return null;
}
/** /**
* Gets a public facing url for an image by checking relevant environment variables. * Gets a public facing url for an image by checking relevant environment variables.
* If s3-style store is in use it will default to guessing a public bucket URL. * If s3-style store is in use it will default to guessing a public bucket URL.