origami 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 400584bfa83ed0b47e3501f85f6ea19733aa365a
-  data.tar.gz: ebe216889afe825f5ea850ac3a330b7b462afb0a
+  metadata.gz: d17b0e4071c2342bd02ad39ac239edc3e185296c
+  data.tar.gz: ed34fe83604f52063e0340b06e95bce6a2f2c801
 SHA512:
-  metadata.gz: a5383fd775e5eb11a8a2a1212b4e8523f9751974fae787fd72074206e435b29b6e5d915c05154e25c12617733b317f20e5a3cd3c7f099a275ec995ce55308bb8
-  data.tar.gz: 5dd566b2f6cedca2b1be9b124d809efb46cc8057fc4f6ffbd5a7f22a56c165da1ff0fd1e1ea0e8be8695d98ef8363adbefafeb77fcab256ddea3dad38cbe674a
+  metadata.gz: 5332359f279fb3e88d28229f1bbd9b361aaeb84724ce3682d296d67b9d1c729c2c8da288a644add7109f7090692dcc669706e907731a308c13f635931c43dea3
+  data.tar.gz: 1fe6ceb2f9cfff14bd15018bc1c965c43ad01e96d46de67538d58c48d9d8a9c97a7dc9b520aeb9b1e2caa2d9958f3f741406a90d4f7f4ee90e9b01d0f9198e89

data/bin/pdf2ruby

@@ -82,6 +82,8 @@ if ARGV.empty?
 else
   TARGET = ARGV.shift
 end
+
+Origami::OPTIONS[:enable_type_guessing] = Origami::OPTIONS[:enable_type_propagation] = true
       
 TARGET_DIR = File.basename(TARGET, '.pdf')
 TARGET_FILE = "#{TARGET_DIR}/#{TARGET_DIR}.rb"
@@ -99,11 +101,12 @@ def objectToRuby(obj, inclevel = 0, internalname = nil, do_convert = false)
     when Origami::String
       "'#{obj.value.gsub("'","\\\\'")}'"
     when Origami::Dictionary
-      customtype = nil
-      if obj[:Type] and Origami::DICT_SPECIAL_TYPES.include?(obj[:Type].value)
-        customtype = Origami::DICT_SPECIAL_TYPES[obj[:Type].value]
+      customclass = nil
+      if obj.class != Origami::Dictionary
+        p = (obj.class == Origami::Encoding) ? 0 : 1
+        customclass = obj.class.to_s.split('::')[p..-1].join('::') # strip Origami prefix if there is no collision
       end
-      dictionaryToRuby(obj, inclevel, internalname, customtype)
+      dictionaryToRuby(obj, inclevel, internalname, customclass)
     when Origami::Array
       arrayToRuby(obj, inclevel, internalname)
     when Origami::Stream

data/lib/origami/encryption.rb

@@ -1067,7 +1067,7 @@ module Origami
     module Standard
     
       PADDING = "\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A" #:nodoc:
-      PADDING.force_encoding('binary') if RUBY_VERSION > '1.8'
+      PADDING.force_encoding('binary') if RUBY_VERSION >= '1.9'
     
       #
       # Permission constants for encrypted documents.
@@ -1115,7 +1115,7 @@ module Origami
          
           if self.R < 5
             padded = pad_password(userpassword)
-            padded.force_encoding('binary') if RUBY_VERSION > '1.8'
+            padded.force_encoding('binary') if RUBY_VERSION >= '1.9'
 
             padded << self.O
             padded << [ self.P ].pack("i")

data/lib/origami/page.rb

@@ -199,7 +199,7 @@ module Origami
       rsrc = ls_resources(type)
       n = '1'
 
-      while rsrc.include? (prefix + n).to_sym
+      while rsrc.include?((prefix + n).to_sym)
         n.next!
       end
 

data/lib/origami/pdf.rb

@@ -564,15 +564,15 @@ module Origami
         raise TypeError, "Invalid parameter type : #{no.class}" 
       end
       
-      set = indirect_objects_table
-     
       #
       # Search through accessible indirect objects.
       #
-      if set.include?(target)
-        set[target]
-      elsif use_xrefstm == true
-        # Look into XRef streams.
+      @revisions.each do |rev|
+        return rev.body[target] if rev.body.include?(target)
+      end
+
+      # Look into XRef streams.
+      if use_xrefstm == true
 
         if @revisions.last.has_xrefstm?
           xrefstm = @revisions.last.xrefstm
@@ -605,8 +605,12 @@ module Origami
         #
         # Lastly search directly into Object streams (might be very slow).
         #
-        stream = set.values.find_all{|obj| obj.is_a?(ObjectStream)}.find do |objstm| objstm.include?(target.refno) end
-        stream && stream.extract(target.refno)
+        @revisions.each do |rev|
+          streams = rev.objects.find_all{|obj| obj.is_a?(ObjectStream) and obj.include?(target.refno)}
+          return streams.first.extract(target.refno) unless streams.empty?
+        end
+
+        nil
       end
       
     end
@@ -1016,10 +1020,6 @@ module Origami
       max
     end
     
-    def indirect_objects_table #:nodoc:
-      @revisions.inject({}) do |set, rev| set.merge(rev.body) end
-    end
- 
     def indirect_objects_by_rev #:nodoc:
       @revisions.inject([]) do |set,rev|
         objset = rev.objects

data/lib/origami/stream.rb

@@ -476,6 +476,7 @@ module Origami
         objoff += objdata.size
         data << objdata
         obj.set_indirect(true)
+        obj.no = num
       end
       
       self.data = prolog + data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origami
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Guillaume Delugre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies: []
 description: "Origami is a PDF-compliant parser. This is not a PDF rendering library,
   it aims at providing a scripting tool to generate and analyze malicious PDF files.
@@ -32,8 +32,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README
 - COPYING.LESSER
+- README
 - bin/config/pdfcop.conf.yml
 - bin/gui/COPYING
 - bin/gui/about.rb
@@ -62,6 +62,7 @@ files:
 - bin/pdfmetadata
 - bin/pdfsh
 - bin/pdfwalker
+- bin/shell/.irbrc
 - bin/shell/console.rb
 - bin/shell/hexdump.rb
 - lib/origami.rb
@@ -154,7 +155,6 @@ files:
 - templates/patterns.rb
 - templates/widgets.rb
 - templates/xdp.rb
-- bin/shell/.irbrc
 - test/ts_pdf.rb
 homepage: http://code.google.com/p/origami-pdf
 licenses:
@@ -166,18 +166,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - ruby-gtk2 if you plan to run the PDF Walker interface
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Origami aims at providing a scripting tool to generate and analyze malicious