Skip to content

refactor(auth): Use $request->getCookie() instead of $_COOKIE #57287

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

Open
joshtrichards wants to merge 3 commits into
base: master
Choose a base branch
from
Open

refactor(auth): Use $request->getCookie() instead of $_COOKIE #57287

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72fd8e3
refactor(auth): improve robustness and readability of handleLogin
joshtrichards Dec 29, 2025
0e0cbeb
chore: fix typo
joshtrichards Dec 30, 2025
8a17e00
chore: fixup for lint
joshtrichards Dec 30, 2025
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
37 changes: 31 additions & 6 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,13 +1156,31 @@ public static function handleRequest(): void {
}

/**
* Check login: apache auth, auth token, basic auth
* Attempts to authenticate the current request using multiple authentication mechanisms.
*
* Tries authentication in the following order: Apache authentication, app API login, token-based login,
* cookie-based login, and HTTP Basic authentication. Returns true if any method authenticates the user
* successfully, otherwise false.
*
* If the request contains the 'X-Nextcloud-Federation' header, authentication will be skipped.
*
* @param OCP\IRequest $request The current HTTP request object.
* @return bool True if authentication succeeds, false otherwise.
* @throws \Exception Passes through any unexpected exceptions from underlying authentication methods.
*
* @security Every authentication method is invoked in priority order, and early return is used on first success.
* Headers from federation requests are explicitly rejected.
*/
public static function handleLogin(OCP\IRequest $request): bool {
// Talk federated users have no user backend; auth handled via Talk
if ($request->getHeader('X-Nextcloud-Federation')) {
return false;
}

$userSession = Server::get(\OC\User\Session::class);
$throttler = Server::get(IThrottler::class);

// Try different authentication methods in order of preference
if (OC_User::handleApacheAuth()) {
return true;
}
Expand All @@ -1172,15 +1190,22 @@ public static function handleLogin(OCP\IRequest $request): bool {
if ($userSession->tryTokenLogin($request)) {
return true;
}
if (isset($_COOKIE['nc_username'])
&& isset($_COOKIE['nc_token'])
&& isset($_COOKIE['nc_session_id'])
&& $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
if (
$request->getCookie('nc_username') !== null
&& $request->getCookie('nc_token') !== null
&& $request->getCookie('nc_session_id') !== null
&& $userSession->loginWithCookie(
$request->getCookie('nc_username'),
$request->getCookie('nc_token'),
$request->getCookie('nc_session_id')
)
) {
Comment on lines +1193 to +1202
Copy link
Member

@solracsf solracsf Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps a more readable version?

$username = $request->getCookie('nc_username');
$token = $request->getCookie('nc_token');
$sessionId = $request->getCookie('nc_session_id');

if (
	$username !== null
	&& $token !== null
	&& $sessionId !== null
	&& $userSession->loginWithCookie($username, $token, $sessionId)
) {

return true;
}
if ($userSession->tryBasicAuthLogin($request, Server::get(IThrottler::class))) {
if ($userSession->tryBasicAuthLogin($request, $throttler)) {
return true;
}

return false;
}

Expand Down
Loading