kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Disable the encryption of uploads, in line with other efforts not to encrypt local data.

Browse Source
This commit is contained in:
James Cole
2019-08-25 07:25:01 +02:00
parent 6b86a35ffb
commit af2f085aa7
8 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/DecryptDatabase.php
View File

@@ -148,7 +148,7 @@ class DecryptDatabase extends Command
private function tryDecrypt($value)
{
try {
$value = Crypt::decrypt($value);
$value = Crypt::decrypt($value); // verified
} catch (DecryptException $e) {
if ('The MAC is invalid.' === $e->getMessage()) {
throw new FireflyException($e->getMessage()); // @codeCoverageIgnore

16
app/Console/Commands/ScanAttachments.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\Attachment;
use Illuminate\Console\Command;
use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
use Log;
use Storage;
/**
@@ -51,7 +52,7 @@ class ScanAttachments extends Command
*
* @var string
*/
protected $signature = 'firefly:scan-attachments';
protected $signature = 'firefly-iii:scan-attachments';
/**
* Execute the console command.
@@ -62,21 +63,22 @@ class ScanAttachments extends Command
$disk = Storage::disk('upload');
/** @var Attachment $attachment */
foreach ($attachments as $attachment) {
$fileName = $attachment->fileName();
$fileName = $attachment->fileName();
$decryptedContent = '';
try {
$content = $disk->get($fileName);
$encryptedContent = $disk->get($fileName);
} catch (FileNotFoundException $e) {
$this->error(sprintf('Could not find data for attachment #%d: %s', $attachment->id, $e->getMessage()));
continue;
}
try {
$decrypted = Crypt::decrypt($content);
$decryptedContent = Crypt::decrypt($encryptedContent); // verified
} catch (DecryptException $e) {
$this->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
continue;
Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
$decryptedContent = $encryptedContent;
}
$tempFileName = tempnam(sys_get_temp_dir(), 'FireflyIII');
file_put_contents($tempFileName, $decrypted);
file_put_contents($tempFileName, $decryptedContent);
$md5 = md5_file($tempFileName);
$mime = mime_content_type($tempFileName);
$attachment->md5 = $md5;