\n");
html.append(
@@ -320,7 +316,7 @@ public class EmlToPdf {
// Show advanced features status if requested
assert request != null;
- if (request != null && request.getFileInput().isEmpty()) {
+ if (request.getFileInput().isEmpty()) {
html.append("
\n");
html.append(
"
Note: Some advanced features require Jakarta Mail"
@@ -345,8 +341,10 @@ public class EmlToPdf {
sessionClass.getMethod("getDefaultInstance", Properties.class);
Object session = getDefaultInstance.invoke(null, new Properties());
+ // Cast the session object to the proper type for the constructor
+ Class[] constructorArgs = new Class[] {sessionClass, InputStream.class};
Constructor mimeMessageConstructor =
- mimeMessageClass.getConstructor(sessionClass, InputStream.class);
+ mimeMessageClass.getConstructor(constructorArgs);
Object message =
mimeMessageConstructor.newInstance(session, new ByteArrayInputStream(emlBytes));
@@ -493,7 +491,7 @@ public class EmlToPdf {
attachmentInfo
.append("")
.append("
")
- .append(MimeConstants.ATTACHMENT_ICON_PLACEHOLDER)
+ .append(MimeConstants.ATTACHMENT_MARKER)
.append(" ")
.append("
")
.append(escapeHtml(filename))
@@ -658,6 +656,10 @@ public class EmlToPdf {
}
private static String processEmailHtmlBody(String htmlBody) {
+ return processEmailHtmlBody(htmlBody, null);
+ }
+
+ private static String processEmailHtmlBody(String htmlBody, EmailContent emailContent) {
if (htmlBody == null) return "";
String processed = htmlBody;
@@ -666,10 +668,83 @@ public class EmlToPdf {
processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*fixed[^;]*;?", "");
processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*absolute[^;]*;?", "");
+ // Process inline images (cid: references) if we have email content with attachments
+ if (emailContent != null && !emailContent.getAttachments().isEmpty()) {
+ processed = processInlineImages(processed, emailContent);
+ }
+
return processed;
}
- private static void appendEnhancedStyles(StringBuilder html, EmlToPdfRequest request) {
+ private static String processInlineImages(String htmlContent, EmailContent emailContent) {
+ if (htmlContent == null || emailContent == null) return htmlContent;
+
+ // Create a map of Content-ID to attachment data
+ Map contentIdMap = new HashMap<>();
+ for (EmailAttachment attachment : emailContent.getAttachments()) {
+ if (attachment.isEmbedded()
+ && attachment.getContentId() != null
+ && attachment.getData() != null) {
+ contentIdMap.put(attachment.getContentId(), attachment);
+ }
+ }
+
+ if (contentIdMap.isEmpty()) return htmlContent;
+
+ // Pattern to match cid: references in img src attributes
+ Pattern cidPattern =
+ Pattern.compile(
+ "(?i)]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
+ Pattern.CASE_INSENSITIVE);
+ Matcher matcher = cidPattern.matcher(htmlContent);
+
+ StringBuffer result = new StringBuffer();
+ while (matcher.find()) {
+ String contentId = matcher.group(1);
+ EmailAttachment attachment = contentIdMap.get(contentId);
+
+ if (attachment != null && attachment.getData() != null) {
+ // Convert to data URI
+ String mimeType = attachment.getContentType();
+ if (mimeType == null || mimeType.isEmpty()) {
+ // Try to determine MIME type from filename
+ String filename = attachment.getFilename();
+ if (filename != null) {
+ if (filename.toLowerCase().endsWith(".png")) {
+ mimeType = "image/png";
+ } else if (filename.toLowerCase().endsWith(".jpg")
+ || filename.toLowerCase().endsWith(".jpeg")) {
+ mimeType = "image/jpeg";
+ } else if (filename.toLowerCase().endsWith(".gif")) {
+ mimeType = "image/gif";
+ } else if (filename.toLowerCase().endsWith(".bmp")) {
+ mimeType = "image/bmp";
+ } else {
+ mimeType = "image/png"; // fallback
+ }
+ } else {
+ mimeType = "image/png"; // fallback
+ }
+ }
+
+ String base64Data = Base64.getEncoder().encodeToString(attachment.getData());
+ String dataUri = "data:" + mimeType + ";base64," + base64Data;
+
+ // Replace the cid: reference with the data URI
+ String replacement =
+ matcher.group(0).replaceFirst("cid:" + Pattern.quote(contentId), dataUri);
+ matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
+ } else {
+ // Keep original if attachment not found
+ matcher.appendReplacement(result, Matcher.quoteReplacement(matcher.group(0)));
+ }
+ }
+ matcher.appendTail(result);
+
+ return result.toString();
+ }
+
+ private static void appendEnhancedStyles(StringBuilder html) {
int fontSize = StyleConstants.DEFAULT_FONT_SIZE;
String textColor = StyleConstants.DEFAULT_TEXT_COLOR;
String backgroundColor = StyleConstants.DEFAULT_BACKGROUND_COLOR;
@@ -851,7 +926,7 @@ public class EmlToPdf {
processMultipartAdvanced(messageContent, content, request);
}
} catch (Exception e) {
- log.warn("Error processing multipart content: {}", e.getMessage());
+ log.warn("Error processing content: {}", e.getMessage());
}
}
@@ -868,6 +943,12 @@ public class EmlToPdf {
private static void processMultipartAdvanced(
Object multipart, EmailContent content, EmlToPdfRequest request) {
try {
+ // Enhanced multipart type checking
+ if (!isValidJakartaMailMultipart(multipart)) {
+ log.warn("Invalid Jakarta Mail multipart type: {}", multipart.getClass().getName());
+ return;
+ }
+
Class multipartClass = multipart.getClass();
java.lang.reflect.Method getCount = multipartClass.getMethod("getCount");
int count = (Integer) getCount.invoke(multipart);
@@ -888,6 +969,11 @@ public class EmlToPdf {
private static void processPartAdvanced(
Object part, EmailContent content, EmlToPdfRequest request) {
try {
+ if (!isValidJakartaMailPart(part)) {
+ log.warn("Invalid Jakarta Mail part type: {}", part.getClass().getName());
+ return;
+ }
+
Class partClass = part.getClass();
java.lang.reflect.Method isMimeType = partClass.getMethod("isMimeType", String.class);
java.lang.reflect.Method getContent = partClass.getMethod("getContent");
@@ -921,10 +1007,18 @@ public class EmlToPdf {
String[] contentIdHeaders = (String[]) getHeader.invoke(part, "Content-ID");
if (contentIdHeaders != null && contentIdHeaders.length > 0) {
attachment.setEmbedded(true);
+ // Store the Content-ID, removing angle brackets if present
+ String contentId = contentIdHeaders[0];
+ if (contentId.startsWith("<") && contentId.endsWith(">")) {
+ contentId = contentId.substring(1, contentId.length() - 1);
+ }
+ attachment.setContentId(contentId);
}
- // Extract attachment data only if attachments should be included
- if (request != null && request.isIncludeAttachments()) {
+ // Extract attachment data if attachments should be included OR if it's an
+ // embedded image (needed for inline display)
+ if ((request != null && request.isIncludeAttachments())
+ || attachment.isEmbedded()) {
try {
Object attachmentContent = getContent.invoke(part);
byte[] attachmentData = null;
@@ -945,15 +1039,23 @@ public class EmlToPdf {
if (attachmentData != null) {
// Check size limit (use default 10MB if request is null)
- long maxSizeMB = request.getMaxAttachmentSizeMB();
+ long maxSizeMB =
+ request != null ? request.getMaxAttachmentSizeMB() : 10L;
long maxSizeBytes = maxSizeMB * 1024 * 1024;
if (attachmentData.length <= maxSizeBytes) {
attachment.setData(attachmentData);
attachment.setSizeBytes(attachmentData.length);
} else {
- // Still show attachment info even if too large
- attachment.setSizeBytes(attachmentData.length);
+ // For embedded images, always include data regardless of size
+ // to ensure inline display works
+ if (attachment.isEmbedded()) {
+ attachment.setData(attachmentData);
+ attachment.setSizeBytes(attachmentData.length);
+ } else {
+ // Still show attachment info even if too large
+ attachment.setSizeBytes(attachmentData.length);
+ }
}
}
} catch (Exception e) {
@@ -989,7 +1091,7 @@ public class EmlToPdf {
html.append("\n");
html.append("").append(escapeHtml(content.getSubject())).append("\n");
html.append("\n");
html.append("\n");
@@ -1013,7 +1115,7 @@ public class EmlToPdf {
html.append("\n");
if (content.getHtmlBody() != null && !content.getHtmlBody().trim().isEmpty()) {
- html.append(processEmailHtmlBody(content.getHtmlBody()));
+ html.append(processEmailHtmlBody(content.getHtmlBody(), content));
} else if (content.getTextBody() != null && !content.getTextBody().trim().isEmpty()) {
html.append("
");
html.append(convertTextToHtml(content.getTextBody()));
@@ -1046,7 +1148,7 @@ public class EmlToPdf {
.append(uniqueId)
.append("\">")
.append("")
- .append(MimeConstants.PAPERCLIP_EMOJI)
+ .append(MimeConstants.ATTACHMENT_MARKER)
.append(" ")
.append("")
.append(escapeHtml(safeMimeDecode(attachment.getFilename())))
@@ -1213,25 +1315,24 @@ public class EmlToPdf {
return;
}
- // 1. Find the screen position of all emoji anchors
- EmojiPositionFinder finder = new EmojiPositionFinder();
+ // 1. Find the screen position of all attachment markers
+ AttachmentMarkerPositionFinder finder = new AttachmentMarkerPositionFinder();
finder.setSortByPosition(true); // Process pages in order
finder.getText(document);
- List emojiPositions = finder.getPositions();
+ List markerPositions = finder.getPositions();
- // 2. Warn if the number of anchors and attachments don't match
- if (emojiPositions.size() != attachments.size()) {
+ // 2. Warn if the number of markers and attachments don't match
+ if (markerPositions.size() != attachments.size()) {
log.warn(
- "Found {} emoji anchors, but there are {} attachments. Annotation count may be"
- + " incorrect.",
- emojiPositions.size(),
+ "Found {} attachment markers, but there are {} attachments. Annotation count may be incorrect.",
+ markerPositions.size(),
attachments.size());
}
- // 3. Create an invisible annotation over each found emoji
- int annotationsToAdd = Math.min(emojiPositions.size(), attachments.size());
+ // 3. Create an invisible annotation over each found marker
+ int annotationsToAdd = Math.min(markerPositions.size(), attachments.size());
for (int i = 0; i < annotationsToAdd; i++) {
- EmojiPosition position = emojiPositions.get(i);
+ MarkerPosition position = markerPositions.get(i);
EmailAttachment attachment = attachments.get(i);
if (attachment.getEmbeddedFilename() != null) {
@@ -1366,8 +1467,6 @@ public class EmlToPdf {
}
}
- // MIME header decoding functionality for RFC 2047 encoded headers - moved to constants
-
private static String decodeMimeHeader(String encodedText) {
if (encodedText == null || encodedText.trim().isEmpty()) {
return encodedText;
@@ -1456,13 +1555,73 @@ public class EmlToPdf {
}
try {
- return decodeMimeHeader(headerValue.trim());
+ if (isJakartaMailAvailable()) {
+ // Use Jakarta Mail's MimeUtility for proper MIME decoding
+ Class mimeUtilityClass = Class.forName("jakarta.mail.internet.MimeUtility");
+ Method decodeText = mimeUtilityClass.getMethod("decodeText", String.class);
+ return (String) decodeText.invoke(null, headerValue.trim());
+ } else {
+ // Fallback to basic MIME decoding
+ return decodeMimeHeader(headerValue.trim());
+ }
} catch (Exception e) {
log.warn("Failed to decode MIME header, using original: {}", headerValue, e);
return headerValue;
}
}
+ private static boolean isValidJakartaMailPart(Object part) {
+ if (part == null) return false;
+
+ try {
+ // Check if the object implements jakarta.mail.Part interface
+ Class partInterface = Class.forName("jakarta.mail.Part");
+ if (!partInterface.isInstance(part)) {
+ return false;
+ }
+
+ // Additional check for MimePart
+ try {
+ Class mimePartInterface = Class.forName("jakarta.mail.internet.MimePart");
+ return mimePartInterface.isInstance(part);
+ } catch (ClassNotFoundException e) {
+ // MimePart not available, but Part is sufficient
+ return true;
+ }
+ } catch (ClassNotFoundException e) {
+ log.debug("Jakarta Mail Part interface not available for validation");
+ return false;
+ }
+ }
+
+ private static boolean isValidJakartaMailMultipart(Object multipart) {
+ if (multipart == null) return false;
+
+ try {
+ // Check if the object implements jakarta.mail.Multipart interface
+ Class multipartInterface = Class.forName("jakarta.mail.Multipart");
+ if (!multipartInterface.isInstance(multipart)) {
+ return false;
+ }
+
+ // Additional check for MimeMultipart
+ try {
+ Class mimeMultipartClass = Class.forName("jakarta.mail.internet.MimeMultipart");
+ if (mimeMultipartClass.isInstance(multipart)) {
+ log.debug("Found MimeMultipart instance for enhanced processing");
+ return true;
+ }
+ } catch (ClassNotFoundException e) {
+ log.debug("MimeMultipart not available, using base Multipart interface");
+ }
+
+ return true;
+ } catch (ClassNotFoundException e) {
+ log.debug("Jakarta Mail Multipart interface not available for validation");
+ return false;
+ }
+ }
+
@Data
public static class EmailContent {
private String subject;
@@ -1507,15 +1666,13 @@ public class EmlToPdf {
}
@Data
- public static class EmojiPosition {
+ public static class MarkerPosition {
private int pageIndex;
private float x;
private float y;
private String character;
- public EmojiPosition() {}
-
- public EmojiPosition(int pageIndex, float x, float y, String character) {
+ public MarkerPosition(int pageIndex, float x, float y, String character) {
this.pageIndex = pageIndex;
this.x = x;
this.y = y;
@@ -1523,14 +1680,15 @@ public class EmlToPdf {
}
}
- public static class EmojiPositionFinder extends org.apache.pdfbox.text.PDFTextStripper {
- @Getter private final List positions = new ArrayList<>();
+ public static class AttachmentMarkerPositionFinder
+ extends org.apache.pdfbox.text.PDFTextStripper {
+ @Getter private final List positions = new ArrayList<>();
private int currentPageIndex;
- private boolean sortByPosition;
+ protected boolean sortByPosition;
private boolean isInAttachmentSection;
private boolean attachmentSectionFound;
- public EmojiPositionFinder() throws IOException {
+ public AttachmentMarkerPositionFinder() {
super();
this.currentPageIndex = 0;
this.sortByPosition = false;
@@ -1573,24 +1731,18 @@ public class EmlToPdf {
isInAttachmentSection = false;
}
- // Only look for emojis if we are in the attachment section
+ // Only look for markers if we are in the attachment section
if (isInAttachmentSection) {
- // Look for paperclip emoji characters (U+1F4CE)
- String paperclipEmoji = "\uD83D\uDCCE"; // 📎 Unicode representation
-
- for (int i = 0; i < string.length(); i++) {
- // Check if we have a complete paperclip emoji at this position
- if (i < string.length() - 1
- && string.substring(i, i + 2).equals(paperclipEmoji)
- && i < textPositions.size()) {
-
+ String attachmentMarker = MimeConstants.ATTACHMENT_MARKER;
+ for (int i = 0; (i = string.indexOf(attachmentMarker, i)) != -1; i++) {
+ if (i < textPositions.size()) {
org.apache.pdfbox.text.TextPosition textPosition = textPositions.get(i);
- EmojiPosition position =
- new EmojiPosition(
+ MarkerPosition position =
+ new MarkerPosition(
currentPageIndex,
textPosition.getXDirAdj(),
textPosition.getYDirAdj(),
- paperclipEmoji);
+ attachmentMarker);
positions.add(position);
}
}
@@ -1602,16 +1754,5 @@ public class EmlToPdf {
public void setSortByPosition(boolean sortByPosition) {
this.sortByPosition = sortByPosition;
}
-
- public boolean isSortByPosition() {
- return sortByPosition;
- }
-
- public void reset() {
- positions.clear();
- currentPageIndex = 0;
- isInAttachmentSection = false;
- attachmentSectionFound = false;
- }
}
}
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
index c9872992a..2e7a197de 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
-
import stirling.software.common.model.ApplicationProperties;
@Service
@@ -142,6 +141,7 @@ public class EndpointConfiguration {
addEndpointToGroup("Convert", "markdown-to-pdf");
addEndpointToGroup("Convert", "pdf-to-csv");
addEndpointToGroup("Convert", "pdf-to-markdown");
+ addEndpointToGroup("Convert", "eml-to-pdf");
// Adding endpoints to "Security" group
addEndpointToGroup("Security", "add-password");
@@ -265,6 +265,7 @@ public class EndpointConfiguration {
addEndpointToGroup("Weasyprint", "html-to-pdf");
addEndpointToGroup("Weasyprint", "url-to-pdf");
addEndpointToGroup("Weasyprint", "markdown-to-pdf");
+ addEndpointToGroup("Weasyprint", "eml-to-pdf");
// Pdftohtml dependent endpoints
addEndpointToGroup("Pdftohtml", "pdf-to-html");