diff --git a/.github/labels.yml b/.github/labels.yml index 3a5973003..b7f5642e7 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -137,4 +137,41 @@ description: "Reverts a previous commit" - name: "style" color: "FFA500" - description: "Changes that do not affect the meaning of the code (formatting, etc.)" \ No newline at end of file + description: "Changes that do not affect the meaning of the code (formatting, etc.)" +- name: "admin" + color: "195055" +- name: "codex" + color: "ededed" + description: null +- name: "Github" + color: "0052CC" +- name: "github_actions" + color: "000000" + description: "Pull requests that update GitHub Actions code" +- name: "needs-changes" + color: "A65A86" +- name: "on-hold" + color: "2526F9" +- name: "python" + color: "2b67c6" + description: "Pull requests that update Python code" +- name: "size:L" + color: "eb9500" + description: "This PR changes 100-499 lines ignoring generated files." +- name: "size:M" + color: "ebb800" + description: "This PR changes 30-99 lines ignoring generated files." +- name: "size:S" + color: "77b800" + description: "This PR changes 10-29 lines ignoring generated files." +- name: "size:XL" + color: "ff823f" + description: "This PR changes 500-999 lines ignoring generated files." +- name: "size:XS" + color: "00ff00" + description: "This PR changes 0-9 lines ignoring generated files." +- name: "size:XXL" + color: "ffb8b8" + description: "This PR changes 1000+ lines ignoring generated files." +- name: "to research" + color: "FBCA04" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ead7cb6f..098dd3725 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,7 @@ jobs: fail-fast: false matrix: jdk-version: [17, 21] + spring-security: [true, false] steps: - name: Harden Runner @@ -37,56 +38,41 @@ jobs: java-version: ${{ matrix.jdk-version }} distribution: "temurin" - - name: Build with Gradle and no spring security + - name: Build with Gradle and spring security ${{ matrix.spring-security }} run: ./gradlew clean build env: - DISABLE_ADDITIONAL_FEATURES: true - - - name: Build with Gradle and with spring security - run: ./gradlew clean build - env: - DISABLE_ADDITIONAL_FEATURES: false + DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }} - name: Check Test Reports Exist id: check-reports if: always() run: | + declare -a dirs=( + "stirling-pdf/build/reports/tests/" + "stirling-pdf/build/test-results/" + "common/build/reports/tests/" + "common/build/test-results/" + "proprietary/build/reports/tests/" + "proprietary/build/test-results/" + ) missing_reports=() - - # Check for required test report directories - if [ ! -d "stirling-pdf/build/reports/tests/" ]; then - missing_reports+=("stirling-pdf/build/reports/tests/") - fi - if [ ! -d "stirling-pdf/build/test-results/" ]; then - missing_reports+=("stirling-pdf/build/test-results/") - fi - if [ ! -d "common/build/reports/tests/" ]; then - missing_reports+=("common/build/reports/tests/") - fi - if [ ! -d "common/build/test-results/" ]; then - missing_reports+=("common/build/test-results/") - fi - if [ ! -d "proprietary/build/reports/tests/" ]; then - missing_reports+=("proprietary/build/reports/tests/") - fi - if [ ! -d "proprietary/build/test-results/" ]; then - missing_reports+=("proprietary/build/test-results/") - fi - - # Fail if any required reports are missing + for dir in "${dirs[@]}"; do + if [ ! -d "$dir" ]; then + missing_reports+=("$dir") + fi + done if [ ${#missing_reports[@]} -gt 0 ]; then echo "ERROR: The following required test report directories are missing:" printf '%s\n' "${missing_reports[@]}" exit 1 fi - echo "All required test report directories are present" - name: Upload Test Reports - if: steps.check-reports.outcome == 'success' + if: always() uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: test-reports-jdk-${{ matrix.jdk-version }} + name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }} path: | stirling-pdf/build/reports/tests/ stirling-pdf/build/test-results/ @@ -98,6 +84,7 @@ jobs: proprietary/build/test-results/ proprietary/build/reports/problems/ retention-days: 3 + if-no-files-found: warn check-licence: runs-on: ubuntu-latest diff --git a/common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java b/common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java index 755f143aa..062f3e0a1 100644 --- a/common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java +++ b/common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java @@ -6,42 +6,73 @@ import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +/** + * Shortcut for a POST endpoint that is executed through the Stirling "auto‑job" framework. + *

+ * Behaviour notes: + *

+ *

+ * + *

Unless stated otherwise an attribute only affects async execution.

+ */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented @RequestMapping(method = RequestMethod.POST) public @interface AutoJobPostMapping { + + /** + * Alias for {@link RequestMapping#value} – the path mapping of the endpoint. + */ @AliasFor(annotation = RequestMapping.class, attribute = "value") String[] value() default {}; + /** + * MIME types this endpoint accepts. Defaults to {@code multipart/form-data}. + */ @AliasFor(annotation = RequestMapping.class, attribute = "consumes") String[] consumes() default {"multipart/form-data"}; /** - * Custom timeout in milliseconds for this specific job. If not specified, the default system - * timeout will be used. + * Maximum execution time in milliseconds before the job is aborted. + * A negative value means "use the application default". + *

Only honoured when {@code async=true}.

*/ long timeout() default -1; - /** Maximum number of times to retry the job on failure. Default is 1 (no retries). */ + /** + * Total number of attempts (initial + retries). Must be at least 1. + * Retries are executed with exponential back‑off. + *

Only honoured when {@code async=true}.

+ */ int retryCount() default 1; /** - * Whether to track and report progress for this job. If enabled, the job will send progress - * updates through WebSocket. + * Record percentage / note updates so they can be retrieved via the REST status endpoint. + *

Only honoured when {@code async=true}.

*/ boolean trackProgress() default true; /** - * Whether this job can be queued when system resources are limited. If enabled, jobs will be - * queued instead of rejected when the system is under high load. The queue size is dynamically - * adjusted based on available memory and CPU resources. + * If {@code true} the job may be placed in a queue instead of being rejected when resources + * are scarce. + *

Only honoured when {@code async=true}.

*/ boolean queueable() default false; /** - * Optional resource weight of this job (1-100). Higher values indicate more resource-intensive - * jobs that may need stricter queuing. Default is 50 (medium weight). + * Relative resource weight (1–100) used by the scheduler to prioritise / throttle jobs. Values + * below 1 are clamped to 1, values above 100 to 100. */ int resourceWeight() default 50; } diff --git a/common/src/main/java/stirling/software/common/service/ResourceMonitor.java b/common/src/main/java/stirling/software/common/service/ResourceMonitor.java index cd1e766d1..2791fff90 100644 --- a/common/src/main/java/stirling/software/common/service/ResourceMonitor.java +++ b/common/src/main/java/stirling/software/common/service/ResourceMonitor.java @@ -172,8 +172,8 @@ public class ResourceMonitor { if (oldStatus != newStatus) { log.info("System resource status changed from {} to {}", oldStatus, newStatus); log.info( - "Current metrics - CPU: {:.1f}%, Memory: {:.1f}%, Free Memory: {} MB", - cpuUsage * 100, memoryUsage * 100, freeMemory / (1024 * 1024)); + "Current metrics - CPU: {}%, Memory: {}%, Free Memory: {} MB", + String.format("%.1f", cpuUsage * 100), String.format("%.1f", memoryUsage * 100), freeMemory / (1024 * 1024)); } } catch (Exception e) { log.error("Error updating resource metrics: {}", e.getMessage(), e); diff --git a/common/src/main/java/stirling/software/common/util/EmlToPdf.java b/common/src/main/java/stirling/software/common/util/EmlToPdf.java index a97673745..b08bc16a5 100644 --- a/common/src/main/java/stirling/software/common/util/EmlToPdf.java +++ b/common/src/main/java/stirling/software/common/util/EmlToPdf.java @@ -46,12 +46,10 @@ import stirling.software.common.model.api.converters.EmlToPdfRequest; @Slf4j @UtilityClass public class EmlToPdf { - private static final class StyleConstants { // Font and layout constants static final int DEFAULT_FONT_SIZE = 12; - static final String DEFAULT_FONT_FAMILY = - "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif"; + static final String DEFAULT_FONT_FAMILY = "Helvetica, sans-serif"; static final float DEFAULT_LINE_HEIGHT = 1.4f; static final String DEFAULT_ZOOM = "1.0"; @@ -72,20 +70,15 @@ public class EmlToPdf { static final int EML_CHECK_LENGTH = 8192; static final int MIN_HEADER_COUNT_FOR_VALID_EML = 2; - private StyleConstants() { - // Utility class - prevent instantiation - } + private StyleConstants() {} } private static final class MimeConstants { static final Pattern MIME_ENCODED_PATTERN = Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?="); - static final String PAPERCLIP_EMOJI = "\uD83D\uDCCE"; // 📎 - static final String ATTACHMENT_ICON_PLACEHOLDER = "icon"; + static final String ATTACHMENT_MARKER = "@"; - private MimeConstants() { - // Utility class - prevent instantiation - } + private MimeConstants() {} } private static final class FileSizeConstants { @@ -93,9 +86,7 @@ public class EmlToPdf { static final long BYTES_IN_MB = BYTES_IN_KB * 1024L; static final long BYTES_IN_GB = BYTES_IN_MB * 1024L; - private FileSizeConstants() { - // Utility class - prevent instantiation - } + private FileSizeConstants() {} } // Cached Jakarta Mail availability check @@ -104,8 +95,15 @@ public class EmlToPdf { private static boolean isJakartaMailAvailable() { if (jakartaMailAvailable == null) { try { + // Check for core Jakarta Mail classes Class.forName("jakarta.mail.internet.MimeMessage"); Class.forName("jakarta.mail.Session"); + Class.forName("jakarta.mail.internet.MimeUtility"); + Class.forName("jakarta.mail.internet.MimePart"); + Class.forName("jakarta.mail.internet.MimeMultipart"); + Class.forName("jakarta.mail.Multipart"); + Class.forName("jakarta.mail.Part"); + jakartaMailAvailable = true; log.debug("Jakarta Mail libraries are available"); } catch (ClassNotFoundException e) { @@ -172,7 +170,7 @@ public class EmlToPdf { } } - private static void validateEmlInput(byte[] emlBytes) throws IOException { + private static void validateEmlInput(byte[] emlBytes) { if (emlBytes == null || emlBytes.length == 0) { throw new IllegalArgumentException("EML file is empty or null"); } @@ -208,7 +206,6 @@ public class EmlToPdf { disableSanitize); } catch (IOException | InterruptedException e) { log.warn("Initial HTML to PDF conversion failed, trying with simplified HTML"); - // Try with simplified HTML String simplifiedHtml = simplifyHtmlContent(htmlContent); return FileToPdf.convertHtmlToPdf( weasyprintPath, @@ -259,7 +256,7 @@ public class EmlToPdf { html.append("\n"); html.append("").append(escapeHtml(subject)).append("\n"); html.append("\n"); html.append("\n"); @@ -298,7 +295,7 @@ public class EmlToPdf { html.append("

Attachments

\n"); html.append(attachmentInfo); - // Add status message about attachment inclusion + // Add a status message about attachment inclusion if (request != null && request.isIncludeAttachments()) { html.append("
\n"); html.append( @@ -316,7 +313,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 dependencies.

\n"); @@ -340,8 +337,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)); @@ -488,7 +487,7 @@ public class EmlToPdf { attachmentInfo .append("
") .append("") - .append(MimeConstants.ATTACHMENT_ICON_PLACEHOLDER) + .append(MimeConstants.ATTACHMENT_MARKER) .append(" ") .append("") .append(escapeHtml(filename)) @@ -651,6 +650,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; @@ -659,10 +662,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; @@ -844,7 +920,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()); } } @@ -861,6 +937,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); @@ -881,6 +963,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"); @@ -914,10 +1001,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; @@ -938,15 +1033,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) { @@ -982,7 +1085,7 @@ public class EmlToPdf { html.append("\n"); html.append("").append(escapeHtml(content.getSubject())).append("\n"); html.append("\n"); html.append("\n"); @@ -1006,7 +1109,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())); @@ -1039,7 +1142,7 @@ public class EmlToPdf { .append(uniqueId) .append("\">") .append("") - .append(MimeConstants.PAPERCLIP_EMOJI) + .append(MimeConstants.ATTACHMENT_MARKER) .append(" ") .append("") .append(escapeHtml(safeMimeDecode(attachment.getFilename()))) @@ -1205,24 +1308,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) { @@ -1356,8 +1459,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; @@ -1446,13 +1547,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; @@ -1497,15 +1658,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; @@ -1513,14 +1672,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; @@ -1563,24 +1723,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); } } @@ -1592,16 +1746,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"); diff --git a/stirling-pdf/src/main/resources/templates/fragments/multi-toolAdvert.html b/stirling-pdf/src/main/resources/templates/fragments/multi-toolAdvert.html index 681630aeb..5b624bd2c 100644 --- a/stirling-pdf/src/main/resources/templates/fragments/multi-toolAdvert.html +++ b/stirling-pdf/src/main/resources/templates/fragments/multi-toolAdvert.html @@ -1,7 +1,7 @@
- +