origami 2.0.4 → 2.1.0

data/lib/origami/filters/lzw.rb

@@ -52,16 +52,13 @@ module Origami
                 input.each_byte do |byte|
                     char = byte.chr
 
-                    case table.size
-                    when 512 then codesize = 10
-                    when 1024 then codesize = 11
-                    when 2048 then codesize = 12
-                    when 4096
+                    if table.size == 4096
                         result.write(CLEARTABLE, codesize)
-                        table, codesize = reset_state
-                        redo
+                        table, _ = reset_state
                     end
 
+                    codesize = table.size.bit_length
+
                     it = s + char
                     if table.has_key?(it)
                         s = it
@@ -72,7 +69,7 @@ module Origami
                     end
                 end
 
-                result.write(table[s], codesize)
+                result.write(table[s], codesize) unless s.empty?
                 result.write(EOD, codesize)
 
                 result.final.to_s
@@ -85,14 +82,16 @@ module Origami
             def decode(string)
                 result = "".b
                 bstring = Utils::BitReader.new(string)
-                table, codesize, prevbyte = reset_state
+                table, codesize = reset_state
+                prevbyte = nil
 
                 until bstring.eod? do
                     byte = bstring.read(codesize)
                     break if byte == EOD
 
                     if byte == CLEARTABLE
-                        table, codesize, prevbyte = reset_state
+                        table, codesize = reset_state
+                        prevbyte = nil
                         redo
                     end
 
@@ -120,7 +119,7 @@ module Origami
                 when 510...1022 then 10
                 when 1022...2046 then 11
                 when 2046...4095 then 12
-                when 4095
+                else
                     raise InvalidLZWDataError, "LZW table is full and no clear flag was set"
                 end
             end
@@ -162,8 +161,8 @@ module Origami
                 table[CLEARTABLE] = CLEARTABLE
                 table[EOD] = EOD
 
-                # Codeword table, codeword size, previous_byte
-                [table, 9, nil]
+                # Codeword table, codeword size
+                [table, 9]
             end
         end
 

data/lib/origami/graphics/patterns.rb

@@ -166,7 +166,9 @@ module Origami
     end
 
     class PDF::Instruction
-        insn 'sh',  Name
+        insn 'sh',  Name do |canvas, shading|
+            canvas.paint_shading(shading)
+        end
     end
 
 end

data/lib/origami/graphics/render.rb

@@ -36,6 +36,7 @@ module Origami
             def write_text(s); end
             def stroke_path; end
             def fill_path; end
+            def paint_shading(sh); end
         end
 
         class DummyCanvas

data/lib/origami/graphics/xobject.rb

@@ -486,8 +486,8 @@ module Origami
         end
 
         # TODO :nodoc:
-        def paint_shading(_shade)
-            raise NotImplementedError
+        def paint_shading(shade)
+            last_content_stream.paint_shading(shade)
         end
 
         # TODO :nodoc:

data/lib/origami/signature.rb

@@ -49,17 +49,7 @@ module Origami
             signature = digsig[:Contents]
             subfilter = digsig.SubFilter.value
 
-            case subfilter
-            when Signature::DigitalSignature::PKCS7_DETACHED
-                Signature.verify_pkcs7_detached_signature(data, signature, store, flags)
-
-
-            when Signature::DigitalSignature::PKCS7_SHA1
-                Signature.verify_pkcs7_sha1_signature(data, signature, store, flags)
-
-            else
-                raise NotImplementedError, "Unsupported method #{digsig.SubFilter}"
-            end
+            Signature.verify(subfilter.to_s, data, signature, store, flags)
         end
 
         #
@@ -75,7 +65,7 @@ module Origami
         # _reason_:: Signing reason.
         #
         def sign(certificate, key,
-                 method: "adbe.pkcs7.detached",
+                 method: Signature::PKCS7_DETACHED,
                  ca: [],
                  annotation: nil,
                  issuer: nil,
@@ -99,41 +89,6 @@ module Origami
                 raise TypeError, "Expected a Annotation::Widget::Signature object."
             end
 
-            case method
-            when 'adbe.pkcs7.detached'
-                signfield_size = -> (crt, pkey, certs) do
-                    OpenSSL::PKCS7.sign(
-                        crt,
-                        pkey,
-                        "",
-                        certs,
-                        OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY
-                    ).to_der.size
-                end
-
-            when 'adbe.pkcs7.sha1'
-                signfield_size = -> (crt, pkey, certs) do
-                    OpenSSL::PKCS7.sign(
-                        crt,
-                        pkey,
-                        Digest::SHA1.digest(''),
-                        certs,
-                        OpenSSL::PKCS7::BINARY
-                    ).to_der.size
-                end
-
-            when 'adbe.x509.rsa_sha1'
-                signfield_size = -> (_crt, pkey, _certs) do
-                    pkey.private_encrypt(
-                      Digest::SHA1.digest('')
-                    ).size
-                end
-                raise NotImplementedError, "Unsupported method #{method.inspect}"
-
-            else
-                raise NotImplementedError, "Unsupported method #{method.inspect}"
-            end
-
             digsig = Signature::DigitalSignature.new.set_indirect(true)
 
             if annotation.nil?
@@ -146,18 +101,19 @@ module Origami
             self.Catalog.AcroForm.SigFlags =
                 InteractiveForm::SigFlags::SIGNATURES_EXIST | InteractiveForm::SigFlags::APPEND_ONLY
 
-            digsig.Type = :Sig #:nodoc:
-            digsig.Contents = HexaString.new("\x00" * signfield_size[certificate, key, ca]) #:nodoc:
-            digsig.Filter = :"Adobe.PPKLite" #:nodoc:
-            digsig.SubFilter = Name.new(method) #:nodoc:
-            digsig.ByteRange = [0, 0, 0, 0] #:nodoc:
+            digsig.Type = :Sig
+            digsig.Contents = HexaString.new("\x00" * Signature::required_size(method, certificate, key, ca))
+            digsig.Filter = :"Adobe.PPKLite"
+            digsig.SubFilter = Name.new(method)
+            digsig.ByteRange = [0, 0, 0, 0]
             digsig.Name = issuer
 
             digsig.Location = HexaString.new(location) if location
             digsig.ContactInfo = HexaString.new(contact) if contact
             digsig.Reason = HexaString.new(reason) if reason
 
-            if method == 'adbe.x509.rsa_sha1'
+            # PKCS1 signatures require a Cert entry.
+            if method == Signature::PKCS1_RSA_SHA1
                 digsig.Cert =
                     if ca.empty?
                         HexaString.new(certificate.to_der)
@@ -197,30 +153,10 @@ module Origami
             signable_data = file_data[digsig.ByteRange[0],digsig.ByteRange[1]] +
                 file_data[digsig.ByteRange[2],digsig.ByteRange[3]]
 
-            signature =
-                case method
-                when 'adbe.pkcs7.detached'
-                    OpenSSL::PKCS7.sign(
-                        certificate,
-                        key,
-                        signable_data,
-                        ca,
-                        OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY
-                    ).to_der
-
-                when 'adbe.pkcs7.sha1'
-                    OpenSSL::PKCS7.sign(
-                        certificate,
-                        key,
-                        Digest::SHA1.digest(signable_data),
-                        ca,
-                        OpenSSL::PKCS7::BINARY
-                    ).to_der
-
-                when 'adbe.x509.rsa_sha1'
-                    key.private_encrypt(Digest::SHA1.digest(signable_data))
-                end
-
+            #
+            # Computes and inserts the signature.
+            #
+            signature = Signature.compute(method, signable_data, certificate, key, ca)
             digsig.Contents[0, signature.size] = signature
 
             #
@@ -248,15 +184,8 @@ module Origami
         #
         def enable_usage_rights(cert, pkey, *rights)
 
-            signfield_size = -> (crt, key, ca) do
-                OpenSSL::PKCS7.sign(
-                    crt,
-                    key,
-                    '',
-                    ca,
-                    OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY
-                ).to_der.size
-            end
+            # Always uses a detached PKCS7 signature for UR.
+            method = Signature::PKCS7_DETACHED
 
             #
             # Load key pair
@@ -272,21 +201,21 @@ module Origami
             self.Catalog.AcroForm ||= InteractiveForm.new
             #self.Catalog.AcroForm.SigFlags = InteractiveForm::SigFlags::APPEND_ONLY
 
-            digsig.Type = :Sig #:nodoc:
-            digsig.Contents = HexaString.new("\x00" * signfield_size[certificate, key, []]) #:nodoc:
-            digsig.Filter = :"Adobe.PPKLite" #:nodoc:
-            digsig.Name = "ARE Acrobat Product v8.0 P23 0002337" #:nodoc:
-            digsig.SubFilter = :"adbe.pkcs7.detached" #:nodoc:
-            digsig.ByteRange = [0, 0, 0, 0] #:nodoc:
+            digsig.Type = :Sig
+            digsig.Contents = HexaString.new("\x00" * Signature.required_size(method, certificate, key, []))
+            digsig.Filter = :"Adobe.PPKLite"
+            digsig.Name = "ARE Acrobat Product v8.0 P23 0002337"
+            digsig.SubFilter = Name.new(method )
+            digsig.ByteRange = [0, 0, 0, 0]
 
-            sigref = Signature::Reference.new #:nodoc:
-            sigref.Type = :SigRef #:nodoc:
-            sigref.TransformMethod = :UR3 #:nodoc:
+            sigref = Signature::Reference.new
+            sigref.Type = :SigRef
+            sigref.TransformMethod = :UR3
             sigref.Data = self.Catalog
 
             sigref.TransformParams = UsageRights::TransformParams.new
-            sigref.TransformParams.P = true #:nodoc:
-            sigref.TransformParams.Type = :TransformParams #:nodoc:
+            sigref.TransformParams.P = true
+            sigref.TransformParams.Type = :TransformParams
             sigref.TransformParams.V = UsageRights::TransformParams::VERSION
 
             rights.each do |right|
@@ -330,13 +259,7 @@ module Origami
             signable_data = file_data[digsig.ByteRange[0],digsig.ByteRange[1]] +
                 file_data[digsig.ByteRange[2],digsig.ByteRange[3]]
 
-            signature = OpenSSL::PKCS7.sign(
-                certificate,
-                key,
-                signable_data,
-                [],
-                OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY
-            ).to_der
+            signature = Signature.compute(method, signable_data, certificate, key, [])
             digsig.Contents[0, signature.size] = signature
 
             #
@@ -399,19 +322,50 @@ module Origami
 
     module Signature
 
-        # Verifies a PKCS7 detached signature.
-        def self.verify_pkcs7_detached_signature(data, signature, store, flags)
-            pkcs7 = OpenSSL::PKCS7.new(signature)
-            raise SignatureError, "Not a PKCS7 detached signature" unless pkcs7.detached?
+        PKCS1_RSA_SHA1  = "adbe.x509.rsa_sha1"
+        PKCS7_SHA1      = "adbe.pkcs7.sha1"
+        PKCS7_DETACHED  = "adbe.pkcs7.detached"
+
+        def self.verify(method, data, signature, store, flags)
+            case method
+            when PKCS7_DETACHED
+                pkcs7 = OpenSSL::PKCS7.new(signature)
+                raise SignatureError, "Not a PKCS7 detached signature" unless pkcs7.detached?
+                flags |= OpenSSL::PKCS7::DETACHED
+                pkcs7.verify([], store, data, flags)
 
-            flags |= OpenSSL::PKCS7::DETACHED
-            pkcs7.verify([], store, data, flags)
+            when PKCS7_SHA1
+                pkcs7 = OpenSSL::PKCS7.new(signature)
+                pkcs7.verify([], store, nil, flags) and pkcs7.data == Digest::SHA1.digest(data)
+
+            else
+                raise NotImplementedError, "Unsupported signature method #{method.inspect}"
+            end
+        end
+
+        #
+        # Computes the required size in bytes for storing the signature.
+        #
+        def self.required_size(method, certificate, key, ca)
+            self.compute(method, "", certificate, key, ca).size
         end
 
-        # Verifies a PKCS7-SHA1 signature.
-        def self.verify_pkcs7_sha1_signature(data, signature, store, flags)
-            pkcs7 = OpenSSL::PKCS7.new(signature)
-            pkcs7.verify([], store, nil, flags) and pkcs7.data == Digest::SHA1.digest(data)
+        #
+        # Computes the signature using the specified subfilter method.
+        #
+        def self.compute(method, data, certificate, key, ca)
+            case method
+            when PKCS7_DETACHED
+                OpenSSL::PKCS7.sign(certificate, key, data, ca, OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY).to_der
+
+            when PKCS7_SHA1
+                OpenSSL::PKCS7.sign(certificate, key, Digest::SHA1.digest(data), ca, OpenSSL::PKCS7::BINARY).to_der
+
+            when PKCS1_RSA_SHA1
+                key.sign(OpenSSL::Digest::SHA1.new, data)
+            else
+                raise NotImplementedError, "Unsupported signature method #{method.inspect}"
+            end
         end
 
         #
@@ -506,10 +460,6 @@ module Origami
         class DigitalSignature < Dictionary
             include StandardObject
 
-            PKCS1_RSA_SHA1  = :"adbe.x509.rsa_sha1"
-            PKCS7_SHA1      = :"adbe.pkcs7.sha1"
-            PKCS7_DETACHED  = :"adbe.pkcs7.detached"
-
             field   :Type,            :Type => Name, :Default => :Sig
             field   :Filter,          :Type => Name, :Default => :"Adobe.PPKLite", :Required => true
             field   :SubFilter,       :Type => Name

data/lib/origami/stream.rb

@@ -99,8 +99,6 @@ module Origami
         def dictionary=(dict)
             @dictionary = dict
             @dictionary.parent = self
-
-            @dictionary
         end
 
         def pre_build

data/lib/origami/version.rb

@@ -19,5 +19,5 @@
 =end
 
 module Origami
-    VERSION   = "2.0.4"
+    VERSION   = "2.1.0"
 end 

data/test/test_streams.rb

@@ -57,6 +57,8 @@ class TestStreams < Minitest::Test
         stm.encoded_data = raw
 
         assert_equal stm.data, @data
+
+        assert_equal Filter::Flate.decode(Filter::Flate.encode("")), ""
     end
 
     def test_filter_asciihex
@@ -71,7 +73,7 @@ class TestStreams < Minitest::Test
             Filter::ASCIIHex.decode("123456789ABCDEFGHIJKL")
         end
 
-        assert_equal Filter::ASCIIHex.decode(""), ""
+        assert_equal Filter::ASCIIHex.decode(Filter::ASCIIHex.encode("")), ""
     end
 
     def test_filter_ascii85
@@ -86,7 +88,7 @@ class TestStreams < Minitest::Test
             Filter::ASCII85.decode("ABCD\x01")
         end
 
-        assert_equal Filter::ASCII85.decode(""), ""
+        assert_equal Filter::ASCII85.decode(Filter::ASCII85.encode("")), ""
     end
 
     def test_filter_rle
@@ -101,7 +103,7 @@ class TestStreams < Minitest::Test
             Filter::RunLength.decode("\x7f")
         end
 
-        assert_equal Filter::RunLength.decode(""), ""
+        assert_equal Filter::RunLength.decode(Filter::RunLength.encode("")), ""
     end
 
     def test_filter_lzw
@@ -116,7 +118,7 @@ class TestStreams < Minitest::Test
             Filter::LZW.decode("abcd")
         end
 
-        assert_equal Filter::LZW.decode(""), ""
+        assert_equal Filter::LZW.decode(Filter::LZW.encode("")), ""
     end
 
     def test_filter_ccittfax
@@ -132,7 +134,7 @@ class TestStreams < Minitest::Test
             Filter::CCITTFax.decode("abcd")
         end
 
-        assert_equal Filter::CCITTFax.decode(""), ""
+        assert_equal Filter::CCITTFax.decode(Filter::CCITTFax.encode("")), ""
     end
 
     def test_stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origami
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Guillaume Delugré
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -42,7 +42,6 @@ description: Origami is a pure Ruby library to parse, modify and generate PDF do
 email: origami@subvert.technology
 executables:
 - pdfsh
-- pdfwalker
 - pdf2pdfa
 - pdf2ruby
 - pdfcop
@@ -59,20 +58,6 @@ files:
 - COPYING.LESSER
 - README.md
 - bin/config/pdfcop.conf.yml
-- bin/gui/COPYING
-- bin/gui/about.rb
-- bin/gui/config.rb
-- bin/gui/file.rb
-- bin/gui/gtkhex.rb
-- bin/gui/hexview.rb
-- bin/gui/imgview.rb
-- bin/gui/menu.rb
-- bin/gui/properties.rb
-- bin/gui/signing.rb
-- bin/gui/textview.rb
-- bin/gui/treeview.rb
-- bin/gui/walker.rb
-- bin/gui/xrefs.rb
 - bin/pdf2pdfa
 - bin/pdf2ruby
 - bin/pdfcop
@@ -83,10 +68,9 @@ files:
 - bin/pdfextract
 - bin/pdfmetadata
 - bin/pdfsh
-- bin/pdfwalker
-- bin/shell/.irbrc
 - bin/shell/console.rb
 - bin/shell/hexdump.rb
+- bin/shell/irbrc
 - examples/README.md
 - examples/attachments/attachment.rb
 - examples/attachments/nested_document.rb
@@ -223,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- gtk2 to run the graphical interface
+requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13
 signing_key: