Skip to content

Allow accessing CORS routes on ApiControllers if a proper CSRF token is provided #19354

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

Closed
juliusknorr wants to merge 2 commits into from
Closed

Allow accessing CORS routes on ApiControllers if a proper CSRF token is provided #19354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf5b33f
Allow accessing CORS routes if on ApiControllers if a proper CSRF tok…
juliusknorr Feb 7, 2020
f1b3876
Properly check for empty basic auth when trying to log in a user on C…
juliusknorr Feb 7, 2020
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
8 changes: 6 additions & 2 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 @@ -80,17 +80,21 @@ public function __construct(IRequest $request,
* @throws SecurityException
* @since 6.0.0
*/
public function beforeController($controller, $methodName){
public function beforeController($controller, $methodName) {
// ensure that @CORS annotated API routes are not used in conjunction
// with session authentication since this enables CSRF attack vectors
if ($this->reflector->hasAnnotation('CORS') &&
!$this->reflector->hasAnnotation('PublicPage')) {
$user = $this->request->server['PHP_AUTH_USER'];
$pass = $this->request->server['PHP_AUTH_PW'];

// Allow to use the current session if a CSRF token is provided
if ($this->request->passesCSRFCheck()) {
return;
}
$this->session->logout();
try {
if (!$this->session->logClientIn($user, $pass, $this->request, $this->throttler)) {
if (!empty($user) && !empty($pass) && !$this->session->logClientIn($user, $pass, $this->request, $this->throttler)) {
throw new SecurityException('CORS requires basic auth', Http::STATUS_UNAUTHORIZED);
}
} catch (PasswordLoginForbiddenException $ex) {
Expand Down
16 changes: 10 additions & 6 deletions lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\App\AppPathNotFoundException;
use OCP\App\IAppManager;
use OCP\AppFramework\ApiController;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\RedirectResponse;
Expand Down Expand Up @@ -170,13 +171,16 @@ public function beforeController($controller, $methodName) {
*
* Additionally we allow Bearer authenticated requests to pass on OCS routes.
* This allows oauth apps (e.g. moodle) to use the OCS endpoints
* CORS routes are also allowed to pass since the authentication and possible required
* CSRF token check is handled in the CORSMiddleware
*/
if(!$this->request->passesCSRFCheck() && !(
$controller instanceof OCSController && (
$this->request->getHeader('OCS-APIREQUEST') === 'true' ||
strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0
)
)) {
if (!$this->request->passesCSRFCheck()
&& !($controller instanceof ApiController && $this->reflector->hasAnnotation('CORS'))
&& !($controller instanceof OCSController && (
$this->request->getHeader('OCS-APIREQUEST') === 'true' ||
strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0)
)
) {
throw new CrossSiteRequestForgeryException();
}
}
Expand Down