Skip to content

Commit

Permalink
DigestAuthentication adapted to new auth in HttpSocket.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrbasso
jrbasso committed Dec 3, 2010
1 parent 4325e67 commit f004bef
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 55 deletions.
50 changes: 27 additions & 23 deletions cake/libs/http/digest_authentication.php
View file
Expand Up @@ -30,40 +30,43 @@ class DigestAuthentication {
* Authentication
*
* @param HttpSocket $http
* @param array $authInfo
* @return void
* @throws Exception
* @link http://www.ietf.org/rfc/rfc2617.txt
*/
public static function authentication(HttpSocket $http) {
if (isset($http->request['auth']['user'], $http->request['auth']['pass'])) {
if (!isset($http->config['request']['auth']['realm']) && !self::_getServerInformation($http)) {
public static function authentication(HttpSocket $http, &$authInfo) {
if (isset($authInfo['user'], $authInfo['pass'])) {
if (!isset($authInfo['realm']) && !self::_getServerInformation($http, $authInfo)) {
return;
}
$http->request['header']['Authorization'] = self::_generateHeader($http);
$http->request['header']['Authorization'] = self::_generateHeader($http, $authInfo);
}
}

/**
* Retrive information about the authetication
*
* @param HttpSocket $http
* @parma array $authInfo
* @return boolean
*/
protected static function _getServerInformation(HttpSocket $http) {
protected static function _getServerInformation(HttpSocket $http, &$authInfo) {
$originalRequest = $http->request;
$http->request['auth'] = array('method' => false);
$http->setAuthConfig(false);
$http->request($http->request);
$http->request = $originalRequest;
$http->setAuthConfig('Digest', $authInfo);

if (empty($http->response['header']['WWW-Authenticate'])) {
return false;
}
preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $http->response['header']['WWW-Authenticate'], $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
$http->config['request']['auth'][$match[1]] = $match[2];
$authInfo[$match[1]] = $match[2];
}
if (!empty($http->config['request']['auth']['qop']) && empty($http->config['request']['auth']['nc'])) {
$http->config['request']['auth']['nc'] = 1;
if (!empty($authInfo['qop']) && empty($authInfo['nc'])) {
$authInfo['nc'] = 1;
}
return true;
}
Expand All @@ -72,31 +75,32 @@ protected static function _getServerInformation(HttpSocket $http) {
* Generate the header Authorization
*
* @param HttpSocket $http
* @param array $authInfo
* @return string
*/
protected static function _generateHeader(HttpSocket $http) {
$a1 = md5($http->request['auth']['user'] . ':' . $http->config['request']['auth']['realm'] . ':' . $http->request['auth']['pass']);
protected static function _generateHeader(HttpSocket $http, &$authInfo) {
$a1 = md5($authInfo['user'] . ':' . $authInfo['realm'] . ':' . $authInfo['pass']);
$a2 = md5($http->request['method'] . ':' . $http->request['uri']['path']);

if (empty($http->config['request']['auth']['qop'])) {
$response = md5($a1 . ':' . $http->config['request']['auth']['nonce'] . ':' . $a2);
if (empty($authInfo['qop'])) {
$response = md5($a1 . ':' . $authInfo['nonce'] . ':' . $a2);
} else {
$http->config['request']['auth']['cnonce'] = uniqid();
$nc = sprintf('%08x', $http->config['request']['auth']['nc']++);
$response = md5($a1 . ':' . $http->config['request']['auth']['nonce'] . ':' . $nc . ':' . $http->config['request']['auth']['cnonce'] . ':auth:' . $a2);
$authInfo['cnonce'] = uniqid();
$nc = sprintf('%08x', $authInfo['nc']++);
$response = md5($a1 . ':' . $authInfo['nonce'] . ':' . $nc . ':' . $authInfo['cnonce'] . ':auth:' . $a2);
}

$authHeader = 'Digest ';
$authHeader .= 'username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $http->request['auth']['user']) . '", ';
$authHeader .= 'realm="' . $http->config['request']['auth']['realm'] . '", ';
$authHeader .= 'nonce="' . $http->config['request']['auth']['nonce'] . '", ';
$authHeader .= 'username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $authInfo['user']) . '", ';
$authHeader .= 'realm="' . $authInfo['realm'] . '", ';
$authHeader .= 'nonce="' . $authInfo['nonce'] . '", ';
$authHeader .= 'uri="' . $http->request['uri']['path'] . '", ';
$authHeader .= 'response="' . $response . '"';
if (!empty($http->config['request']['auth']['opaque'])) {
$authHeader .= ', opaque="' . $http->config['request']['auth']['opaque'] . '"';
if (!empty($authInfo['opaque'])) {
$authHeader .= ', opaque="' . $authInfo['opaque'] . '"';
}
if (!empty($http->config['request']['auth']['qop'])) {
$authHeader .= ', qop="auth", nc=' . $nc . ', cnonce="' . $http->config['request']['auth']['cnonce'] . '"';
if (!empty($authInfo['qop'])) {
$authHeader .= ', qop="auth", nc=' . $nc . ', cnonce="' . $authInfo['cnonce'] . '"';
}
return $authHeader;
}
Expand Down
60 changes: 28 additions & 32 deletions cake/tests/cases/libs/http/digest_authentication.test.php
View file
Expand Up @@ -72,11 +72,6 @@ public function setUp() {
$this->HttpSocket = new DigestHttpSocket();
$this->HttpSocket->request['method'] = 'GET';
$this->HttpSocket->request['uri']['path'] = '/';
$this->HttpSocket->request['auth'] = array(
'method' => 'Digest',
'user' => 'admin',
'pass' => '1234'
);
}

/**
Expand All @@ -95,12 +90,13 @@ function tearDown() {
*/
public function testBasic() {
$this->HttpSocket->nextHeader = 'Digest realm="The batcave",nonce="4cded326c6c51"';
$this->HttpSocket->config['request']['auth'] = array();
$this->assertFalse(isset($this->HttpSocket->request['header']['Authorization']));
DigestAuthentication::authentication($this->HttpSocket);

$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$this->assertTrue(isset($this->HttpSocket->request['header']['Authorization']));
$this->assertEqual($this->HttpSocket->config['request']['auth']['realm'], 'The batcave');
$this->assertEqual($this->HttpSocket->config['request']['auth']['nonce'], '4cded326c6c51');
$this->assertEqual($auth['realm'], 'The batcave');
$this->assertEqual($auth['nonce'], '4cded326c6c51');
}

/**
Expand All @@ -110,20 +106,20 @@ public function testBasic() {
*/
public function testQop() {
$this->HttpSocket->nextHeader = 'Digest realm="The batcave",nonce="4cded326c6c51"';
$this->HttpSocket->config['request']['auth'] = array();
DigestAuthentication::authentication($this->HttpSocket);
$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$expected = 'Digest username="admin", realm="The batcave", nonce="4cded326c6c51", uri="/", response="da7e2a46b471d77f70a9bb3698c8902b"';
$this->assertEqual($expected, $this->HttpSocket->request['header']['Authorization']);
$this->assertFalse(isset($this->HttpSocket->config['request']['auth']['qop']));
$this->assertFalse(isset($this->HttpSocket->config['request']['auth']['nc']));
$this->assertFalse(isset($auth['qop']));
$this->assertFalse(isset($auth['nc']));

$this->HttpSocket->nextHeader = 'Digest realm="The batcave",nonce="4cded326c6c51",qop="auth"';
$this->HttpSocket->config['request']['auth'] = array();
DigestAuthentication::authentication($this->HttpSocket);
$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$expected = '@Digest username="admin", realm="The batcave", nonce="4cded326c6c51", uri="/", response="[a-z0-9]{32}", qop="auth", nc=00000001, cnonce="[a-z0-9]+"@';
$this->assertPattern($expected, $this->HttpSocket->request['header']['Authorization']);
$this->assertEqual($this->HttpSocket->config['request']['auth']['qop'], 'auth');
$this->assertEqual($this->HttpSocket->config['request']['auth']['nc'], 2);
$this->assertEqual($auth['qop'], 'auth');
$this->assertEqual($auth['nc'], 2);
}

/**
Expand All @@ -133,13 +129,13 @@ public function testQop() {
*/
public function testOpaque() {
$this->HttpSocket->nextHeader = 'Digest realm="The batcave",nonce="4cded326c6c51"';
$this->HttpSocket->config['request']['auth'] = array();
DigestAuthentication::authentication($this->HttpSocket);
$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$this->assertFalse(strpos($this->HttpSocket->request['header']['Authorization'], 'opaque="d8ea7aa61a1693024c4cc3a516f49b3c"'));

$this->HttpSocket->nextHeader = 'Digest realm="The batcave",nonce="4cded326c6c51",opaque="d8ea7aa61a1693024c4cc3a516f49b3c"';
$this->HttpSocket->config['request']['auth'] = array();
DigestAuthentication::authentication($this->HttpSocket);
$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$this->assertTrue(strpos($this->HttpSocket->request['header']['Authorization'], 'opaque="d8ea7aa61a1693024c4cc3a516f49b3c"') > 0);
}

Expand All @@ -150,21 +146,21 @@ public function testOpaque() {
*/
public function testMultipleRequest() {
$this->HttpSocket->nextHeader = 'Digest realm="The batcave",nonce="4cded326c6c51",qop="auth"';
$this->HttpSocket->config['request']['auth'] = array();
DigestAuthentication::authentication($this->HttpSocket);
$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$this->assertTrue(strpos($this->HttpSocket->request['header']['Authorization'], 'nc=00000001') > 0);
$this->assertEqual($this->HttpSocket->config['request']['auth']['nc'], 2);
$this->assertEqual($auth['nc'], 2);

DigestAuthentication::authentication($this->HttpSocket);
DigestAuthentication::authentication($this->HttpSocket, $auth);
$this->assertTrue(strpos($this->HttpSocket->request['header']['Authorization'], 'nc=00000002') > 0);
$this->assertEqual($this->HttpSocket->config['request']['auth']['nc'], 3);
$this->assertEqual($auth['nc'], 3);
$responsePos = strpos($this->HttpSocket->request['header']['Authorization'], 'response=');
$response = substr($this->HttpSocket->request['header']['Authorization'], $responsePos + 10, 32);

$this->HttpSocket->nextHeader = '';
DigestAuthentication::authentication($this->HttpSocket);
DigestAuthentication::authentication($this->HttpSocket, $auth);
$this->assertTrue(strpos($this->HttpSocket->request['header']['Authorization'], 'nc=00000003') > 0);
$this->assertEqual($this->HttpSocket->config['request']['auth']['nc'], 4);
$this->assertEqual($auth['nc'], 4);
$responsePos = strpos($this->HttpSocket->request['header']['Authorization'], 'response=');
$response2 = substr($this->HttpSocket->request['header']['Authorization'], $responsePos + 10, 32);
$this->assertNotEqual($response, $response2);
Expand All @@ -178,8 +174,8 @@ public function testMultipleRequest() {
public function testPathChanged() {
$this->HttpSocket->nextHeader = 'Digest realm="The batcave",nonce="4cded326c6c51"';
$this->HttpSocket->request['uri']['path'] = '/admin';
$this->HttpSocket->config['request']['auth'] = array();
DigestAuthentication::authentication($this->HttpSocket);
$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$responsePos = strpos($this->HttpSocket->request['header']['Authorization'], 'response=');
$response = substr($this->HttpSocket->request['header']['Authorization'], $responsePos + 10, 32);
$this->assertNotEqual($response, 'da7e2a46b471d77f70a9bb3698c8902b');
Expand All @@ -193,8 +189,8 @@ public function testPathChanged() {
public function testNoDigestResponse() {
$this->HttpSocket->nextHeader = false;
$this->HttpSocket->request['uri']['path'] = '/admin';
$this->HttpSocket->config['request']['auth'] = array();
DigestAuthentication::authentication($this->HttpSocket);
$auth = array('user' => 'admin', 'pass' => '1234');
DigestAuthentication::authentication($this->HttpSocket, $auth);
$this->assertFalse(isset($this->HttpSocket->request['header']['Authorization']));
}

Expand Down

0 comments on commit f004bef

Please sign in to comment.