fix(dav): fallback realm for HTTP authentication

By default, the name of the Nextcloud instance is an empty string, until changed by the admin. This leads to an empty realm sent with the WWW-Authenticate header, while the realm is mandatory for Basic HTTP authentication. Some clients have issues with an empty realm, e.g. Thunderbird cannot store passwords in this case.

This commit applies "Nextcloud" as fallback for the realm, in case the name of the Nextcloud instance is not set.

Solves: https://help.nextcloud.com/t/thunderbird-dont-save-caldav-password-because-of-missing-httprealm-or-formsubmiturl/93233

Signed-off-by: MichaIng <micha@dietpi.com>

diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
index d613a5a188f1b54d3819655389028ef632e3d323..65b20ca661ab2357615c88f021ea746bb4677a53 100644 (file)
--- a/apps/dav/lib/Connector/PublicAuth.php
+++ b/apps/dav/lib/Connector/PublicAuth.php
@@ -61,7 +61,7 @@ class PublicAuth extends AbstractBasic {
 
                // setup realm
                $defaults = new \OCP\Defaults();
-               $this->realm = $defaults->getName();
+               $this->realm = $defaults->getName() ?: 'Nextcloud';
        }
 
        /**

diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php
index 243b92e63f744ac95361a429285e684232b31734..c2e343d8656f1c6a50d5d049c01a6e8a14efc6e9 100644 (file)
--- a/apps/dav/lib/Connector/Sabre/Auth.php
+++ b/apps/dav/lib/Connector/Sabre/Auth.php
@@ -75,7 +75,7 @@ class Auth extends AbstractBasic {
 
                // setup realm
                $defaults = new \OCP\Defaults();
-               $this->realm = $defaults->getName();
+               $this->realm = $defaults->getName() ?: 'Nextcloud';
        }
 
        /**

diff --git a/apps/dav/lib/Connector/Sabre/BearerAuth.php b/apps/dav/lib/Connector/Sabre/BearerAuth.php
index 4d9599b97a3da0aecd11daeb959ffc220f897080..6fd61c44b3452c15f7e8a059839c45d7db268933 100644 (file)
--- a/apps/dav/lib/Connector/Sabre/BearerAuth.php
+++ b/apps/dav/lib/Connector/Sabre/BearerAuth.php
@@ -47,7 +47,7 @@ class BearerAuth extends AbstractBearer {
 
                // setup realm
                $defaults = new \OCP\Defaults();
-               $this->realm = $defaults->getName();
+               $this->realm = $defaults->getName() ?: 'Nextcloud';
        }
 
        private function setupUserFs($userId) {