Don't embed default font in case of PDFA signing

DEVSIX-7850

Author: guustysebie

forms/src/main/java/com/itextpdf/forms/fields/PdfFormAnnotation.java

@@ -1100,6 +1100,9 @@ private boolean fontRequiredForRegeneration() {
         if (parent instanceof PdfButtonFormField) {
             return ((PdfButtonFormField) parent).isPushButton();
         }
+        if (parent instanceof PdfSignatureFormField) {
+            return false;
+        }
         return true;
     }
 

forms/src/test/java/com/itextpdf/forms/form/element/SignatureFieldAppearanceTest.java

@@ -34,6 +34,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.image.ImageDataFactory;
 import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.kernel.colors.ColorConstants;
+import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDictionary;
 import com.itextpdf.kernel.pdf.PdfDocument;
@@ -50,6 +51,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.element.List;
 import com.itextpdf.layout.element.ListItem;
 import com.itextpdf.layout.element.Paragraph;
+import com.itextpdf.layout.exceptions.LayoutExceptionMessageConstant;
 import com.itextpdf.layout.properties.AlignmentPropertyValue;
 import com.itextpdf.layout.properties.BoxSizingPropertyValue;
 import com.itextpdf.layout.properties.FlexDirectionPropertyValue;
@@ -64,13 +66,14 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.io.IOException;
-
 @Category(IntegrationTest.class)
 public class SignatureFieldAppearanceTest extends ExtendedITextTest {
     public static final String SOURCE_FOLDER =
@@ -390,6 +393,43 @@ public void borderTypesTest() throws IOException, InterruptedException {
         Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, DESTINATION_FOLDER));
     }
 
+    @Test
+    public void fontSizeTest() throws IOException, InterruptedException {
+        String outPdf = DESTINATION_FOLDER + "fontSizeTest.pdf";
+        String cmpPdf = SOURCE_FOLDER + "cmp_fontSizeTest.pdf";
+        try (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) {
+            SignatureFieldAppearance sigField = new SignatureFieldAppearance("SigField");
+            //TODO DEVSIX-7970 Fontsize doesn't get recalculate correctly in SignatureFieldAppearance making the signature look absent
+            sigField.setFontSize(20);
+            sigField.setContent("test");
+            document.add(sigField);
+        }
+        Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, DESTINATION_FOLDER));
+    }
+
+    @Test
+    public void fontNullCustomCheck() throws FileNotFoundException {
+        String outPdf = DESTINATION_FOLDER + "fontNullCustomCheck.pdf";
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outPdf)) {
+            @Override
+            public PdfFont getDefaultFont() {
+                return null;
+            }
+        };
+        Document document = new Document(pdfDoc);
+
+        SignatureFieldAppearance sigField = new SignatureFieldAppearance("SigField");
+        sigField.setContent("test");
+        sigField.setInteractive(true);
+        sigField.setBorder(new SolidBorder(ColorConstants.GREEN, 1));
+
+        Exception e = Assert.assertThrows(IllegalStateException.class, () -> {
+            document.add(sigField);
+        });
+        Assert.assertEquals(LayoutExceptionMessageConstant.INVALID_FONT_PROPERTY_VALUE, e.getMessage());
+
+    }
+
     @Test
     public void signatureOnRotatedPagesTest() throws IOException, InterruptedException {
         String outPdf = DESTINATION_FOLDER + "signatureOnRotatedPages.pdf";

forms/src/test/resources/com/itextpdf/forms/form/element/SignatureFieldAppearanceTest/cmp_fontSizeTest.pdf

@@ -53,6 +53,7 @@ public final class LayoutExceptionMessageConstant {
 
     public static final String INVALID_COLUMN_PROPERTIES =
             "Invalid column-count/column-width/column-gap properties, they're absent or have negative value";
+    public static final String INVALID_FONT_PROPERTY_VALUE = "Invalid FONT property value type.";
 
     private LayoutExceptionMessageConstant(){}
 }

layout/src/main/java/com/itextpdf/layout/exceptions/LayoutExceptionMessageConstant.java

@@ -1542,7 +1542,7 @@ protected boolean resolveFonts(List<IRenderer> addTo) {
             }
             return true;
         } else {
-            throw new IllegalStateException("Invalid FONT property value type.");
+            throw new IllegalStateException(LayoutExceptionMessageConstant.INVALID_FONT_PROPERTY_VALUE);
         }
     }
 

layout/src/main/java/com/itextpdf/layout/renderer/TextRenderer.java

@@ -22,18 +22,10 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.pdfa;
 
-import com.itextpdf.io.logs.IoLogMessageConstant;
-import com.itextpdf.kernel.font.PdfFont;
-import com.itextpdf.kernel.font.PdfFontFactory;
-import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.pdf.StampingProperties;
 
-import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * This class extends {@link PdfADocument} and serves as {@link PdfADocument} for
  * PDF/A compliant documents and as {@link com.itextpdf.kernel.pdf.PdfDocument}
@@ -45,7 +37,6 @@ This file is part of the iText (R) project.
  */
 public class PdfAAgnosticPdfDocument extends PdfADocument {
 
-    private PdfFont defaultFont;
 
     /**
      * Opens a PDF/A document in stamping mode.
@@ -67,28 +58,4 @@ public PdfAAgnosticPdfDocument (PdfReader reader, PdfWriter writer) {
     public PdfAAgnosticPdfDocument (PdfReader reader, PdfWriter writer, StampingProperties properties) {
         super(reader, writer, properties, true);
     }
-
-    /**
-     * Get default font for the document: Helvetica, WinAnsi.
-     * One instance per document.
-     *
-     * @return instance of {@link PdfFont} or {@code null} on error.
-     */
-    @Override
-    public PdfFont getDefaultFont() {
-        // TODO DEVSIX-7850 investigate embedding default font into PDF/A documents while signing
-        if (defaultFont == null) {
-            try {
-                defaultFont = PdfFontFactory.createFont();
-                if (writer != null) {
-                    defaultFont.makeIndirect(this);
-                }
-            } catch (IOException e) {
-                Logger logger = LoggerFactory.getLogger(PdfDocument.class);
-                logger.error(IoLogMessageConstant.EXCEPTION_WHILE_CREATING_DEFAULT_FONT, e);
-                defaultFont = null;
-            }
-        }
-        return defaultFont;
-    }
 }

pdfa/src/main/java/com/itextpdf/pdfa/PdfAAgnosticPdfDocument.java

@@ -120,7 +120,10 @@ public PdfADocument(PdfWriter writer, PdfAConformanceLevel conformanceLevel, Pdf
      */
     @Override
     public PdfFont getDefaultFont() {
-        return null;
+        if (isPdfADocument) {
+            return null;
+        }
+        return super.getDefaultFont();
     }
 
     /**

pdfa/src/main/java/com/itextpdf/pdfa/PdfADocument.java

@@ -32,18 +32,21 @@ This file is part of the iText (R) project.
 import com.itextpdf.forms.fields.PdfFormAnnotation;
 import com.itextpdf.forms.fields.PdfFormCreator;
 import com.itextpdf.forms.fields.PdfFormField;
+import com.itextpdf.forms.fields.PdfSignatureFormField;
 import com.itextpdf.forms.fields.PushButtonFormFieldBuilder;
 import com.itextpdf.forms.fields.RadioFormFieldBuilder;
 import com.itextpdf.forms.fields.SignatureFormFieldBuilder;
 import com.itextpdf.forms.fields.TextFormFieldBuilder;
 import com.itextpdf.forms.fields.properties.CheckBoxType;
+import com.itextpdf.forms.fields.properties.SignedAppearanceText;
 import com.itextpdf.forms.form.element.Button;
 import com.itextpdf.forms.form.element.CheckBox;
 import com.itextpdf.forms.form.element.ComboBoxField;
 import com.itextpdf.forms.form.element.IFormField;
 import com.itextpdf.forms.form.element.InputField;
 import com.itextpdf.forms.form.element.Radio;
 import com.itextpdf.forms.form.element.SelectFieldItem;
+import com.itextpdf.forms.form.element.SignatureFieldAppearance;
 import com.itextpdf.forms.form.element.TextArea;
 import com.itextpdf.io.font.PdfEncodings;
 import com.itextpdf.io.logs.IoLogMessageConstant;
@@ -667,6 +670,41 @@ public void testCopyPagesDoesntEmbedHelveticaFont() throws IOException, Interrup
 
     }
 
+    @Test
+    public void pdfASignatureFieldTestWithAndFontText() throws IOException, InterruptedException {
+        String name = "pdfASignatureFieldTestWithText";
+        String fileName = DESTINATION_FOLDER + name + ".pdf";
+        String cmp = SOURCE_FOLDER + "cmp/PdfAFormFieldTest/cmp_pdfASignatureFieldTestWithText.pdf";
+
+        PdfFont fontFreeSans = PdfFontFactory.createFont(SOURCE_FOLDER + "FreeSans.ttf",
+                "WinAnsi", EmbeddingStrategy.FORCE_EMBEDDED);
+
+        makePdfDocument(fileName, cmp, (pdfDoc) -> {
+            SignatureFieldAppearance signatureFieldAppearance = new SignatureFieldAppearance("Signature1");
+            signatureFieldAppearance.setContent(new SignedAppearanceText().setLocationLine("HEEELLLLLO"));
+            signatureFieldAppearance.setInteractive(true);
+            signatureFieldAppearance.setFont(fontFreeSans);
+            pdfDoc.add(signatureFieldAppearance);
+            PdfAcroForm form = PdfFormCreator.getAcroForm(pdfDoc.getPdfDocument(), true);
+            SignatureFormFieldBuilder signatureFormFieldBuilder = new SignatureFormFieldBuilder(pdfDoc.getPdfDocument(),
+                    "Signature2");
+
+            SignatureFieldAppearance signatureFieldAppearance2 = new SignatureFieldAppearance("Signature2");
+            signatureFieldAppearance2.setContent(new SignedAppearanceText().setLocationLine("Byeeee"));
+            signatureFieldAppearance2.setInteractive(true);
+
+            PdfSignatureFormField signatureFormField = signatureFormFieldBuilder.setWidgetRectangle(
+                            new Rectangle(200, 200, 40, 40))
+                    .setFont(fontFreeSans)
+                    .setConformanceLevel(PdfAConformanceLevel.PDF_A_4)
+                    .createSignature();
+            signatureFormField.getFirstFormAnnotation().setFormFieldElement(signatureFieldAppearance2);
+            form.addField(signatureFormField);
+
+        });
+
+    }
+
     private void makePdfDocument(String outPdf, String cmp, Consumer<Document> consumer)
             throws IOException, InterruptedException {
         PdfWriter writer = new PdfWriter(outPdf,