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

Parse URL When Ensuring CORS for Direct Uploads #46

Merged
merged 1 commit into from Sep 12, 2019
Merged

Parse URL When Ensuring CORS for Direct Uploads #46

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/app/services/workarea/direct_upload.rb
View file
Open in desktop
Expand Up @@ -2,7 +2,11 @@ module Workarea
class DirectUpload
class InvalidTypeError < RuntimeError; end

def self.ensure_cors!(url)
def self.ensure_cors!(request_url)
uri = URI.parse(request_url)
url = "#{uri.scheme}://#{uri.host}"
url += ":#{uri.port}" unless uri.port.in? [80, 443]

Workarea.s3.put_bucket_cors(
Configuration::S3.bucket,
'CORSConfiguration' => [
Expand Down
6 changes: 3 additions & 3 deletions core/test/services/workarea/direct_upload_test.rb
View file
Open in desktop
Expand Up @@ -82,9 +82,9 @@ def test_ensure_cors
).returns(true)


assert(DirectUpload.ensure_cors!('http://test.host'))
assert(DirectUpload.ensure_cors!('http://localhost:3000'))
assert(DirectUpload.ensure_cors!('https://example.com'))
assert(DirectUpload.ensure_cors!('http://test.host/admin/content_assets'))
assert(DirectUpload.ensure_cors!('http://localhost:3000/admin/content_assets'))
assert(DirectUpload.ensure_cors!('https://example.com/admin/direct_uploads'))
end

private
Expand Down