kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 18:58:07 +00:00
Code Issues Projects Releases Wiki Activity

Add debug for issue https://github.com/firefly-iii/firefly-iii/issues/8110

Browse Source
This commit is contained in:
James Cole
2023-11-01 18:53:36 +01:00
parent 3b4b074bae
commit dedc1e8131
1 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/Helpers/Attachments/AttachmentHelper.php
View File

@@ -32,6 +32,7 @@ use Illuminate\Contracts\Encryption\EncryptException;
use Illuminate\Contracts\Filesystem\Filesystem; use Illuminate\Contracts\Filesystem\Filesystem;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\MessageBag; use Illuminate\Support\MessageBag;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -79,7 +80,7 @@ class AttachmentHelper implements AttachmentHelperInterface
try { try {
$unencryptedData = Crypt::decrypt($encryptedData); // verified $unencryptedData = Crypt::decrypt($encryptedData); // verified
} catch (DecryptException $e) { } catch (DecryptException $e) {
app('log')->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage())); Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
$unencryptedData = $encryptedData; $unencryptedData = $encryptedData;
} }
@@ -138,33 +139,42 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
public function saveAttachmentFromApi(Attachment $attachment, string $content): bool public function saveAttachmentFromApi(Attachment $attachment, string $content): bool
{ {
Log::debug(sprintf('Now in %s', __METHOD__));
$resource = tmpfile(); $resource = tmpfile();
if (false === $resource) { if (false === $resource) {
app('log')->error('Cannot create temp-file for file upload.'); Log::error('Cannot create temp-file for file upload.');
return false; return false;
} }
if ('' === $content) { if ('' === $content) {
app('log')->error('Cannot upload empty file.'); Log::error('Cannot upload empty file.');
return false; return false;
} }
$path = stream_get_meta_data($resource)['uri']; $path = stream_get_meta_data($resource)['uri'];
fwrite($resource, $content); Log::debug(sprintf('Path is %s', $path));
$result = fwrite($resource, $content);
if(false === $result) {
Log::error('Could not write temp file.');
return false;
}
Log::debug(sprintf('Wrote %d bytes to temp file.', $result));
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$mime = finfo_file($finfo, $path); $mime = finfo_file($finfo, $path);
$allowedMime = config('firefly.allowedMimes'); $allowedMime = config('firefly.allowedMimes');
if (!in_array($mime, $allowedMime, true)) { if (!in_array($mime, $allowedMime, true)) {
app('log')->error(sprintf('Mime type %s is not allowed for API file upload.', $mime)); Log::error(sprintf('Mime type %s is not allowed for API file upload.', $mime));
fclose($resource); fclose($resource);
return false; return false;
} }
Log::debug(sprintf('Found mime "%s" in file "%s"', $mime, $path));
// is allowed? Save the file, without encryption. // is allowed? Save the file, without encryption.
$parts = explode('/', $attachment->fileName()); $parts = explode('/', $attachment->fileName());
$file = $parts[count($parts) - 1]; $file = $parts[count($parts) - 1];
Log::debug(sprintf('Write file to disk in file named "%s"', $file));
$this->uploadDisk->put($file, $content); $this->uploadDisk->put($file, $content);
// update attachment. // update attachment.
@@ -174,6 +184,8 @@ class AttachmentHelper implements AttachmentHelperInterface
$attachment->uploaded = true; $attachment->uploaded = true;
$attachment->save(); $attachment->save();
Log::debug('Done!');
return true; return true;
} }
@@ -192,19 +204,19 @@ class AttachmentHelper implements AttachmentHelperInterface
return false; return false;
} }
app('log')->debug(sprintf('Now in saveAttachmentsForModel for model %s', get_class($model))); Log::debug(sprintf('Now in saveAttachmentsForModel for model %s', get_class($model)));
if (is_array($files)) { if (is_array($files)) {
app('log')->debug('$files is an array.'); Log::debug('$files is an array.');
/** @var UploadedFile $entry */ /** @var UploadedFile $entry */
foreach ($files as $entry) { foreach ($files as $entry) {
if (null !== $entry) { if (null !== $entry) {
$this->processFile($entry, $model); $this->processFile($entry, $model);
} }
} }
app('log')->debug('Done processing uploads.'); Log::debug('Done processing uploads.');
} }
if (!is_array($files)) { if (!is_array($files)) {
app('log')->debug('Array of files is not an array. Probably nothing uploaded. Will not store attachments.'); Log::debug('Array of files is not an array. Probably nothing uploaded. Will not store attachments.');
} }
return true; return true;
@@ -222,7 +234,7 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
protected function processFile(UploadedFile $file, Model $model): ?Attachment protected function processFile(UploadedFile $file, Model $model): ?Attachment
{ {
app('log')->debug('Now in processFile()'); Log::debug('Now in processFile()');
$validation = $this->validateUpload($file, $model); $validation = $this->validateUpload($file, $model);
$attachment = null; $attachment = null;
if (false !== $validation) { if (false !== $validation) {
@@ -241,7 +253,7 @@ class AttachmentHelper implements AttachmentHelperInterface
$attachment->size = $file->getSize(); $attachment->size = $file->getSize();
$attachment->uploaded = false; $attachment->uploaded = false;
$attachment->save(); $attachment->save();
app('log')->debug('Created attachment:', $attachment->toArray()); Log::debug('Created attachment:', $attachment->toArray());
$fileObject = $file->openFile(); $fileObject = $file->openFile();
$fileObject->rewind(); $fileObject->rewind();
@@ -251,7 +263,7 @@ class AttachmentHelper implements AttachmentHelperInterface
} }
$content = $fileObject->fread($file->getSize()); $content = $fileObject->fread($file->getSize());
app('log')->debug(sprintf('Full file length is %d and upload size is %d.', strlen($content), $file->getSize())); Log::debug(sprintf('Full file length is %d and upload size is %d.', strlen($content), $file->getSize()));
// store it without encryption. // store it without encryption.
$this->uploadDisk->put($attachment->fileName(), $content); $this->uploadDisk->put($attachment->fileName(), $content);
@@ -277,13 +289,13 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
protected function validateUpload(UploadedFile $file, Model $model): bool protected function validateUpload(UploadedFile $file, Model $model): bool
{ {
app('log')->debug('Now in validateUpload()'); Log::debug('Now in validateUpload()');
$result = true; $result = true;
if (!$this->validMime($file)) { if (!$this->validMime($file)) {
$result = false; $result = false;
} }
if (0 === $file->getSize()) { if (0 === $file->getSize()) {
app('log')->error('Cannot upload empty file.'); Log::error('Cannot upload empty file.');
$result = false; $result = false;
} }
@@ -309,17 +321,17 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
protected function validMime(UploadedFile $file): bool protected function validMime(UploadedFile $file): bool
{ {
app('log')->debug('Now in validMime()'); Log::debug('Now in validMime()');
$mime = e($file->getMimeType()); $mime = e($file->getMimeType());
$name = e($file->getClientOriginalName()); $name = e($file->getClientOriginalName());
app('log')->debug(sprintf('Name is %s, and mime is %s', $name, $mime)); Log::debug(sprintf('Name is %s, and mime is %s', $name, $mime));
app('log')->debug('Valid mimes are', $this->allowedMimes); Log::debug('Valid mimes are', $this->allowedMimes);
$result = true; $result = true;
if (!in_array($mime, $this->allowedMimes, true)) { if (!in_array($mime, $this->allowedMimes, true)) {
$msg = (string)trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]); $msg = (string)trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]);
$this->errors->add('attachments', $msg); $this->errors->add('attachments', $msg);
app('log')->error($msg); Log::error($msg);
$result = false; $result = false;
} }
@@ -343,7 +355,7 @@ class AttachmentHelper implements AttachmentHelperInterface
if ($size > $this->maxUploadSize) { if ($size > $this->maxUploadSize) {
$msg = (string)trans('validation.file_too_large', ['name' => $name]); $msg = (string)trans('validation.file_too_large', ['name' => $name]);
$this->errors->add('attachments', $msg); $this->errors->add('attachments', $msg);
app('log')->error($msg); Log::error($msg);
$result = false; $result = false;
} }
@@ -376,7 +388,7 @@ class AttachmentHelper implements AttachmentHelperInterface
if ($count > 0) { if ($count > 0) {
$msg = (string)trans('validation.file_already_attached', ['name' => $name]); $msg = (string)trans('validation.file_already_attached', ['name' => $name]);
$this->errors->add('attachments', $msg); $this->errors->add('attachments', $msg);
app('log')->error($msg); Log::error($msg);
$result = true; $result = true;
} }