Skip to content
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

Do not setup a session when not required on API requests #28311

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Do not setup a session when not required on API requests #28311

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
1 change: 1 addition & 0 deletions apps/files/lib/Controller/ViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public function showFile(string $fileid = null, int $openfile = 1): Response {
/**
* @NoCSRFRequired
* @NoAdminRequired
* @UseSession
*
* @param string $dir
* @param string $view
Expand Down
20 changes: 15 additions & 5 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Group\Events\UserRemovedEvent;
use OCP\ILogger;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\Server;
Expand Down Expand Up @@ -408,7 +409,16 @@ private static function printUpgradePage(\OC\SystemConfig $systemConfig): void {
}

public static function initSession(): void {
if (Server::get(\OCP\IRequest::class)->getServerProtocol() === 'https') {
$request = Server::get(IRequest::class);
$isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
Copy link
Member

Choose a reason for hiding this comment

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

what about public webdav ? basic auth is used there with share token as user and share password as password

if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest) {
setcookie('cookie_test', 'test', time() + 3600);
// Do not initialize the session if a request is authenticated directly
// unless there is a session cookie already sent along
return;
}

if ($request->getServerProtocol() === 'https') {
ini_set('session.cookie_secure', 'true');
}

Expand Down Expand Up @@ -516,7 +526,7 @@ private static function sendSameSiteCookies(): void {
* also we can't directly interfere with PHP's session mechanism.
*/
private static function performSameSiteCookieProtection(\OCP\IConfig $config): void {
$request = Server::get(\OCP\IRequest::class);
$request = Server::get(IRequest::class);

// Some user agents are notorious and don't really properly follow HTTP
// specifications. For those, have an automated opt-out. Since the protection
Expand Down Expand Up @@ -778,7 +788,7 @@ public static function init(): void {
return;
}

$request = Server::get(\OCP\IRequest::class);
$request = Server::get(IRequest::class);
$host = $request->getInsecureServerHost();
/**
* if the host passed in headers isn't trusted
Expand Down Expand Up @@ -840,7 +850,7 @@ public static function registerCleanupHooks(\OC\SystemConfig $systemConfig): voi
if (!defined('PHPUNIT_RUN') && $userSession->isLoggedIn()) {
// reset brute force delay for this IP address and username
$uid = $userSession->getUser()->getUID();
$request = Server::get(\OCP\IRequest::class);
$request = Server::get(IRequest::class);
$throttler = Server::get(\OC\Security\Bruteforce\Throttler::class);
$throttler->resetDelay($request->getRemoteAddress(), 'login', ['user' => $uid]);
}
Expand Down Expand Up @@ -970,7 +980,7 @@ public static function handleRequest(): void {
exit();
}

$request = Server::get(\OCP\IRequest::class);
$request = Server::get(IRequest::class);
$requestPath = $request->getRawPathInfo();
if ($requestPath === '/heartbeat') {
return;
Expand Down
3 changes: 2 additions & 1 deletion lib/private/Authentication/TwoFactorAuth/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
use OCP\IConfig;
use OCP\ISession;
use OCP\IUser;
use OCP\Session\Exceptions\SessionNotAvailableException;
use Psr\Log\LoggerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
Expand Down Expand Up @@ -362,7 +363,7 @@ public function needsSecondFactor(IUser $user = null): bool {
$this->session->set(self::SESSION_UID_DONE, $user->getUID());
return false;
}
} catch (InvalidTokenException $e) {
} catch (InvalidTokenException|SessionNotAvailableException $e) {
}
}

Expand Down