pdfrb 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a819d2ed2b54eb4ca8c0ac17ceb14cc1c45a79e359bb51c6b5194e2fdb7025
-  data.tar.gz: bcb6a670c04b7e68b20b90f8ac344ac0672a76f1fd3e16306ac46b4c44f728ec
+  metadata.gz: b0edf5439bfe359af4b900aeb846047b168d741271eb78a7f78315ca5b0bba55
+  data.tar.gz: 0b30e0edb04dcc2a4d26a493ba782379a8a864904eafc72f07c0c49ca4a25e57
 SHA512:
-  metadata.gz: f8eb286788ae52128019b39b18006776c9c9227ab92e76b0a72add85eb92b16daa390704d243627a0f79fcd8b9c0195a606f7f6878953db634ff1c9ad257b0f4
-  data.tar.gz: 1940d86297e8e20ae06d33b23bd7b36815d5249fce28eb120262ab33e5350668fa015247444ed905ac1ba5b73295fa092b74d6e477c9fd74a507252a78cb110f
+  metadata.gz: bd9802dee13e72edb052c80bd4fea095eade14c95b0fe8cb31277c0a9c36de9f9c202d99bbc3a485911dc5035d6253589b3f50358f0d2b789f4756c19d211e72
+  data.tar.gz: c44636603bba32db00de362646b378238fcb884008b085627c1e19d66e899472d9c1a2539ffffd3eb076a58788afb3abec2eaecfb9b44274960e025d31c7ed34

data/lib/pdfrb/cli.rb

@@ -334,10 +334,16 @@ module Pdfrb
 
       # Set up the handler so Writer can encrypt per-object.
       handler = Pdfrb::Encryption::StandardSecurityHandler.new(
-        Encrypt: { V: v, R: r, Length: length, P: perms, O: o_entry, U: u_entry },
-        ID: [id0.b, id0.b]
+        {
+          Encrypt: { V: v, R: r, Length: length, P: perms,
+                     O: o_entry, U: u_entry },
+          ID: [id0.b, id0.b],
+        }
       )
-      handler.verify_user_password(user_pw)
+      unless handler.verify_user_password?(user_pw)
+        raise Pdfrb::EncryptionError, "failed to derive encryption key"
+      end
+
       doc.config["encryption.handler"] = handler
       doc.config["encryption.password"] = user_pw
     end

data/lib/pdfrb/compare/comparator.rb

@@ -96,8 +96,7 @@ module Pdfrb
 
       def inventory_fonts(doc)
         fonts = Set.new
-        doc.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
           next unless obj[:Type] == :Font
 
           name = obj[:BaseFont] || obj[:Name] || "Unknown"
@@ -117,8 +116,7 @@ module Pdfrb
 
       def count_images(doc)
         count = 0
-        doc.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next unless obj[:Subtype] == :Image
 
           count += 1

data/lib/pdfrb/conformance/pdf_a.rb

@@ -31,8 +31,7 @@ module Pdfrb
                       id: "6.1-4", description: "JavaScript prohibited",
                       severity: :error, spec_clause: "ISO 19005-1 6.1",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           if obj.value[:S] == :JavaScript
                             return Violation.new(rule_id: "6.1-4", message: "PDF/A prohibits JavaScript actions",
                                                  object: "JavaScript action", severity: :error,
@@ -201,8 +200,7 @@ module Pdfrb
                       id: "a1-1", description: "JPEG2000 not allowed in A-1",
                       severity: :error, spec_clause: "ISO 19005-1 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
                           next unless obj[:Filter] == :JPXDecode
 
                           return Violation.new(rule_id: "a1-1",
@@ -217,8 +215,7 @@ module Pdfrb
                       id: "a1-2", description: "Object streams not allowed in A-1",
                       severity: :error, spec_clause: "ISO 19005-1 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :ObjStm
 
                           return Violation.new(rule_id: "a1-2",
@@ -247,9 +244,7 @@ module Pdfrb
                       id: "a1-4", description: "LZWDecode not allowed in A-1",
                       severity: :error, spec_clause: "ISO 19005-1 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
                           f = obj[:Filter]
                           fs = f.is_a?(::Array) ? f : [f]
                           next unless fs.include?(:LZWDecode)
@@ -269,8 +264,7 @@ module Pdfrb
                       id: "a2-1", description: "PostScript XObjects prohibited",
                       severity: :warning, spec_clause: "ISO 19005-2 6.2.4",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
                           next unless [:PS, :PSXObject].include?(obj[:Subtype])
 
                           return Violation.new(rule_id: "a2-1",
@@ -285,8 +279,7 @@ module Pdfrb
                       id: "a2-2", description: "Embedded files not allowed in A-2",
                       severity: :error, spec_clause: "ISO 19005-2 6.2",
                       check: ->(doc) {
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :EmbeddedFile
 
                           return Violation.new(rule_id: "a2-2",
@@ -316,8 +309,7 @@ module Pdfrb
                       severity: :error, spec_clause: "ISO 19005-3 6.2",
                       check: ->(doc) {
                         vs = []
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :Filespec
                           next if obj.value[:AFRelationship]
 
@@ -348,8 +340,7 @@ module Pdfrb
                       severity: :error, spec_clause: "ISO 19005-4 6.2",
                       check: ->(doc) {
                         vs = []
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           next unless obj.value[:Type] == :Filespec
                           next if obj.value[:AFRelationship]
 
@@ -366,8 +357,7 @@ module Pdfrb
                       severity: :error, spec_clause: "ISO 19005-4 6.2.3",
                       check: ->(doc) {
                         vs = []
-                        doc.each_indirect_object do |annot|
-                          next unless annot.is_a?(Pdfrb::Model::Cos::Dictionary)
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |annot|
                           next unless annot.value[:Type] == :Annot
 
                           st = annot.value[:Subtype]

data/lib/pdfrb/conformance/pdf_x.rb

@@ -150,9 +150,7 @@ module Pdfrb
                       spec_clause: "ISO 15930 §6.5",
                       check: ->(doc) {
                         violations = []
-                        doc.each_indirect_object do |obj|
-                          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
-
+                        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
                           s = obj[:S]
                           next unless [:JavaScript, :JS, :Launch, :URI].include?(s)
 
@@ -231,7 +229,7 @@ module Pdfrb
         spec_clause: "ISO 15930-11 6.1",
         check: ->(doc) {
           v = doc.version.to_s
-          next nil if compare_versions(v, "2.0") >= 0
+          next nil if Pdfrb::PdfVersion.compare(v, "2.0") >= 0
 
           Violation.new(
             rule_id: "x6-1",
@@ -280,16 +278,8 @@ module Pdfrb
         rs.register(X6_OUTPUT_INTENT_RULE)
       end
 
-      def compare_versions(a, b)
-        aa = a.to_s.split(".").map(&:to_i)
-        bb = b.to_s.split(".").map(&:to_i)
-        (aa <=> bb) || 0
-      end
-
       def scan_color_spaces(doc, &block)
-        doc.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
-
+        doc.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
           cs = obj.value[:ColorSpace]
           next unless cs
 

data/lib/pdfrb/content/canvas.rb

@@ -43,13 +43,11 @@ module Pdfrb
       end
 
       def concat(a, b, c, d, e, f, &)
-        emit_op Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f
-        return self unless block_given?
+        return emit_op(Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f) unless block_given?
 
-        begin
+        save_graphics_state do
+          emit_op(Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f)
           yield self
-        ensure
-          emit_op Pdfrb::Content::Operator::SaveGraphicsState
         end
         self
       end
@@ -282,41 +280,28 @@ module Pdfrb
                 create_ext_g_state(BM: mode.to_s))
       end
 
-      def with_transparency(opacity: 1.0, blend_mode: nil)
-        save_graphics_state
-        self.opacity = opacity if opacity < 1.0
-        self.blend_mode = blend_mode if blend_mode
-
-        begin
+      def with_transparency(opacity: 1.0, blend_mode: nil, &)
+        save_graphics_state do
+          self.opacity = opacity if opacity < 1.0
+          self.blend_mode = blend_mode if blend_mode
           yield self
-        ensure
-          emit_op(Pdfrb::Content::Operator::RestoreGraphicsState)
         end
         self
       end
 
       def draw_image(name, at: nil, width: nil, height: nil, matrix: nil)
-        @used_xobjects[name] = true
-        save_graphics_state do
-          if matrix
-            a, b, c, d, e, f = matrix
-            concat(a, b, c, d, e, f)
-            emit_op(Pdfrb::Content::Operator::InvokeXObject, name)
-          else
-            translate(at[0], at[1])
-            concat(width, 0, 0, height, 0, 0)
-            append(" /#{name} Do\n")
-          end
+        if matrix
+          a, b, c, d, e, f = matrix
+          invoke_xobject(name, matrix: [a, b, c, d, e, f])
+        else
+          invoke_xobject(name, matrix: [width, 0, 0, height, 0, 0],
+                               pre_translate: at)
         end
         self
       end
 
       def draw_image_matrix(name, a:, b:, c:, d:, e:, f:)
-        @used_xobjects[name] = true
-        save_graphics_state do
-          concat(a, b, c, d, e, f)
-          emit_op(Pdfrb::Content::Operator::InvokeXObject, name)
-        end
+        invoke_xobject(name, matrix: [a, b, c, d, e, f])
         self
       end
 
@@ -327,13 +312,20 @@ module Pdfrb
       # @param at [Array<Numeric>] x, y translation.
       # @param matrix [Array<Numeric>, nil] 6-element transform matrix.
       def draw_form_xobject(name, at: [0, 0], matrix: nil)
+        translate = matrix.nil? ? at : nil
+        invoke_xobject(name, matrix: matrix, pre_translate: translate)
+        self
+      end
+
+      # Invoke an XObject (/Do) inside a saved graphics state, applying
+      # an optional translation then a 6-element transform matrix.
+      def invoke_xobject(name, matrix: nil, pre_translate: nil)
         @used_xobjects[name] = true
         save_graphics_state do
+          translate(pre_translate[0], pre_translate[1]) if pre_translate
           if matrix
             a, b, c, d, e, f = matrix
-            concat(a, b, c, d, e, f)
-          elsif at
-            translate(at[0], at[1])
+            emit_op(Pdfrb::Content::Operator::ConcatMatrix, a, b, c, d, e, f)
           end
           emit_op(Pdfrb::Content::Operator::InvokeXObject, name)
         end

data/lib/pdfrb/content/hidden_text_detector.rb

@@ -55,8 +55,7 @@ module Pdfrb
       end
 
       def find_page(stream_obj)
-        @document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Dictionary)
+        @document.each_indirect_of(Pdfrb::Model::Cos::Dictionary) do |obj|
           next unless obj[:Type] == :Page
 
           contents = obj[:Contents]

data/lib/pdfrb/digital_signature.rb

@@ -13,16 +13,17 @@ module Pdfrb
     autoload :TimestampHandler, "pdfrb/digital_signature/timestamp_handler"
     autoload :TimestampClient, "pdfrb/digital_signature/timestamp_client"
 
-    HANDLERS = {
-      "adbe.pkcs7.detached": CmsHandler,
-      "adbe.pkcs7.sha1": CmsHandler,
-      "adbe.revision": TimestampHandler,
-    }.freeze
-
     module_function
 
+    # Resolve the handler class for +sub_filter+. Constant references
+    # live inside the case so the autoloads above defer loading the
+    # handlers (and their OpenSSL surface) until an actual
+    # sign/verify call needs them.
     def handler_for(sub_filter)
-      HANDLERS[sub_filter.to_sym]
+      case sub_filter.to_sym
+      when :"adbe.pkcs7.detached", :"adbe.pkcs7.sha1" then CmsHandler
+      when :"adbe.revision" then TimestampHandler
+      end
     end
 
     def sign(document, cert:, key:, **)

data/lib/pdfrb/document.rb

@@ -282,6 +282,16 @@ module Pdfrb
       end
     end
 
+    # Yield every indirect object of +klass+ (e.g. all Streams, all
+    # Dictionaries). Enumerator when blockless.
+    def each_indirect_of(klass)
+      return enum_for(:each_indirect_of, klass) unless block_given?
+
+      each_indirect_object do |obj|
+        yield obj if obj.is_a?(klass)
+      end
+    end
+
     # Walk every revision in the document's incremental-update chain,
     # from the latest (most recent) revision backward via /Prev.
     # Each revision yields a (revision_index, xref, trailer) tuple

data/lib/pdfrb/linearization/writer.rb

@@ -30,7 +30,7 @@ module Pdfrb
 
       def initialize(document)
         @document = document
-        @serializer = Pdfrb::Serializer.new
+        @serializer = Pdfrb::Writer.serializer_for(document)
       end
 
       # @param io [IO] target output.
@@ -70,7 +70,8 @@ module Pdfrb
 
         ordered.each do |obj|
           offsets[obj.oid] = temp.pos
-          temp << @serializer.serialize_indirect(obj)
+          temp << @serializer.serialize_indirect(obj,
+                                                 skip_string_encryption: encryption_dict?(obj))
         end
         first_page_end = temp.pos if first_page_objects.any?
 
@@ -79,7 +80,6 @@ module Pdfrb
         hint_compressed = ::Zlib::Deflate.deflate(hint_data)
         hint_offset = temp.pos
         hint_dict = @serializer.serialize(
-          Type: :XRef,
           S: HintStream::DEFAULT_ITEM_BITS,
           Filter: :FlateDecode,
           Length: hint_compressed.bytesize
@@ -132,7 +132,8 @@ module Pdfrb
         buf << lin_padded
 
         layout.ordered_objects.each do |obj|
-          buf << @serializer.serialize_indirect(obj)
+          buf << @serializer.serialize_indirect(obj,
+                                                skip_string_encryption: encryption_dict?(obj))
         end
 
         buf << "#{layout.hint_oid} 0 obj\n"
@@ -243,7 +244,16 @@ module Pdfrb
                    end
         size = [@document.next_oid || 1, 2].max
 
-        trailer_str = @serializer.serialize(Size: size, Root: root_ref)
+        trailer_hash = {}
+        (@document.trailer || {}).each do |k, v|
+          next if Pdfrb::Writer::TRAILER_OVERRIDDEN_KEYS.include?(k)
+
+          trailer_hash[k] = v
+        end
+        trailer_hash[:Size] = size
+        trailer_hash[:Root] = root_ref if root_ref
+
+        trailer_str = @serializer.serialize(trailer_hash)
         "trailer\n#{trailer_str}\nstartxref\n#{xref_offset}\n%%EOF\n"
       end
 
@@ -251,6 +261,11 @@ module Pdfrb
         "%PDF-1.7\n%\xE2\xE3\xCF\xD3\n"
       end
 
+      # The /Encrypt dictionary's own strings must stay in cleartext.
+      def encryption_dict?(obj)
+        (@document.trailer || {})[:Encrypt]&.oid == obj.oid
+      end
+
       def write_non_linearized(io)
         Pdfrb::Writer.write(@document, io)
       end

data/lib/pdfrb/pdf_version.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Pdfrb
+  # PDF header version comparisons (ISO 32000-2, s7.2). Version strings
+  # are dot-separated numerics ("1.4", "2.0"); comparison is
+  # numeric-per-component, never lexical ("1.10" > "1.9").
+  module PdfVersion
+    module_function
+
+    # @return [Integer] -1, 0, or 1 as +a+ is earlier, equal, or later
+    #   than +b+.
+    def compare(a, b)
+      aa = a.to_s.split(".").map(&:to_i)
+      bb = b.to_s.split(".").map(&:to_i)
+      (aa <=> bb) || 0
+    end
+
+    # @return [Boolean] whether +version+ meets or exceeds +minimum+.
+    def at_least?(version, minimum)
+      compare(version, minimum) >= 0
+    end
+  end
+end

data/lib/pdfrb/serializer.rb

@@ -50,21 +50,28 @@ module Pdfrb
     end
 
     # Serialise an indirect object's body, including `oid gen obj`
-    # header and (for streams) the stream payload.
-    def serialize_indirect(obj)
+    # header and (for streams) the stream payload. When an encrypter
+    # is set, all strings in the object's dictionaries and the stream
+    # payload are encrypted with the per-object key (s7.6.1) — pass
+    # +skip_string_encryption:+ for the /Encrypt dictionary itself,
+    # whose entries must stay readable.
+    def serialize_indirect(obj, skip_string_encryption: false)
       raise ArgumentError, "not indirect: #{obj.inspect}" unless obj.indirect?
 
+      encrypt_strings = !skip_string_encryption && encrypter
       buffer = +""
       buffer << "#{obj.oid} #{obj.gen} obj\n"
       case obj
       when Pdfrb::Model::Cos::Stream
-        dict, payload = emit_stream(obj)
+        dict_value = encrypt_strings ? encrypt_value_strings(obj.value, obj.oid, obj.gen) : obj.value
+        dict, payload = emit_stream(obj, dict_value)
         buffer << dict
         buffer << "\nstream\n"
         buffer << (encrypter ? encrypter.encrypt(payload, obj.oid, obj.gen) : payload)
         buffer << "\nendstream\n"
       else
-        buffer << serialize(obj)
+        value = encrypt_strings ? encrypt_value_strings(obj.value, obj.oid, obj.gen) : obj.value
+        buffer << serialize(value)
         buffer << "\n"
       end
       buffer << "endobj\n"
@@ -73,12 +80,39 @@ module Pdfrb
 
     private
 
+    # Deep-transform +value+ so every literal string carries the
+    # per-object ciphertext (s7.6.1: strings AND streams encrypt).
+    def encrypt_value_strings(value, oid, gen)
+      case value
+      when ::Hash
+        value.each_with_object({}) do |(k, v), h|
+          h[k] = encrypt_value_strings(v, oid, gen)
+        end
+      when ::Array
+        value.map { |v| encrypt_value_strings(v, oid, gen) }
+      when Pdfrb::Model::PdfArray
+        Pdfrb::Model::PdfArray.new(value.map { |v| encrypt_value_strings(v, oid, gen) })
+      when Pdfrb::Model::Object
+        Pdfrb::Model::Object.new(encrypt_value_strings(value.value, oid, gen),
+                                 oid: value.oid, gen: value.gen)
+      when ::String
+        bytes = if value.encoding == Encoding::UTF_8
+                  Pdfrb::Model::Cos::StringEncoding.encode_text(value)
+                else
+                  value.dup.force_encoding(Encoding::BINARY)
+                end
+        encrypter.encrypt(bytes, oid, gen)
+      else
+        value
+      end
+    end
+
     # Build the dict body + payload for a stream object, applying
     # FlateDecode compression when enabled and the stream is large
     # enough to benefit. Returns [dict_bytes, payload_bytes].
-    def emit_stream(stream_obj)
+    def emit_stream(stream_obj, dict_value = stream_obj.value)
       payload = stream_obj.stream
-      hash = stream_obj.value.dup
+      hash = dict_value.dup
       existing_filter = hash[:Filter]
 
       if should_compress?(stream_obj, payload, existing_filter)

data/lib/pdfrb/task/optimize.rb

@@ -55,9 +55,7 @@ module Pdfrb
       # {duplicate_oid => canonical_oid} that was applied.
       def dedup_streams!(document)
         canonical_for = {}
-        document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-          next unless obj.indirect?
+        document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next if obj.value[:Type] == :ObjStm
 
           key = stream_dedup_key(obj)
@@ -65,9 +63,7 @@ module Pdfrb
         end
 
         replacements = {}
-        document.each_indirect_object do |obj|
-          next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
-          next unless obj.indirect?
+        document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
           next if obj.value[:Type] == :ObjStm
 
           key = stream_dedup_key(obj)

data/lib/pdfrb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pdfrb
-  VERSION = "0.8.5"
+  VERSION = "0.8.7"
 end

data/lib/pdfrb/writer.rb

@@ -17,24 +17,37 @@ module Pdfrb
   class Writer
     DEFAULT_VERSION = "1.4"
 
+    # Trailer keys each writer recomputes itself; existing values
+    # for these are never carried through from the parsed trailer.
+    TRAILER_OVERRIDDEN_KEYS = %i[Size Root Prev XRefStm].freeze
+
     attr_reader :document, :io, :serializer
 
     def initialize(document, io)
       @document = document
       @io = io
-      @serializer = Serializer.new(
+      @serializer = Writer.serializer_for(document)
+      @xref_offsets = {}
+    end
+
+    # Build a Serializer configured for +document+: stream compression
+    # from config, and an encrypter derived from the trailer /Encrypt.
+    # Raises EncryptionError when the document is encrypted but the
+    # configured password does not open it — writing must never
+    # silently fall back to plaintext.
+    def self.serializer_for(document)
+      Serializer.new(
         compress_streams: document.config["writer.compress_streams"],
         compress_min_size: document.config["writer.compress_min_size"],
-        **serializer_encrypter_opts
+        **serializer_encrypter_opts_for(document)
       )
-      @xref_offsets = {}
     end
 
     # Build the encrypter option for the Serializer from the document's
     # /Encrypt dict. If the document isn't encrypted, returns empty hash.
     # The SecurityHandler's encrypt_data method becomes the Serializer's
     # encrypter, which encrypts string/stream payloads per-object.
-    def serializer_encrypter_opts
+    def self.serializer_encrypter_opts_for(document)
       # Use a pre-configured handler if the document provides one
       # (e.g., set by the encryption CLI).
       handler = document.config["encryption.handler"]
@@ -50,15 +63,21 @@ module Pdfrb
       return {} unless encrypt_dict
 
       handler = Pdfrb::Encryption::StandardSecurityHandler.new(
-        Encrypt: encrypt_dict.value,
-        ID: trailer[:ID]
+        { Encrypt: encrypt_dict.value, ID: trailer[:ID] }
       )
       password = document.config["encryption.password"] || ""
-      handler.verify_user_password(password)
+      unless handler.verify_user_password?(password)
+        raise Pdfrb::EncryptionError,
+              "cannot write encrypted document: password does not verify"
+      end
 
       { encrypter: handler }
-    rescue StandardError
-      {}
+    end
+
+    # The /Encrypt dictionary's own strings (U, O, UE, OE, Perms) must
+    # stay in cleartext — they carry the password hashes.
+    def encryption_dict?(obj)
+      (document.trailer || {})[:Encrypt]&.oid == obj.oid
     end
 
     def self.write(document, io)
@@ -84,7 +103,8 @@ module Pdfrb
         next if packed.key?(obj.oid)
 
         @xref_offsets[obj.oid] = @io.pos
-        @io << @serializer.serialize_indirect(obj)
+        @io << @serializer.serialize_indirect(obj,
+                                              skip_string_encryption: encryption_dict?(obj))
       end
 
       xref_pos = if use_stream
@@ -118,7 +138,8 @@ module Pdfrb
         next unless obj.indirect?
 
         @xref_offsets[obj.oid] = @io.pos
-        @io << @serializer.serialize_indirect(obj)
+        @io << @serializer.serialize_indirect(obj,
+                                              skip_string_encryption: encryption_dict?(obj))
       end
       xref_pos = write_xref(prev: previous_xref_offset)
       write_trailer(xref_pos, prev: previous_xref_offset)
@@ -293,7 +314,7 @@ module Pdfrb
       existing = document.trailer || {}
       trailer_hash = {}
       existing.each do |k, v|
-        next if %i[Size Root Prev XRefStm].include?(k)
+        next if TRAILER_OVERRIDDEN_KEYS.include?(k)
 
         trailer_hash[k] = v
       end
@@ -392,26 +413,19 @@ module Pdfrb
       return current unless catalog
 
       v = current
-      if (catalog.value[:AF] || catalog.value[:Collection]) && compare_versions(v, "2.0").negative?
+      if (catalog.value[:AF] || catalog.value[:Collection]) && Pdfrb::PdfVersion.compare(v, "2.0").negative?
         v = "2.0"
       end
-      if catalog.value[:OCProperties] && compare_versions(v, "1.5").negative?
+      if catalog.value[:OCProperties] && Pdfrb::PdfVersion.compare(v, "1.5").negative?
         v = "1.5"
       end
       document.version = v
       v
     end
 
-    def compare_versions(a, b)
-      aa = a.to_s.split(".").map(&:to_i)
-      bb = b.to_s.split(".").map(&:to_i)
-      (aa <=> bb) || 0
-    end
-
     def compress_content_streams
       require "zlib"
-      document.each_indirect_object do |obj|
-        next unless obj.is_a?(Pdfrb::Model::Cos::Stream)
+      document.each_indirect_of(Pdfrb::Model::Cos::Stream) do |obj|
         next if obj.value[:Filter]
         next unless obj.stream
         next if obj.value[:Type] == :Metadata

data/lib/pdfrb.rb

@@ -18,6 +18,7 @@ module Pdfrb
   autoload :Configuration, "pdfrb/configuration"
   autoload :DataDir, "pdfrb/data_dir"
   autoload :PdfConstants, "pdfrb/pdf_constants"
+  autoload :PdfVersion, "pdfrb/pdf_version"
 
   autoload :Source, "pdfrb/source"
   autoload :Model, "pdfrb/model"
@@ -46,8 +47,6 @@ module Pdfrb
   autoload :Serializer, "pdfrb/serializer"
   autoload :Writer, "pdfrb/writer"
   autoload :Importer, "pdfrb/importer"
-  autoload :Revision, "pdfrb/revision"
-  autoload :Revisions, "pdfrb/revisions"
   autoload :XrefSection, "pdfrb/xref_section"
   autoload :Document, "pdfrb/document"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdfrb
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-29 00:00:00.000000000 Z
+date: 2026-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark
@@ -1261,6 +1261,7 @@ files:
 - lib/pdfrb/model/type/xobject_image.rb
 - lib/pdfrb/model/type/xref_stream.rb
 - lib/pdfrb/pdf_constants.rb
+- lib/pdfrb/pdf_version.rb
 - lib/pdfrb/serializer.rb
 - lib/pdfrb/source.rb
 - lib/pdfrb/source/header_reader.rb