Skip to content

When adding attachments to emails, input streams are closed before being used #879

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

Closed
wants to merge 3 commits into from
Closed

When adding attachments to emails, input streams are closed before being used #879

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0274d2
Fix file input stream closed when adding attachment
Jul 1, 2024
fa7d4bd
base64Output stream incorrectly closed (caused the socket to close)
Jul 1, 2024
812b71b
Merge branch 'master' into master
tomas-sexenian Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions gxmail/src/main/java/com/genexus/internet/SMTPSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,25 @@ private void sendAttachment(String sTime, String fileNamePath, String attachment
try {
fis = new FileInputStream(attachmentPath + fileNamePath);
is = fis;
}
catch (FileNotFoundException e) {

println(getNextMessageIdMixed(sTime, false));
println("Content-Type: " + "application/octet-stream");
println("Content-Transfer-Encoding: " + "base64");
println("Content-Disposition: " + "attachment; filename=\"" + GXMailer.getEncodedString(fileName) + "\"");
println("");

int BUFFER_SIZE = 4096;
byte[] buffer = new byte[BUFFER_SIZE];
OutputStream base64Output = new Base64OutputStream(outStream);
int n = is.read(buffer, 0, BUFFER_SIZE);
while (n >= 0) {
base64Output.write(buffer, 0, n);
n = is.read(buffer, 0, BUFFER_SIZE);
}
base64Output.flush();
outStream.writeBytes(CRLF);
outStream.flush();
} catch (FileNotFoundException e) {
log ("11 - FileNotFound " + e.getMessage());
throw new GXMailException("Can't find " + attachmentPath + fileNamePath, MAIL_InvalidAttachment);
} finally {
Expand All @@ -633,24 +650,6 @@ private void sendAttachment(String sTime, String fileNamePath, String attachment
if (fis != null)
fis.close();
}

println(getNextMessageIdMixed(sTime, false));
println("Content-Type: " + "application/octet-stream");
println("Content-Transfer-Encoding: " + "base64");
println("Content-Disposition: " + "attachment; filename=\"" + GXMailer.getEncodedString(fileName) + "\"");
println("");

int BUFFER_SIZE = 4096;
byte[] buffer = new byte[BUFFER_SIZE];
OutputStream base64Output = new Base64OutputStream(outStream);
int n = is.read(buffer, 0, BUFFER_SIZE);
while (n >= 0) {
base64Output.write(buffer, 0, n);
n = is.read(buffer, 0, BUFFER_SIZE);
}
base64Output.flush();
outStream.writeBytes(CRLF);
outStream.flush();
}

private void println(String s) throws IOException
Expand Down