workarea-core 3.4.15 → 3.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca7289a6b90924018068c1ab8f800600ed3c714d63a08cf95217224efc8f069c
-  data.tar.gz: 23a4f30485bb3d230669213d5f7acd258a605865ea0f1a94da9ce4321d941224
+  metadata.gz: b344edcc1824bf26da32d7d12bc44579c7199f6aac8b0c7475657f3ee7aac70b
+  data.tar.gz: bfe91752df68f85cf594bf84dea1f9639020ae25f51c9b0506f638fed86e1f99
 SHA512:
-  metadata.gz: ac75f323f12f1e4ebfdf965edc82524219daa425fcf3fe90999e2ffc173ff18ec987616df95527328f0d568a7471fe570053ce1c73c511c3bce08202a076c8ad
-  data.tar.gz: f4dd55dd0a19e1d3db07e6e181c5a349ec19ee40b5c91026b1286bb09419ecb2d9c4e80d9169d0975cef1f5efc22d38f81db358d2f6cd15df5820baeb2ccfa49
+  metadata.gz: 74cc0ecbd7977a33d887c5f1519f4bab35608869f8f46e1a0c74967f42bc8194b738bfc25f43788592fbfb5457fccb3d3a1964f925febbb4aa3f20ad8e60d60d
+  data.tar.gz: 5126befad7fff351d48d575f80ce336121341301c1303f970934e21162a932bd46e1af55862d4669b17d6ef9ed07b443789fbdb094263e084f035f974b3650a7

data/app/services/workarea/direct_upload.rb

@@ -2,15 +2,16 @@ module Workarea
   class DirectUpload
     class InvalidTypeError < RuntimeError; end
 
-    def self.ensure_cors!
-      url = "http#{Rails.application.config.force_ssl ? 's' : ''}://"
-      url += Workarea.config.host
+    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' => [
           {
-            'ID' => "direct_upload_#{Workarea.config.host}",
+            'ID' => "direct_upload_#{url}",
             'AllowedMethod' => 'PUT',
             'AllowedOrigin' => url,
             'AllowedHeader' => '*'

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 15
+    PATCH = 16
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/services/workarea/direct_upload_test.rb

@@ -46,6 +46,47 @@ module Workarea
       refute(direct_upload.valid?)
     end
 
+    def test_ensure_cors
+      Workarea.s3.expects(:put_bucket_cors).with(
+        Configuration::S3.bucket,
+        'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_http://test.host",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://test.host',
+            'AllowedHeader' => '*'
+          }
+        ]
+      ).returns(true)
+      Workarea.s3.expects(:put_bucket_cors).with(
+        Configuration::S3.bucket,
+        'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_http://localhost:3000",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'http://localhost:3000',
+            'AllowedHeader' => '*'
+          }
+        ]
+      ).returns(true)
+      Workarea.s3.expects(:put_bucket_cors).with(
+        Configuration::S3.bucket,
+        'CORSConfiguration' => [
+          {
+            'ID' => "direct_upload_https://example.com",
+            'AllowedMethod' => 'PUT',
+            'AllowedOrigin' => 'https://example.com',
+            'AllowedHeader' => '*'
+          }
+        ]
+      ).returns(true)
+
+
+      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
 
     def upload_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.15
+  version: 3.4.16
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler