[RTM] Distinguish between error 401 and 403 #1381
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
leofeyer
changed the title
aschempp
suggested changes
Feb 19, 2018
| @@ -79,7 +81,7 @@ public function loginAction(): Response | |||
| { | |||
| $this->get('contao.framework')->initialize(); | |||
|
|
|||
| if (!isset($GLOBALS['TL_PTY']['error_403']) || !class_exists($GLOBALS['TL_PTY']['error_403'])) { | |||
| if (!isset($GLOBALS['TL_PTY']['error_401']) || !class_exists($GLOBALS['TL_PTY']['error_401'])) { | |||
| return $this->redirectToRoute('contao_root'); | |||
There was a problem hiding this comment.
You should throw the UnauthorizedHttpException here as well
| if ($objPage->protected) | ||
| { | ||
| if (!\System::getContainer()->get('contao.security.token_checker')->hasFrontendUser()) |
There was a problem hiding this comment.
This service should not be used in this case. It's only meant to check users across firewalls (because it unserialized the token from the session instead of using the token storage).
| public static function find401ByPid($intPid, array $arrOptions=array()) | ||
| { | ||
| $t = static::$strTable; | ||
| $arrColumns = array("$t.pid=? AND $t.type='error_401'"); |
There was a problem hiding this comment.
so this only works if the page is a direct child of the root page? Is this already the case for 403?
| */ | ||
| protected function prepare($objRootPage=null) | ||
| { | ||
| // Use the given root page object if available (thanks to Andreas Schempp) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR implements #1274.