Merge branch 'master' into feature/mvn-build

Author: asturio

.github/workflows/maven.yml

@@ -10,8 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [21, 24, 25, 26, '27-ea'] 
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        java: [21, 25, '27-ea'] # Only LTS and latest
     name: Build with Java ${{ matrix.java }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5

openpdf-core/src/main/java/org/openpdf/text/html/HtmlWriter.java

@@ -329,7 +329,7 @@ public void open() {
         super.open();
         try {
             writeComment(Document.getVersion());
-            writeComment("CreationDate: " + new Date().toString());
+            writeComment("CreationDate: " + new Date());
             addTabs(1);
             writeEnd(HtmlTags.HEAD);
             addTabs(1);
@@ -467,7 +467,7 @@ protected void writeJavaScript(Header header) throws IOException {
         addTabs(2);
         writeStart(HtmlTags.SCRIPT);
         write(HtmlTags.LANGUAGE, HtmlTags.JAVASCRIPT);
-        if (markup.size() > 0) {
+        if (!markup.isEmpty()) {
             /* JavaScript reference example:
              *
              * <script language="JavaScript" src="/myPath/MyFunctions.js"/>
@@ -629,7 +629,7 @@ protected void write(Element element, int indent) throws IOException {
                 if (attributes != null && attributes.get(Chunk.NEWPAGE) != null) {
                     return;
                 }
-                boolean tag = isOtherFont(chunk.getFont()) || markup.size() > 0;
+                boolean tag = isOtherFont(chunk.getFont()) || !markup.isEmpty();
                 if (tag) {
                     // start span tag
                     addTabs(indent);

openpdf-core/src/main/java/org/openpdf/text/pdf/OcspClientBouncyCastle.java

@@ -85,7 +85,7 @@
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the MPL as stated above or under the terms of the GNU
- * Library General Public License as published by the Free Software Foundation;
+ * Library General Public License as published by the Free Software Foundation,
  * either version 2 of the License, or any later version.
  *
  * This library is distributed in the hope that it will be useful, but WITHOUT
@@ -108,8 +108,10 @@
 import java.math.BigInteger;
 import java.net.HttpURLConnection;
 import java.net.Proxy;
+import java.net.URI;
 import java.net.URL;
 import java.security.Provider;
+import java.security.SecureRandom;
 import java.security.Security;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
@@ -153,6 +155,7 @@ public class OcspClientBouncyCastle implements OcspClient {
      * HTTP proxy used to access the OCSP URL
      */
     private Proxy proxy;
+    private static final Random RANDOM_INSTANCE = new SecureRandom();
 
     /**
      * Creates an instance of an OcspClient that will be using BouncyCastle.
@@ -185,10 +188,6 @@ private static OCSPReq generateOCSPRequest(X509Certificate issuerCert,
         Security.addProvider(prov);
 
         // Generate the id for the certificate we are looking for
-        // OJO... Modificacion de
-        // Felix--------------------------------------------------
-        // CertificateID id = new CertificateID(CertificateID.HASH_SHA1, issuerCert,
-        // serialNumber);
         // Example from
         // http://grepcode.com/file/repo1.maven.org/maven2/org.bouncycastle/bcmail-jdk16/1.46/org/bouncycastle/cert/ocsp/test/OCSPTest.java
         DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder()
@@ -203,19 +202,10 @@ private static OCSPReq generateOCSPRequest(X509Certificate issuerCert,
 
         gen.addRequest(id);
 
-        // create details for nonce extension
-        // Vector oids = new Vector();
-        // Vector values = new Vector();
-        // oids.add(OCSPObjectIdentifiers.id_pkix_ocsp_nonce);
-        // values.add(new X509Extension(false, new DEROctetString(new
-        // DEROctetString(PdfEncryption.createDocumentId()).getEncoded())));
-        // gen.setRequestExtensions(new X509Extensions(oids, values));
-
         // Add nonce extension
         ExtensionsGenerator extGen = new ExtensionsGenerator();
         byte[] nonce = new byte[16];
-        Random rand = new Random();
-        rand.nextBytes(nonce);
+        RANDOM_INSTANCE.nextBytes(nonce);
 
         extGen.addExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false,
                 new DEROctetString(nonce));
@@ -236,7 +226,7 @@ public byte[] getEncoded() {
             OCSPReq request = generateOCSPRequest(rootCert,
                     checkCert.getSerialNumber());
             byte[] array = request.getEncoded();
-            URL urlt = new URL(url);
+            URL urlt = new URI(url).toURL();
             Proxy tmpProxy = proxy == null ? Proxy.NO_PROXY : proxy;
             HttpURLConnection con = (HttpURLConnection) urlt.openConnection(tmpProxy);
             con.setRequestProperty("Content-Type", "application/ocsp-request");

openpdf-core/src/main/java/org/openpdf/text/pdf/PdfReader.java

@@ -92,9 +92,13 @@ public class PdfReader implements PdfViewerPreferences, Closeable {
     static final PdfName[] pageInhCandidates = {PdfName.MEDIABOX,
             PdfName.ROTATE, PdfName.RESOURCES, PdfName.CROPBOX};
 
-    private static final byte[] endstream = PdfEncodings
-            .convertToBytes("endstream", null);
+    private static final String ENDSTREAM = "endstream";
+    private static final byte[] endstreamBytes = PdfEncodings
+            .convertToBytes(ENDSTREAM, null);
     private static final byte[] endobj = PdfEncodings.convertToBytes("endobj", null);
+    private static final String FALSE = "false";
+    private static final String ILLEGAL_LENGTH_VALUE = "illegal.length.value";
+    public static final String BAD_USER_PASSWORD = "bad.user.password";
     private final PdfViewerPreferencesImp viewerPreferences = new PdfViewerPreferencesImp();
     protected PRTokeniser tokens;
     // Each xref pair is a position
@@ -1482,12 +1486,12 @@ private void readDecryptedDocObj() throws IOException {
                     o = enc.get(PdfName.LENGTH);
                     if (!o.isNumber()) {
                         throw new InvalidPdfException(
-                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                                MessageLocalization.getComposedMessage(ILLEGAL_LENGTH_VALUE));
                     }
                     lengthValue = ((PdfNumber) o).intValue();
                     if (lengthValue > 128 || lengthValue < 40 || lengthValue % 8 != 0) {
                         throw new InvalidPdfException(
-                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                                MessageLocalization.getComposedMessage(ILLEGAL_LENGTH_VALUE));
                     }
                     cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
                     break;
@@ -1513,14 +1517,14 @@ private void readDecryptedDocObj() throws IOException {
                                         .getComposedMessage("no.compatible.encryption.found"));
                     }
                     PdfObject em = enc.get(PdfName.ENCRYPTMETADATA);
-                    if (em != null && em.toString().equals("false")) {
+                    if (em != null && em.toString().equals(FALSE)) {
                         cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
                     }
                     break;
                 case 6:
                     cryptoMode = PdfWriter.ENCRYPTION_AES_256_V3;
                     em = enc.get(PdfName.ENCRYPTMETADATA);
-                    if (em != null && em.toString().equals("false")) {
+                    if (em != null && em.toString().equals(FALSE)) {
                         cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
                     }
                     break;
@@ -1548,12 +1552,12 @@ private void readDecryptedDocObj() throws IOException {
                     o = enc.get(PdfName.LENGTH);
                     if (!o.isNumber()) {
                         throw new InvalidPdfException(
-                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                                MessageLocalization.getComposedMessage(ILLEGAL_LENGTH_VALUE));
                     }
                     lengthValue = ((PdfNumber) o).intValue();
                     if (lengthValue > 128 || lengthValue < 40 || lengthValue % 8 != 0) {
                         throw new InvalidPdfException(
-                                MessageLocalization.getComposedMessage("illegal.length.value"));
+                                MessageLocalization.getComposedMessage(ILLEGAL_LENGTH_VALUE));
                     }
                     cryptoMode = PdfWriter.STANDARD_ENCRYPTION_128;
                     recipients = (PdfArray) enc.get(PdfName.RECIPIENTS);
@@ -1582,7 +1586,7 @@ private void readDecryptedDocObj() throws IOException {
                                         .getComposedMessage("no.compatible.encryption.found"));
                     }
                     PdfObject em = dic.get(PdfName.ENCRYPTMETADATA);
-                    if (em != null && em.toString().equals("false")) {
+                    if (em != null && em.toString().equals(FALSE)) {
                         cryptoMode |= PdfWriter.DO_NOT_ENCRYPT_METADATA;
                     }
 
@@ -1634,7 +1638,7 @@ private void readDecryptedDocObj() throws IOException {
                     if (!equalsArray(uValue, decrypt.userKey,
                             (rValue == 3 || rValue == 4) ? 16 : 32)) {
                         throw new BadPasswordException(
-                                MessageLocalization.getComposedMessage("bad.user.password"));
+                                MessageLocalization.getComposedMessage(BAD_USER_PASSWORD));
                     }
                 } else {
                     ownerPasswordUsed = true;
@@ -1684,13 +1688,13 @@ decrypt it (revision 6 and later) - ISO 32000-2 section 7.6.4.3.3 */
                         // analog of step c of Algorithm 2.A for user password
                         hashAlg2B = decrypt.hashAlg2B(password, Arrays.copyOfRange(uValue, 32, 40), null);
                         if (!equalsArray(hashAlg2B, uValue, 32)) {
-                            throw new BadPasswordException(MessageLocalization.getComposedMessage("bad.user.password"));
+                            throw new BadPasswordException(MessageLocalization.getComposedMessage(BAD_USER_PASSWORD));
                         }
                         // step e of Algorithm 2.A
                         decrypt.setupByUserPassword(documentID, password, uValue, ueValue, oValue, oeValue, pValue);
                         // step f of Algorithm 2.A
                         if (!decrypt.decryptAndCheckPerms(permsValue)) {
-                            throw new BadPasswordException(MessageLocalization.getComposedMessage("bad.user.password"));
+                            throw new BadPasswordException(MessageLocalization.getComposedMessage(BAD_USER_PASSWORD));
                         }
                     }
                     pValue = decrypt.permissions;
@@ -1981,7 +1985,7 @@ private void checkPRStreamLength(PRStream stream) throws IOException {
                 String line = tokens.readString(20);
                 if (!line.startsWith("\nendstream")
                         && !line.startsWith("\r\nendstream")
-                        && !line.startsWith("\rendstream") && !line.startsWith("endstream")) {
+                        && !line.startsWith("\rendstream") && !line.startsWith(ENDSTREAM)) {
                     calc = true;
                 }
             }
@@ -1996,14 +2000,14 @@ private void checkPRStreamLength(PRStream stream) throws IOException {
                 if (!tokens.readLineSegment(tline)) {
                     break;
                 }
-                if (equalsn(tline, endstream)) {
+                if (equalsn(tline, endstreamBytes)) {
                     streamLength = pos - start;
                     break;
                 }
                 if (equalsn(tline, endobj)) {
                     tokens.seek(pos - 16);
                     String s = tokens.readString(16);
-                    int index = s.indexOf("endstream");
+                    int index = s.indexOf(ENDSTREAM);
                     if (index >= 0) {
                         pos = pos - 16 + index;
                     }
@@ -2523,7 +2527,7 @@ protected PdfObject readPRObject() throws IOException {
                         return new PdfBoolean(true);
                     } // else
                     return PdfBoolean.PDFTRUE;
-                } else if ("false".equals(sv)) {
+                } else if (FALSE.equals(sv)) {
                     if (readDepth == 0) {
                         return new PdfBoolean(false);
                     } // else
@@ -2985,6 +2989,7 @@ public int shuffleSubsetNames() {
      *
      * @return the subset prefix
      */
+    @SuppressWarnings("java:S2245") // weak random is here ok
     private String createRandomSubsetPrefix() {
         String s = "";
         for (int k = 0; k < 6; ++k) {

openpdf-renderer/src/main/java/org/openpdf/renderer/core/OpenPdfCorePageRenderer.java

@@ -40,9 +40,8 @@
 import org.openpdf.text.pdf.PdfString;
 
 /**
- * Renders a single PDF page to a {@link Graphics2D} surface, parsing the page's
- * content stream with {@code openpdf-core}'s {@link PdfContentParser} and
- * dispatching the resulting operators to Java2D drawing calls.
+ * Renders a single PDF page to a {@link Graphics2D} surface, parsing the page's content stream with
+ * {@code openpdf-core}'s {@link PdfContentParser} and dispatching the resulting operators to Java2D drawing calls.
  *
  * <p>This is the {@code openpdf-core}-driven Java2D rasterizer that backs
  * {@link OpenPdfCoreRenderer#renderPage(int, float)}.</p>
@@ -79,7 +78,9 @@ final class OpenPdfCorePageRenderer {
 
     private static final Logger LOG = Logger.getLogger(OpenPdfCorePageRenderer.class.getName());
 
-    /** Default user-space resolution of a PDF, in DPI. */
+    /**
+     * Default user-space resolution of a PDF, in DPI.
+     */
     private static final float PDF_USER_SPACE_DPI = 72f;
 
     private final Graphics2D g2;
@@ -115,8 +116,7 @@ private OpenPdfCorePageRenderer(Graphics2D g2, PdfDictionary resources) {
     }
 
     /**
-     * Renders the given page to {@code g2}, sized to {@code targetWidth x targetHeight}
-     * pixels at the requested DPI.
+     * Renders the given page to {@code g2}, sized to {@code targetWidth x targetHeight} pixels at the requested DPI.
      *
      * @param reader       the open PDF
      * @param pageNumber   1-based page number
@@ -198,8 +198,10 @@ private void processContent(byte[] contentBytes) throws IOException {
         }
     }
 
-    /** Dispatches one operator. Operands include the trailing operator literal at index size-1. */
-    private void dispatch(String op, List<PdfObject> operands) throws IOException {
+    /**
+     * Dispatches one operator. Operands include the trailing operator literal at index size-1.
+     */
+    private void dispatch(String op, List<PdfObject> operands) {
         switch (op) {
             // --- Graphics state ---
             case "q":
@@ -303,8 +305,7 @@ private void dispatch(String op, List<PdfObject> operands) throws IOException {
                 strokePath();
                 resetPath();
                 break;
-            case "f":
-            case "F":
+            case "f", "F":
                 fillPath(Path2D.WIND_NON_ZERO);
                 resetPath();
                 break;
@@ -530,23 +531,33 @@ private Font mapFont(CMapAwareDocumentFont docFont, float size) {
             String name = docFont.getPostscriptFontName();
             if (name != null) {
                 String lower = name.toLowerCase();
-                if (lower.contains("mono") || lower.contains("courier")) {
-                    family = Font.MONOSPACED;
-                } else if (lower.contains("sans") || lower.contains("helvetica")
-                        || lower.contains("arial")) {
-                    family = Font.SANS_SERIF;
-                }
-                if (lower.contains("bold")) {
-                    style |= Font.BOLD;
-                }
-                if (lower.contains("italic") || lower.contains("oblique")) {
-                    style |= Font.ITALIC;
-                }
+                family = detectFontFamily(lower, family);
+                style = detectStyles(lower, style);
             }
         }
         return new Font(family, style, 1).deriveFont(Math.max(size, 0.1f));
     }
 
+    private static int detectStyles(String lower, int style) {
+        if (lower.contains("bold")) {
+            style |= Font.BOLD;
+        }
+        if (lower.contains("italic") || lower.contains("oblique")) {
+            style |= Font.ITALIC;
+        }
+        return style;
+    }
+
+    private static String detectFontFamily(String lower, String family) {
+        if (lower.contains("mono") || lower.contains("courier")) {
+            family = Font.MONOSPACED;
+        } else if (lower.contains("sans") || lower.contains("helvetica")
+                || lower.contains("arial")) {
+            family = Font.SANS_SERIF;
+        }
+        return family;
+    }
+
     private CMapAwareDocumentFont lookupFont(String name) {
         if (resources == null) {
             return null;
@@ -597,8 +608,11 @@ private static float clamp01(float v) {
         return v;
     }
 
-    /** Mutable per-graphics-state snapshot. Not thread-safe. */
+    /**
+     * Mutable per-graphics-state snapshot. Not thread-safe.
+     */
     private static final class GState {
+
         Color fillColor = Color.BLACK;
         Color strokeColor = Color.BLACK;
         float lineWidth = 1.0f;