Skip to content

cookie_domain config option for setting cookie on a wider domain #51657

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
AndyScherzinger merged 1 commit into from
Jun 17, 2025
Merged

cookie_domain config option for setting cookie on a wider domain #51657

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
8 changes: 8 additions & 0 deletions config/config.sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@
'[2001:db8::1]'
],

/**
* The validity domain for cookies, for example '' (cookies will be sent only
* the domain that defined it, e.g. 'demo.example.org'), 'demo.example.org'
* (cookies will be valid for the domain and all subdomains), ...
*
* Defaults to '' (safe option)
*/
'cookie_domain' => '',

/**
* Where user files are stored. The SQLite database is also stored here, when
Expand Down
6 changes: 6 additions & 0 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,12 @@ public static function initSession(): void {
$cookie_path = OC::$WEBROOT ? : '/';
ini_set('session.cookie_path', $cookie_path);

// set the cookie domain to the Nextcloud domain
$cookie_domain = self::$config->getValue('cookie_domain', '');
if ($cookie_domain) {
ini_set('session.cookie_domain', $cookie_domain);
}

// Let the session name be changed in the initSession Hook
$sessionName = OC_Util::getInstanceId();

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Session/CryptoWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct(
[
'expires' => 0,
'path' => $webRoot,
'domain' => '',
'domain' => \OCP\Server::get(\OCP\IConfig::class)->getSystemValueString('cookie_domain'),
'secure' => $secureCookie,
'httponly' => true,
'samesite' => 'Lax',
Expand Down
20 changes: 11 additions & 9 deletions lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,14 +967,15 @@ public function setMagicInCookie($username, $token) {
if ($webRoot === '') {
$webRoot = '/';
}
$domain = $this->config->getSystemValueString('cookie_domain');

$maxAge = $this->config->getSystemValueInt('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
\OC\Http\CookieHelper::setCookie(
'nc_username',
$username,
$maxAge,
$webRoot,
'',
$domain,
$secureCookie,
true,
\OC\Http\CookieHelper::SAMESITE_LAX
Expand All @@ -984,7 +985,7 @@ public function setMagicInCookie($username, $token) {
$token,
$maxAge,
$webRoot,
'',
$domain,
$secureCookie,
true,
\OC\Http\CookieHelper::SAMESITE_LAX
Expand All @@ -995,7 +996,7 @@ public function setMagicInCookie($username, $token) {
$this->session->getId(),
$maxAge,
$webRoot,
'',
$domain,
$secureCookie,
true,
\OC\Http\CookieHelper::SAMESITE_LAX
Expand All @@ -1011,18 +1012,19 @@ public function setMagicInCookie($username, $token) {
public function unsetMagicInCookie() {
//TODO: DI for cookies and IRequest
$secureCookie = OC::$server->getRequest()->getServerProtocol() === 'https';
$domain = $this->config->getSystemValueString('cookie_domain');

unset($_COOKIE['nc_username']); //TODO: DI
unset($_COOKIE['nc_token']);
unset($_COOKIE['nc_session_id']);
setcookie('nc_username', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT, '', $secureCookie, true);
setcookie('nc_token', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT, '', $secureCookie, true);
setcookie('nc_session_id', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT, '', $secureCookie, true);
setcookie('nc_username', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT, $domain, $secureCookie, true);
setcookie('nc_token', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT, $domain, $secureCookie, true);
setcookie('nc_session_id', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT, $domain, $secureCookie, true);
// old cookies might be stored under /webroot/ instead of /webroot
// and Firefox doesn't like it!
setcookie('nc_username', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', '', $secureCookie, true);
setcookie('nc_token', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', '', $secureCookie, true);
setcookie('nc_session_id', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', '', $secureCookie, true);
setcookie('nc_username', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', $domain, $secureCookie, true);
setcookie('nc_token', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', $domain, $secureCookie, true);
setcookie('nc_session_id', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', $domain, $secureCookie, true);
}

/**
Expand Down
Loading