holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* egw-pear: improve connection handling regarding the validation of connectionsvia expected responses

Browse Source
This commit is contained in:
Klaus Leithoff 2011-09-21 09:24:18 +00:00
parent 643dcfa834
commit e6df83be65
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
egw-pear/Net/IMAP.php
View File

@ -64,17 +64,21 @@ class Net_IMAP extends Net_IMAPProtocol {
function connect($host, $port, $enableSTARTTLS = true)
{
$ret = $this->cmdConnect($host, $port);
if($ret === true ){
// Determine server capabilities
$res = $this->cmdCapability();
if(PEAR::isError($res) )
{
return $res;
}
// check if we can enable TLS via STARTTLS (requires PHP 5 >= 5.1.0RC1 for stream_socket_enable_crypto)
if ($this->hasCapability('STARTTLS') === true && $enableSTARTTLS === true && function_exists('stream_socket_enable_crypto') === true) {
if (PEAR::isError($res = $this->cmdStartTLS())) {
return $res;
}
}
return $ret;
//return $ret;
}
if(empty($ret)){
return new PEAR_Error("Unexpected response on connection");
@ -82,7 +86,7 @@ class Net_IMAP extends Net_IMAPProtocol {
if(PEAR::isError($ret) ){
return $ret;
}
if(isset( $ret["RESPONSE"]["CODE"] ) ){
if(isset( $ret["RESPONSE"]["CODE"] ) ){
if(strtoupper($ret["RESPONSE"]["CODE"]) != "OK"){
return new PEAR_Error($ret["RESPONSE"]["CODE"] . ", " . $ret["RESPONSE"]["STR_CODE"]);
}

14
egw-pear/Net/IMAPProtocol.php
View File

@ -180,9 +180,15 @@ class Net_IMAPProtocol {
if (PEAR::isError($error = $this->_socket->connect($host, $port, null, $this->_timeout, $this->_streamContextOptions))) {
return $error;
}
if ( PEAR::isError( $this->_getRawResponse() ) ) {
$rv = $this->_getRawResponse();
if ( PEAR::isError( $rv )) {
return new PEAR_Error( 'unable to open socket' );
}
$rv = trim($rv);
//error_log(__METHOD__.__LINE__.'#'.$rv.'#');
// if we do not use the standard ports, we expect to see imap with the server greeting
if (empty($rv) || (!($port==143 || $port==993) && stripos($rv,'imap')===false)) return new PEAR_Error( "No IMAP response from $host at port $port. Response was:".$rv );
$this->_connected = true;
return true;
}
@ -1068,6 +1074,7 @@ class Net_IMAPProtocol {
}
}
$ret["PARSED"]=$subrv;
if (stripos(array2string($ret['PARSED']),'imap')===false) return new PEAR_Error( "No IMAP response for CAPABILITY" );
//fill the $this->_serverAuthMethods and $this->_serverSupportedCapabilities arrays
foreach( (array)$ret["PARSED"]["CAPABILITIES"] as $auth_method ){
if( strtoupper( substr( $auth_method , 0 ,5 ) ) == "AUTH=" )
@ -3277,13 +3284,14 @@ class Net_IMAPProtocol {
$cmdid = $this->_getCmdId();
$this->_putCMD( $cmdid , $command , $params );
$args=$this->_getRawResponse( $cmdid );
#error_log("egw-pear::NET::IMAPProtocoll:_genericCommand:".$command." result:".print_r($args,TRUE));
//error_log("egw-pear::NET::IMAPProtocoll:_genericCommand:".$command.' '.$params);
//error_log("egw-pear::NET::IMAPProtocoll:_genericCommand: ->result:".print_r($args,TRUE));
return $this->_genericImapResponseParser( $args , $cmdid );
}
function utf_7_encode($str)
function utf_7_encode($str)
{
if($this->_useUTF_7 == false ){
return $str;