diogo/xmpphp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add patch from http://code.google.com/p/xmpphp/issues/detail?id=67 - Digest MD5

Browse Source
This commit is contained in:
Ivan Borzenkov 2010-03-07 23:58:05 +03:00
parent 6e1b55fddf
commit b26491cdc9
1 changed files with 95 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
XMPPHP/XMPP.php
View File

@ -98,6 +98,21 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
*/ */
public $roster; public $roster;
/**
* @var array supported auth mechanisms
*/
protected $auth_mechanism_supported = array('PLAIN', 'DIGEST-MD5');
/**
* @var string default auth mechanism
*/
protected $auth_mechanism_default = 'PLAIN';
/**
* @var string prefered auth mechanism
*/
protected $auth_mechanism_preferred = 'DIGEST-MD5';
/** /**
* Constructor * Constructor
* *
@ -117,6 +132,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
$this->password = $password; $this->password = $password;
$this->resource = $resource; $this->resource = $resource;
if(!$server) $server = $host; if(!$server) $server = $host;
$this->server = $server;
$this->basejid = $this->user . '@' . $this->host; $this->basejid = $this->user . '@' . $this->host;
$this->roster = new Roster(); $this->roster = new Roster();
@ -133,6 +149,8 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
$this->addXPathHandler('{jabber:client}message', 'message_handler'); $this->addXPathHandler('{jabber:client}message', 'message_handler');
$this->addXPathHandler('{jabber:client}presence', 'presence_handler'); $this->addXPathHandler('{jabber:client}presence', 'presence_handler');
$this->addXPathHandler('iq/{jabber:iq:roster}query', 'roster_iq_handler'); $this->addXPathHandler('iq/{jabber:iq:roster}query', 'roster_iq_handler');
// For DIGEST-MD5 auth :
$this->addXPathHandler('{urn:ietf:params:xml:ns:xmpp-sasl}challenge', 'sasl_challenge_handler');
} }
/** /**
@ -316,7 +334,33 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
} else { } else {
$this->log->log("Attempting Auth..."); $this->log->log("Attempting Auth...");
if ($this->password) { if ($this->password) {
$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>" . base64_encode("\x00" . $this->user . "\x00" . $this->password) . "</auth>"); $mechanism = 'PLAIN'; // default;
if ($xml->hasSub('mechanisms') && $xml->sub('mechanisms')->hasSub('mechanism')) {
// Get the list of all available auth mechanism that we can use
$available = array();
foreach ($xml->sub('mechanisms')->subs as $sub) {
if ($sub->name == 'mechanism') {
if (in_array($sub->data, $this->auth_mechanism_supported)) {
$available[$sub->data] = $sub->data;
}
}
}
if (isset($available[$this->auth_mechanism_preferred])) {
$mechanism = $this->auth_mechanism_preferred;
} else {
// use the first available
$mechanism = reset($available);
}
$this->log->log("Trying $mechanism (available : " . implode(',', $available) . ')');
}
switch ($mechanism) {
case 'PLAIN':
$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>" . base64_encode("\x00" . $this->user . "\x00" . $this->password) . "</auth>");
break;
case 'DIGEST-MD5':
$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5' />");
break;
}
} else { } else {
$this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='ANONYMOUS'/>"); $this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='ANONYMOUS'/>");
} }
@ -346,6 +390,56 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
throw new XMPPHP_Exception('Auth failed!'); throw new XMPPHP_Exception('Auth failed!');
} }
/**
* Handle challenges for DIGEST-MD5 auth
*
* @param string $xml
*/
protected function sasl_challenge_handler($xml) {
// Decode and parse the challenge string
// (may be something like foo="bar",foo2="bar2,bar3,bar4",foo3=bar5 )
$challenge = base64_decode($xml->data);
$vars = array();
$matches = array();
preg_match_all('/(\w+)=(?:"([^"]*)|([^,]*))/', $challenge, $matches);
$res = array();
foreach ($matches[1] as $k => $v) {
$vars[$v] = (empty($matches[2][$k])?$matches[3][$k]:$matches[2][$k]);
}
if (isset($vars['nonce'])) {
// First step
$vars['cnonce'] = uniqid(mt_rand(), false);
$vars['nc'] = '00000001';
$vars['qop'] = 'auth'; // Force qop to auth
if (!isset($vars['digest-uri'])) $vars['digest-uri'] = 'xmpp/' . $this->server;
if (!isset($vars['realm'])) $vars['realm'] = '';
// now, the magic...
$a1 = sprintf('%s:%s:%s', $this->user, $vars['realm'], $this->password);
if ($vars['algorithm'] == 'md5-sess') {
$a1 = pack('H32',md5($a1)) . ':' . $vars['nonce'] . ':' . $vars['cnonce'];
}
$a2 = "AUTHENTICATE:" . $vars['digest-uri'];
$password = md5($a1) . ':' . $vars['nonce'] . ':' . $vars['nc'] . ':' . $vars['cnonce'] . ':' . $vars['qop'] . ':' .md5($a2);
$password = md5($password);
$response = sprintf('username="%s",realm="%s",nonce="%s",cnonce="%s",nc=%s,qop=%s,digest-uri="%s",response=%s,charset=utf-8',
$this->user, $vars['realm'], $vars['nonce'], $vars['cnonce'], $vars['nc'], $vars['qop'], $vars['digest-uri'], $password);
// Send the response
$response = base64_encode($response);
$this->send("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>$response</response>");
} else {
if (isset($vars['rspauth'])) {
// Second step
$this->send("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>");
} else {
$this->log->log("ERROR receiving challenge : " . $challenge, XMPPHP_Log::LEVEL_ERROR);
}
}
}
/** /**
* Resource bind handler * Resource bind handler
* *