makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6562 from marc1706/ticket/14047

Browse source 
[ticket/14047] Check for stream close handshake before closing stream
This commit is contained in:
Marc Alexander 2023-11-05 15:35:53 +01:00
commit 43e69df080
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/includes/functions_jabber.php
View file

@ -51,6 +51,9 @@ class jabber
var $features = array(); var $features = array();
/** @var string Stream close handshake */
private const STREAM_CLOSE_HANDSHAKE = '</stream:stream>';
/** /**
* Constructor * Constructor
* *
@ -58,7 +61,7 @@ class jabber
* @param int $port Jabber server port * @param int $port Jabber server port
* @param string $username Jabber username or JID * @param string $username Jabber username or JID
* @param string $password Jabber password * @param string $password Jabber password
* @param boold $use_ssl Use ssl * @param bool $use_ssl Use ssl
* @param bool $verify_peer Verify SSL certificate * @param bool $verify_peer Verify SSL certificate
* @param bool $verify_peer_name Verify Jabber peer name * @param bool $verify_peer_name Verify Jabber peer name
* @param bool $allow_self_signed Allow self signed certificates * @param bool $allow_self_signed Allow self signed certificates
@ -183,7 +186,15 @@ class jabber
$this->send_presence('offline', '', true); $this->send_presence('offline', '', true);
} }
$this->send('</stream:stream>'); $this->send(self::STREAM_CLOSE_HANDSHAKE);
// Check stream close handshake reply
$stream_close_reply = $this->listen();
if ($stream_close_reply != self::STREAM_CLOSE_HANDSHAKE)
{
$this->add_to_log("Error: Unexpected stream close handshake reply ”{$stream_close_reply}”");
}
$this->session = array(); $this->session = array();
return fclose($this->connection); return fclose($this->connection);
} }