Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.3 HttpSocket enhancements #947

Merged
merged 7 commits into from Nov 13, 2012
Merged

2.3 HttpSocket enhancements #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e3af1f
Rename HttpResponse to HttpSocketResponse.
markstory Nov 11, 2012
9e72564
Add context() to CakeSocket.
markstory Nov 11, 2012
7a5dfdf
Add mozilla root CA bundle.
markstory Nov 11, 2012
240c871
Implement SSL peer verification in HttpSocket
markstory Nov 11, 2012
d95ef5d
Fix failing tests.
markstory Nov 12, 2012
593cfc0
Skip tests if openssl is not enabled.
markstory Nov 12, 2012
12e2e13
Skip more tests when openssl is not enabled.
markstory Nov 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3,920 changes: 3,920 additions & 0 deletions lib/Cake/Config/cacert.pem
View file
Open in desktop

Large diffs are not rendered by default.

62 changes: 58 additions & 4 deletions lib/Cake/Network/CakeSocket.php
View file
Open in desktop
Expand Up @@ -101,6 +101,14 @@ class CakeSocket {
// @codingStandardsIgnoreEnd
);

/**
* Used to capture connection warnings which can happen when there are
* SSL errors for example.
*
* @var array
*/
protected $_connectionErrors = array();

/**
* Constructor.
*
Expand All @@ -126,28 +134,74 @@ public function connect() {
}

$scheme = null;
if (isset($this->config['request']) && $this->config['request']['uri']['scheme'] == 'https') {
if (isset($this->config['request']['uri']) && $this->config['request']['uri']['scheme'] == 'https') {
$scheme = 'ssl://';
}

if ($this->config['persistent']) {
$this->connection = @pfsockopen($scheme . $this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']);
if (!empty($this->config['context'])) {
$context = stream_context_create($this->config['context']);
} else {
$this->connection = @fsockopen($scheme . $this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']);
$context = stream_context_create();
}

$connectAs = STREAM_CLIENT_CONNECT;
if ($this->config['persistent']) {
$connectAs |= STREAM_CLIENT_PERSISTENT;
}

set_error_handler(array($this, '_connectionErrorHandler'));
$this->connection = stream_socket_client(
$scheme . $this->config['host'] . ':' . $this->config['port'],
$errNum,
$errStr,
$this->config['timeout'],
$connectAs,
$context
);
restore_error_handler();

if (!empty($errNum) || !empty($errStr)) {
$this->setLastError($errNum, $errStr);
throw new SocketException($errStr, $errNum);
}

if (!$this->connection && $this->_connectionErrors) {
$message = implode("\n", $this->_connectionErrors);
throw new SocketException($message, E_WARNING);
}

$this->connected = is_resource($this->connection);
if ($this->connected) {
stream_set_timeout($this->connection, $this->config['timeout']);
}
return $this->connected;
}

/**
* socket_stream_client() does not populate errNum, or $errStr when there are
* connection errors, as in the case of SSL verification failure.
*
* Instead we need to handle those errors manually.
*
* @param int $code
* @param string $message
*/
protected function _connectionErrorHandler($code, $message) {
$this->_connectionErrors[] = $message;
}

/**
* Get the connection context.
*
* @return null|array Null when there is no connnection, an array when there is.
*/
public function context() {
if (!$this->connection) {
return;
}
return stream_context_get_options($this->connection);
}

/**
* Get the host name of the current connection.
*
Expand Down