adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Putting the auth and proxy data in request attribute after request.

Browse source
This commit is contained in:
Juan Basso 2010-12-10 10:38:49 -02:00
parent bcacace061
commit 453c5364c2
2 changed files with 54 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/http_socket.php
View file

@ -246,6 +246,8 @@ class HttpSocket extends CakeSocket {
$this->config['host'] = $host; $this->config['host'] = $host;
} }
$this->_setProxy(); $this->_setProxy();
$this->request['proxy'] = $this->_proxy;
$cookies = null; $cookies = null;
if (is_array($this->request['header'])) { if (is_array($this->request['header'])) {
@ -276,6 +278,7 @@ class HttpSocket extends CakeSocket {
$this->setAuthConfig('Basic', $this->request['uri']['user'], $this->request['uri']['pass']); $this->setAuthConfig('Basic', $this->request['uri']['user'], $this->request['uri']['pass']);
} }
$this->_setAuth(); $this->_setAuth();
$this->request['auth'] = $this->_auth;
if (is_array($this->request['body'])) { if (is_array($this->request['body'])) {
$this->request['body'] = $this->_httpSerialize($this->request['body']); $this->request['body'] = $this->_httpSerialize($this->request['body']);

55
cake/tests/cases/libs/http_socket.test.php
View file

@ -349,7 +349,7 @@ class HttpSocketTest extends CakeTestCase {
'host' => 'www.cakephp.org', 'host' => 'www.cakephp.org',
'port' => 80 'port' => 80
), ),
'cookies' => array() 'cookies' => array(),
) )
), ),
'request' => array( 'request' => array(
@ -369,7 +369,9 @@ class HttpSocketTest extends CakeTestCase {
'line' => "GET /?foo=bar HTTP/1.1\r\n", 'line' => "GET /?foo=bar HTTP/1.1\r\n",
'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n", 'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n",
'raw' => "", 'raw' => "",
'cookies' => array() 'cookies' => array(),
'proxy' => array(),
'auth' => array()
) )
) )
), ),
@ -621,11 +623,11 @@ class HttpSocketTest extends CakeTestCase {
} }
/** /**
* testRequestResultAsPointer method * testRequestResultAsReference method
* *
* @return void * @return void
*/ */
public function testRequestResultAsPointer() { public function testRequestResultAsReference() {
$request = array('uri' => 'htpp://www.cakephp.org/'); $request = array('uri' => 'htpp://www.cakephp.org/');
$serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a cookie test!</h1>"; $serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a cookie test!</h1>";
$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse)); $this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
@ -652,6 +654,28 @@ class HttpSocketTest extends CakeTestCase {
$this->assertEqual($this->Socket->request['raw'], $expected); $this->assertEqual($this->Socket->request['raw'], $expected);
$this->assertEqual($this->Socket->config['host'], 'proxy.server'); $this->assertEqual($this->Socket->config['host'], 'proxy.server');
$this->assertEqual($this->Socket->config['port'], 123); $this->assertEqual($this->Socket->config['port'], 123);
$expected = array(
'host' => 'proxy.server',
'port' => 123,
'method' => null,
'user' => null,
'pass' => null
);
$this->assertEqual($this->Socket->request['proxy'], $expected);
$expected = "GET http://www.cakephp.org/bakery HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n\r\n";
$this->Socket->request('/bakery');
$this->assertEqual($this->Socket->request['raw'], $expected);
$this->assertEqual($this->Socket->config['host'], 'proxy.server');
$this->assertEqual($this->Socket->config['port'], 123);
$expected = array(
'host' => 'proxy.server',
'port' => 123,
'method' => null,
'user' => null,
'pass' => null
);
$this->assertEqual($this->Socket->request['proxy'], $expected);
$expected = "GET http://www.cakephp.org/ HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nProxy-Authorization: Test mark.secret\r\n\r\n"; $expected = "GET http://www.cakephp.org/ HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nProxy-Authorization: Test mark.secret\r\n\r\n";
$this->Socket->setProxyConfig('proxy.server', 123, 'Test', 'mark', 'secret'); $this->Socket->setProxyConfig('proxy.server', 123, 'Test', 'mark', 'secret');
@ -659,11 +683,34 @@ class HttpSocketTest extends CakeTestCase {
$this->assertEqual($this->Socket->request['raw'], $expected); $this->assertEqual($this->Socket->request['raw'], $expected);
$this->assertEqual($this->Socket->config['host'], 'proxy.server'); $this->assertEqual($this->Socket->config['host'], 'proxy.server');
$this->assertEqual($this->Socket->config['port'], 123); $this->assertEqual($this->Socket->config['port'], 123);
$expected = array(
'host' => 'proxy.server',
'port' => 123,
'method' => 'Test',
'user' => 'mark',
'pass' => 'secret'
);
$this->assertEqual($this->Socket->request['proxy'], $expected);
$this->Socket->setAuthConfig('Test', 'login', 'passwd'); $this->Socket->setAuthConfig('Test', 'login', 'passwd');
$expected = "GET http://www.cakephp.org/ HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nProxy-Authorization: Test mark.secret\r\nAuthorization: Test login.passwd\r\n\r\n"; $expected = "GET http://www.cakephp.org/ HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nProxy-Authorization: Test mark.secret\r\nAuthorization: Test login.passwd\r\n\r\n";
$this->Socket->request('http://www.cakephp.org/'); $this->Socket->request('http://www.cakephp.org/');
$this->assertEqual($this->Socket->request['raw'], $expected); $this->assertEqual($this->Socket->request['raw'], $expected);
$expected = array(
'host' => 'proxy.server',
'port' => 123,
'method' => 'Test',
'user' => 'mark',
'pass' => 'secret'
);
$this->assertEqual($this->Socket->request['proxy'], $expected);
$expected = array(
'Test' => array(
'user' => 'login',
'pass' => 'passwd'
)
);
$this->assertEqual($this->Socket->request['auth'], $expected);
} }
/** /**