activestorage-hotcell-server 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf17ea2179bb687a22b71617e04962d371dec1f92a53eec85e04f1a03df6ae01
-  data.tar.gz: 52ee3dedc13811e9e71882c1a26bfe342a3f28013c9005842f1969e1cce1d3fe
+  metadata.gz: 564a7c12f6ca3517a73524b53f1fe3a4e2eeb8227def645557cc840b0a6fedca
+  data.tar.gz: b40a4dedbf29c4c7164670fda7466fe40c54740317d5d740940279cf15149aee
 SHA512:
-  metadata.gz: d7375a3807281a2f753fcaf71300f7aabbc6fd3e5312964232e75547565667264bada483eb7f0c67bc7a0b4d2093f39851b401ba144860098174da91b3b60b37
-  data.tar.gz: 1d2fe8b510a6eaffc40a19a21f5fee3bd20077a399a83c436f6616ce8476270541a8fe8347743bf736f77b80f29961e18e206f4bf96a49c8ac63524db70681e1
+  metadata.gz: 276349261e10c73ec526f98ac2cfa5883a350b5dd943f833a523b8af626fb647ee3de51acac42cd83d55c36d3e23d489a09860a0188e81f2399032963fc8e3ed
+  data.tar.gz: 6770cd3d3e91768735583b5583045dbfd5b7005702955dffe1ef8a56af26f7cdb7cec7848c0fd74c2f1ecf76d7e98323ceccd57f0df1f9f9fca4919a1f5c36a2

data/lib/active_storage/hot_cell/server/previewers/pdf/mutool.rb

@@ -22,7 +22,8 @@ module ActiveStorage
               # separate change.
               def render(source, destination, page:, resolution:)
                 run! "mutool", "draw", "-F", "png", "-r", resolution.to_s, "-o", destination.path,
-                     source.fd_path, page.to_s, pass: [ source.to_io ]
+                     source.fd_path, page.to_s, pass: [ source.to_io ],
+                     causes: { /cannot authenticate password/ => ProtectedDocument }
               end
 
               def tool

data/lib/active_storage/hot_cell/server/previewers/pdf/poppler.rb

@@ -22,7 +22,7 @@ module ActiveStorage
               def render(source, destination, page:, resolution:)
                 run! "pdftoppm", "-png", "-singlefile", "-cropbox", "-r", resolution.to_s,
                      "-f", page.to_s, "-l", page.to_s, source.fd_path, destination.path,
-                     pass: [ source.to_io ]
+                     pass: [ source.to_io ], causes: { /Incorrect password/ => ProtectedDocument }
 
                 destination.adopt destination.path(extension: "png")
               end

data/lib/active_storage/hot_cell/server/tool_operation.rb

@@ -20,16 +20,25 @@ module ActiveStorage
         # UnreadableInput is always in the rescue list, and this descends from it.
         class UnreadableDocument < ::HotCell::UnreadableInput; end
 
+        # The document demands credentials the cell does not have.
+        class ProtectedDocument < UnreadableDocument
+          def self.cause
+            ::HotCell::Codes::PROTECTED
+          end
+        end
+
         private
           # Runs the tool with unsetenv_others and a written environment, and turns a non-zero exit into
           # `unreadable`. The tool's own stderr is the only useful diagnostic, and it is attacker-influenced,
           # so it is capped and scrubbed on its way onto the wire like any other error message.
-          def run!(*command, pass: [])
+          # `causes` maps stderr patterns to the UnreadableDocument subclass to raise instead.
+          def run!(*command, pass: [], causes: {})
             result = run_tool(*command, pass: pass)
             return result if result.ok?
 
-            raise UnreadableDocument, "#{command.first} exited #{result.status.exitstatus}: " \
-                                      "#{result.err.to_s.strip[0, 200]}"
+            error = causes.detect { |pattern, _| result.err.to_s.match?(pattern) }&.last || UnreadableDocument
+            raise error, "#{command.first} exited #{result.status.exitstatus}: " \
+                         "#{result.err.to_s.strip[0, 200]}"
           end
 
           # An empty output means the tool said it succeeded and produced nothing, which the client would

data/lib/active_storage/hot_cell/server/transformers/image/vips.rb

@@ -10,7 +10,8 @@ module ActiveStorage
         module Image
           # What `ActiveStorage::Transformers::ImageProcessingTransformer` does, moved out of the application,
           # and deliberately nothing more: the transformations and the format reach ImageProcessing exactly as
-          # Rails hands them over.
+          # Rails hands them over, except that the client sends a web image's format as its content type's
+          # canonical extension, so `jfif` arrives as `jpg` (#84).
           #
           # There is no allowlist here, and that mirrors Rails: the vips path validates exactly one thing —
           # `combine_options` is refused — and `ActiveStorage.supported_image_processing_methods` is enforced by

data/lib/active_storage/hot_cell/server/version.rb

@@ -3,7 +3,7 @@
 module ActiveStorage
   module HotCell
     module Server
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-hotcell-server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Dalessio
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +99,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/basecamp/hotcell
-  source_code_uri: https://github.com/basecamp/hotcell/tree/v1.0.0/activestorage-hotcell-server
-  changelog_uri: https://github.com/basecamp/hotcell/blob/v1.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/basecamp/hotcell/tree/v1.1.0/activestorage-hotcell-server
+  changelog_uri: https://github.com/basecamp/hotcell/blob/v1.1.0/CHANGELOG.md
   documentation_uri: https://basecamp.github.io/hotcell/
   bug_tracker_uri: https://github.com/basecamp/hotcell/issues
   rubygems_mfa_required: 'true'
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.16
 specification_version: 4
 summary: The operations a cell runs on behalf of Active Storage.
 test_files: []