saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-08-26 22:29:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

log issue

Browse Source
This commit is contained in:
Anthony Stirling 2025-07-02 11:50:33 +01:00
parent 377c795fd6
commit 2148556f94
4 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/stirling/software/common/util/ExceptionUtils.java
View File

@ -146,7 +146,6 @@ public class ExceptionUtils {
public static IllegalArgumentException createIllegalArgumentException( public static IllegalArgumentException createIllegalArgumentException(
String messageKey, String defaultMessage, Object... args) { String messageKey, String defaultMessage, Object... args) {
String message = I18nUtils.getMessage(messageKey, defaultMessage, args); String message = I18nUtils.getMessage(messageKey, defaultMessage, args);
System.out.println("######## Test " + message);
return new IllegalArgumentException(message); return new IllegalArgumentException(message);
} }

2
stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
View File

@ -227,8 +227,6 @@ public class EndpointConfiguration {
log.info( log.info(
"No endpoints disabled despite missing tools - fallback implementations available"); "No endpoints disabled despite missing tools - fallback implementations available");
} }
} }
public void init() { public void init() {

4
stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
View File

@ -601,7 +601,7 @@ public class CompressController {
if (bytesRead > 0) { if (bytesRead > 0) {
byte[] dataToHash = byte[] dataToHash =
bytesRead == buffer.length ? buffer : Arrays.copyOf(buffer, bytesRead); bytesRead == buffer.length ? buffer : Arrays.copyOf(buffer, bytesRead);
return bytesToHexString(generatMD5(dataToHash)); return bytesToHexString(generateMD5(dataToHash));
} }
return "empty-stream"; return "empty-stream";
} }
@ -619,7 +619,7 @@ public class CompressController {
return sb.toString(); return sb.toString();
} }
private byte[] generatMD5(byte[] data) throws IOException { private byte[] generateMD5(byte[] data) throws IOException {
try { try {
MessageDigest md = MessageDigest.getInstance("MD5"); MessageDigest md = MessageDigest.getInstance("MD5");
return md.digest(data); // Get the MD5 hash of the image bytes return md.digest(data); // Get the MD5 hash of the image bytes

60
stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
View File

@ -149,37 +149,35 @@ public class GetInfoOnPDF {
try { try {
PDMetadata pdMetadata = document.getDocumentCatalog().getMetadata(); PDMetadata pdMetadata = document.getDocumentCatalog().getMetadata();
if (pdMetadata != null) { if (pdMetadata != null) {
COSInputStream metaStream = pdMetadata.createInputStream(); try (COSInputStream metaStream = pdMetadata.createInputStream()) {
// First try to read raw metadata as string to check for standard keywords
byte[] metadataBytes = metaStream.readAllBytes();
String rawMetadata = new String(metadataBytes, StandardCharsets.UTF_8);
// First try to read raw metadata as string to check for standard keywords if (rawMetadata.contains(standardKeyword)) {
byte[] metadataBytes = metaStream.readAllBytes(); return true;
String rawMetadata = new String(metadataBytes, StandardCharsets.UTF_8); }
if (rawMetadata.contains(standardKeyword)) {
return true;
} }
// If raw check doesn't find it, try parsing with XMP parser // If raw check doesn't find it, try parsing with XMP parser
// Reset stream for parsing try (COSInputStream metaStream = pdMetadata.createInputStream()) {
metaStream.close(); try {
metaStream = pdMetadata.createInputStream(); DomXmpParser domXmpParser = new DomXmpParser();
XMPMetadata xmpMeta = domXmpParser.parse(metaStream);
try { ByteArrayOutputStream baos = new ByteArrayOutputStream();
DomXmpParser domXmpParser = new DomXmpParser(); new XmpSerializer().serialize(xmpMeta, baos, true);
XMPMetadata xmpMeta = domXmpParser.parse(metaStream); String xmpString = new String(baos.toByteArray(), StandardCharsets.UTF_8);
ByteArrayOutputStream baos = new ByteArrayOutputStream(); if (xmpString.contains(standardKeyword)) {
new XmpSerializer().serialize(xmpMeta, baos, true); return true;
String xmpString = new String(baos.toByteArray(), StandardCharsets.UTF_8); }
} catch (XmpParsingException e) {
if (xmpString.contains(standardKeyword)) { // XMP parsing failed, but we already checked raw metadata above
return true; log.debug(
"XMP parsing failed for standard check, but raw metadata was already checked: {}",
e.getMessage());
} }
} catch (XmpParsingException e) {
// XMP parsing failed, but we already checked raw metadata above
log.debug(
"XMP parsing failed for standard check, but raw metadata was already checked: {}",
e.getMessage());
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -409,20 +407,18 @@ public class GetInfoOnPDF {
if (pdMetadata != null) { if (pdMetadata != null) {
try { try {
COSInputStream is = pdMetadata.createInputStream(); try (COSInputStream is = pdMetadata.createInputStream()) {
try {
DomXmpParser domXmpParser = new DomXmpParser(); DomXmpParser domXmpParser = new DomXmpParser();
XMPMetadata xmpMeta = domXmpParser.parse(is); XMPMetadata xmpMeta = domXmpParser.parse(is);
ByteArrayOutputStream os = new ByteArrayOutputStream(); ByteArrayOutputStream os = new ByteArrayOutputStream();
new XmpSerializer().serialize(xmpMeta, os, true); new XmpSerializer().serialize(xmpMeta, os, true);
xmpString = new String(os.toByteArray(), StandardCharsets.UTF_8); xmpString = new String(os.toByteArray(), StandardCharsets.UTF_8);
} catch (XmpParsingException e) { }
// XMP parsing failed, try to read raw metadata instead } catch (XmpParsingException e) {
log.debug("XMP parsing failed, reading raw metadata: {}", e.getMessage()); // XMP parsing failed, try to read raw metadata instead
is.close(); log.debug("XMP parsing failed, reading raw metadata: {}", e.getMessage());
is = pdMetadata.createInputStream(); try (COSInputStream is = pdMetadata.createInputStream()) {
byte[] metadataBytes = is.readAllBytes(); byte[] metadataBytes = is.readAllBytes();
xmpString = new String(metadataBytes, StandardCharsets.UTF_8); xmpString = new String(metadataBytes, StandardCharsets.UTF_8);
} }