Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions lib/Service/RequestClassificationService.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Swp\Service;

use OCP\IRequest;

class RequestClassificationService {
public static function isTopLevelHtmlNavigation(IRequest $request): bool {
if (strtoupper($request->getMethod()) !== 'GET') {
return false;
}

$accept = strtolower($request->getHeader('Accept'));
if ($accept !== '' && strpos($accept, 'text/html') === false) {
return false;
}

if ($request->getHeader('X-Requested-With') === 'XMLHttpRequest') {
return false;
}

$secFetchMode = strtolower($request->getHeader('Sec-Fetch-Mode'));
if ($secFetchMode !== '' && $secFetchMode !== 'navigate') {
return false;
}

$secFetchDest = strtolower($request->getHeader('Sec-Fetch-Dest'));
if ($secFetchDest !== '' && $secFetchDest !== 'document') {
return false;
}

return true;
}
}
24 changes: 24 additions & 0 deletions lib/Service/TokenService.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,34 @@ public function reauthenticate() {
return;
}

$accept = $this->request->getHeader('Accept');
$xRequestedWith = $this->request->getHeader('X-Requested-With');
$secFetchMode = $this->request->getHeader('Sec-Fetch-Mode');
$secFetchDest = $this->request->getHeader('Sec-Fetch-Dest');
if (!RequestClassificationService::isTopLevelHtmlNavigation($this->request)) {
$this->userSession->logout();
$this->logger->debug('[TokenService] reauthenticate skipped: request is not a top-level HTML navigation', [
'request_uri' => $this->request->getRequestUri(),
'accept' => $accept,
'x_requested_with' => $xRequestedWith,
'sec_fetch_mode' => $secFetchMode,
'sec_fetch_dest' => $secFetchDest,
]);
return;
}

// Logout the user and redirect to the oidc login flow to gather a fresh token
$this->userSession->logout();
$redirectUrl = $this->urlGenerator->getAbsoluteURL('/index.php/apps/user_oidc/login/' . strval($token->getProviderId()))
. '?redirectUrl=' . urlencode($this->request->getRequestUri());
$this->logger->debug('[TokenService] reauthenticate redirect', [
'redirect_url' => $redirectUrl,
'request_uri' => $this->request->getRequestUri(),
'accept' => $accept,
'x_requested_with' => $xRequestedWith,
'sec_fetch_mode' => $secFetchMode,
'sec_fetch_dest' => $secFetchDest,
]);
header('Location: ' . $redirectUrl);
exit();
}
Expand Down