Skip to content

added CORS skip if session was created by AppAPI #40737

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
bigcat88 merged 3 commits into from
Oct 9, 2023
Merged

added CORS skip if session was created by AppAPI #40737

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f16c9f4
added CORS skip if session was created by AppAPI
bigcat88 Oct 2, 2023
0b8a3b5
fixed Drone test
bigcat88 Oct 6, 2023
6ef3875
Merge branch 'master' into cors-app_api
bigcat88 Oct 9, 2023
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
Next Next commit
added CORS skip if session was created by AppAPI 
Signed-off-by: Alexander Piskun <[email protected]>
  • Loading branch information
@bigcat88
bigcat88 committed Oct 2, 2023
commit f16c9f42c65d784f5c394de4d19a6f58b525aaa3
4 changes: 4 additions & 0 deletions lib/private/AppFramework/Middleware/Security/CORSMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ public function beforeController($controller, $methodName) {
if ($this->request->passesCSRFCheck()) {
return;
}
// Skip CORS check for requests with AppAPI auth.
if ($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