Skip to content

[stable10] Backport of #28457 (Enabled CORS on ownCloud) #28852

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
PVince81 merged 3 commits into from
Sep 18, 2017
Merged

[stable10] Backport of #28457 (Enabled CORS on ownCloud) #28852

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37c5d9f
Enabled CORS on ownCloud
noveens Jul 21, 2017
63d9b00
Added array check
noveens Aug 30, 2017
75c28e3
OAuth2 Fix
noveens Sep 12, 2017
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
Prev Previous commit
Next Next commit
Added array check
  • Loading branch information
@noveens
noveens committed Aug 30, 2017
commit 63d9b00a075d14a3289c096da36fedee86e5337d
2 changes: 1 addition & 1 deletion lib/private/legacy/response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public static function setCorsHeaders($userId, $domain, $response, $config = nul
$config = \OC::$server->getConfig();
}
$allowedDomains = json_decode($config->getUserValue($userId, 'core', 'domains'));
if (in_array($domain, $allowedDomains)) {
if (is_array($allowedDomains) && in_array($domain, $allowedDomains)) {
// TODO: infer allowed verbs from existing known routes
$allHeaders['Access-Control-Allow-Headers'] = ["authorization", "OCS-APIREQUEST", "Origin", "X-Requested-With", "Content-Type", "Access-Control-Allow-Origin"];
$allHeaders['Access-Control-Allow-Origin'] = [$domain];
Expand Down