-
Notifications
You must be signed in to change notification settings - Fork 644
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4016 from chihiro-adachi/fix-redirect
リダイレクト処理の修正(3.0)
- Loading branch information
Showing
4 changed files
with
155 additions
and
1 deletion.
There are no files selected for viewing
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
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
57 changes: 57 additions & 0 deletions
57
src/Eccube/Security/Http/Authentication/EccubeAuthenticationFailureHandler.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of EC-CUBE | ||
| * | ||
| * Copyright(c) 2000-2015 LOCKON CO.,LTD. All Rights Reserved. | ||
| * | ||
| * http://www.lockon.co.jp/ | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| */ | ||
|
|
||
| namespace Eccube\Security\Http\Authentication; | ||
|
|
||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\Security\Core\Exception\AuthenticationException; | ||
| use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler; | ||
|
|
||
| class EccubeAuthenticationFailureHandler extends DefaultAuthenticationFailureHandler | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function onAuthenticationFailure(Request $request, AuthenticationException $exception) | ||
| { | ||
| $response = parent::onAuthenticationFailure($request, $exception); | ||
| $targetUrl = $response->getTargetUrl(); | ||
|
|
||
| if (preg_match('/^https?:\\\\/i', $targetUrl)) { | ||
| $response->setTargetUrl($request->getUriForPath('/')); | ||
|
|
||
| return $response; | ||
| } | ||
|
|
||
| $host = $request->getHttpHost(); | ||
| $targetRequest = Request::create($response->getTargetUrl()); | ||
| $targetHost = $targetRequest->getHttpHost(); | ||
|
|
||
| if (strpos($targetHost, $host) !== 0) { | ||
| $response->setTargetUrl($request->getUriForPath('/')); | ||
| } | ||
|
|
||
| return $response; | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
src/Eccube/Security/Http/Authentication/EccubeAuthenticationSuccessHandler.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of EC-CUBE | ||
| * | ||
| * Copyright(c) 2000-2015 LOCKON CO.,LTD. All Rights Reserved. | ||
| * | ||
| * http://www.lockon.co.jp/ | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| */ | ||
|
|
||
| namespace Eccube\Security\Http\Authentication; | ||
|
|
||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; | ||
| use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler; | ||
|
|
||
| class EccubeAuthenticationSuccessHandler extends DefaultAuthenticationSuccessHandler | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function onAuthenticationSuccess(Request $request, TokenInterface $token) | ||
| { | ||
| $response = parent::onAuthenticationSuccess($request, $token); | ||
| $targetUrl = $response->getTargetUrl(); | ||
|
|
||
| if (preg_match('/^https?:\\\\/i', $targetUrl)) { | ||
| $response->setTargetUrl($request->getUriForPath('/')); | ||
|
|
||
| return $response; | ||
| } | ||
|
|
||
| $host = $request->getHttpHost(); | ||
| $targetRequest = Request::create($response->getTargetUrl()); | ||
| $targetHost = $targetRequest->getHttpHost(); | ||
|
|
||
| if (strpos($targetHost, $host) !== 0) { | ||
| $response->setTargetUrl($request->getUriForPath('/')); | ||
| } | ||
|
|
||
| return $response; | ||
| } | ||
| } |