Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-36838-FF17-MNETSSO-23' of git://github.com/peterbul…

…mer/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit 78601ea6fe40dc48eb40370fa299cdaea3b29fe2 2 parents a38a5ce + 166d3b6
@danpoltawski danpoltawski authored
Showing with 6 additions and 6 deletions.
  1. +6 −6 auth/mnet/auth.php
View
12 auth/mnet/auth.php
@@ -46,10 +46,10 @@ function user_login($username, $password) {
}
/**
- * Return user data for the provided token, compare with user_agent string.
+ * Return user data for the provided token
*
* @param string $token The unique ID provided by remotehost.
- * @param string $UA User Agent string.
+ * @param string $UA User Agent string (as seen by SP) - ignored
* @return array $userdata Array of user info for remote host
*/
function user_authorise($token, $useragent) {
@@ -57,7 +57,7 @@ function user_authorise($token, $useragent) {
$remoteclient = get_mnet_remote_client();
require_once $CFG->dirroot . '/mnet/xmlrpc/serverlib.php';
- $mnet_session = $DB->get_record('mnet_session', array('token'=>$token, 'useragent'=>$useragent));
+ $mnet_session = $DB->get_record('mnet_session', array('token'=>$token));
if (empty($mnet_session)) {
throw new mnet_server_exception(1, 'authfail_nosessionexists');
}
@@ -1087,14 +1087,14 @@ function kill_children($username, $useragent) {
* calls the function (over xmlrpc) provides us with the mnethostid we need.
*
* @param string $username Username for session to kill
- * @param string $useragent SHA1 hash of user agent to look for
+ * @param string $useragent SHA1 hash of user agent as seen by IdP - ignored
* @return bool True on success
*/
function kill_child($username, $useragent) {
global $CFG, $DB;
$remoteclient = get_mnet_remote_client();
- $session = $DB->get_record('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id, 'useragent'=>$useragent));
- $DB->delete_records('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id, 'useragent'=>$useragent));
+ $session = $DB->get_record('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id));
+ $DB->delete_records('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id));
if (false != $session) {
session_kill($session->session_id);
return true;
Please sign in to comment.
Something went wrong with that request. Please try again.