Skip to content

Commit ef8515b

Browse files
committed
MAGETWO-45465: CSRF not validated or regenerated in Magento
- fixed static legacy test
1 parent c30fbcd commit ef8515b

File tree

1 file changed

+16
-5
lines changed
  • app/code/Magento/Backend/Controller/Adminhtml/Auth

1 file changed

+16
-5
lines changed

app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,30 @@ public function execute()
3838
if ($this->_auth->getAuthStorage()->isFirstPageAfterLogin()) {
3939
$this->_auth->getAuthStorage()->setIsFirstPageAfterLogin(true);
4040
}
41-
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
42-
$resultRedirect = $this->resultRedirectFactory->create();
43-
$resultRedirect->setPath($this->_backendUrl->getStartupPageUrl());
44-
return $resultRedirect;
41+
return $this->getRedirect($this->_backendUrl->getStartupPageUrl());
4542
}
4643

4744
$requestUrl = $this->getRequest()->getUri();
4845
$backendUrl = $this->getUrl('*');
4946
// redirect according to rewrite rule
5047
if ($requestUrl != $backendUrl) {
51-
$this->_redirect('*');
48+
return $this->getRedirect($backendUrl);
5249
} else {
5350
return $this->resultPageFactory->create();
5451
}
5552
}
53+
54+
/**
55+
* Get redirect response
56+
*
57+
* @param string $path
58+
* @return \Magento\Backend\Model\View\Result\Redirect
59+
*/
60+
private function getRedirect($path)
61+
{
62+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
63+
$resultRedirect = $this->resultRedirectFactory->create();
64+
$resultRedirect->setPath($path);
65+
return $resultRedirect;
66+
}
5667
}

0 commit comments

Comments
 (0)