Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZCS-11699: adding check to verify zimbra_external_email_warning is enabled before updating the content #1317

Merged
merged 1 commit into from
Jul 15, 2022
Merged

ZCS-11699: adding check to verify zimbra_external_email_warning is enabled before updating the content #1317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 18 additions & 16 deletions store/src/java/com/zimbra/cs/lmtpserver/ZimbraLmtpBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,24 +345,26 @@ public void deliver(LmtpEnvelope env, InputStream in, int sizeHint) throws Unrec
// initializing input stream and blob for External Email Warning (EEW)
InputStream inEEW = null;
Blob blobEEW = null;
// duplicating input stream for EEW
try {
for (int i = 0; i < CHARSET_NAMES.length; i++) {
final String charsetName = CHARSET_NAMES[i];
// copy input stream and evaluate content encoding
final byte[] ba = IOUtils.toByteArray(in);
IOUtils.closeQuietly(in);
in = new ByteArrayInputStream(ba);
final String content = new String(ba, charsetName);
// if current encoding is suitable, use it; otherwise, continue or use default
if (!content.contains(GARBLED_CHARACTER) || i == CHARSET_NAMES.length - 1) {
final String contentEEW = ExternalEmailWarning.getInstance().getUpdatedContent(content);
inEEW = IOUtils.toInputStream(contentEEW, charsetName);
break;
if (ExternalEmailWarning.getInstance().isEnabled()) {
// duplicating input stream for EEW
try {
for (int i = 0; i < CHARSET_NAMES.length; i++) {
final String charsetName = CHARSET_NAMES[i];
// copy input stream and evaluate content encoding
final byte[] ba = IOUtils.toByteArray(in);
IOUtils.closeQuietly(in);
in = new ByteArrayInputStream(ba);
final String content = new String(ba, charsetName);
// if current encoding is suitable, use it; otherwise, continue or use default
if (!content.contains(GARBLED_CHARACTER) || i == CHARSET_NAMES.length - 1) {
final String contentEEW = ExternalEmailWarning.getInstance().getUpdatedContent(content);
inEEW = IOUtils.toInputStream(contentEEW, charsetName);
break;
}
}
} catch (Exception e) {
ZimbraLog.lmtp.warn("failed to duplicate input stream for EEW", e);
}
} catch (Exception e) {
ZimbraLog.lmtp.warn("failed to duplicate input stream for EEW", e);
}
try {
int bufLen = Provisioning.getInstance().getLocalServer().getMailDiskStreamingThreshold();
Expand Down