Commit 36dad86f authored by Nigel McNie's avatar Nigel McNie
Browse files

Implement the Auth->logout hook for XMLRPC authentication, to do proper single sign-out.

Calls the MNET method kill_children at the IDP so proper single singout happens. But we _don't_ do this when the session times out, as the user could log in again.

Make sure we set/unset session variables as appropriate also.
parent 292a56bd
......@@ -490,6 +490,52 @@ class AuthXmlrpc extends Auth {
* Overrides the default logout mechanism to do proper single singout
public function logout() {
global $USER, $SESSION;
if (get_config('usersuniquebyusername')) {
// The auth_remote_user will have a row for the institution in
// which the user SSOed into first. However, they could have
// been coming from somewhere else this time, which is why we
// can't use auth_remote_user for the lookup. Their username
// won't change for their Mahara account anyway, so just grab
// it out of the usr table.
$remoteusername = get_field('usr', 'username', 'id', $USER->get('id'));
else {
// Check the auth_remote_user table for what the remote
// application thinks the username is
$remoteusername = get_field('auth_remote_user', 'remoteusername', 'localusr', $USER->get('id'), 'authinstance', $this->instanceid);
if (!$remoteusername && $this->parent) {
$remoteusername = get_field('auth_remote_user', 'remoteusername', 'localusr', $USER->get('id'), 'authinstance', $this->parent);
if (isset($_GET['logout'])) {
// Explicit logout request
elseif (!$this->parent) {
// Redirect back to their IDP if they don't have a parent auth method set
// (aka: they can't log in at Mahara's log in form)
$peer = get_peer($this->wwwroot);
// TODO: This should be stored in the application config table
$jumpurl = str_replace('land', 'jump', $peer->application->ssolandurl);
redirect($this->wwwroot . $jumpurl . '?hostwwwroot=' . dropslash(get_config('wwwroot')) . '&wantsurl=' . urlencode($_SERVER['REQUEST_URI']));
// Anything else is a session timeout
$SESSION->set('mnetuser', null);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment