[OpenNMS/opennms] e670ad: NMS-20102: Keep the message body on streamed mail ...

Marshall Massengill via opennms-cvs <[email protected]> Fri, 31 Jul 2026 13:26:58 -0700
Newsgroups gmane.network.opennms.cvs
Message-ID <OpenNMS/opennms/push/refs/heads/mm/NMS-20102-smoke/[email protected]>
  Branch: refs/heads/mm/NMS-20102-smoke
  Home:   https://github.com/OpenNMS/opennms
  Commit: e670ad98c77bb3518159e7fa589e4cc3348c277c
      https://github.com/OpenNMS/opennms/commit/e670ad98c77bb3518159e7fa589e4cc3348c277c
  Author: Marshall Massengill <[email protected]>
  Date:   2026-07-31 (Fri, 31 Jul 2026)

  Changed paths:
    M opennms-javamail/opennms-javamail-api/src/main/java/org/opennms/javamail/JavaMailer.java
    M opennms-javamail/opennms-javamail-api/src/test/java/org/opennms/javamail/JavaMailerWireTest.java

  Log Message:
  -----------
  NMS-20102: Keep the message body on streamed mail attachments

JavaMailer.buildMessage() has two attachment branches: the file branch
builds a multipart with the message text followed by the attachment,
while the stream branch (added in 1dfc6c9e481, 2010) added only the
attachment part. Callers that set an input stream therefore lost the
message text entirely -- DefaultReportWrapperService sets both, so every
emailed database report arrived as a bare PDF or CSV with no body.

The stream branch now adds the text part first, matching the file
branch. Covered by a GreenMail wire test asserting both parts and their
order; the test fails on the previous behavior with one part instead of
two.

Pre-existing on release-36.x and unrelated to the Jakarta migration,
folded in here since this is the mail rework.


  Commit: 80158cd166320bf1a8ae2970844e2014bb53d1b2
      https://github.com/OpenNMS/opennms/commit/80158cd166320bf1a8ae2970844e2014bb53d1b2
  Author: Marshall Massengill <[email protected]>
  Date:   2026-07-31 (Fri, 31 Jul 2026)

  Changed paths:
    M docs/modules/operation/pages/deep-dive/notifications/configuration.adoc
    M docs/modules/releasenotes/pages/whatsnew.adoc

  Log Message:
  -----------
  NMS-20102: Document mail server TLS certificate verification

Angus enforces certificate trust and host-name verification
independently, and mail.smtp.ssl.trust suppresses only the first --
including when set to "*", the conventional workaround for self-signed
certificates. Installations carrying it therefore still fail
host-name verification after the upgrade, which the release note did
not convey.

Adds a Mail server TLS section to the notification configuration page
covering both properties, the two distinct failure messages, and which
property applies to each; the release note is trimmed to the behavior
change and points there. Verified against a STARTTLS server presenting
a certificate for a different name.


Compare: https://github.com/OpenNMS/opennms/compare/dc30e2210c78...80158cd16632

To unsubscribe from these emails, change your notification settings at https://github.com/OpenNMS/opennms/settings/notifications


_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/wiki/index.php?page=MailingListFaq
opennms-cvs mailing list

To *unsubscribe* or change your subscription options, see the bottom of this page:
https://lists.sourceforge.net/lists/listinfo/opennms-cvs