From 3d9e328fb3884720c26f467346dd81bfe1d79dd4 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 14 Jan 2014 11:05:45 -0800 Subject: [PATCH] Add an "active login sessions" table to Settings Summary: Ref T4310. Ref T3720. Partly, this makes it easier for users to understand login sessions. Partly, it makes it easier for me to make changes to login sessions for T4310 / T3720 without messing anything up. Test Plan: {F101512} Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T3720, T4310 Differential Revision: https://secure.phabricator.com/D7954 --- src/__phutil_library_map__.php | 10 ++ .../query/PhabricatorAuthSessionQuery.php | 73 ++++++++++++++ .../auth/storage/PhabricatorAuthSession.php | 72 ++++++++++++++ .../base/controller/PhabricatorController.php | 2 +- .../PhabricatorSettingsPanelSessions.php | 95 +++++++++++++++++++ 5 files changed, 251 insertions(+), 1 deletion(-) create mode 100644 src/applications/auth/query/PhabricatorAuthSessionQuery.php create mode 100644 src/applications/auth/storage/PhabricatorAuthSession.php create mode 100644 src/applications/settings/panel/PhabricatorSettingsPanelSessions.php diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 16b800ccb8..45b832608d 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1202,6 +1202,8 @@ phutil_register_library_map(array( 'PhabricatorAuthProviderPassword' => 'applications/auth/provider/PhabricatorAuthProviderPassword.php', 'PhabricatorAuthProviderPersona' => 'applications/auth/provider/PhabricatorAuthProviderPersona.php', 'PhabricatorAuthRegisterController' => 'applications/auth/controller/PhabricatorAuthRegisterController.php', + 'PhabricatorAuthSession' => 'applications/auth/storage/PhabricatorAuthSession.php', + 'PhabricatorAuthSessionQuery' => 'applications/auth/query/PhabricatorAuthSessionQuery.php', 'PhabricatorAuthStartController' => 'applications/auth/controller/PhabricatorAuthStartController.php', 'PhabricatorAuthUnlinkController' => 'applications/auth/controller/PhabricatorAuthUnlinkController.php', 'PhabricatorAuthValidateController' => 'applications/auth/controller/PhabricatorAuthValidateController.php', @@ -1915,6 +1917,7 @@ phutil_register_library_map(array( 'PhabricatorSettingsPanelPassword' => 'applications/settings/panel/PhabricatorSettingsPanelPassword.php', 'PhabricatorSettingsPanelSSHKeys' => 'applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php', 'PhabricatorSettingsPanelSearchPreferences' => 'applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php', + 'PhabricatorSettingsPanelSessions' => 'applications/settings/panel/PhabricatorSettingsPanelSessions.php', 'PhabricatorSetupCheck' => 'applications/config/check/PhabricatorSetupCheck.php', 'PhabricatorSetupCheckAPC' => 'applications/config/check/PhabricatorSetupCheckAPC.php', 'PhabricatorSetupCheckAuth' => 'applications/config/check/PhabricatorSetupCheckAuth.php', @@ -3760,6 +3763,12 @@ phutil_register_library_map(array( 'PhabricatorAuthProviderPassword' => 'PhabricatorAuthProvider', 'PhabricatorAuthProviderPersona' => 'PhabricatorAuthProvider', 'PhabricatorAuthRegisterController' => 'PhabricatorAuthController', + 'PhabricatorAuthSession' => + array( + 0 => 'PhabricatorAuthDAO', + 1 => 'PhabricatorPolicyInterface', + ), + 'PhabricatorAuthSessionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorAuthStartController' => 'PhabricatorAuthController', 'PhabricatorAuthUnlinkController' => 'PhabricatorAuthController', 'PhabricatorAuthValidateController' => 'PhabricatorAuthController', @@ -4548,6 +4557,7 @@ phutil_register_library_map(array( 'PhabricatorSettingsPanelPassword' => 'PhabricatorSettingsPanel', 'PhabricatorSettingsPanelSSHKeys' => 'PhabricatorSettingsPanel', 'PhabricatorSettingsPanelSearchPreferences' => 'PhabricatorSettingsPanel', + 'PhabricatorSettingsPanelSessions' => 'PhabricatorSettingsPanel', 'PhabricatorSetupCheckAPC' => 'PhabricatorSetupCheck', 'PhabricatorSetupCheckAuth' => 'PhabricatorSetupCheck', 'PhabricatorSetupCheckBaseURI' => 'PhabricatorSetupCheck', diff --git a/src/applications/auth/query/PhabricatorAuthSessionQuery.php b/src/applications/auth/query/PhabricatorAuthSessionQuery.php new file mode 100644 index 0000000000..24fe83b568 --- /dev/null +++ b/src/applications/auth/query/PhabricatorAuthSessionQuery.php @@ -0,0 +1,73 @@ +identityPHIDs = $identity_phids; + return $this; + } + + protected function loadPage() { + $table = new PhabricatorAuthSession(); + $conn_r = $table->establishConnection('r'); + + $data = queryfx_all( + $conn_r, + 'SELECT * FROM %T %Q %Q %Q', + $table->getTableName(), + $this->buildWhereClause($conn_r), + $this->buildOrderClause($conn_r), + $this->buildLimitClause($conn_r)); + + return $table->loadAllFromArray($data); + } + + protected function willFilterPage(array $sessions) { + $identity_phids = mpull($sessions, 'getUserPHID'); + + $identity_objects = id(new PhabricatorObjectQuery()) + ->setViewer($this->getViewer()) + ->setParentQuery($this) + ->withPHIDs($identity_phids) + ->execute(); + $identity_objects = mpull($identity_objects, null, 'getPHID'); + + foreach ($sessions as $key => $session) { + $identity_object = idx($identity_objects, $session->getUserPHID()); + if (!$identity_object) { + unset($sessions[$key]); + } else { + $session->attachIdentityObject($identity_object); + } + } + + return $sessions; + } + + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { + $where = array(); + + if ($this->identityPHIDs) { + $where[] = qsprintf( + $conn_r, + 'userPHID IN (%Ls)', + $this->identityPHIDs); + } + + $where[] = $this->buildPagingClause($conn_r); + + return $this->formatWhereClause($where); + } + + public function getPagingColumn() { + return 'sessionKey'; + } + + public function getQueryApplicationClass() { + return 'PhabricatorApplicationAuth'; + } + +} diff --git a/src/applications/auth/storage/PhabricatorAuthSession.php b/src/applications/auth/storage/PhabricatorAuthSession.php new file mode 100644 index 0000000000..493adc5650 --- /dev/null +++ b/src/applications/auth/storage/PhabricatorAuthSession.php @@ -0,0 +1,72 @@ + self::IDS_MANUAL, + self::CONFIG_TIMESTAMPS => false, + ) + parent::getConfiguration(); + } + + public function getApplicationName() { + // This table predates the "Auth" application, and really all applications. + return 'user'; + } + + public function getTableName() { + // This is a very old table with a nonstandard name. + return PhabricatorUser::SESSION_TABLE; + } + + public function attachIdentityObject($identity_object) { + $this->identityObject = $identity_object; + return $this; + } + + public function getIdentityObject() { + return $this->assertAttached($this->identityObject); + } + + +/* -( PhabricatorPolicyInterface )----------------------------------------- */ + + + public function getCapabilities() { + return array( + PhabricatorPolicyCapability::CAN_VIEW, + ); + } + + public function getPolicy($capability) { + return PhabricatorPolicies::POLICY_NOONE; + } + + public function hasAutomaticCapability($capability, PhabricatorUser $viewer) { + if (!$viewer->getPHID()) { + return false; + } + + $object = $this->getIdentityObject(); + if ($object instanceof PhabricatorUser) { + return ($object->getPHID() == $viewer->getPHID()); + } else if ($object instanceof PhabricatorExternalAccount) { + return ($object->getUserPHID() == $viewer->getPHID()); + } + + return false; + } + + public function describeAutomaticCapability($capability) { + return pht('A session is visible only to its owner.'); + } + +} diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php index 4d7d6e3243..373cd07208 100644 --- a/src/applications/base/controller/PhabricatorController.php +++ b/src/applications/base/controller/PhabricatorController.php @@ -44,7 +44,7 @@ abstract class PhabricatorController extends AphrontController { 'SELECT u.* FROM %T u JOIN %T s ON u.phid = s.userPHID AND s.type LIKE %> AND s.sessionKey = %s', $user->getTableName(), - 'phabricator_session', + PhabricatorUser::SESSION_TABLE, 'web-', PhabricatorHash::digest($phsid)); if ($info) { diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSessions.php b/src/applications/settings/panel/PhabricatorSettingsPanelSessions.php new file mode 100644 index 0000000000..0923541a98 --- /dev/null +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSessions.php @@ -0,0 +1,95 @@ +getUser(); + + $accounts = id(new PhabricatorExternalAccountQuery()) + ->setViewer($viewer) + ->withUserPHIDs(array($viewer->getPHID())) + ->execute(); + + $identity_phids = mpull($accounts, 'getPHID'); + $identity_phids[] = $viewer->getPHID(); + + $sessions = id(new PhabricatorAuthSessionQuery()) + ->setViewer($viewer) + ->withIdentityPHIDs($identity_phids) + ->execute(); + + $handles = id(new PhabricatorHandleQuery()) + ->setViewer($viewer) + ->withPHIDs($identity_phids) + ->execute(); + + // TODO: Once this has a real ID column, use that instead. + $sessions = msort($sessions, 'getSessionStart'); + $sessions = array_reverse($sessions); + + $current_key = PhabricatorHash::digest($request->getCookie('phsid')); + + $rows = array(); + $rowc = array(); + foreach ($sessions as $session) { + if ($session->getSessionKey() == $current_key) { + $rowc[] = 'highlighted'; + } else { + $rowc[] = null; + } + + $rows[] = array( + $handles[$session->getUserPHID()]->renderLink(), + substr($session->getSessionKey(), 0, 12), + $session->getType(), + phabricator_datetime($session->getSessionStart(), $viewer), + ); + } + + $table = new AphrontTableView($rows); + $table->setNoDataString(pht("You don't have any active sessions.")); + $table->setRowClasses($rowc); + $table->setHeaders( + array( + pht('Identity'), + pht('Session'), + pht('Type'), + pht('Created'), + )); + $table->setColumnClasses( + array( + 'wide', + 'n', + '', + 'right', + )); + + + $header = id(new PHUIHeaderView()) + ->setHeader(pht('Active Login Sessions')); + + $panel = id(new PHUIObjectBoxView()) + ->setHeader($header) + ->appendChild($table); + + return $panel; + } + +}