lockbox 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05cf227cc78a31ce5ad67f4352196ee720d31e0f614db26089d1c5b0a17ae823
-  data.tar.gz: c47effd7829d2e7ffc7143d51fa6adb03ae6e11bd24f8b7048d39c2e559d5389
+  metadata.gz: 9d220724fb1331a7a9fdda8fdd073de62c19f601b2d15173a5fe22046e51071d
+  data.tar.gz: 9f144deb1211bd79d49f5eb2dccee29b25a2ea8869aadadad92ebda825012c00
 SHA512:
-  metadata.gz: 79b18945ec5c492feedc8913669dde990b7849264b0ca3bc9e5a3be991656a59e5f953e414cf51108b747aa1d98687838715452824f0e38697cbe55fe0cae023
-  data.tar.gz: a747b3d2ebe4dd12cfafd91fb4970bd020515a8585a05d0bdd222ddbe30e6f402e596b4188c1d945bfaf6d2cb21914fddfd1199030f9ca73c61a5a02acf24b0f
+  metadata.gz: 31492e71cafb170205944089f047269302249a5ba03f23533d302b45f45fc770ee221eb56af50f47c39ac44d980f8886ff0aa3cd50ed9dcc018638859ac06ace
+  data.tar.gz: 69faba8f29dca9c7b85c3e5d7905db625d96105b2ae74a61b0a3cd7094cbcea437caf909a731346ac53607f8624ec27b1b9d58bb44f80f294028c07ab813e938

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.6 (2020-04-19)
+
+- Fixed content type detection for Active Storage and CarrierWave
+- Fixed decryption with Active Storage 6 and `attachment.open`
+
 ## 0.3.5 (2020-04-13)
 
 - Added `array` type

data/README.md

@@ -780,6 +780,20 @@ end
 
 ## Upgrading
 
+### 0.3.6
+
+0.3.6 makes content type detection more reliable for Active Storage. You can check and update the content type of existing files with:
+
+```ruby
+User.find_each do |user|
+  license = user.license
+  content_type = Marcel::MimeType.for(license.download, name: license.filename.to_s)
+  if content_type != license.content_type
+    license.update!(content_type: content_type)
+  end
+end
+```
+
 ### 0.2.0
 
 0.2.0 brings a number of improvements. Here are a few to be aware of:
@@ -837,7 +851,7 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Write, clarify, or fix documentation
 - Suggest or add new features
 
-To get started with development and testing:
+To get started with development, [install Libsodium](https://github.com/crypto-rb/rbnacl/wiki/Installing-libsodium) and run:
 
 ```sh
 git clone https://github.com/ankane/lockbox.git

data/lib/lockbox/active_storage_extensions.rb

@@ -101,6 +101,26 @@ module Lockbox
         result
       end
 
+      if ActiveStorage::VERSION::MAJOR >= 6
+        def open(**options)
+          blob.open(**options) do |file|
+            options = Utils.encrypted_options(record, name)
+            if options
+              result = file.read
+              file.rewind
+              # truncate may not be available on all platforms
+              # according to the Ruby docs
+              # may need to create a new temp file instead
+              file.truncate(0)
+              file.write(Utils.build_box(record, options, record.class.table_name, name).decrypt(result))
+              file.rewind
+            end
+
+            yield file
+          end
+        end
+      end
+
       def mark_analyzed
         if Utils.encrypted_options(record, name)
           blob.update!(metadata: blob.metadata.merge(analyzed: true))
@@ -111,5 +131,17 @@ module Lockbox
         after_save :mark_analyzed
       end
     end
+
+    module Blob
+      private
+
+      def extract_content_type(io)
+        if io.is_a?(Lockbox::IO) && io.extracted_content_type
+          io.extracted_content_type
+        else
+          super
+        end
+      end
+    end
   end
 end

data/lib/lockbox/carrier_wave_extensions.rb

@@ -8,6 +8,7 @@ module Lockbox
           @file = CarrierWave::SanitizedFile.new(lockbox.encrypt_io(file))
         end
 
+        # TODO safe to memoize?
         def read
           r = super
           lockbox.decrypt(r) if r
@@ -17,6 +18,11 @@ module Lockbox
           read.bytesize
         end
 
+        # based on CarrierWave::SanitizedFile#mime_magic_content_type
+        def content_type
+          MimeMagic.by_magic(read).try(:type) || "invalid/invalid"
+        end
+
         def rotate_encryption!
           io = Lockbox::IO.new(read)
           io.original_filename = file.filename

data/lib/lockbox/io.rb

@@ -1,5 +1,8 @@
 module Lockbox
   class IO < StringIO
     attr_accessor :original_filename, :content_type
+
+    # private: do not use
+    attr_accessor :extracted_content_type
   end
 end

data/lib/lockbox/railtie.rb

@@ -16,6 +16,7 @@ module Lockbox
       app.config.to_prepare do
         if defined?(ActiveStorage)
           ActiveStorage::Attachment.include(Lockbox::ActiveStorageExtensions::Attachment)
+          ActiveStorage::Blob.prepend(Lockbox::ActiveStorageExtensions::Blob)
         end
       end
     end

data/lib/lockbox/utils.rb

@@ -49,17 +49,20 @@ module Lockbox
     def self.encrypt_attachable(record, name, attachable)
       options = encrypted_options(record, name)
       box = build_box(record, options, record.class.table_name, name)
+      io = nil
 
       case attachable
       when ActionDispatch::Http::UploadedFile, Rack::Test::UploadedFile
+        io = attachable
         attachable = {
-          io: box.encrypt_io(attachable),
+          io: box.encrypt_io(io),
           filename: attachable.original_filename,
           content_type: attachable.content_type
         }
       when Hash
+        io = attachable[:io]
         attachable = {
-          io: box.encrypt_io(attachable[:io]),
+          io: box.encrypt_io(io),
           filename: attachable[:filename],
           content_type: attachable[:content_type]
         }
@@ -67,6 +70,10 @@ module Lockbox
         raise NotImplementedError, "Not supported"
       end
 
+      # set content type based on unencrypted data
+      # keep synced with ActiveStorage::Blob#extract_content_type
+      attachable[:io].extracted_content_type = Marcel::MimeType.for(io, name: attachable[:filename].to_s, declared_type: attachable[:content_type])
+
       attachable
     end
   end

data/lib/lockbox/version.rb

@@ -1,3 +1,3 @@
 module Lockbox
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockbox
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement