Skip to content

fix(activesync): guard against null IMAP client in _getImapOb() #78

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

Merged
TDannhauer merged 4 commits into from
Jul 8, 2026
Merged

fix(activesync): guard against null IMAP client in _getImapOb() #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf20a96
fix(activesync): guard against null IMAP client in _getImapOb()
TDannhauer Jul 8, 2026
5bdc88c
Update _getImapOb() docblock @throws to Horde_Exception_Authenticatio…
Copilot Jul 8, 2026
dabe78d
fix(activesync): preserve IMAP auth exception context
Copilot Jul 8, 2026
74dce98
test(activesync): cover null IMAP client ping failure
Copilot Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions lib/Horde/ActiveSync/Imap/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,15 +1218,23 @@ protected function _doQuery(array $query, array $options, bool $deepTraversal):
* is not yet authenticated at the time of object creation.
*
* @return Horde_Imap_Client_Base
* @throws Horde_ActiveSync_Exception
* @throws Horde_Exception_AuthenticationFailure
*/
protected function _getImapOb()
{
$message = 'EMERGENCY - Unable to obtain the IMAP Client';

try {
return $this->_imap->getImapOb();
$imap = $this->_imap->getImapOb();
Comment thread
TDannhauer marked this conversation as resolved.
} catch (Horde_ActiveSync_Exception $e) {
throw new Horde_Exception_AuthenticationFailure('EMERGENCY - Unable to obtain the IMAP Client');
throw new Horde_Exception_AuthenticationFailure($message, 0, $e);
}
Comment thread
TDannhauer marked this conversation as resolved.

if (empty($imap)) {
throw new Horde_Exception_AuthenticationFailure($message);
}
Comment thread
TDannhauer marked this conversation as resolved.

return $imap;
}

/**
Expand Down
12 changes: 12 additions & 0 deletions test/unit/Horde/ActiveSync/ImapAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ public function testPingUsesPingWatermarkNotSyncModseq()
$this->assertEquals(6000, $folder->pingModseq());
}

public function testPingThrowsAuthenticationFailureWhenImapClientIsNull()
{
$adapter = new Horde_ActiveSync_Imap_Adapter([
'factory' => $this->_imapFactoryFixture(null),
]);
$folder = new Horde_ActiveSync_Folder_Imap('INBOX', Horde_ActiveSync::CLASS_EMAIL);

$this->expectException(\Horde_Exception_AuthenticationFailure::class);

$adapter->ping($folder);
}

public function testBug13711()
{
Bug13711Fixtures::setActiveSyncProtocolVersion('14.1');
Expand Down