Skip to content

Make Phabricator return the user to the page they were on after prompting for an MFA #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toastwaffle wants to merge 1 commit into
base: tm-master
Choose a base branch
from
Open

Make Phabricator return the user to the page they were on after prompting for an MFA #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/applications/auth/controller/PhabricatorAuthFinishController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ public function handleRequest(AphrontRequest $request) {
return id(new AphrontRedirectResponse())->setURI('/');
}

$next_uri = PhabricatorCookies::getNextURICookie($request);
if (!phutil_nonempty_string($next_uri)) {
if ($this->getDelegatingController()) {
$next_uri = (string)$request->getRequestURI();
if (!$request->isFormPost()) {
PhabricatorCookies::setNextURICookie($request, $next_uri);
}
}
}

$engine = new PhabricatorAuthSessionEngine();

// If this cookie is set, the user is headed into a high security area
Expand Down
18 changes: 17 additions & 1 deletion src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ public function handleRequest(AphrontRequest $request) {
return new Aphront400Response();
}

$next_uri = PhabricatorCookies::getNextURICookie($request);
if (!phutil_nonempty_string($next_uri)) {
if ($this->getDelegatingController()) {
$next_uri = (string)$request->getRequestURI();
if (!$request->isFormPost()) {
PhabricatorCookies::setNextURICookie($request, $next_uri);
}
}
}

$panels = $this->loadPanels();

$multifactor_key = id(new PhabricatorMultiFactorSettingsPanel())
Expand Down Expand Up @@ -190,11 +200,17 @@ private function newGuidance() {
'You can make adjustments from the [[ /settings/ | Settings ]] panel '.
'later.');

$request = $this->getRequest();
$next = PhabricatorCookies::getNextURICookie($request);
if (!PhabricatorEnv::isValidLocalURIForLink($next)) {
$next = '/';
}

return $this->newDialog()
->setTitle(pht('Multi-Factor Authentication Setup Complete'))
->setWidth(AphrontDialogView::WIDTH_FULL)
->appendChild(new PHUIRemarkupView($viewer, $guidance))
->addCancelButton('/', pht('Continue'));
->addCancelButton($next, pht('Continue'));
}

$views = array();
Expand Down