hexapdf 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f7d2d181cfcbe2c6b8a99add1901773b07b459c81964efeb4d506a86932620
-  data.tar.gz: eb36de061e2f0dd9cb2ee939b12d9feb04bb0993ae3657258fe5dff98c2b8466
+  metadata.gz: ee462224ffa152978df2a0aebd05b52c7a75a21655880858bbb4b61e2eccd3dd
+  data.tar.gz: dc2eedf3a556c7a85fbfb229372512043f33200c6ffb6223b344c96bf4aff91b
 SHA512:
-  metadata.gz: 473cd080839b097d72113963fbe709e94a0a718dce6db8790636178bb206a61ac7a095398896e21166c413344fa932d8d9da35003e4c65ec04e22990f994aa04
-  data.tar.gz: 547e778a0b621ed708d295db9f14fd9026d2c08a7480a5dfc0fcb0f2854158588a89840993783590db4e583d9d70e9ab97302caa44247de1fe4cf259b5e73065
+  metadata.gz: da87ec95143ad653a606c699dc4e29ac3e4abf6b4e1a0bfc535ede8221f047ab35f7b69556eaa7b7cf23d7da69909685c515d98ea67f1e1e0265ebbb460f2eb7
+  data.tar.gz: f47ec5e10af27baf8a8ee06d4f496f53841b57acc93ce1111288576a473dfb73d73052aa65f21835e19ebadb6e87868fcc3d63f84c82dbfd81dca7ae56eb9975

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.9.2 - 2019-05-22
+
+### Changed
+
+* [HexaPDF::Encryption::AES] to handle invalid padding
+* [HexaPDF::Filter::FlateDecode] to correctly handle invalid empty streams
+
 ## 0.9.1 - 2019-03-26
 
 ### Fixed

data/CONTRIBUTERS

@@ -1,4 +1,4 @@
   Count Name
 ======= ====
-   1034 Thomas Leitner <t_leitner@gmx.at>
+   1037 Thomas Leitner <t_leitner@gmx.at>
       1 Daniel Kraus <bovender@bovender.de>

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/hexapdf/encryption/aes.rb

@@ -170,13 +170,18 @@ module HexaPDF
         # Removes the padding from the data according to the PKCS#5 padding scheme and returns the
         # result.
         #
+        # In case the padding is not correct as per the specification, it is assumed that there is
+        # no padding and the input is returned as is.
+        #
         # See: PDF1.7 s7.6.2
         def unpad(data)
           padding_length = data.getbyte(-1)
-          if padding_length > BLOCK_SIZE || padding_length == 0
-            raise HexaPDF::EncryptionError, "Invalid AES padding length #{padding_length}"
+          if padding_length > BLOCK_SIZE || padding_length == 0 ||
+              data[-padding_length, padding_length].each_byte.any? {|byte| byte != padding_length }
+            data
+          else
+            data[0...-padding_length]
           end
-          data[0...-padding_length]
         end
 
       end

data/lib/hexapdf/filter/flate_decode.rb

@@ -49,10 +49,14 @@ module HexaPDF
     module FlateDecode
 
       # See HexaPDF::Filter
+      #
+      # The decoder also handles the case of an empty string not deflated to a correct flate stream
+      # but just output as an empty string.
       def self.decoder(source, options = nil)
         fib = Fiber.new do
           inflater = Zlib::Inflate.new
           while source.alive? && (data = source.resume)
+            next if data.empty?
             begin
               data = inflater.inflate(data)
             rescue StandardError => e
@@ -61,7 +65,7 @@ module HexaPDF
             Fiber.yield(data)
           end
           begin
-            data = (data = inflater.finish).empty? ? nil : data
+            data = inflater.total_in == 0 || (data = inflater.finish).empty? ? nil : data
             inflater.close
             data
           rescue StandardError => e

data/lib/hexapdf/version.rb

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

data/test/hexapdf/encryption/test_aes.rb

@@ -48,12 +48,6 @@ describe HexaPDF::Encryption::AES do
       end
     end
 
-    it "fails on decryption if the padding is invalid" do
-      assert_raises(HexaPDF::EncryptionError) do
-        @algorithm_class.decrypt('some' * 4, 'iv' * 8 + 'somedata' * 4)
-      end
-    end
-
     it "fails on decryption if not enough bytes are provided" do
       assert_raises(HexaPDF::EncryptionError) do
         @algorithm_class.decrypt('some' * 4, 'no iv')
@@ -102,10 +96,18 @@ describe HexaPDF::Encryption::AES do
       assert_equal('a' * 40, result)
     end
 
-    it "fails on decryption if the padding is invalid" do
-      assert_raises(HexaPDF::EncryptionError) do
-        TestHelper.collector(@algorithm_class.decryption_fiber('some' * 4, Fiber.new { 'a' * 32 }))
-      end
+    it "decryption works if the padding is invalid" do
+      f = Fiber.new { 'a' * 32 }
+      result = TestHelper.collector(@algorithm_class.decryption_fiber('some' * 4, f))
+      assert_equal('a' * 16, result)
+
+      f = Fiber.new { 'a' * 31 + "\x00" }
+      result = TestHelper.collector(@algorithm_class.decryption_fiber('some' * 4, f))
+      assert_equal('a' * 15 + "\x00", result)
+
+      f = Fiber.new { 'a' * 29 + "\x00\x01\x03" }
+      result = TestHelper.collector(@algorithm_class.decryption_fiber('some' * 4, f))
+      assert_equal('a' * 13 + "\x00\x01\x03", result)
     end
 
     it "fails on decryption if not enough bytes are provided" do

data/test/hexapdf/filter/test_flate_decode.rb

@@ -17,13 +17,22 @@ describe HexaPDF::Filter::FlateDecode do
   end
 
   describe "decoder" do
+    it "works for empty input" do
+      assert_equal('', collector(@obj.decoder(Fiber.new { "" })))
+      assert_equal('', collector(@obj.decoder(Fiber.new {})))
+    end
+
     it "applies the Predictor after decoding" do
       assert_equal(@decoded, collector(@obj.decoder(feeder(@encoded_predictor), @predictor_opts)))
     end
 
     it "fails on invalid input" do
-      assert_raises(HexaPDF::FilterError) { collector(@obj.decoder(feeder("some test"))) }
-      assert_raises(HexaPDF::FilterError) { collector(@obj.decoder(Fiber.new {})) }
+      assert_raises(HexaPDF::FilterError) do
+        collector(@obj.decoder(feeder(@encoded[0..-2], @encoded.length - 3)))
+      end
+      assert_raises(HexaPDF::FilterError) do
+        collector(@obj.decoder(feeder("some data")))
+      end
     end
   end
 

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.9.1)>>
+      <</Producer(HexaPDF version 0.9.2)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.9.1)>>
+      <</Producer(HexaPDF version 0.9.2)>>
       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.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -206,7 +206,6 @@ files:
 - examples/016-frame_automatic_box_placement.rb
 - examples/017-frame_text_flow.rb
 - examples/018-composer.rb
-- examples/019-column_box.rb
 - examples/emoji-smile.png
 - examples/emoji-wink.png
 - examples/machupicchu.jpg
@@ -318,7 +317,6 @@ 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

data/examples/019-column_box.rb

@@ -1,57 +0,0 @@
-# ## 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/layout/column_box.rb

@@ -1,161 +0,0 @@
-# -*- 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-2019 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, &:unused_draw_block)
-        @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
-          @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
-          break if max_y != height && (@results.any?(&:empty?) ||
-                                       max_y - min_y >= last_height_difference ||
-                                       max_y - min_y < 0.5)
-          last_height_difference = max_y - min_y
-          height -= last_height_difference / 2.0
-          p [height]
-        end
-        @results.all? {|res| res.length == 1 }
-      end
-
-      private
-
-      def fit_box(box)
-        cur_frame = @frames[@frame_index]
-        fitted_boxes = []
-        while true && cur_frame
-          result = cur_frame.fit(box)
-          if result.success?
-            cur_frame.remove_area(result.mask)
-            fitted_boxes << 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)
-              fitted_boxes << result
-            elsif !cur_frame.find_next_region
-              @frame_index += 1
-              break if @frame_index == @frames.length
-              cur_frame = @frames[@frame_index]
-            end
-          end
-        end
-        fitted_boxes
-      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