browse-everything 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eedf3447096af5429b239653b707bf23e881fcd43a097cbe25804c7d48bc16e2
-  data.tar.gz: 1ccf9adb1e189a413ae6ceb9a4e67bccfae3a5179c84f583c1b165f4e051cf00
+  metadata.gz: faa729e0e6ae6d2ae76c0c9364b44017d689bbb89153b3c1e98bde8c17fa1427
+  data.tar.gz: 7a29fe7df1a1dd5bdd309e23e4edc22af28d3fb618bceaf01d852537d37fdb3b
 SHA512:
-  metadata.gz: 58511d9c04085a4a9d72246c906bb20cb46bac2e980d17bf90276807b67fe4c38eab79dbae89c10a69e735da6ee2e0acffe0399fe7993526a0454886cc3555ee
-  data.tar.gz: 5484761c6ed0b148ba8a10852dea363a1c6860b146271dd0b8bedbad65f37dfb50b0644f3da2ae533c0b84c782fadea9d808f8d1f2d10d1acb00e3ee8f9d6b34
+  metadata.gz: 4a97f843dafad43ddb8a58cf30f663d586dcdecaec0ba1fde64f38c2189c6a3c731d9fd0e1c9c39437ce63f8ad294ded4befac02d651b9de2063eedf3b13311b
+  data.tar.gz: 487830c4ba65dbd1810774a87fef7ecd4202e805a4153bbfdb4c333e9c833afdcfaab24de26e285c198e2bc29d1ea944f387bf1011cb21c76e697da88a23e2d3

data/Gemfile

@@ -25,6 +25,12 @@ end
 
 ENV['RAILS_VERSION'] ||= "8.0.0"
 
+# json 3 dropped the quirks_mode option that ActiveSupport before 8.1 passes
+# when encoding, so Hash#to_json raises ArgumentError under it.
+if ENV['RAILS_VERSION'] != 'edge' && Gem::Version.new(ENV['RAILS_VERSION']) < Gem::Version.new('8.1')
+  gem 'json', '< 3'
+end
+
 if ENV['RAILS_VERSION']
   if ENV['RAILS_VERSION'] == 'edge'
     gem 'rails', github: 'rails/rails'

data/app/assets/javascripts/browse_everything/behavior.js

@@ -323,7 +323,12 @@ $(function () {
 
   $(document).on('click', 'button.ev-submit', function (event) {
     event.preventDefault();
-    $(this).button('loading');
+    // button('loading') is Bootstrap 3's button plugin. When jQuery UI's
+    // button widget owns $.fn.button instead, it throws on the call and the
+    // selection is never submitted. startWait() disables the button either way.
+    if ($.fn.button && $.fn.button.Constructor) {
+      $(this).button('loading');
+    }
     startWait();
     $('form.ev-submit-form').append(Array.from(selected_files.values()));
     var main_form = $(this).closest('form');

data/lib/browse_everything/driver/s3.rb

@@ -55,17 +55,19 @@ module BrowseEverything
       def link_for(path)
         obj = bucket.object(full_path(path))
 
-        extras = {
-          file_name: File.basename(path),
-          expires: (config[:expires_in] if config[:response_type] == :signed_url)
-        }.compact
-
-        url = case config[:response_type].to_sym
+        response_type = config[:response_type].to_sym
+        url = case response_type
               when :signed_url then obj.presigned_url(:get, expires_in: config[:expires_in])
               when :public_url then obj.public_url
               when :s3_uri     then "s3://#{obj.bucket_name}/#{obj.key}"
               end
 
+        extras = {
+          file_name: File.basename(path),
+          file_size: object_size(obj),
+          expires: (signed_url_expiry(url) if response_type == :signed_url)
+        }.compact
+
         [url, extras]
       end
 
@@ -79,6 +81,26 @@ module BrowseEverything
 
       private
 
+      # The size is a convenience for consumers, so credentials that can list
+      # but not read an object (enough for an :s3_uri link) leave it out
+      # rather than fail the link.
+      def object_size(obj)
+        obj.content_length
+      rescue Aws::S3::Errors::ServiceError, Seahorse::Client::NetworkingError
+        nil
+      end
+
+      # Retriever#retrieve parses `expires` as a time, so send when the link
+      # expires, as the Box and Google Drive drivers do. It is read from the
+      # signed URL itself because the SDK can sign for less than expires_in,
+      # for example when the signing credentials are temporary.
+      def signed_url_expiry(url)
+        params = Rack::Utils.parse_query(URI(url).query)
+        return unless params['X-Amz-Date'] && params['X-Amz-Expires']
+
+        Time.strptime(params['X-Amz-Date'], '%Y%m%dT%H%M%S%z') + params['X-Amz-Expires'].to_i
+      end
+
       def strip(path)
         path.sub %r{^/?(.+?)/?$}, '\1'
       end

data/lib/browse_everything/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrowseEverything
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

data/spec/lib/browse_everything/driver/s3_spec.rb

@@ -134,28 +134,68 @@ describe BrowseEverything::Driver::S3 do
       context 'when retrieving the link for an asset' do
         subject { contents[2] }
 
+        let(:signed_at) { Time.now.utc.change(usec: 0) }
+        let(:presigned_url) do
+          "https://s3.amazonaws.com/presigned_url?X-Amz-Date=#{signed_at.strftime('%Y%m%dT%H%M%SZ')}&X-Amz-Expires=3600"
+        end
+
         before do
           object = instance_double(Aws::S3::Object)
-          allow(object).to receive(:presigned_url).and_return('https://s3.amazonaws.com/presigned_url')
+          allow(object).to receive(:presigned_url).and_return(presigned_url)
           allow(object).to receive(:public_url).and_return('https://s3.amazonaws.com/public_url')
           allow(object).to receive(:bucket_name).and_return('s3.bucket')
           allow(object).to receive(:key).and_return('foo/quux.png')
+          allow(object).to receive(:content_length).and_return(1_511_860)
           allow(provider.bucket).to receive(:object).and_return(object)
         end
 
         it ':signed_url' do
           provider.config[:response_type] = :signed_url
-          expect(provider.link_for('foo/quux.png')).to eq ['https://s3.amazonaws.com/presigned_url', { file_name: 'quux.png', expires: 14400 }]
+          expect(provider.link_for('foo/quux.png')).to eq [presigned_url, { file_name: 'quux.png', file_size: 1_511_860, expires: signed_at + 3600 }]
+        end
+
+        it ':signed_url reports the lifetime the URL was signed for, not expires_in' do
+          provider.config[:response_type] = :signed_url
+          provider.config[:expires_in] = 14400
+          expect(provider.link_for('foo/quux.png').last[:expires]).to eq signed_at + 3600
+        end
+
+        it ':signed_url configured as a string still sends the expiry' do
+          provider.config[:response_type] = 'signed_url'
+          expect(provider.link_for('foo/quux.png').last[:expires]).to eq signed_at + 3600
+        end
+
+        [Aws::S3::Errors::Forbidden.new(nil, 'Forbidden'), Seahorse::Client::NetworkingError.new(Errno::ECONNRESET.new)].each do |error|
+          it "leaves out the size when reading it raises #{error.class}" do
+            provider.config[:response_type] = :s3_uri
+            allow(provider.bucket.object('foo/quux.png')).to receive(:content_length).and_raise(error)
+            expect(provider.link_for('foo/quux.png')).to eq ['s3://s3.bucket/foo/quux.png', { file_name: 'quux.png' }]
+          end
+        end
+
+        it ':s3_uri keeps a key that is not a valid URI' do
+          provider.config[:response_type] = :s3_uri
+          allow(provider.bucket.object('foo/quux.png')).to receive(:key).and_return('foo/résumé file.pdf')
+          expect(provider.link_for('foo/quux.png').first).to eq 's3://s3.bucket/foo/résumé file.pdf'
+        end
+
+        it ':signed_url gives an expiry the retriever accepts' do
+          provider.config[:response_type] = :signed_url
+          url, extras = provider.link_for('foo/quux.png')
+          spec = { 'url' => url, 'expires' => extras[:expires].to_s, 'file_size' => extras[:file_size] }
+          retriever = BrowseEverything::Retriever.new
+          allow(retriever).to receive(:retrieve_http)
+          expect { retriever.retrieve(spec) }.not_to raise_error
         end
 
         it ':public_url' do
           provider.config[:response_type] = :public_url
-          expect(provider.link_for('foo/quux.png')).to eq ['https://s3.amazonaws.com/public_url', { file_name: 'quux.png' }]
+          expect(provider.link_for('foo/quux.png')).to eq ['https://s3.amazonaws.com/public_url', { file_name: 'quux.png', file_size: 1_511_860 }]
         end
 
         it ':s3_uri' do
           provider.config[:response_type] = :s3_uri
-          expect(provider.link_for('foo/quux.png')).to eq ['s3://s3.bucket/foo/quux.png', { file_name: 'quux.png' }]
+          expect(provider.link_for('foo/quux.png')).to eq ['s3://s3.bucket/foo/quux.png', { file_name: 'quux.png', file_size: 1_511_860 }]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Carolyn Cole
@@ -629,7 +629,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 4.0.22
 specification_version: 4
 summary: AJAX/Rails engine file browser for cloud storage services
 test_files: