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

Jump to bottom

[stable27] added CORS skip if session was created by AppAPI #40830

Merged
merged 2 commits into from Oct 9, 2023
Merged

[stable27] added CORS skip if session was created by AppAPI #40830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb703d
added CORS skip if session was created by AppAPI
bigcat88 Oct 2, 2023
4623fd1
fixed Drone test
bigcat88 Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/private/AppFramework/Middleware/Security/CORSMiddleware.php
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Middleware;
use OCP\IRequest;
use OCP\ISession;
use ReflectionMethod;

/**
Expand Down Expand Up @@ -97,6 +98,10 @@ public function beforeController($controller, $methodName) {
if ($this->request->passesCSRFCheck()) {
return;
}
// Skip CORS check for requests with AppAPI auth.
if ($this->session->getSession() instanceof ISession && $this->session->getSession()->get('app_api') === true) {
return;
}
$this->session->logout();
try {
if ($user === null || $pass === null || !$this->session->logClientIn($user, $pass, $this->request, $this->throttler)) {
Expand Down