projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7d66c47)
RSS feed reader now QP-Encodes message text.
authorArt Cancro <ajc@citadel.org>
Fri, 6 Jan 2023 22:45:21 +0000 (17:45 -0500)
committerArt Cancro <ajc@citadel.org>
Fri, 6 Jan 2023 22:45:21 +0000 (17:45 -0500)
RSS and Atom do not specify any limitation on line lengths, and there are feeds
out there that supply HTML with no line breaks at all.  This was causing messages
to be truncated when read by clients with 1K or 4K line buffers.  So we now use
quoted-printable encoding on incoming feed text when inserting it into a message.

citadel/server/modules/rssclient/serv_rssclient.c patch | blob | history

diff --git a/citadel/server/modules/rssclient/serv_rssclient.c b/citadel/server/modules/rssclient/serv_rssclient.c
index 4f4db62fc07875fc0b9103cbd242a4aeb2780208..28afc5b1cbe6438622a8623a1ad964458e615755 100644 (file)
--- a/citadel/server/modules/rssclient/serv_rssclient.c
+++ b/citadel/server/modules/rssclient/serv_rssclient.c
@@ -126,13 +126,9 @@ void rss_end_element(void *data, const char *el) {
                        if (already_seen == 0) {
 
                                // Compose the message text
-                               // FIXME ajc 2023jan06 - this can create lines longer than 1024 characters which chokes the client message parsers
+
                                StrBuf *TheMessage = NewStrBuf();
-                               StrBufAppendPrintf(TheMessage,
-                                       "Content-type: text/html\n\n"
-                                       "\n\n"
-                                       "<html><head></head><body>"
-                               );
+                               StrBufAppendPrintf(TheMessage, "<html><head></head><body>");
 
                                if (r->description != NULL) {
                                        StrBufAppendPrintf(TheMessage, "%s<br><br>\r\n", r->description);
@@ -147,6 +143,21 @@ void rss_end_element(void *data, const char *el) {
                                }
 
                                StrBufAppendPrintf(TheMessage, "</body></html>\r\n");
+
+                               // Quoted-Printable encode the HTML message, because RSS and Atom make no guarantee of line length limits.
+                               StrBuf *TheMessage_Encoded = StrBufQuotedPrintableEncode(TheMessage);
+
+                               // Now we reuse TheMessage -- this time it will contain the MIME headers concatenated with the encoded message.
+                               FlushStrBuf(TheMessage);
+                               StrBufAppendBufPlain(TheMessage, HKEY(
+                                       "Content-type: text/html; charset=UTF-8\r\n"
+                                       "Content-Transfer-Encoding: quoted-printable\r\n"
+                                       "\r\n"
+                                       ), 0
+                               );
+                               StrBufAppendBuf(TheMessage, TheMessage_Encoded, 0);
+                               FreeStrBuf(&TheMessage_Encoded);
+
                                CM_SetField(r->msg, eMesageText, ChrPtr(TheMessage), StrLength(TheMessage));
                                FreeStrBuf(&TheMessage);
 
Citadel server, clients, utilities