Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 08:27:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

MS autodiscover priorities DNS over subdomain

Browse source
This commit is contained in:
the-djmaze 2024-08-27 13:19:30 +02:00
parent 9e2b9a9fcd
commit 3306fadc47
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php
View file

@ -168,16 +168,6 @@ abstract class Autoconfig
*/ */
private static function autodiscover(string $domain) : ?array private static function autodiscover(string $domain) : ?array
{ {
foreach ([
"https://{$domain}",
"https://autodiscover.{$domain}",
"http://autodiscover.{$domain}"
] as $host) {
$result = static::autodiscover_resolve($host, $domain);
if ($result) {
return $result;
}
}
foreach (\SnappyMail\DNS::SRV("_autodiscover._tcp.{$domain}") as $record) { foreach (\SnappyMail\DNS::SRV("_autodiscover._tcp.{$domain}") as $record) {
if (443 == $record['port']) { if (443 == $record['port']) {
$result = static::autodiscover_resolve("https://{$record['target']}", $domain); $result = static::autodiscover_resolve("https://{$record['target']}", $domain);
@ -190,6 +180,16 @@ abstract class Autoconfig
return $result; return $result;
} }
} }
foreach ([
"https://{$domain}",
"https://autodiscover.{$domain}",
"http://autodiscover.{$domain}"
] as $host) {
$result = static::autodiscover_resolve($host, $domain);
if ($result) {
return $result;
}
}
return null; return null;
} }