origami 1.2.5 → 1.2.6

data/lib/origami/catalog.rb

@@ -284,51 +284,6 @@ module Origami
     ATTACHMENTS = :UseAttachments
   end
 
-  #
-  # Class representing the Catalog Dictionary of a PDF file.
-  #
-  class Catalog < Dictionary
-    
-    include StandardObject
-
-    field   :Type,                :Type => Name, :Default => :Catalog, :Required => true
-    field   :Version,             :Type => Name, :Version => "1.4"
-    field   :Pages,               :Type => Dictionary, :Required => true
-    field   :PageLabels,          :Type => Dictionary, :Version => "1.3"
-    field   :Names,               :Type => Dictionary, :Version => "1.2"
-    field   :Dests,               :Type => Dictionary, :Version => "1.1"
-    field   :ViewerPreferences,   :Type => Dictionary, :Version => "1.2"  
-    field   :PageLayout,          :Type => Name, :Default => PageLayout::SINGLE
-    field   :PageMode,            :Type => Name, :Default => PageMode::NONE
-    field   :Outlines,            :Type => Dictionary
-    field   :Threads,             :Type => Array, :Version => "1.1"
-    field   :OpenAction,          :Type => [ Array, Dictionary ], :Version => "1.1"
-    field   :AA,                  :Type => Dictionary, :Version => "1.4"
-    field   :URI,                 :Type => Dictionary, :Version => "1.1"
-    field   :AcroForm,            :Type => Dictionary, :Version => "1.2"
-    field   :Metadata,            :Type => Stream, :Version => "1.4"
-    field   :StructTreeRoot,      :Type => Dictionary, :Version => "1.3"
-    field   :MarkInfo,            :Type => Dictionary, :Version => "1.4"
-    field   :Lang,                :Type => String, :Version => "1.4"
-    field   :SpiderInfo,          :Type => Dictionary, :Version => "1.3"
-    field   :OutputIntents,       :Type => Array, :Version => "1.4"
-    field   :PieceInfo,           :Type => Dictionary, :Version => "1.4"
-    field   :OCProperties,        :Type => Dictionary, :Version => "1.5"
-    field   :Perms,               :Type => Dictionary, :Version => "1.5"
-    field   :Legal,               :Type => Dictionary, :Version => "1.5"
-    field   :Requirements,        :Type => Array, :Version => "1.7"
-    field   :Collection,          :Type => Dictionary, :Version => "1.7"
-    field   :NeedsRendering,      :Type => Boolean, :Version => "1.7", :Default => false
-    field   :Extensions,          :Type => Dictionary, :Version => "1.7", :ExtensionLevel => 3
-
-    def initialize(hash = {})
-      set_indirect(true)
-
-      super(hash)
-    end
-    
-  end
-  
   #
   # Class representing additional actions which can be associated with a Catalog.
   #
@@ -482,4 +437,49 @@ module Origami
 
   end
   
+  #
+  # Class representing the Catalog Dictionary of a PDF file.
+  #
+  class Catalog < Dictionary
+    
+    include StandardObject
+
+    field   :Type,                :Type => Name, :Default => :Catalog, :Required => true
+    field   :Version,             :Type => Name, :Version => "1.4"
+    field   :Pages,               :Type => Dictionary, :Required => true
+    field   :PageLabels,          :Type => Dictionary, :Version => "1.3"
+    field   :Names,               :Type => Dictionary, :Version => "1.2"
+    field   :Dests,               :Type => Dictionary, :Version => "1.1"
+    field   :ViewerPreferences,   :Type => ViewerPreferences, :Version => "1.2"  
+    field   :PageLayout,          :Type => Name, :Default => PageLayout::SINGLE
+    field   :PageMode,            :Type => Name, :Default => PageMode::NONE
+    field   :Outlines,            :Type => Dictionary
+    field   :Threads,             :Type => Array, :Version => "1.1"
+    field   :OpenAction,          :Type => [ Array, Dictionary ], :Version => "1.1"
+    field   :AA,                  :Type => Dictionary, :Version => "1.4"
+    field   :URI,                 :Type => Dictionary, :Version => "1.1"
+    field   :AcroForm,            :Type => Dictionary, :Version => "1.2"
+    field   :Metadata,            :Type => Stream, :Version => "1.4"
+    field   :StructTreeRoot,      :Type => Dictionary, :Version => "1.3"
+    field   :MarkInfo,            :Type => Dictionary, :Version => "1.4"
+    field   :Lang,                :Type => String, :Version => "1.4"
+    field   :SpiderInfo,          :Type => Dictionary, :Version => "1.3"
+    field   :OutputIntents,       :Type => Array, :Version => "1.4"
+    field   :PieceInfo,           :Type => Dictionary, :Version => "1.4"
+    field   :OCProperties,        :Type => Dictionary, :Version => "1.5"
+    field   :Perms,               :Type => Dictionary, :Version => "1.5"
+    field   :Legal,               :Type => Dictionary, :Version => "1.5"
+    field   :Requirements,        :Type => Array, :Version => "1.7"
+    field   :Collection,          :Type => Dictionary, :Version => "1.7"
+    field   :NeedsRendering,      :Type => Boolean, :Version => "1.7", :Default => false
+    field   :Extensions,          :Type => Dictionary, :Version => "1.7", :ExtensionLevel => 3
+
+    def initialize(hash = {})
+      set_indirect(true)
+
+      super(hash)
+    end
+    
+  end
+  
 end

data/lib/origami/dictionary.rb

@@ -1,5 +1,4 @@
 =begin
-
 = File
 	dictionary.rb
 
@@ -39,6 +38,7 @@ module Origami
       @@regexp_open = Regexp.new(WHITESPACES + Regexp.escape(TOKENS.first) + WHITESPACES)
       @@regexp_close = Regexp.new(WHITESPACES + Regexp.escape(TOKENS.last) + WHITESPACES)
       
+      @@cast_fingerprints = {}
       attr_reader :strings_cache, :names_cache, :xref_cache
 
       #
@@ -76,7 +76,7 @@ module Origami
         end
       end
       
-      def self.parse(stream) #:nodoc:
+      def self.parse(stream, parser = nil) #:nodoc:
         
         offset = stream.pos
 
@@ -86,28 +86,44 @@ module Origami
           
         pairs = {}
         while stream.skip(@@regexp_close).nil? do
-          key = Name.parse(stream)
+          key = Name.parse(stream, parser)
           
           type = Object.typeof(stream)
           if type.nil?
             raise InvalidDictionaryObjectError, "Invalid object for field #{key.to_s}"
           end
-          value = type.parse(stream)
           
+          value = type.parse(stream, parser)
           pairs[key] = value
         end
        
         dict = 
           if Origami::OPTIONS[:enable_type_guessing]
-            type = pairs[Name.new(:Type)]
-            if type.is_a?(Name) and DICT_SPECIAL_TYPES.include?(type.value)
-              DICT_SPECIAL_TYPES[type.value].new(pairs)
+            guessed_type = self.guess_type(pairs)
+
+            if Origami::OPTIONS[:enable_type_propagation]
+              guessed_type.new(
+                Hash[
+                  pairs.map {|key, value|
+                    hint_type = guessed_type.hint_type(key.value)
+                    if hint_type.is_a?(::Array) and not value.is_a?(Reference) # Choose best match
+                      hint_type.find {|type| type.native_type == value.native_type}
+                    end
+
+                    if hint_type.is_a?(Class) and hint_type.native_type == value.native_type
+                      [key, value.cast_to(hint_type)]
+                    elsif hint_type and value.is_a?(Reference) and parser
+                      parser.defer_type_cast(value, hint_type)
+                      [key, value]
+                    else
+                      [key, value]
+                    end
+                  }])
             else
-              Dictionary.new(pairs)
+              guessed_type.new(pairs)
             end
-
           else
-            Dictionary.new(pairs)
+            self.new(pairs)
           end
 
         dict.file_offset = offset
@@ -117,7 +133,7 @@ module Origami
       
       alias to_h to_hash
       
-      def to_s(indent = 1)  #:nodoc:
+      def to_s(indent = 1) #:nodoc:
         if indent > 0
           content = TOKENS.first + EOL
           self.each_pair do |key,value|
@@ -177,9 +193,26 @@ module Origami
         super(key.to_o)
       end
 
-      alias each each_value
+      def cast_to(type)
+        super(type)
+
+        cast = type.new(self)
+        cast.parent = self.parent
+        cast.no, cast.generation = self.no, self.generation
+        if self.is_indirect?
+          cast.set_indirect(true) 
+          cast.set_pdf(self.pdf) 
+          cast.file_offset = self.file_offset # cast can replace self
+        end
 
-      def real_type ; Dictionary end
+        cast.xref_cache.update(self.xref_cache)
+        cast.names_cache.concat(self.names_cache)
+        cast.strings_cache.concat(self.strings_cache)
+
+        cast
+      end
+
+      alias each each_value
 
       alias value to_h
 
@@ -194,6 +227,46 @@ module Origami
         end
       end
 
+      def copy
+        copy = self.class.new
+        self.each_pair do |k,v|
+          copy[k] = v.copy 
+        end 
+
+        copy.parent = @parent
+        copy.no, copy.generation = @no, @generation
+        copy.set_indirect(true) if is_indirect?
+        copy.set_pdf(@pdf) if is_indirect?
+        copy
+      end
+
+      def self.native_type; Dictionary end
+
+      def self.add_type_info(typeclass, key, value) #:nodoc:
+        if not @@cast_fingerprints.has_key?(typeclass) and typeclass.superclass != Dictionary and
+           @@cast_fingerprints.has_key?(typeclass.superclass)
+          @@cast_fingerprints[typeclass] = @@cast_fingerprints[typeclass.superclass].dup
+        end
+
+        @@cast_fingerprints[typeclass] ||= {}
+        @@cast_fingerprints[typeclass][key.to_o] = value.to_o
+      end
+
+      def self.guess_type(hash) #:nodoc:
+        best_type = self
+
+        @@cast_fingerprints.each_pair do |typeclass, keys|
+          best_type = typeclass if keys.all? { |k,v| 
+            hash.has_key?(k) and hash[k] == v
+          } and typeclass < best_type
+        end
+
+        best_type
+      end
+
+      def self.hint_type(name); nil end #:nodoc:
+
     end #class
  
-end # Origami
+end
+# Origami

data/lib/origami/encryption.rb

@@ -23,6 +23,12 @@
 
 =end
 
+begin
+  require 'openssl' if Origami::OPTIONS[:use_openssl]
+rescue LoadError
+  Origami::OPTIONS[:use_openssl] = false
+end
+
 require 'digest/md5'
 require 'digest/sha2'
 
@@ -163,20 +169,18 @@ module Origami
                       obj.equal?(encrypt_dict[:Perms]) or
                       (obj.parent.is_a?(Signature::DigitalSignature) and obj.equal?(obj.parent[:Contents]))
 
-              obj.extend(Encryption::EncryptedString)
+              obj.extend(Encryption::EncryptedString) unless obj.is_a?(Encryption::EncryptedString)
               obj.encryption_handler = handler
               obj.encryption_key = encryption_key
               obj.algorithm = str_algo
-              obj.decrypted = false
               obj.decrypt!
 
             when Stream
               next if obj.is_a?(XRefStream) or (not encrypt_metadata and obj.equal?(metadata))
-              obj.extend(Encryption::EncryptedStream)
+              obj.extend(Encryption::EncryptedStream) unless obj.is_a?(Encryption::EncryptedStream)
               obj.encryption_handler = handler
               obj.encryption_key = encryption_key
               obj.algorithm = stm_algo
-              obj.decrypted = false
           end
         end
       end
@@ -293,6 +297,26 @@ module Origami
   #
   module Encryption
 
+    #
+    # Generates _n_ random bytes from a fast PRNG.
+    #
+    def self.rand_bytes(n)
+      ::Array.new(n) { rand(256) }.pack("C*")
+    end
+
+    #
+    # Generates _n_ random bytes from a crypto PRNG.
+    #
+    def self.strong_rand_bytes(n)
+      if Origami::OPTIONS[:use_openssl]
+        OpenSSL::Random.random_bytes(n)
+      elsif RUBY_VERSION >= '1.9'
+        Random.new.bytes(n)
+      else
+        self.rand_bytes(n)
+      end
+    end
+
     module EncryptedDocument
 
       attr_writer :encryption_key
@@ -442,7 +466,7 @@ module Origami
           if @algorithm == ARC4 or @algorithm == Identity
             @algorithm.encrypt(key, self.value)
           else
-            iv = ::Array.new(AES::BLOCKSIZE) { rand(256) }.pack('C*')
+            iv = Encryption.rand_bytes(AES::BLOCKSIZE)
             @algorithm.encrypt(key, iv, self.value)
           end
 
@@ -482,7 +506,7 @@ module Origami
             if @algorithm == ARC4 or @algorithm == Identity
               @algorithm.encrypt(key, self.rawdata)
             else
-              iv = ::Array.new(AES::BLOCKSIZE) { rand(256) }.pack('C*')
+              iv = Encryption.rand_bytes(AES::BLOCKSIZE)
               @algorithm.encrypt(key, iv, @rawdata)
             end
 
@@ -1043,6 +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'
     
       #
       # Permission constants for encrypted documents.
@@ -1090,6 +1115,7 @@ module Origami
          
           if self.R < 5
             padded = pad_password(userpassword)
+            padded.force_encoding('binary') if RUBY_VERSION > '1.8'
 
             padded << self.O
             padded << [ self.P ].pack("i")
@@ -1097,7 +1123,7 @@ module Origami
             padded << fileid
             
             encrypt_metadata = self.EncryptMetadata != false
-            padded << "\xFF\xFF\xFF\xFF" if self.R >= 4 and not encrypt_metadata
+            padded << [ -1 ].pack("i") if self.R >= 4 and not encrypt_metadata
 
             key = Digest::MD5.digest(padded)
 
@@ -1135,9 +1161,9 @@ module Origami
             oks = self.O[40, 8]
 
             if self.R == 5
-              okey = Digest::SHA256.digest(passwd + oks)
+              okey = Digest::SHA256.digest(passwd + oks + self.U)
             else
-              okey = compute_hardened_hash(passwd, oks)
+              okey = compute_hardened_hash(passwd, oks, self.U)
             end
 
             iv = ::Array.new(AES::BLOCKSIZE, 0).pack("C*")
@@ -1163,35 +1189,31 @@ module Origami
             upass = password_to_utf8(userpassword)
             opass = password_to_utf8(ownerpassword)
 
-            uvs, uks, ovs, oks = ::Array.new(4) { ::Array.new(8) { rand(255) }.pack("C*") }
-            file_key = ::Array.new(32) { rand(256) }.pack("C*")
+            uvs, uks, ovs, oks = ::Array.new(4) { Encryption.rand_bytes(8) }
+            file_key = Encryption.strong_rand_bytes(32)
             iv = ::Array.new(AES::BLOCKSIZE, 0).pack("C*")
             
             if self.R == 5
+              self.U = Digest::SHA256.digest(upass + uvs) + uvs + uks
+              self.O = Digest::SHA256.digest(opass + ovs + self.U) + ovs + oks
               ukey = Digest::SHA256.digest(upass + uks)
-              okey = Digest::SHA256.digest(opass + oks)
+              okey = Digest::SHA256.digest(opass + oks + self.U)
             else
+              self.U = compute_hardened_hash(upass, uvs) + uvs + uks
+              self.O = compute_hardened_hash(opass, ovs, self.U) + ovs + oks
               ukey = compute_hardened_hash(upass, uks)
-              okey = compute_hardened_hash(upass, oks)
+              okey = compute_hardened_hash(opass, oks, self.U)
             end
 
             self.UE = AES.new(ukey, iv, false).encrypt(file_key)[iv.size, 32]
             self.OE = AES.new(okey, iv, false).encrypt(file_key)[iv.size, 32]
-              
-            if self.R == 5
-              self.U = Digest::SHA256.digest(upass + uvs) + uvs + uks
-              self.O = Digest::SHA256.digest(opass + ovs + self.U) + ovs + oks
-            else
-              self.U = compute_hardened_hash(upass, uvs) + uvs + uks
-              self.O = compute_hardened_hash(opass, ovs, self.U) + ovs + oks
-            end
 
             perms = 
               [ self.P ].pack("V") +                              # 0-3
-              "\xff" * 4 +                                        # 4-7
+              [ -1 ].pack("V") +                                  # 4-7
               (self.EncryptMetadata == true ? "T" : "F") +        # 8
               "adb" +                                             # 9-11
-              "\x00" * 4                                          # 12-15
+              [ 0 ].pack("V")                                     # 12-15
 
             self.Perms = AES.new(file_key, iv, false).encrypt(perms)[iv.size, 16]
 
@@ -1294,7 +1316,7 @@ module Origami
             
             19.times { |i| user_key = ARC4.encrypt(xor(key,i+1), user_key) }
             
-            user_key.ljust(32, "\xFF")
+            user_key.ljust(32, 0xFF.chr)
           end
         end
 

data/lib/origami/file.rb

@@ -182,8 +182,7 @@ module Origami
     # A class representing a file outside the current PDF file.
     #
     class ExternalFile < FileSpec
-     
-      field   :Type,        :Type => Name, :Default => :FileSpec, :Required => true
+      field   :Type,        :Type => Name, :Default => :FileSpec #, :Required => true
 
       #
       # Creates a new external file specification.