hexapdf 0.44.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b30b54b90222fbcc5469b23153efc4b15083797f527af6c5b34b3f6e161832d
-  data.tar.gz: 969c67ab85591e3b7ccad17023bd3bc820ea5effa4c01e53d254915ab1626d71
+  metadata.gz: f9c1a35d4ad93b48faa1f728bcddc91778da584c8d673e2f15557bd22050a438
+  data.tar.gz: 2ef8ca70891723643080a402f0808882f66f01a816c422477cc03fad34774859
 SHA512:
-  metadata.gz: b60934dd6534ccd019953b278fa188b77996634b3e3878332302b9a2acccfd13b493b57432cff2113b7cc7727f028f24301c2d050f9b908c1b43cf66fbdeebfd
-  data.tar.gz: fdd792109306bc7cf0e30bb2da770e58e81e333843e3c785a9a31873a296b7d027121b467b54a80405332735e99bdaf6b0d167c9eaf08dbc04a26922b890bb51
+  metadata.gz: 87c109bd8a6711b4df27a40c689a025d816075d6c68c21a1cc22924b5ae827cd44d98e45bff8f43c85403dd82d6a6e54b66c99bfe135298cba33292e9511a1fc
+  data.tar.gz: e0529e3e244be8366e722ea29ab06a8b922f18698526c79a28d5d11f02da5ee103cba71ecbc6882fefe3de27f02d38f8ce8b505fefbb45839069c74aefaed9ae

data/CHANGELOG.md

@@ -1,3 +1,62 @@
+## 0.46.0 - 2024-08-11
+
+### Added
+
+* [HexaPDF::DigitalSignature::CMSHandler#embedded_tsa_signature] to return the
+  embedded timestamp authority signature if any
+* [HexaPDF::DigitalSignature::Signing::DefaultHandler#signing_time] for setting
+  a custom signing time
+* [HexaPDF::Document#duplicate] for making an in-memory copy of a PDF document
+* Configuration option 'font.default' for setting the default font for the
+  document layout engine
+
+### Changed
+
+* [HexaPDF::Document::Layout::CellArgumentCollector#[]=] to allow stepped ranges
+* [HexaPDF::Document::Layout::ChildrenCollector] to also return the box when
+  creating and adding one to the list
+* [HexaPDF::Layout::InlineBox] to allow usage without predefined width
+* [HexaPDF::DigitalSignature::CMSHandler#verify] to recognize non-repudiation
+  signatures
+* [HexaPDF::DigitalSignature::CMSHandler#signing_time] to use time from an
+  embedded timestamp authority signature if possible
+* [HexaPDF::Layout::Box#fit] to return success for boxes with content
+  width/height of zero
+* [HexaPDF::Importer::copy] to optionally allow copying the catalog and page
+  tree nodes
+
+### Fixed
+
+* Setting of correct x-position in fit result for boxes with flow positioning
+* [HexaPDF::Layout::ListBox#fit] to respect the set height
+* CLI command `hexapdf inspect` to work in case of missing Unicde mappings
+* [HexaPDF::Type::AcroForm::Form#delete_field] to correctly work for fields with
+  an embedded widget
+* Parsing of "linearized" PDF files where the first cross-reference section
+  isn't actually used
+* [HexaPDF::Layout::PageStyle#create_page] to return new frame objects on each
+  invocation
+
+
+## 0.45.0 - 2024-06-18
+
+### Added
+
+* [HexaPDF::Document::Layout#styles] and [HexaPDF::Composer#styles] for defining
+  multiple styles at once
+
+### Changed
+
+* [HexaPDF::Layout::Box#fit] to set width/height correctly for boxes with
+  position `:flow`
+
+### Fixed
+
+* Regression in [HexaPDF::Layout::ListBox] that leads to missing markers
+* [HexaPDF::Content::CanvasComposer#draw_box] to handle truncated boxes
+* [HexaPDF::Layout::TableBox::Cell] to handle too-big content in all cases
+
+
 ## 0.44.0 - 2024-06-05
 
 ### Added
@@ -356,8 +415,8 @@
 
 ### Fixed
 
-* [HexaPDF::Document::Pages#add_labelling_range] to add a correct entry for
-  the default range starting at page 1
+* [HexaPDF::Document::Pages#add_labelling_range] to add a correct entry for the
+  default range starting at page 1
 * [HexaPDF::Type::Page#flatten_annotations] to correctly handle scaled
   appearances
 * Using an unknown style name in [HexaPDF:Document::Layout] method by providing
@@ -368,6 +427,8 @@
   than the item content height
 * [HexaPDF::Dictionary] setting default values on wrong classes in certain
   situations
+* [HexaPDF::Importer#import] to correctly import stream objects backed by a
+  [HexaPDF::FiberDoubleForString]
 
 
 ## 0.33.0 - 2023-08-02
@@ -420,8 +481,8 @@
 * [HexaPDF::Content::Canvas#text] to set the leading only when multiple lines
   are drawn
 * [HexaPDF::Layout::TextBox#split] to use float comparison
-* Validation of standard encryption dictionary to auto-correct invalid /U and
-  /O fields in case they are padded with zeros
+* Validation of standard encryption dictionary to auto-correct invalid /U and /O
+  fields in case they are padded with zeros
 * [HexaPDF::Document#wrap] handling of sub-type mapping in case of missing type
 * [HexaPDF::Type::AcroForm::AppearanceGenerator] to also take a text field
   widget's width into account when auto-sizing
@@ -742,8 +803,8 @@
 * Support for the document outline
 * [HexaPDF::Layout::Style#line_height] for setting a custom line height
   independent of the font size
-* [HexaPDF::Document::Destinations#use_or_create] as unified interface for
-  using or creating destinations
+* [HexaPDF::Document::Destinations#use_or_create] as unified interface for using
+  or creating destinations
 * [HexaPDF::Document::Destinations::Destination#valid?] and class method for
   checking whether a destination array is valid
 
@@ -752,8 +813,8 @@
 * Calculation of text related [HexaPDF::Layout::Style] values for Type3 fonts
 * [HexaPDF::Encryption::SecurityHandler#encrypt_string] to either return a
   dupped or encrypted string
-* [HexaPDF::Layout::TextLayouter#fit] to avoid infinite loop when encountering
-  a non-zero width breakpoint penalty
+* [HexaPDF::Layout::TextLayouter#fit] to avoid infinite loop when encountering a
+  non-zero width breakpoint penalty
 * [HexaPDF::Type::ObjectStream] to parse the initial stream data right after
   initialization to avoid access errors
 * [HexaPDF::Revisions::from_io] to merge a completely empty revision with just a
@@ -835,8 +896,7 @@
   fragment if there would not be enough height left anyway
 * [HexaPDF::Layout::WidthFromPolygon] to work correctly in case of very small
   floating point errors
-* HexaPDF::Layout::TextFragment#inspect to work in case of interspersed
-  numbers
+* HexaPDF::Layout::TextFragment#inspect to work in case of interspersed numbers
 * [HexaPDF::Layout::TextBox#split] to work for position :flow when box is wider
   than the initial available width
 * [HexaPDF::Layout::Frame#fit] to create minimally sized mask rectangles
@@ -1118,8 +1178,8 @@
   dictionary are indirect objects
 * [HexaPDF::Content::GraphicObject::EndpointArc] to correctly determine the
   start and end points
-* HexaPDF::Dictionary#perform_validation to correctly handle objects that
-  should not be indirect objects
+* HexaPDF::Dictionary#perform_validation to correctly handle objects that should
+  not be indirect objects
 
 
 ## 0.17.3 - 2021-10-31
@@ -1241,8 +1301,8 @@
 
 ### Fixed
 
-* [HexaPDF::Type::Annotation#appearance] to handle cases where there is
-  no valid appearance stream
+* [HexaPDF::Type::Annotation#appearance] to handle cases where there is no valid
+  appearance stream
 
 
 ## 0.15.3 - 2021-05-01
@@ -1297,8 +1357,8 @@
   empty background color arrays
 * [HexaPDF::Type::AcroForm::Field#delete_widget] to update the wrapper object
   stored in the document in case the widget is embedded
-* Processing of invalid PDF files containing a space,CR,LF combination after
-  the 'stream' keyword
+* Processing of invalid PDF files containing a space,CR,LF combination after the
+  'stream' keyword
 * Cross-reference stream reconstruction with respect to detection of linearized
   files
 * Detection of existing appearances for AcroForm push button fields when
@@ -1393,8 +1453,8 @@
 
 * [HexaPDF::Utils::ObjectHash#oids] to be public instead of private
 * Cross-reference table parsing to handle invalidly numbered main sections
-* [HexaPDF::Document#cache] and [HexaPDF::Object#cache] to allow updating
-  values for existing keys
+* [HexaPDF::Document#cache] and [HexaPDF::Object#cache] to allow updating values
+  for existing keys
 * Appearance creation methods of AcroForm objects to allow forcing the creation
   of new appearances
 * [HexaPDF::Type::AcroForm::AppearanceGenerator#create_text_appearances] to
@@ -1432,8 +1492,8 @@
   new 'parser.try_xref_reconstruction' option
 * Two new `hexapdf inspect` commands for showing page objects and page content
   streams by page number
-* Flag `--check` to the CLI command `hexapdf info` for checking a file for
-  parse and validation errors
+* Flag `--check` to the CLI command `hexapdf info` for checking a file for parse
+  and validation errors
 * [HexaPDF::Type::AcroForm::Field#embedded_widget?] for checking if a widget is
   embedded in the field object
 * [HexaPDF::Type::AcroForm::Field#delete_widget] for deleting a widget
@@ -1490,8 +1550,8 @@
 
 ### Added
 
-* [HexaPDF::Font::Encoding::Base#code] for retrieving the code for a given
-  glyph name
+* [HexaPDF::Font::Encoding::Base#code] for retrieving the code for a given glyph
+  name
 
 ### Fixed
 
@@ -1507,11 +1567,11 @@
   [HexaPDF::Type::AcroForm::Field]
 * [HexaPDF::Type::AcroForm::TextField] and
   [HexaPDF::Type::AcroForm::VariableTextField] for basic text field support
-* [HexaPDF::Type::AcroForm::ButtonField] for push button, radio button and
-  check box support
+* [HexaPDF::Type::AcroForm::ButtonField] for push button, radio button and check
+  box support
 * [HexaPDF::Type::AcroForm::ChoiceField] for combo box and list box support
-* [HexaPDF::Type::AcroForm::AppearanceGenerator] as central class for
-  generating appearance streams for form fields
+* [HexaPDF::Type::AcroForm::AppearanceGenerator] as central class for generating
+  appearance streams for form fields
 * Various convenience methods for [HexaPDF::Type::AcroForm::Form]
 * Various convenience methods for [HexaPDF::Type::AcroForm::Field]
 * Various convenience methods for [HexaPDF::Type::Annotations::Widget]
@@ -1530,8 +1590,8 @@
 * [HexaPDF::Type::Annotation::Border] class
 * [HexaPDF::Content::ColorSpace::device_color_from_specification] for easily
   getting a device color object
-* [HexaPDF::Content::ColorSpace::prenormalized_device_color] for getting a device
-  color object without normalizing values
+* [HexaPDF::Content::ColorSpace::prenormalized_device_color] for getting a
+  device color object without normalizing values
 * [HexaPDF::Type::Annotation#appearance] for returning the associated appearance
   dictionary
 * [HexaPDF::Type::Annotation#appearance?] for checking whether an appearance for
@@ -1650,8 +1710,8 @@
 
 ### Fixed
 
-* Conversion of [HexaPDF::Rectangle] type when the original is not a plain
-  Array but a [HexaPDF::PDFArray]
+* Conversion of [HexaPDF::Rectangle] type when the original is not a plain Array
+  but a [HexaPDF::PDFArray]
 
 
 ## 0.11.1 - 2019-11-19
@@ -1812,12 +1872,12 @@
 
 ### Added
 
-* [HexaPDF::Layout::Frame] for box positioning and easier text layouting
-  inside an arbitrary polygon
+* [HexaPDF::Layout::Frame] for box positioning and easier text layouting inside
+  an arbitrary polygon
 * [HexaPDF::Layout::TextBox] for displaying text in a rectangular and for
   flowing text inside a frame
-* [HexaPDF::Layout::WidthFromPolygon] for getting a width specification from
-  a polygon for use with the text layouting engine
+* [HexaPDF::Layout::WidthFromPolygon] for getting a width specification from a
+  polygon for use with the text layouting engine
 * [HexaPDF::Type::Image#width] and [HexaPDF::Type::Image#height] convenience
   methods
 * [HexaPDF::Type::FontType3] for Type 3 font support
@@ -1869,12 +1929,12 @@
   character in a text fragment is \r
 * [HexaPDF::Layout::TextLayouter] to work if an optional break point (think
   soft-hyphen) is followed by whitespace
-* [HexaPDF::Font::TrueType::Builder] to correctly order the entries in the
-  table directory
+* [HexaPDF::Font::TrueType::Builder] to correctly order the entries in the table
+  directory
 * [HexaPDF::Font::TrueType::Builder] to pad the table data to achieve the
   correct alignment
-* [HexaPDF::Filter::FlateDecode] by removing the Zlib pools since they were
-  not thread safe
+* [HexaPDF::Filter::FlateDecode] by removing the Zlib pools since they were not
+  thread safe
 * All color space classes to accept the color space definition as argument to
   `::new`
 
@@ -1906,9 +1966,8 @@
 * Cross-reference subsection parsing can handle missing whitespace
 * Renamed HexaPDF::Layout::LineFragment to [HexaPDF::Layout::Line]
 * Renamed HexaPDF::Layout::TextBox to [HexaPDF::Layout::TextLayouter]
-* [HexaPDF::Layout::TextFragment::new] and
-  [HexaPDF::Layout::TextLayouter::new] to either take a Style object or
-  style options
+* [HexaPDF::Layout::TextFragment::new] and [HexaPDF::Layout::TextLayouter::new]
+  to either take a Style object or style options
 * [HexaPDF::Layout::TextLayouter#fit] method signature
 * [HexaPDF::Layout::InlineBox] to wrap a generic box
 * HexaPDF::Document::Fonts#load to [HexaPDF::Document::Fonts#add] for
@@ -1970,8 +2029,8 @@
 
 * Handling of invalid glyphs is done using the special
   [HexaPDF::Font::InvalidGlyph] class
-* Configuration option 'font.on_missing_glyph'; returns an invalid glyph
-  instead of raising an error
+* Configuration option 'font.on_missing_glyph'; returns an invalid glyph instead
+  of raising an error
 * Bounding box of TrueType glyphs without contours is set to `[0, 0, 0, 0]`
 * Ligature pairs for AFM fonts are stored like kerning pairs
 * Use TrueType configuration option 'font.true_type.unknown_format' in all
@@ -1988,8 +2047,8 @@
 
 * [HexaPDF::Task::Dereference] to work correctly when encountering invalid
   references
-* [HexaPDF::Tokenizer] and HexaPDF::Content::Tokenizer to parse a solitary
-  plus sign
+* [HexaPDF::Tokenizer] and HexaPDF::Content::Tokenizer to parse a solitary plus
+  sign
 * Usage of Strings instead of Symbols for AFM font kerning and ligature pairs
 * Processing the contents of form XObjects in case they don't have a resources
   dictionary
@@ -2012,8 +2071,8 @@
 * CLI option `--verbose` for more verbose output; also changed the default
   verbosity level to only display warnings and not informational messages
 * CLI option `--quiet` for suppressing additional and diagnostic output
-* CLI option `--strict` for enabling strict parsing and validation; also
-  changed the default from strict to non-strict parsing/validation
+* CLI option `--strict` for enabling strict parsing and validation; also changed
+  the default from strict to non-strict parsing/validation
 * CLI optimization option `--optimize-fonts` for optimizing embedded fonts
 * Method `#word_spacing_applicable?` to font types
 * Support for marked-content points and sequences in [HexaPDF::Content::Canvas]

data/examples/019-acro_form.rb

@@ -6,6 +6,11 @@
 # This example show-cases how to create the various form field types and their
 # possible standard appearances.
 #
+# The [HexaPDF::Type::AcroForm::Form] and [HexaPDF::Type::AcroForm::Field]
+# classes provide a plethora of convenience methods for working with forms, like
+# for creating fields and their widgets, getting field properties like the full
+# hierarchical field name or for setting the field value.
+#
 # Usage:
 # : `ruby acro_form.rb`
 #

data/examples/027-composer_optional_content.rb

@@ -16,8 +16,10 @@
 require 'hexapdf'
 
 HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
-  composer.style(:question, font_size: 16, margin: [0, 0, 16], fill_color: 'hp-blue')
-  composer.style(:answer, font: 'ZapfDingbats', fill_color: "green")
+  composer.styles(
+    question: {font_size: 16, margin: [0, 0, 16], fill_color: 'hp-blue'},
+    answer: {font: 'ZapfDingbats', fill_color: "green"},
+  )
 
   all = composer.document.optional_content.ocg('All answers')
   a1 = composer.document.optional_content.ocg('Answer 1')
@@ -38,7 +40,7 @@ HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
           answers.text('Guido van Rossum')
           answers.multiple do |answer|
             answer.text('Yukihiro “Matz” Matsumoto', position: :float)
-            answer.text("\u{a0}\u{a0}4", style: :answer,
+            answer.text("\u{a0}\u{a0}✔", style: :answer,
                         properties: {'optional_content' => a1})
           end
           answers.text('Rob Pike')
@@ -54,7 +56,7 @@ HexaPDF::Composer.create('composer_optional_content.pdf') do |composer|
           answers.text('1992')
           answers.multiple do |answer|
             answer.text('1993', position: :float)
-            answer.text("\u{a0}\u{a0}4", style: :answer,
+            answer.text("\u{a0}\u{a0}✔", style: :answer,
                         properties: {'optional_content' => a2})
           end
         end

data/examples/030-pdfa.rb

@@ -28,17 +28,18 @@ HexaPDF::Composer.create('pdfa.pdf') do |composer|
   }
 
   # Define all styles
-  composer.style(:base, font: 'Lato', font_size: 10, line_spacing: 1.3)
-  composer.style(:top, font_size: 8)
-  composer.style(:top_box, padding: [100, 0, 0], margin: [0, 0, 10], border: {width: [0, 0, 1]})
-  composer.style(:header, font: 'Lato bold', font_size: 20, margin: [50, 0, 20])
-  composer.style(:line_items, border: {width: 1, color: "eee"}, margin: [20, 0])
-  composer.style(:line_item_cell, font_size: 8)
-  composer.style(:footer, border: {width: [1, 0, 0], color: "darkgrey"},
-                 padding: [5, 0, 0], valign: :bottom)
-  composer.style(:footer_heading, font: 'Lato bold',
-                 font_size: 8, padding: [0, 0, 8])
-  composer.style(:footer_text,  font_size: 8, fill_color: "darkgrey")
+  composer.styles(
+    base: {font: 'Lato', font_size: 10, line_spacing: 1.3},
+    top: {font_size: 8},
+    top_box: {padding: [100, 0, 0], margin: [0, 0, 10], border: {width: [0, 0, 1]}},
+    header: {font: 'Lato bold', font_size: 20, margin: [50, 0, 20]},
+    line_items: {border: {width: 1, color: "eee"}, margin: [20, 0]},
+    line_item_cell: {font_size: 8},
+    footer: {border: {width: [1, 0, 0], color: "darkgrey"}, padding: [5, 0, 0],
+             valign: :bottom},
+    footer_heading: {font: 'Lato bold', font_size: 8, padding: [0, 0, 8]},
+    footer_text: {font_size: 8, fill_color: "darkgrey"},
+  )
 
   # Top part
   composer.box(:container, style: :top_box) do |container|

data/lib/hexapdf/cli/inspect.rb

@@ -117,6 +117,11 @@ module HexaPDF
 
       def execute(file, *commands) #:nodoc:
         with_document(file, password: @password) do |doc|
+          doc.config['font.on_missing_unicode_mapping'] = lambda do |code, font|
+            $stderr.puts("No Unicode mapping for code point #{code} in font #{font[:BaseFont]}, " \
+                         "using the Unicode replacement character")
+            "\u{FFFD}"
+          end
           @doc = doc
           if commands.empty?
             begin

data/lib/hexapdf/composer.rb

@@ -254,6 +254,28 @@ module HexaPDF
       @document.layout.style(name, base: base, **properties)
     end
 
+    # :call-seq:
+    #    composer.styles              -> styles
+    #    composer.styles(**mapping)   -> styles
+    #
+    # Creates multiple named styles at once if +mapping+ is provided, and returns the style mapping.
+    #
+    # See HexaPDF::Document::Layout#styles for details; this method is just a thin wrapper around
+    # that method.
+    #
+    # Example:
+    #
+    #   composer.styles(
+    #     base: {font_size: 12, leading: 1.2},
+    #     header: {font: 'Helvetica', fill_color: "008"},
+    #     header1: {base: :header, font_size: 30}
+    #   )
+    #
+    # See: HexaPDF::Layout::Style
+    def styles(**mapping)
+      @document.layout.styles(**mapping)
+    end
+
     # :call-seq:
     #    composer.page_style(name)                                 -> page_style
     #    composer.page_style(name, **attributes, &template_block)  -> page_style
@@ -428,7 +450,7 @@ module HexaPDF
             (box = draw_box; break) unless box
           elsif !@frame.find_next_region
             unless drawn_on_page
-              raise HexaPDF::Error, "Box doesn't fit on empty page"
+              raise HexaPDF::Error, "Box didn't fit multiple times, even on empty page"
             end
             new_page
             drawn_on_page = false

data/lib/hexapdf/configuration.rb

@@ -277,6 +277,13 @@ module HexaPDF
   #
   #    See PDF2.0 s7.4.1, ADB sH.3 3.3
   #
+  # font.default::
+  #    This font is used by the layout engine when no font is specified but one is needed.
+  #
+  #    This is used, for example, for the font set on styles that don't have a font set.
+  #
+  #    The default value is 'Times'.
+  #
   # font.fallback::
   #    An array of fallback font names to be used when replacing invalid glyphs.
   #
@@ -518,6 +525,7 @@ module HexaPDF
                         Crypt: 'HexaPDF::Filter::Crypt',
                         Encryption: 'HexaPDF::Filter::Encryption',
                       },
+                      'font.default' => 'Times',
                       'font.fallback' => ['ZapfDingbats', 'Symbol'],
                       'font.map' => {},
                       'font.on_invalid_glyph' => method(:font_on_invalid_glyph),

data/lib/hexapdf/content/canvas.rb

@@ -1127,7 +1127,7 @@ module HexaPDF
       #   canvas.rectangle(x, y, width, height, radius: 0)       => canvas
       #
       # Appends a rectangle to the current path as a complete subpath (drawn in counterclockwise
-      # direction), with the bottom left corner specified by +x+ and +y+ and the given +width+ and
+      # direction), with the bottom-left corner specified by +x+ and +y+ and the given +width+ and
       # +height+. Returns +self+.
       #
       # If +radius+ is greater than 0, the corners are rounded with the given radius.
@@ -1137,7 +1137,7 @@ module HexaPDF
       #
       # If there is no current path when the method is invoked, a new path is automatically begun.
       #
-      # The current point is set to the bottom left corner if +radius+ is zero, otherwise it is set
+      # The current point is set to the bottom-left corner if +radius+ is zero, otherwise it is set
       # to (x, y + radius).
       #
       # Examples:
@@ -1720,7 +1720,7 @@ module HexaPDF
       # If the filename or the IO specifies a PDF file, the first page of this file is used to
       # create a form XObject which is then drawn.
       #
-      # The +at+ argument has to be an array containing two numbers specifying the bottom left
+      # The +at+ argument has to be an array containing two numbers specifying the bottom-left
       # corner at which to draw the XObject.
       #
       # If +width+ and +height+ are specified, the drawn XObject will have exactly these

data/lib/hexapdf/content/canvas_composer.rb

@@ -96,6 +96,7 @@ module HexaPDF
             draw_box, box = @frame.split(result)
             if draw_box
               @frame.draw(@canvas, result)
+              (box = draw_box; break) unless box
             elsif !@frame.find_next_region
               raise HexaPDF::Error, "Frame for canvas composer is full and box doesn't fit anymore"
             end

data/lib/hexapdf/digital_signature/cms_handler.rb

@@ -59,7 +59,11 @@ module HexaPDF
 
       # Returns the time of signing.
       def signing_time
-        signer_info.signed_time rescue super
+        if embedded_tsa_signature
+          embedded_tsa_signature.signers.first.signed_time
+        else
+          signer_info.signed_time rescue super
+        end
       end
 
       # Returns the certificate chain.
@@ -78,6 +82,23 @@ module HexaPDF
         @pkcs7.signers.first
       end
 
+      # Returns the OpenSSL::PKCS7 object for the embedded TSA signature if there is one or +nil+
+      # otherwise.
+      def embedded_tsa_signature
+        return @embedded_tsa_signature if defined?(@embedded_tsa_signature)
+
+        @embedded_tsa_signature = nil
+        p7 = OpenSSL::ASN1.decode(signature_dict.contents.sub(/\x00*\z/, ''))
+        signed_data = p7.value[1].value[0]
+        signer_info = signed_data.value[-1].value[0] # first (and only) signer info
+        return unless signer_info.value[-1].tag == 1 # check for unsigned attributes
+        timestamp_token = signer_info.value[-1].value.find do |unsigned_attr|
+          unsigned_attr.value[0].value == "id-smime-aa-timeStampToken"
+        end
+        return unless timestamp_token
+        @embedded_tsa_signature = OpenSSL::PKCS7.new(timestamp_token.value[1].value[0])
+      end
+
       # Verifies the signature using the provided OpenSSL::X509::Store object.
       def verify(store, allow_self_signed: false)
         result = super
@@ -101,9 +122,16 @@ module HexaPDF
           return result
         end
 
+        if embedded_tsa_signature
+          result.log(:info, 'Signing time comes from timestamp authority')
+        end
+
         key_usage = signer_certificate.extensions.find {|ext| ext.oid == 'keyUsage' }
-        unless key_usage && key_usage.value.split(', ').include?("Digital Signature")
-          result.log(:error, "Certificate key usage is missing 'Digital Signature'")
+        key_usage = key_usage&.value&.split(', ')
+        if key_usage&.include?("Non Repudiation") && !key_usage.include?("Digital Signature")
+          result.log(:info, 'Certificate used for non-repudiation')
+        elsif !key_usage || !key_usage.include?("Digital Signature")
+          result.log(:error, "Certificate key usage is missing 'Digital Signature' or 'Non Repudiation'")
         end
 
         if signature_dict.signature_type == 'ETSI.RFC3161'

data/lib/hexapdf/digital_signature/signing/default_handler.rb

@@ -211,6 +211,13 @@ module HexaPDF
         # The contact information. If used, will be set on the signature dictionary.
         attr_accessor :contact_info
 
+        # The custom signing time.
+        #
+        # The signing time is usually the time when signing actually happens. This is also what
+        # HexaPDF uses. If it is known that signing happened at a different point in time, that time
+        # can be provided using this accessor.
+        attr_accessor :signing_time
+
         # The size of the serialized signature that should be reserved.
         #
         # If this attribute is not set, an empty string will be signed using #sign to determine the
@@ -277,7 +284,7 @@ module HexaPDF
         def finalize_objects(_signature_field, signature)
           signature[:Filter] = :'Adobe.PPKLite'
           signature[:SubFilter] = (signature_type == :pades ? :'ETSI.CAdES.detached' : :'adbe.pkcs7.detached')
-          signature[:M] = Time.now
+          signature[:M] = self.signing_time ||= Time.now
           signature[:Reason] = reason if reason
           signature[:Location] = location if location
           signature[:ContactInfo] = contact_info if contact_info
@@ -312,6 +319,7 @@ module HexaPDF
                                      type: signature_type,
                                      certificate: certificate, key: key,
                                      digest_algorithm: digest_algorithm,
+                                     signing_time: signing_time,
                                      timestamp_handler: timestamp_handler,
                                      certificates: certificate_chain, &external_signing).to_der
           else

data/lib/hexapdf/digital_signature/signing/signed_data_creator.rb

@@ -84,6 +84,9 @@ module HexaPDF
         # Allowed values: sha256, sha384, sha512.
         attr_accessor :digest_algorithm
 
+        # The signing time to use instead of Time.now.
+        attr_accessor :signing_time
+
         # The timestamp handler instance that should be used for timestamping.
         attr_accessor :timestamp_handler
 
@@ -119,9 +122,10 @@ module HexaPDF
 
         # Creates the set of signed attributes for the signer information structure.
         def create_signed_attrs(data, signing_time: true)
+          signing_time = (self.signing_time || Time.now).utc if signing_time
           set(
             attribute('content-type', oid('id-data')),
-            (attribute('id-signingTime', utc_time(Time.now.utc)) if signing_time),
+            (attribute('id-signingTime', utc_time(signing_time)) if signing_time),
             attribute(
               'message-digest',
               binary(OpenSSL::Digest.digest(@digest_algorithm, data))