pdf-reader 2.0.0.beta1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ea96ce79d9f4cc65a0a026ea7e50da7b33cd19
-  data.tar.gz: e2302c2d18cdc64cd81654f30658b5cf1e8ae3c3
+  metadata.gz: d34a3033638fcf4f78ce2d71dd5f5aebc2ea7d68
+  data.tar.gz: 912ed3986ab7e7eefce8f987cffc0d0357bcd675
 SHA512:
-  metadata.gz: 31da13f8b8e38dffbb19a33855beb1c85a14c2633137fd8e1957db14f3bac16a434c174e79bab6092c72954e6a6f87f0ab585562e79d39d5ede8f9398fd63f7b
-  data.tar.gz: e097e8aed8bbeb918676bacded748a538e109fdcf1e8740cfe1ce3d63105d891cbe2a90ad228bb87fb494cd796bd7e1c66138592ff21d62c97b87fa270eb0899
+  metadata.gz: a24c874cae12838cf122c92338e6da1639d15187be9ef5c1f149eedd0167cc21b53544c3148efd37992535efe2d0ec4487a02fc3a668992295cecc7aa5529f2a
+  data.tar.gz: c88b9daa21de84eb2a841cc024c499ecc7c5d4b5908ad6618494fa3e7f5d694d291ae87ceb72f5ff9f4d2db66b3bc781e1ff499485ba50290710c6e1061a76db

data/CHANGELOG

@@ -1,3 +1,6 @@
+v2.0.0 (25th February 2017)
+- various bug fixes
+
 v2.0.0.beta1 (15th February 2017)
 - BREAKING CHANGE: remove all methods that were deprecated in 1.0.0
 - Bug: Support extra encrypted PDF variants (thanks to Gyuchang Jun)

data/lib/pdf/reader.rb

@@ -275,7 +275,9 @@ require 'pdf/reader/parser'
 require 'pdf/reader/print_receiver'
 require 'pdf/reader/reference'
 require 'pdf/reader/register_receiver'
+require 'pdf/reader/null_security_handler'
 require 'pdf/reader/standard_security_handler'
+require 'pdf/reader/unimplemented_security_handler'
 require 'pdf/reader/stream'
 require 'pdf/reader/text_run'
 require 'pdf/reader/page_state'

data/lib/pdf/reader/null_security_handler.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+class PDF::Reader
+
+  # A null object security handler. Used when a PDF is unencrypted.
+  class NullSecurityHandler
+
+    def self.supports?(encrypt)
+      encrypt.nil?
+    end
+
+    def decrypt(buf, _ref)
+      buf
+    end
+  end
+end

data/lib/pdf/reader/object_hash.rb

@@ -45,6 +45,7 @@ class PDF::Reader
       @pdf_version = read_version
       @trailer     = @xref.trailer
       @cache       = opts[:cache] || PDF::Reader::ObjectCache.new
+      @sec_handler = NullSecurityHandler.new
       @sec_handler = build_security_handler(opts)
     end
 
@@ -286,20 +287,27 @@ class PDF::Reader
     end
 
     def build_security_handler(opts = {})
-      return nil if trailer[:Encrypt].nil?
-
-      enc = deref(trailer[:Encrypt])
-      case enc[:Filter]
-      when :Standard
-        StandardSecurityHandler.new(enc, deref(trailer[:ID]), opts[:password])
+      encrypt = deref(trailer[:Encrypt])
+      if NullSecurityHandler.supports?(encrypt)
+        NullSecurityHandler.new
+      elsif StandardSecurityHandler.supports?(encrypt)
+        encmeta = !encrypt.has_key?(:EncryptMetadata) || encrypt[:EncryptMetadata].to_s == "true"
+        StandardSecurityHandler.new(
+          key_length: (encrypt[:Length] || 40).to_i,
+          revision: encrypt[:R],
+          owner_key: encrypt[:O],
+          user_key: encrypt[:U],
+          permissions: encrypt[:P].to_i,
+          encrypted_metadata: encmeta,
+          file_id: (deref(trailer[:ID]) || []).first,
+          password: opts[:password]
+        )
       else
-        raise PDF::Reader::EncryptedPDFError, "Unsupported encryption method (#{enc[:Filter]})"
+        UnimplementedSecurityHandler.new
       end
     end
 
     def decrypt(ref, obj)
-      return obj unless sec_handler?
-
       case obj
       when PDF::Reader::Stream then
         obj.data = sec_handler.decrypt(obj.data, ref)
@@ -331,7 +339,7 @@ class PDF::Reader
     # returns a nested array of object references for all pages in this object store.
     #
     def get_page_objects(ref)
-      obj = fetch(ref)
+      obj = deref(ref)
 
       if obj[:Type] == :Page
         ref

data/lib/pdf/reader/standard_security_handler.rb

@@ -42,30 +42,36 @@ class PDF::Reader
                      0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, 0x3e, 0x80,
                      0x2f, 0x0c, 0xa9, 0xfe, 0x64, 0x53, 0x69, 0x7a ]
 
-    attr_reader :filter, :subFilter, :version, :key_length,
-                :crypt_filter, :stream_filter, :string_filter, :embedded_file_filter,
-                :encrypt_key
-    attr_reader :revision, :owner_key, :user_key, :permissions, :file_id, :password
-
-    def initialize( enc, file_id, password )
-      @filter        = enc[:Filter]
-      @subFilter     = enc[:SubFilter]
-      @version       = enc[:V].to_i
-      @key_length    = enc[:Length].to_i/8
-      @crypt_filter  = enc[:CF]
-      @stream_filter = enc[:StmF]
-      @string_filter = enc[:StrF]
-      @revision      = enc[:R].to_i
-      @owner_key     = enc[:O]
-      @user_key      = enc[:U]
-      @permissions   = enc[:P].to_i
-      @embedded_file_filter = enc[:EFF]
-
-      @encryptMeta   = enc.has_key?(:EncryptMetadata)? enc[:EncryptMetadata].to_s == "true" : true;
-
-      @file_id       = (file_id || []).first || ""
-
-      @encrypt_key   = build_standard_key(password)
+    attr_reader :key_length, :revision, :encrypt_key
+    attr_reader :owner_key, :user_key, :permissions, :file_id, :password
+
+    def initialize(opts = {})
+      @key_length    = opts[:key_length].to_i/8
+      @revision      = opts[:revision].to_i
+      @owner_key     = opts[:owner_key]
+      @user_key      = opts[:user_key]
+      @permissions   = opts[:permissions].to_i
+      @encryptMeta   = opts.fetch(:encrypted_metadata, true)
+      @file_id       = opts[:file_id] || ""
+      @encrypt_key   = build_standard_key(opts[:password] || "")
+
+      if @key_length != 5 && @key_length != 16
+        msg = "StandardSecurityHandler only supports 40 and 128 bit\
+               encryption (#{@key_length * 8}bit)"
+        raise ArgumentError, msg
+      end
+    end
+
+    # This handler supports all RC4 encryption that follows the PDF spec. It does not support
+    # AES encryption that was added in later versions of the spec.
+    def self.supports?(encrypt)
+      return false if encrypt.nil?
+
+      filter = encrypt.fetch(:Filter, :Standard)
+      version = encrypt.fetch(:V, 0)
+      algorithm = encrypt.fetch(:CF, {}).fetch(encrypt[:StmF], {}).fetch(:CFM, nil)
+      filter == :Standard &&
+        (version <= 3 || (version == 4 && algorithm != :AESV2))
     end
 
     ##7.6.2 General Encryption Algorithm

data/lib/pdf/reader/unimplemented_security_handler.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+class PDF::Reader
+
+  # Security handler for when we don't support the flavour of encryption
+  # used in a PDF.
+  class UnimplementedSecurityHandler
+    def self.supports?(encrypt)
+      true
+    end
+
+    def decrypt(buf, ref)
+      raise PDF::Reader::EncryptedPDFError, "Unsupported encryption style"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdf-reader
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0
 platform: ruby
 authors:
 - James Healy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -241,6 +241,7 @@ files:
 - lib/pdf/reader/glyph_hash.rb
 - lib/pdf/reader/glyphlist.txt
 - lib/pdf/reader/lzw.rb
+- lib/pdf/reader/null_security_handler.rb
 - lib/pdf/reader/object_cache.rb
 - lib/pdf/reader/object_hash.rb
 - lib/pdf/reader/object_stream.rb
@@ -261,6 +262,7 @@ files:
 - lib/pdf/reader/text_run.rb
 - lib/pdf/reader/token.rb
 - lib/pdf/reader/transformation_matrix.rb
+- lib/pdf/reader/unimplemented_security_handler.rb
 - lib/pdf/reader/width_calculator.rb
 - lib/pdf/reader/width_calculator/built_in.rb
 - lib/pdf/reader/width_calculator/composite.rb
@@ -288,12 +290,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A library for accessing the content of PDF files