Skip to content

feat: improve dns record discovery #76

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
SebastianKrupinski merged 1 commit into from
Jun 25, 2026
Merged

feat: improve dns record discovery #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .github/workflows/phpunit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,8 @@ jobs:
listen-address=127.0.0.1
bind-interfaces
resolv-file=/etc/dnsmasq-upstream-resolv.conf
address=/${{ env.DAV_DOMAIN }}/127.0.0.1
local=/${{ env.DAV_DOMAIN }}/
host-record=${{ env.DAV_DOMAIN }},127.0.0.1
srv-host=_caldav._tcp.${{ env.DAV_DOMAIN }},${{ env.DAV_HOST }},10080,0,0
EOF

Expand Down
30 changes: 28 additions & 2 deletions lib/Service/CoreService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,41 @@ public function locateAccount(array $configuration): ?array {
}
// find dns service records
if (empty($configuration['location_host'])) {
$dns = dns_get_record('_caldavs._tcp.' . $identityDomain, DNS_SRV);
// attempt to locate service host and port using dns srv records
// example: _caldavs._tcp.example.com. IN SRV 0 5 443 dav.example.com.
$dnsService = '_caldavs._tcp.' . $identityDomain;
$dns = dns_get_record($dnsService, DNS_SRV);
if (empty($dns)) {
$dns = dns_get_record('_caldav._tcp.' . $identityDomain, DNS_SRV);
$dnsService = '_caldav._tcp.' . $identityDomain;
$dns = dns_get_record($dnsService, DNS_SRV);
}
if (empty($dns)) {
$dnsService = '_carddavs._tcp.' . $identityDomain;
$dns = dns_get_record($dnsService, DNS_SRV);
}
if (empty($dns)) {
$dnsService = '_carddav._tcp.' . $identityDomain;
$dns = dns_get_record($dnsService, DNS_SRV);
}
if (!empty($dns) && ($dns[0]['type'] ?? null) === 'SRV') {
$dnsTarget = $dns[0]['target'];
$dnsPort = $dns[0]['port'];
$configuration['location_host'] = $dnsTarget;
$configuration['location_port'] = $dnsPort;
// attempt to locate service path using dns txt records
// example: _caldavs._tcp.example.com. IN TXT "path=/dav/"
if (empty($configuration['location_path'])) {
$dnsTxt = dns_get_record($dnsService, DNS_TXT);
foreach (is_array($dnsTxt) ? $dnsTxt : [] as $record) {
if (($record['type'] ?? null) !== 'TXT') {
continue;
}
if (preg_match('/(?:^|\s)path=(\S+)/', $record['txt'] ?? '', $matches) === 1) {
$configuration['location_path'] = $matches[1];
break;
}
}
}
}
}
// find template for dns service target
Expand Down
Loading