[RELEASE] iText pdfHtml 6.0.0

Author: iText-CI

Diff for: SECURITY.md

@@ -0,0 +1,40 @@
+# iText Security Policy
+
+## Reporting a Vulnerability
+
+We are committed to maintaining the security of our software. If you discover a security vulnerability, we encourage you to report it to us as soon as possible.
+
+To report a vulnerability, please visit our [Vulnerability Reporting Page](https://itextpdf.com/report-vulnerability), or email [[email protected]]([email protected]). If you do not receive a response in 2 business days, please follow up as we may not have received your message.
+
+We follow the procedure of Coordinated Vulnerability Disclosure (CVD) and, to protect the ecosystem, we request that those reporting do the same. Please visit the above page for more information, and follow the steps below to ensure that your report is handled promptly and appropriately:
+
+1. **Do not disclose the vulnerability publicly** until we have had a chance to address it.
+2. **Provide a detailed description** of the vulnerability, including steps to reproduce it, if possible.
+3. **Include any relevant information** such as the version of pdfHTML you are using, your operating system, and any other pertinent details.
+
+## Security Updates and Patches
+
+ When a vulnerability is reported, we will:
+
+1. **Investigate and verify** the vulnerability.
+2. **Develop and test** a fix for the vulnerability.
+3. **Release a patch** as soon as possible.
+
+## Known Vulnerabilities
+
+The iText Knowledge Base has a page for known [Common Vulnerabilities and Exposures](https://kb.itextpdf.com/itext/cves) (CVEs), please check it to ensure your vulnerability has not already been disclosed or addressed.
+
+## Supported product lines
+
+See [Compatibility Matrix](https://kb.itextpdf.com/itext/compatibility-matrix)
+
+
+## Security Best Practices
+
+To help ensure the security of your applications using pdfHTML, we recommend the following best practices:
+
+1. **Keep pdfHTML up to date** by regularly checking for and applying updates.
+2. **Review and follow** our security guidelines for secure usage.
+3. **Monitor your applications** for any unusual activity and investigate any anomalies promptly.
+
+Thank you for helping us keep iText secure!

Diff for: pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>8.0.5</version>
+    <version>9.0.0</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>5.0.5</version>
+  <version>6.0.0</version>
 
   <name>pdfHTML</name>
   <description>pdfHTML is an iText add-on that lets you to parse (X)HTML snippets and the associated CSS and converts

Diff for: src/main/java/com/itextpdf/html2pdf/ConverterProperties.java

@@ -26,7 +26,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.attach.ITagWorkerFactory;
 import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
 import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
-import com.itextpdf.kernel.pdf.PdfAConformanceLevel;
+import com.itextpdf.kernel.pdf.PdfAConformance;
 import com.itextpdf.kernel.pdf.PdfOutputIntent;
 import com.itextpdf.layout.font.FontProvider;
 import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
@@ -115,9 +115,9 @@ public class ConverterProperties {
     private PdfOutputIntent outputIntent;
 
     /**
-     * Conformance level for conversion to pdf/a.
+     * Conformance for conversion to pdf/a.
      */
-    private PdfAConformanceLevel conformanceLevel;
+    private PdfAConformance aConformance;
 
     /**
      * Instantiates a new {@link ConverterProperties} instance.
@@ -429,14 +429,14 @@ public ConverterProperties setDocumentOutputIntent(PdfOutputIntent outputIntent)
 
     /**
      * Sets the generation and strictness level of the PDF/A that must be followed.
-     * Required parameter, when converting to pdf/a one have to specify an explicit pdf/a conformance level.
+     * Required parameter, when converting to pdf/a one have to specify an explicit pdf/a conformance.
      *
-     * @param conformanceLevel a {@link PdfAConformanceLevel} constant
+     * @param conformance a {@link PdfAConformance} constant
      *
      * @return the {@link ConverterProperties} instance
      */
-    public ConverterProperties setPdfAConformanceLevel(PdfAConformanceLevel conformanceLevel) {
-        this.conformanceLevel = conformanceLevel;
+    public ConverterProperties setPdfAConformance(PdfAConformance conformance) {
+        this.aConformance = conformance;
         return this;
     }
 
@@ -456,10 +456,10 @@ public PdfOutputIntent getDocumentOutputIntent() {
     /**
      * Gets the generation and strictness level of the PDF/A that must be followed.
      *
-     * @return pdf/a conformance level
+     * @return pdf/a conformance
      */
-    public PdfAConformanceLevel getConformanceLevel() {
-        return conformanceLevel;
+    public PdfAConformance getPdfAConformance() {
+        return aConformance;
     }
 
     /**

Diff for: src/main/java/com/itextpdf/html2pdf/HtmlConverter.java

@@ -28,11 +28,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.exceptions.Html2PdfException;
 import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
 import com.itextpdf.kernel.pdf.DocumentProperties;
-import com.itextpdf.kernel.pdf.PdfAConformanceLevel;
 import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfVersion;
 import com.itextpdf.kernel.pdf.PdfWriter;
-import com.itextpdf.kernel.pdf.WriterProperties;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.IElement;
 import com.itextpdf.layout.properties.Property;
@@ -48,8 +45,6 @@ This file is part of the iText (R) project.
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -61,9 +56,6 @@ This file is part of the iText (R) project.
  * {@link PdfDocument} instance.
  */
 public class HtmlConverter {
-
-    private static final List<PdfAConformanceLevel> pdf2ConformanceLevels = new ArrayList<>(Arrays. asList(PdfAConformanceLevel.PDF_A_4, PdfAConformanceLevel.PDF_A_4E, PdfAConformanceLevel.PDF_A_4F));
-
     /**
      * Instantiates a new HtmlConverter instance.
      */
@@ -90,10 +82,6 @@ public static void convertToPdf(String html, OutputStream pdfStream) {
      * @param converterProperties a {@link ConverterProperties} instance
      */
     public static void convertToPdf(String html, OutputStream pdfStream, ConverterProperties converterProperties) {
-        if (converterProperties != null && pdf2ConformanceLevels.contains(converterProperties.getConformanceLevel())) {
-            convertToPdf(html, new PdfWriter(pdfStream, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)), converterProperties);
-            return;
-        }
         convertToPdf(html, new PdfWriter(pdfStream), converterProperties);
     }
 
@@ -117,16 +105,16 @@ public static void convertToPdf(String html, PdfWriter pdfWriter) {
      * @param converterProperties a {@link ConverterProperties} instance
      */
     public static void convertToPdf(String html, PdfWriter pdfWriter, ConverterProperties converterProperties) {
-        if (converterProperties == null || converterProperties.getConformanceLevel() == null) {
+        if (converterProperties == null || converterProperties.getPdfAConformance() == null) {
             convertToPdf(html, new PdfDocument(pdfWriter, new DocumentProperties()
                     .setEventCountingMetaInfo(resolveMetaInfo(converterProperties))), converterProperties);
             return;
         }
-        PdfDocument document = new PdfADocument(pdfWriter, converterProperties.getConformanceLevel(),
+        PdfDocument document = new PdfADocument(pdfWriter, converterProperties.getPdfAConformance(),
                 converterProperties.getDocumentOutputIntent(), new DocumentProperties()
                 .setEventCountingMetaInfo(resolveMetaInfo(converterProperties)));
         converterProperties = setDefaultFontProviderForPdfA(document, converterProperties);
-        if ("A".equals(converterProperties.getConformanceLevel().getConformance())) {
+        if ("A".equals(converterProperties.getPdfAConformance().getLevel())) {
             document.setTagged();
         }
         convertToPdf(html, document, converterProperties);
@@ -202,10 +190,6 @@ public static void convertToPdf(InputStream htmlStream, OutputStream pdfStream)
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static void convertToPdf(InputStream htmlStream, OutputStream pdfStream, ConverterProperties converterProperties) throws IOException {
-        if (converterProperties != null && pdf2ConformanceLevels.contains(converterProperties.getConformanceLevel())) {
-            convertToPdf(htmlStream, new PdfWriter(pdfStream, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)), converterProperties);
-            return;
-        }
         convertToPdf(htmlStream, new PdfWriter(pdfStream), converterProperties);
     }
 
@@ -245,16 +229,16 @@ public static void convertToPdf(InputStream htmlStream, PdfWriter pdfWriter) thr
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static void convertToPdf(InputStream htmlStream, PdfWriter pdfWriter, ConverterProperties converterProperties) throws IOException {
-        if (converterProperties == null || converterProperties.getConformanceLevel() == null) {
+        if (converterProperties == null || converterProperties.getPdfAConformance() == null) {
             convertToPdf(htmlStream, new PdfDocument(pdfWriter, new DocumentProperties().setEventCountingMetaInfo(
                     resolveMetaInfo(converterProperties))), converterProperties);
             return;
         }
-        PdfDocument document = new PdfADocument(pdfWriter, converterProperties.getConformanceLevel(),
+        PdfDocument document = new PdfADocument(pdfWriter, converterProperties.getPdfAConformance(),
                 converterProperties.getDocumentOutputIntent(), new DocumentProperties()
                 .setEventCountingMetaInfo(resolveMetaInfo(converterProperties)));
         converterProperties = setDefaultFontProviderForPdfA(document, converterProperties);
-        if ("A".equals(converterProperties.getConformanceLevel().getConformance())) {
+        if ("A".equals(converterProperties.getPdfAConformance().getLevel())) {
             document.setTagged();
         }
         convertToPdf(htmlStream, document, converterProperties);
@@ -446,7 +430,7 @@ private static ConverterProperties setDefaultFontProviderForPdfA(PdfDocument doc
             if (properties.getFontProvider() == null) {
                 properties.setFontProvider(new DefaultFontProvider(false, true, false));
             }
-        } else if (document == null && properties != null && properties.getConformanceLevel() != null) {
+        } else if (document == null && properties != null && properties.getPdfAConformance() != null) {
             if (properties.getFontProvider() == null) {
                 properties.setFontProvider(new DefaultFontProvider(false, true, false));
             }

Diff for: src/main/java/com/itextpdf/html2pdf/actions/data/PdfHtmlProductData.java

@@ -30,7 +30,7 @@ This file is part of the iText (R) project.
  */
 public final class PdfHtmlProductData {
     private static final String PDF_HTML_PUBLIC_PRODUCT_NAME = "pdfHTML";
-    private static final String PDF_HTML_VERSION = "5.0.5";
+    private static final String PDF_HTML_VERSION = "6.0.0";
     private static final int PDF_HTML_COPYRIGHT_SINCE = 2000;
     private static final int PDF_HTML_COPYRIGHT_TO = 2024;
 

Diff for: src/main/java/com/itextpdf/html2pdf/attach/ProcessorContext.java

@@ -36,8 +36,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.resolver.form.RadioCheckResolver;
 import com.itextpdf.html2pdf.resolver.resource.HtmlResourceResolver;
 import com.itextpdf.io.font.FontProgram;
-import com.itextpdf.kernel.pdf.IConformanceLevel;
-import com.itextpdf.kernel.pdf.PdfAConformanceLevel;
+import com.itextpdf.kernel.pdf.PdfConformance;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.layout.font.FontInfo;
 import com.itextpdf.layout.font.FontProvider;
@@ -134,9 +133,9 @@ public class ProcessorContext {
     private PdfDocument pdfDocument;
 
     /**
-     * PDF/A conformance level from {@link ConverterProperties} instance.
+     * PDF/A conformance from {@link ConverterProperties} instance.
      */
-    private final PdfAConformanceLevel pdfAConformanceLevelFromProperties;
+    private final PdfConformance pdfAConformanceFromProperties;
 
     /**
      * The Processor meta info
@@ -206,7 +205,7 @@ public ProcessorContext(ConverterProperties converterProperties) {
         formFieldNameResolver = new FormFieldNameResolver();
         radioCheckResolver = new RadioCheckResolver();
         immediateFlush = converterProperties.isImmediateFlush();
-        pdfAConformanceLevelFromProperties = converterProperties.getConformanceLevel();
+        pdfAConformanceFromProperties = new PdfConformance(converterProperties.getPdfAConformance());
         processingInlineSvg = false;
         continuousContainerEnabled = converterProperties.isContinuousContainerEnabled();
     }
@@ -248,12 +247,12 @@ public PdfDocument getPdfDocument() {
     }
 
     /**
-     * Get the PDF document conformance level if specified.
+     * Get the PDF document conformance.
      *
-     * @return the {@link PdfAConformanceLevel} will be null if the processing result won't follow PDF/A strictness
+     * @return the {@link PdfConformance}
      */
-    public IConformanceLevel getConformanceLevel() {
-        return pdfDocument == null ? pdfAConformanceLevelFromProperties : pdfDocument.getConformanceLevel();
+    public PdfConformance getConformance() {
+        return pdfDocument == null ? pdfAConformanceFromProperties : pdfDocument.getConformance();
     }
 
     /**