archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Consolidate use of magical cookie name strings

Browse Source 
Summary: Ref T4339. We have more magical cookie names than we should, move them all to a central location.

Test Plan: Registered, logged in, linked account, logged out. See inlines.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T4339

Differential Revision: https://secure.phabricator.com/D8041
This commit is contained in:
epriestley
2014-01-23 14:01:35 -08:00
parent 02aa193cb0
commit 0727418023
15 changed files with 116 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/applications/auth/controller/PhabricatorAuthValidateController.php
View File

@@ -13,7 +13,7 @@ final class PhabricatorAuthValidateController
$failures = array();
if (!strlen($request->getStr('phusr'))) {
if (!strlen($request->getStr('expect'))) {
return $this->renderErrors(
array(
pht(
@@ -21,8 +21,8 @@ final class PhabricatorAuthValidateController
'phusr')));
}
$expect_phusr = $request->getStr('phusr');
$actual_phusr = $request->getCookie('phusr');
$expect_phusr = $request->getStr('expect');
$actual_phusr = $request->getCookie(PhabricatorCookies::COOKIE_USERNAME);
if ($actual_phusr != $expect_phusr) {
if ($actual_phusr) {
$failures[] = pht(
@@ -54,8 +54,8 @@ final class PhabricatorAuthValidateController
return $this->renderErrors($failures);
}
$next = $request->getCookie('next_uri');
$request->clearCookie('next_uri');
$next = $request->getCookie(PhabricatorCookies::COOKIE_NEXTURI);
$request->clearCookie(PhabricatorCookies::COOKIE_NEXTURI);
if (!PhabricatorEnv::isValidLocalWebResource($next)) {
$next = '/';