Merge pull request #54585 from nextcloud/backport/54575/stable31

[stable31] fix: use appropriate user agent string when syncing Outlook calendar subscriptions
This commit is contained in:
Andy Scherzinger 2025-08-24 18:41:14 +02:00 committed by GitHub
commit 9f1ee66391
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -34,6 +34,16 @@ class Connection {
return null;
}
// ICS feeds hosted on O365 can return HTTP 500 when the UA string isn't satisfactory
// Ref https://github.com/nextcloud/calendar/issues/7234
$uaString = 'Nextcloud Webcal Service';
if (parse_url($url, PHP_URL_HOST) === 'outlook.office365.com') {
// The required format/values here are not documented.
// Instead, this string based on research.
// Ref https://github.com/bitfireAT/icsx5/discussions/654#discussioncomment-14158051
$uaString = 'Nextcloud (Linux) Chrome/66';
}
$allowLocalAccess = $this->config->getValueString('dav', 'webcalAllowLocalAccess', 'no');
$params = [
@ -41,7 +51,7 @@ class Connection {
'allow_local_address' => $allowLocalAccess === 'yes',
],
RequestOptions::HEADERS => [
'User-Agent' => 'Nextcloud Webcal Service',
'User-Agent' => $uaString,
'Accept' => 'text/calendar, application/calendar+json, application/calendar+xml',
],
];