hexapdf 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b666a69330b87a3ad7a5c937a1113a66a3b5ed3d0cb4f4478ee24f97bed0e411
-  data.tar.gz: 460c3cd90b8f76d3e4d32fdd6f1bc8fd71ddfef5d18799c6a207f562773371f8
+  metadata.gz: 9792b3c8be5fd3c3521aa5fe1a66e1315f677494f199e3e8b0e1eb85c9b967c7
+  data.tar.gz: a66f1d6751cac4ca2fc6a35bf493ba60eefee96edca090ae92ed810b756d8761
 SHA512:
-  metadata.gz: a9135019912d8c3d1e282797054dfbc99c028f26aa28f8412a138ab3d8d67124c4e9c52ad104eeb4289487e47dd850e3ff4211b5e928cdb0a8aab2d8ea773930
-  data.tar.gz: 070d0facdb6576fb6a0377a7139609ee648a580be879dabfd10e943bd2f62d66d9d5077058edcecf9ca3eb4e7969a2427c7a4af26bbb4d8f734e238f7022c7cd
+  metadata.gz: 111570ec411684ffe5214833419128b697721c4e5fdd16b61578c3d459a8ab9dde411780dd582e06620d52a260062df30a116b7c3c8544647f5e61f131c6bdc5
+  data.tar.gz: 3d098cb4098f6a02bc832cbe70aebc0b28a40a21b33b53c8e8e055f240fd513a5d96f53846c62ebbc2a00d17d6f99271dd3850e98a70cebb6f32e1a7e279cc87

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.21.1 - 2022-03-12
+
+### Fixed
+
+- Handling of invalid AES encrypted files where the padding is missing
+
+
 ## 0.21.0 - 2022-03-04
 
 ### Added
@@ -246,7 +253,7 @@
 
 ## 0.16.0 - 2021-09-28
 
-## Added
+### Added
 
 * Support for RGB color values of the form "RGB" in addition to "RRGGBB" and for
   CSS color module level 3 color names

data/Rakefile

@@ -49,7 +49,7 @@ namespace :dev do
   task :test_all do
     versions = `rbenv versions --bare | grep -i 2.[567]\\\\\\|3.`.split("\n")
     versions.each do |version|
-      sh "rbenv shell #{version} &>/dev/null && rake test"
+      sh "eval \"$(rbenv init -)\"; rbenv shell #{version} && ruby -v && rake test"
     end
     puts "Looks okay? (enter to continue, Ctrl-c to abort)"
     $stdin.gets

data/examples/020-column_box.rb

@@ -0,0 +1,57 @@
+# ## Column Box
+#
+# This example shows how [HexaPDF::Layout::Frame] and [HexaPDF::Layout::TextBox]
+# can be used to flow text around objects.
+#
+# Three boxes are placed repeatedly onto the frame until it is filled: two
+# floating boxes (one left, one right) and a text box. The text box is styled to
+# flow its content around the other two boxes.
+#
+# Usage:
+# : `ruby frame_text_flow.rb`
+#
+
+require 'hexapdf'
+require 'hexapdf/utils/graphics_helpers'
+
+include HexaPDF::Layout
+include HexaPDF::Utils::GraphicsHelpers
+
+doc = HexaPDF::Document.new
+
+sample_text = "Lorem ipsum dolor sit amet, con\u{00AD}sectetur
+adipis\u{00AD}cing elit, sed do eiusmod tempor incididunt ut labore et
+dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+ullamco laboris nisi ut aliquip ex ea commodo consequat.
+".tr("\n", ' ') * 5
+items = [TextFragment.create(sample_text, font: doc.fonts.add("Times"))]
+
+page = doc.pages.add
+media_box = page.box(:media)
+canvas = page.canvas
+frame = Frame.new(media_box.left + 20, media_box.bottom + 20,
+                  media_box.width - 40, media_box.height - 40)
+
+image = doc.images.add(File.join(__dir__, 'machupicchu.jpg'))
+iw, ih = calculate_dimensions(image.width, image.height, rwidth: 100)
+
+boxes = []
+3.times do
+  boxes << Box.create(width: iw, height: ih,
+    margin: [10, 30], position: :float) do |canv, box|
+    canv.image(image, at: [0, 0], width: 100)
+  end
+  boxes << Box.create(width: 50, height: 50, margin: 20,
+    position: :float, position_hint: :right,
+    border: {width: 1, color: [[255, 0, 0]]})
+  boxes << TextBox.new(items, style: {position: :flow, align: :justify})
+end
+columns = ColumnBox.new(boxes) #, style: {position: :flow})
+polygon = Geom2D::Polygon([250, 350], [350, 350], [350, 500], [250, 500])
+#frame.remove_area(polygon)
+#canvas.draw(:geom2d, object: polygon)
+result = frame.fit(columns)
+p result.success?
+frame.draw(canvas, result)
+
+doc.write("column_box.pdf", optimize: true)

data/lib/hexapdf/encryption/aes.rb

@@ -114,10 +114,12 @@ module HexaPDF
         #
         # See: PDF1.7 s7.6.2.
         def decrypt(key, data)
-          if data.length % BLOCK_SIZE != 0 || data.length < 2 * BLOCK_SIZE
+          if data.length % BLOCK_SIZE != 0 || data.length < BLOCK_SIZE
             raise HexaPDF::EncryptionError, "Invalid data for decryption, need 32 + 16*n bytes"
           end
-          unpad(new(key, data.slice!(0, BLOCK_SIZE), :decrypt).process(data))
+          iv = data.slice!(0, BLOCK_SIZE)
+          # Handle invalid files with missing padding
+          data.empty? ? data : unpad(new(key, iv, :decrypt).process(data))
         end
 
         # Returns a Fiber object that decrypts the data from the given source fiber with the
@@ -140,11 +142,13 @@ module HexaPDF
               Fiber.yield(algorithm.process(new_data))
             end
 
-            if data.length < BLOCK_SIZE || data.length % BLOCK_SIZE != 0
+            if data.length % BLOCK_SIZE != 0
               raise HexaPDF::EncryptionError, "Invalid data for decryption, need 32 + 16*n bytes"
+            elsif data.empty?
+              data # Handle invalid files with missing padding
+            else
+              unpad(algorithm.process(data))
             end
-
-            unpad(algorithm.process(data))
           end
         end
 

data/lib/hexapdf/layout/column_box.rb

@@ -0,0 +1,168 @@
+# -*- encoding: utf-8; frozen_string_literal: true -*-
+#
+#--
+# This file is part of HexaPDF.
+#
+# HexaPDF - A Versatile PDF Creation and Manipulation Library For Ruby
+# Copyright (C) 2014-2022 Thomas Leitner
+#
+# HexaPDF is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3 as
+# published by the Free Software Foundation with the addition of the
+# following permission added to Section 15 as permitted in Section 7(a):
+# FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+# THOMAS LEITNER, THOMAS LEITNER DISCLAIMS THE WARRANTY OF NON
+# INFRINGEMENT OF THIRD PARTY RIGHTS.
+#
+# HexaPDF is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with HexaPDF. If not, see <http://www.gnu.org/licenses/>.
+#
+# The interactive user interfaces in modified source and object code
+# versions of HexaPDF must display Appropriate Legal Notices, as required
+# under Section 5 of the GNU Affero General Public License version 3.
+#
+# In accordance with Section 7(b) of the GNU Affero General Public
+# License, a covered work must retain the producer line in every PDF that
+# is created or manipulated using HexaPDF.
+#
+# If the GNU Affero General Public License doesn't fit your need,
+# commercial licenses are available at <https://gettalong.at/hexapdf/>.
+#++
+require 'hexapdf/layout/box'
+
+module HexaPDF
+  module Layout
+
+    # A ColumnBox arranges boxes in one or more columns.
+    #
+    # The number of columns as well as the size of the gap between the columns can be modified.
+    class ColumnBox < Box
+
+      # The child boxes of this ColumnBox.
+      attr_reader :children
+
+      # The number of columns.
+      # TODO: allow array with column widths later like [100, :*, :*]; same for gaps
+      attr_reader :columns
+
+      # The size of the gap between the columns.
+      attr_reader :gap
+
+      # Creates a new ColumnBox object for the given +children+ boxes.
+      def initialize(children = [], columns = 2, gap: 36, **kwargs)
+        super(**kwargs)
+        @children = children
+        @columns = columns
+        @gap = gap
+      end
+
+      # Fits the column box into the available space.
+      def fit(available_width, available_height, frame)
+        last_height_difference = 1_000_000
+        height = if style.position == :flow
+                   frame.height
+                 else
+                   (@initial_height > 0 ? @initial_height : available_height) - reserved_height
+                 end
+        while true
+          p '-'*100
+          @frames = []
+          if style.position == :flow
+            column_width = (frame.width - gap * (@columns - 1)).to_f / @columns
+            @columns.times do |col_nr|
+              left = (column_width + gap) * col_nr + frame.left
+              bottom = frame.bottom
+              rect = Geom2D::Polygon([left, bottom],
+                                     [left + column_width, bottom],
+                                     [left + column_width, bottom + height],
+                                     [left, bottom + height])
+              shape = Geom2D::Algorithms::PolygonOperation.run(frame.shape, rect, :intersection)
+              col_frame = Frame.new(left, bottom, column_width, height)
+              col_frame.shape = shape
+              @frames << col_frame
+            end
+            @frame_index = 0
+            @results = @children.map {|child_box| fit_box(child_box) }
+            @width = frame.width
+            @height = frame.height - @frames.min_by(&:y).y
+          else
+            width = (@initial_width > 0 ? @initial_width : available_width) - reserved_width
+            column_width = (width - gap * (@columns - 1)).to_f / @columns
+            @columns.times do |col_nr|
+              @frames << Frame.new((column_width + gap) * col_nr, 0, column_width, height)
+            end
+            @frame_index = 0
+            @results = @children.map {|child_box| fit_box(child_box) }
+            @width = width
+            @height = height - @frames.min_by(&:y).y
+          end
+          min_y, max_y = @frames.minmax_by(&:y).map(&:y)
+          p [height, @frames.map(&:y), last_height_difference, min_y, max_y]
+          # TOOD: @result.any?(&:empty?) only for the first run!!!! if the first run fails, we
+          # cannot balance the columns because there is too much content.
+          # TODO: another break condition is if the @results didn't change since the last run
+          p [:maybe_redo, min_y, max_y, height, last_height_difference]
+          p [@results.map {|arr| arr.all? {|r| r.status }}]
+          break if max_y != height && @results.all? {|arr| !arr.empty? && arr.all? {|r| r.success? }} &&
+            (@results.any?(&:empty?) ||
+             max_y - min_y >= last_height_difference ||
+             max_y - min_y < 0.5)
+          if max_y == 0 && min_y == 0
+            height += last_height_difference / 4.0
+          else
+            last_height_difference = max_y - min_y
+            height -= last_height_difference / 2.0
+          end
+        end
+        @results.all? {|res| res.length == 1 }
+      end
+
+      private
+
+      def fit_box(box)
+        cur_frame = @frames[@frame_index]
+        fit_results = []
+        while cur_frame
+          result = cur_frame.fit(box)
+          if result.success?
+            cur_frame.remove_area(result.mask)
+            fit_results << result
+            break
+          elsif cur_frame.full?
+            @frame_index += 1
+            break if @frame_index == @frames.length
+            cur_frame = @frames[@frame_index]
+          else
+            draw_box, box = cur_frame.split(result)
+            if draw_box
+              cur_frame.remove_area(result.mask)
+              fit_results << result
+            elsif !cur_frame.find_next_region
+              @frame_index += 1
+              break if @frame_index == @frames.length
+              cur_frame = @frames[@frame_index]
+            end
+          end
+        end
+        fit_results
+      end
+
+      # Draws the child boxes onto the canvas at position [x, y].
+      def draw_content(canvas, x, y)
+        x = y = 0 if style.position == :flow
+        @results.each do |result_boxes|
+          result_boxes.each do |result|
+            result.box.draw(canvas, x + result.x, y + result.y)
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.21.0'
+  VERSION = '0.21.1'
 
 end

data/test/hexapdf/encryption/test_aes.rb

@@ -48,6 +48,10 @@ describe HexaPDF::Encryption::AES do
       end
     end
 
+    it "handles invalid files with missing 16 byte padding" do
+      assert_equal('', @algorithm_class.decrypt('some key' * 2, 'iv' * 8))
+    end
+
     it "fails on decryption if not enough bytes are provided" do
       assert_raises(HexaPDF::EncryptionError) do
         @algorithm_class.decrypt('some' * 4, 'no iv')
@@ -97,6 +101,10 @@ describe HexaPDF::Encryption::AES do
     end
 
     it "decryption works if the padding is invalid" do
+      f = Fiber.new { 'a' * 16 }
+      result = TestHelper.collector(@algorithm_class.decryption_fiber('some' * 4, f))
+      assert_equal('', result)
+
       f = Fiber.new { 'a' * 32 }
       result = TestHelper.collector(@algorithm_class.decryption_fiber('some' * 4, f))
       assert_equal('a' * 16, result)

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.21.0)>>
+      <</Producer(HexaPDF version 0.21.1)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.21.0)>>
+      <</Producer(HexaPDF version 0.21.1)>>
       endobj
       2 0 obj
       <</Length 10>>stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -217,6 +217,7 @@ files:
 - examples/017-frame_text_flow.rb
 - examples/018-composer.rb
 - examples/019-acro_form.rb
+- examples/020-column_box.rb
 - examples/emoji-smile.png
 - examples/emoji-wink.png
 - examples/machupicchu.jpg
@@ -333,6 +334,7 @@ files:
 - lib/hexapdf/importer.rb
 - lib/hexapdf/layout.rb
 - lib/hexapdf/layout/box.rb
+- lib/hexapdf/layout/column_box.rb
 - lib/hexapdf/layout/frame.rb
 - lib/hexapdf/layout/image_box.rb
 - lib/hexapdf/layout/inline_box.rb