Dereku/snappymail
0
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-11-04 03:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch hkps http errors as they can be ignored

Browse source
This commit is contained in:
the-djmaze 2026-11-03 22:16:58 +01:00
parent 89140dd66c
commit 311476b5cb
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
View file

@ -212,9 +212,19 @@ abstract class Keyservers
$b32 = new \SnappyMail\Base32('ybndrfg8ejkmcpqxot1uwisza345h769');
$keyid = $b32->encode(\sha1($localPart, true));
$oResponse = static::HTTP()->doRequest('GET', "https://openpgpkey.{$host}/.well-known/openpgpkey/{$host}/hu/{$keyid}");
if (!$oResponse || 200 !== $oResponse->status) {
$oResponse = static::HTTP()->doRequest('GET', "https://{$host}/.well-known/openpgpkey/hu/{$keyid}");
$oResponse = null;
try {
$oResponse = static::HTTP()->doRequest('GET', "https://openpgpkey.{$host}/.well-known/openpgpkey/{$host}/hu/{$keyid}");
} catch (\Throwable $e) {
\SnappyMail\Log::info('PGP', "WKD: {$e->getMessage()}");
}
if (200 !== $oResponse?->status) {
try {
$oResponse = static::HTTP()->doRequest('GET', "https://{$host}/.well-known/openpgpkey/hu/{$keyid}");
} catch (\Throwable $e) {
\SnappyMail\Log::info('PGP', "WKD: {$e->getMessage()}");
return false;
}
}
if (!$oResponse) {
\SnappyMail\Log::info('PGP', "No response for WKD key {$keyId} on {$host}");