origami 2.0.0 → 2.0.1

data/bin/gui/textview.rb

@@ -68,7 +68,7 @@ module PDFWalker
                         end
 
                         text.encode!("UTF-8", replace: '.')
-                            .gsub!("\x00", '.')
+                            .tr!("\x00", '.')
 
                         @pdfbuffer.set_text(text)
                         @pdfbuffer.apply_tag("Default", @pdfbuffer.start_iter, @pdfbuffer.end_iter)

data/bin/gui/treeview.rb

@@ -41,7 +41,7 @@ module PDFWalker
     end
 
     class PDFTree < TreeView
-        include Popable
+        include PopupMenu
 
         OBJCOL = 0
         TEXTCOL = 1
@@ -73,7 +73,7 @@ module PDFWalker
                 end
             }
 
-            signal_connect('row-activated') { |tree, path, column|
+            signal_connect('row-activated') { |_tree, path,_column|
                 if selection.selected
                     obj = @treestore.get_value(selection.selected, OBJCOL)
 
@@ -87,7 +87,7 @@ module PDFWalker
                 end
             }
 
-            signal_connect('row-expanded') { |tree, iter, path|
+            signal_connect('row-expanded') { |_tree, iter, _path|
                 obj = @treestore.get_value(iter, OBJCOL)
 
                 if obj.is_a?(Origami::Stream) and iter.n_children == 1
@@ -114,7 +114,7 @@ module PDFWalker
             }
 
             add_events(Gdk::Event::BUTTON_PRESS_MASK)
-            signal_connect('button_press_event') { |widget, event|
+            signal_connect('button_press_event') { |_widget, event|
                 if event.button == 3 && parent.opened
                     path = get_path(event.x,event.y).first
                     set_cursor(path, nil, false)
@@ -209,6 +209,12 @@ module PDFWalker
             end
         end
 
+        def object_by_path(path)
+            iter = @treestore.get_iter(path)
+
+            @treestore.get_value(iter, OBJCOL)
+        end
+
         private
 
         def object_to_tree_pos(obj)
@@ -221,7 +227,7 @@ module PDFWalker
                 object_path.push(root_obj)
             end
 
-            @treestore.each do |model, path, iter|
+            @treestore.each do |_model, path, iter|
                 current_obj = @treestore.get_value(iter, OBJCOL)
 
                 # Load the intermediate nodes if necessary.
@@ -295,7 +301,7 @@ module PDFWalker
                 name =
                     case object
                     when Origami::String
-                        '"' + object.to_utf8.gsub("\x00", ".") + '"'
+                        '"' + object.to_utf8.tr("\x00", ".") + '"'
                     when Origami::Number, Origami::Name
                         object.value.to_s
                     else
@@ -379,7 +385,7 @@ module PDFWalker
             @@appearance[:Body] = {Color: "purple", Weight: Pango::WEIGHT_BOLD, Style: Pango::STYLE_NORMAL}
             @@appearance[:XRefSection] = {Color: "purple", Weight: Pango::WEIGHT_BOLD, Style: Pango::STYLE_NORMAL}
             @@appearance[:XRefSubSection] = {Color: "brown", Weight: Pango::WEIGHT_BOLD, Style: Pango::STYLE_NORMAL}
-            @@appearance[:XRef] = {Color: "gray20", Weight: Pango::WEIGHT_BOLD, Style: Pango::STYLE_NORMAL}
+            @@appearance[:XRef] = {Weight: Pango::WEIGHT_BOLD, Style: Pango::STYLE_NORMAL}
             @@appearance[:Trailer] = {Color: "purple", Weight: Pango::WEIGHT_BOLD, Style: Pango::STYLE_NORMAL}
             @@appearance[:StartXref] = {Weight: Pango::WEIGHT_BOLD, Style: Pango::STYLE_NORMAL}
             @@appearance[:String] = {Color: "red", Weight: Pango::WEIGHT_NORMAL, Style: Pango::STYLE_ITALIC}

data/bin/gui/walker.rb

@@ -74,38 +74,9 @@ module PDFWalker  #:nodoc:all
                 :type => :body
             }
 
-            @explorer_history = Array.new
+            @explorer_history = []
 
-            signal_connect('destroy') {
-                @config.save
-                Gtk.main_quit
-            }
-
-            add_events(Gdk::Event::KEY_RELEASE_MASK)
-            signal_connect('key_release_event') { |w, event|
-                if event.keyval == Gdk::Keyval::GDK_F1 then about
-                elsif event.keyval == Gdk::Keyval::GDK_Escape and @opened and not @explorer_history.empty?
-                    @treeview.goto(@explorer_history.pop)
-                end
-            }
-
-            create_menus
-            create_treeview
-            create_hexview
-            create_objectview
-            create_panels
-            create_statusbar
-
-            @vbox = VBox.new
-            @vbox.pack_start(@menu, false, false)
-            @vbox.pack_start(@hpaned)
-            @vbox.pack_end(@statusbar, false, false)
-
-            add @vbox
-
-            set_default_size(self.screen.width * 0.5, self.screen.height * 0.5)
-            #maximize
-            show_all
+            init_interface
 
             open(target_file)
         end
@@ -155,50 +126,13 @@ module PDFWalker  #:nodoc:all
             dialog.vbox.pack_start(button_byname)
             dialog.vbox.pack_end(button_regexp)
 
-            dialog.signal_connect('response') do |dlg, response|
+            dialog.signal_connect('response') do |_, response|
                 if response != Gtk::Dialog::RESPONSE_OK
                     dialog.destroy
                     next
                 end
 
-                search =
-                {
-                    :expr => entry.text,
-                    :regexp => button_regexp.active?,
-                    :type => button_byname.active? ? :name : :body
-                }
-
-                if search == @last_search
-                    @last_search_result.push @last_search_result.shift
-                    results = @last_search_result
-                else
-                    expr = search[:regexp] ? Regexp.new(search[:expr]) : search[:expr]
-
-                    results =
-                        if search[:type] == :body
-                            @opened.grep(expr)
-                        else
-                            @opened.ls(expr, follow_references: false)
-                        end
-
-                    @last_search = search
-                end
-
-                if results.empty?
-                    error("No result found.")
-                else
-                    if results != @last_search_result
-                        # Reset the previous search highlighting.
-                        @last_search_result.each do |obj| @treeview.highlight(obj, nil) end
-
-                        # Highlight the new results.
-                        results.each do |obj| @treeview.highlight(obj, "lightpink") end
-
-                        @last_search_result = results
-                    end
-
-                    @treeview.goto(results.first, follow_references: false)
-                end
+                search_document(entry.text, regexp: button_regexp.active?, type: (button_bydata.active? ? 'body' : 'name'))
             end
 
             dialog.show_all
@@ -244,12 +178,89 @@ module PDFWalker  #:nodoc:all
             if obj.nil?
                 error("Object #{no} not found.")
             else
-              @treeview.goto(obj)
+                @treeview.goto(obj)
             end
         end
 
         private
 
+        def init_interface
+            signal_connect('destroy') {
+                @config.save
+                Gtk.main_quit
+            }
+
+            add_events(Gdk::Event::KEY_RELEASE_MASK)
+            signal_connect('key_release_event') { |_w, event|
+                if event.keyval == Gdk::Keyval::GDK_F1 then about
+                elsif event.keyval == Gdk::Keyval::GDK_Escape and @opened and not @explorer_history.empty?
+                    @treeview.goto(@explorer_history.pop)
+                end
+            }
+
+            create_menus
+            create_treeview
+            create_hexview
+            create_objectview
+            create_panels
+            create_statusbar
+
+            @vbox = VBox.new
+            @vbox.pack_start(@menu, false, false)
+            @vbox.pack_start(@hpaned)
+            @vbox.pack_end(@statusbar, false, false)
+
+            add @vbox
+
+            set_default_size(self.screen.width * 0.5, self.screen.height * 0.5)
+            show_all
+        end
+
+        def search_document(expr, regexp: false, type: 'body')
+            search =
+            {
+                expr: expr,
+                regexp: regexp,
+                type: type,
+            }
+
+            if search == @last_search
+                @last_search_result.push @last_search_result.shift
+                results = @last_search_result
+            else
+                expr = Regexp.new(expr) if search[:regexp]
+
+                results =
+                    if search[:type] == 'body'
+                        @opened.grep(expr)
+                    else
+                        @opened.ls(expr, follow_references: false)
+                    end
+
+                @last_search = search
+            end
+
+            goto_next_search_result(results)
+        end
+
+        def goto_next_search_result(results)
+            if results.empty?
+                error("No result found.")
+            else
+                if results != @last_search_result
+                    # Reset the previous search highlighting.
+                    @last_search_result.each do |obj| @treeview.highlight(obj, nil) end
+
+                    # Highlight the new results.
+                    results.each do |obj| @treeview.highlight(obj, "lightpink") end
+
+                    @last_search_result = results
+                end
+
+                @treeview.goto(results.first, follow_references: false)
+            end
+        end
+
         def create_panels
             @hpaned = HPaned.new
 
@@ -270,6 +281,26 @@ module PDFWalker  #:nodoc:all
             @main_context = @statusbar.get_context_id 'Main'
             @statusbar.push(@main_context, 'No file selected')
         end
+
+        def start_profiling
+            if @help_menu_profile.active?
+                require 'ruby-prof'
+                RubyProf.start
+            end
+
+            result = yield
+
+            if @help_menu_profile.active?
+                result = RubyProf.stop
+                multiprinter = RubyProf::MultiPrinter.new(result)
+
+                Dir.mkdir(@config.profile_output_dir) unless Dir.exist?(@config.profile_output_dir) 
+
+                multiprinter.print(path: @config.profile_output_dir, profile: File.basename(filename))
+            end
+
+            result
+        end
     end
 
 end

data/bin/gui/xrefs.rb

@@ -55,7 +55,7 @@ module PDFWalker
                 @list.set_value(iter, NAMECOL, str)
             }
 
-            @view.signal_connect("row_activated") { |tree, path, _column|
+            @view.signal_connect("row_activated") { |_tree, _path, _column|
                 if @view.selection.selected
                     from = @list.get_value(@view.selection.selected, OBJCOL)
                     @parent.treeview.goto(from)

data/bin/pdf2ruby

@@ -185,7 +185,7 @@ def dictionaryToRuby(dict, inclevel, internalname, customtype = nil)
 
             if val.is_a?(Origami::Reference) and @var_hash[val] and @var_hash[val][0,3] == "obj"
                 oldname = @var_hash[val]
-                newname = (key.value.to_s.downcase.gsub(/[^[[:alnum:]]]/,'_') + "_" + @var_hash[val][4..-1]).gsub('.','_')
+                newname = (key.value.to_s.downcase.gsub(/[^[[:alnum:]]]/,'_') + "_" + @var_hash[val][4..-1]).tr('.', '_')
 
                 if not @obj_route.include?(oldname)
                     @var_hash[val] = newname
@@ -217,7 +217,7 @@ def dictionaryToHashMap(dict, inclevel, internalname)
 
         if val.is_a?(Origami::Reference) and @var_hash[val] and @var_hash[val][0,3] == "obj"
             oldname = @var_hash[val]
-            newname = (key.value.to_s.downcase + "_" + @var_hash[val][4..-1]).gsub('.','_')
+            newname = (key.value.to_s.downcase + "_" + @var_hash[val][4..-1]).tr('.', '_')
 
             if not @obj_route.include?(oldname)
                 @var_hash[val] = newname
@@ -237,7 +237,7 @@ def dictionaryToHashMap(dict, inclevel, internalname)
 end
 
 def streamToRuby(stm, internalname)
-    dict = stm.dictionary.dup.delete_if{|k,v| k == :Length}
+    dict = stm.dictionary.dup.delete_if {|k, _| k == :Length}
 
     code = "Stream.new("
 

data/bin/pdfcop

@@ -57,7 +57,7 @@ Options:
 USAGE
 
     def self.parse(args)
-        options = {colors: true}
+        options = {colors: true, password: ''}
 
         opts = OptionParser.new do |opts|
             opts.banner = BANNER
@@ -70,8 +70,12 @@ USAGE
                 options[:config_file] = cf
             end
 
-            opts.on("-p", "--policy POLICY_NAME", "Specify applied policy. Predefined policies: 'none', 'standard', 'strong', 'paranoid'") do |p|
-                options[:policy] = p
+            opts.on("-p", "--policy POLICY_NAME", "Specify applied policy. Predefined policies: 'none', 'standard', 'strong', 'paranoid'") do |policy|
+                options[:policy] = policy
+            end
+
+            opts.on("-P", "--password PASSWORD", "Password to use if the document is encrypted") do |passwd|
+                options[:password] = passwd
             end
 
             opts.on("-n", "--no-color", "Turn off colorized output") do
@@ -158,7 +162,7 @@ def analyze_xfa_forms(xfa)
     end
 end
 
-def analyze_annotation(annot, level = 0)
+def analyze_annotation(annot, _level = 0)
     check_rights(:allowAnnotations)
 
     if annot.is_a?(Origami::Dictionary) and annot.has_key?(:Subtype)
@@ -193,7 +197,7 @@ def analyze_annotation(annot, level = 0)
                     u3dstream = dd[:"3DD"]
                 end
 
-                if u3dstream and u3dstream.has_field?(:OnInstantiate)
+                if u3dstream and u3dstream.key?(:OnInstantiate)
                     check_rights(:allowJS)
 
                     if annot.has_key?(:"3DA") # is 3d view instantiated automatically?
@@ -262,11 +266,11 @@ def analyze_action(action, triggered_at_opening, level = 0)
             check_rights(:allowGoToAction)
             dest = action[:D].is_a?(Origami::Reference) ? action[:D].solve : action[:D]
             if dest.is_a?(Origami::Array) and dest.length > 0 and dest.first.is_a?(Origami::Reference)
-              dest_page = dest.first.solve
-              if dest_page.is_a?(Origami::Page)
-                log(text_prefix + " Destination page found.")
-                analyze_page(dest_page, level + 1)
-              end
+                dest_page = dest.first.solve
+                if dest_page.is_a?(Origami::Page)
+                    log(text_prefix + " Destination page found.")
+                    analyze_page(dest_page, level + 1)
+                end
             end
 
         when :GoToE
@@ -329,7 +333,10 @@ begin
 
     @pdf = Origami::PDF.read(TARGET,
         verbosity: Origami::Parser::VERBOSE_QUIET,
-        ignore_errors: SECURITY_POLICIES["POLICY_#{@options[:policy].upcase}"]['allowParserErrors']
+        ignore_errors: SECURITY_POLICIES["POLICY_#{@options[:policy].upcase}"]['allowParserErrors'],
+        decrypt: SECURITY_POLICIES["POLICY_#{@options[:policy].upcase}"]['allowEncryption'],
+        prompt_password: lambda { '' },
+        password: @options[:password]
     )
 
     log("> Inspecting document structure...", :yellow)

data/bin/pdfextract

@@ -135,7 +135,13 @@ begin
 
         pdf.root_objects.find_all{|obj| obj.is_a?(Stream)}.each do |stream|
             stream_file = File.join(stream_dir, "stream_#{stream.reference.refno}.dmp")
-            File.binwrite(stream_file, stream.data)
+            begin
+                File.binwrite(stream_file, stream.data)
+            rescue
+                STDERR.puts "Cannot decode stream #{stream.reference}: #{$!.message}"
+                next
+            end
+
             nstreams += 1
         end
 
@@ -161,7 +167,7 @@ begin
 
         # Also checking for presence of JavaScript in XML forms.
         if pdf.form? and pdf.Catalog.AcroForm.has_key?(:XFA)
-            xfa = pdf.Catalog.AcroForm[:XFA].solve
+            xfa = pdf.Catalog.AcroForm.XFA
 
             case xfa
             when Array then
@@ -197,10 +203,11 @@ begin
         Dir::mkdir(attachments_dir) unless File.directory?(attachments_dir)
 
         pdf.each_attachment do |name, attachment|
+            name = name.to_utf8.tr("\/\x00", "_")
             attached_file = File.join(attachments_dir, "attached_#{File.basename(name)}")
-            spec = attachment.solve
-            if spec and spec.EF and f = spec.EF.F and f.is_a?(Stream)
-                File.binwrite(attached_file, f.data)
+
+            if attachment and attachment.EF and attachment.EF.F.is_a?(Stream)
+                File.binwrite(attached_file, attachment.EF.F.data)
                 nattach += 1
             end
         end
@@ -257,6 +264,7 @@ begin
                 nimages += 1
             rescue
                 STDERR.puts "Unable to decode image (stream #{stream.reference.refno}). #{$!.message}"
+                STDERR.puts $!.backtrace.join($/)
             end
         end
 
@@ -264,5 +272,6 @@ begin
     end
 
 rescue
+    STDERR.puts $!.backtrace.join($/)
     abort "#{$!.class}: #{$!.message}"
 end