diff --git a/.env.example b/.env.example index 3b4f7c74c5..e07c635c51 100644 --- a/.env.example +++ b/.env.example @@ -10,7 +10,6 @@ APP_DEBUG=false SITE_OWNER=mail@example.com # The encryption key for your sessions. Keep this very secure. -# If you generate a new one all existing attachments must be considered LOST. # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it. # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE APP_KEY=SomeRandomStringOf32CharsExactly diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index b29615721d..12af2e9376 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -306,7 +306,7 @@ class AttachmentHelper implements AttachmentHelperInterface $content = $fileObject->fread($file->getSize()); Log::debug(sprintf('Full file length is %d and upload size is %d.', strlen($content), $file->getSize())); - // store it: + // store it without encryption. $this->uploadDisk->put($attachment->fileName(), $content); $attachment->uploaded = true; // update attachment $attachment->save(); diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 2968bc937b..1d9842131f 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -112,6 +112,8 @@ class LoginController extends Controller Log::channel('audit')->info(sprintf('User "%s" has been logged in.', $request->get('email'))); Log::debug(sprintf('Redirect after login is %s.', $this->redirectPath())); + // if you just logged in, it can't be that you have a valid 2FA cookie. + return $this->sendLoginResponse($request); } diff --git a/changelog.md b/changelog.md index 2c3f13cc85..4c79d71030 100644 --- a/changelog.md +++ b/changelog.md @@ -12,7 +12,8 @@ Some warnings before you install this version Several alpha and beta releases preceded this release. - 5.4.0-alpha.1 on 2020-08-14 -- 5.4.0-alpha.2 on 2020-08-?? +- 5.4.0-alpha.2 on 2020-08-21 +- 5.4.0-alpha.3 on 2020-08-21 ### Added - [Issue 3187](https://github.com/firefly-iii/firefly-iii/issues/3187) A new field for transaction URL's. @@ -38,7 +39,7 @@ Several alpha and beta releases preceded this release. ### Changed - ⚠️ All auto-complete code now uses the API; let me know if errors occur. - ⚠️ New rule processing engine, which is much faster than the old one, especially on large datasets. Expect several magnitudes of time improvements. -- ⚠️ Many new search operators, which are documented [in the documentation](). +- ⚠️ Many new search operators, which are documented [in the documentation](https://docs.firefly-iii.org/concepts/search). - [Issue 3578](https://github.com/firefly-iii/firefly-iii/issues/3578) Use php-intl to do currency formatting, made by @hoshsadiq - [Issue 3586](https://github.com/firefly-iii/firefly-iii/issues/3586) Removed features that aren't necessary when using third party auth providers. - [Issue 3659](https://github.com/firefly-iii/firefly-iii/issues/3659) Update the readme to include third party apps.