forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #427 from Inkrementator/RFC2045_FIX 

Rfc2045 fixes
This commit is contained in:
Adam D. Ruppe 2024-04-18 19:05:12 -04:00 committed by GitHub
parent ed8cd91cdd 315a8869a4
commit 97313ae98e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
email.d
View File

@ -8,6 +8,7 @@ pragma(lib, "curl");
import std.base64; import std.base64;
import std.string; import std.string;
import std.range;
import arsd.characterencodings; import arsd.characterencodings;
@ -188,13 +189,14 @@ class EmailMessage {
{ {
MimeContainer mimeMessage; MimeContainer mimeMessage;
enum NO_TRANSFER_ENCODING = "Content-Transfer-Encoding: 8bit";
if(isHtml) { if(isHtml) {
auto alternative = new MimeContainer("multipart/alternative"); auto alternative = new MimeContainer("multipart/alternative");
alternative.stuff ~= new MimeContainer("text/plain; charset=UTF-8", textBody); alternative.stuff ~= new MimeContainer("text/plain; charset=UTF-8", textBody).with_header(NO_TRANSFER_ENCODING);
alternative.stuff ~= new MimeContainer("text/html; charset=UTF-8", htmlBody); alternative.stuff ~= new MimeContainer("text/html; charset=UTF-8", htmlBody).with_header(NO_TRANSFER_ENCODING);
mimeMessage = alternative; mimeMessage = alternative;
} else { } else {
mimeMessage = new MimeContainer("text/plain; charset=UTF-8", textBody); mimeMessage = new MimeContainer("text/plain; charset=UTF-8", textBody).with_header(NO_TRANSFER_ENCODING);
} }
top = mimeMessage; top = mimeMessage;
} }
@ -211,7 +213,7 @@ class EmailMessage {
auto mimeAttachment = new MimeContainer(attachment.type ~ "; name=\""~attachment.filename~"\""); auto mimeAttachment = new MimeContainer(attachment.type ~ "; name=\""~attachment.filename~"\"");
mimeAttachment.headers ~= "Content-Transfer-Encoding: base64"; mimeAttachment.headers ~= "Content-Transfer-Encoding: base64";
mimeAttachment.headers ~= "Content-ID: <" ~ attachment.id ~ ">"; mimeAttachment.headers ~= "Content-ID: <" ~ attachment.id ~ ">";
mimeAttachment.content = Base64.encode(cast(const(ubyte)[]) attachment.content); mimeAttachment.content = encodeBase64Mime(cast(const(ubyte)[]) attachment.content);
mimeRelated.stuff ~= mimeAttachment; mimeRelated.stuff ~= mimeAttachment;
} }
@ -233,7 +235,7 @@ class EmailMessage {
if(attachment.id.length) if(attachment.id.length)
mimeAttachment.headers ~= "Content-ID: <" ~ attachment.id ~ ">"; mimeAttachment.headers ~= "Content-ID: <" ~ attachment.id ~ ">";
mimeAttachment.content = Base64.encode(cast(const(ubyte)[]) attachment.content); mimeAttachment.content = encodeBase64Mime(cast(const(ubyte)[]) attachment.content);
mimeMixed.stuff ~= mimeAttachment; mimeMixed.stuff ~= mimeAttachment;
} }
@ -1152,6 +1154,24 @@ immutable(ubyte)[] decodeQuotedPrintable(string text) {
return ret; return ret;
} }
/// Add header UFCS helper
auto with_header(MimeContainer container, string header){
container.headers ~= header;
return container;
}
/// Base64 range encoder UFCS helper.
alias base64encode = Base64.encoder;
/// Base64 encoded data with line length of 76 as mandated by RFC 2045 Section 6.8
string encodeBase64Mime(const(ubyte[]) content, string LINESEP = "\r\n") {
enum LINE_LENGTH = 76;
/// Only 6 bit of every byte are used; log2(64) = 6
enum int SOURCE_CHUNK_LENGTH = LINE_LENGTH * 6/8;
return cast(immutable(char[]))content.chunks(SOURCE_CHUNK_LENGTH).base64encode.join(LINESEP);
}
/+ /+
void main() { void main() {
import std.file; import std.file;