]> code.citadel.org Git - citadel.git/blobdiff - libcitadel/lib/mime_parser.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* use a lookup table to convert hex to char (like we already do vice versa) to be...
[citadel.git] / libcitadel / lib / mime_parser.c
diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 1a768951493c4ef5efb0f9135edd0566fe56a3bc..038851e2114b6c480691b471e3cb2220d1497312 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -1,9 +1,7 @@
 /*
- * $Id$
- *
  * This is the MIME parser for Citadel.
  *
- * Copyright (c) 1998-2007 by the citadel.org development team.
+ * Copyright (c) 1998-2010 by the citadel.org development team.
  * This code is distributed under the GNU General Public License v3.
  *
  */
@@ -24,20 +22,72 @@
 #include "libcitadel.h"
 #include "libcitadellocal.h"
 
-void extract_key(char *target, char *source, long sourcelen, char *key, long keylen)
+const unsigned char FromHexTable [256] = {
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //  0
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 10
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 20
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 30
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, // 40
+       0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0xFF, // 50
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, // 60
+       0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 70
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 80
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0x0B, 0x0C, // 90
+       0x0D, 0x0E, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //100
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //110
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //120
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //130
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //140
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //150
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //160
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //170
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //180
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //190
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //200
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //210
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //220
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //230
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, //240
+       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF                          //250
+};
+
+
+void extract_key(char *target, char *source, long sourcelen, char *key, long keylen, char KeyEnd)
 {
-       char *ptr;
+       char *sptr, *ptr = NULL;
        int double_quotes = 0;
+       long RealKeyLen = keylen;
 
-       ptr = bmstrcasestr_len(source, sourcelen, key, keylen);
+       sptr = source;
 
+       while (sptr != NULL)
+       {
+               ptr = bmstrcasestr_len(sptr, sourcelen - (sptr - source), 
+                                      key, keylen);
+               if(ptr != NULL)
+               {
+                       while (isspace(*(ptr + RealKeyLen)))
+                               RealKeyLen ++;
+                       if (*(ptr + RealKeyLen) == KeyEnd)
+                       {
+                               sptr = NULL;
+                               RealKeyLen ++;                          
+                       }
+                       else
+                       {
+                               sptr = ptr + RealKeyLen + 1;
+                       }
+               }
+               else 
+                       sptr = ptr;
+       }
        if (ptr == NULL) {
-               strcpy(target, "");
+               *target = '\0';
                return;
        }
-       strcpy(target, (ptr + keylen));
+       strcpy(target, (ptr + RealKeyLen));
 
-       for (ptr=target; (*ptr != 0); ++ptr) {
+       for (ptr=target; (*ptr != 0); ptr++) {
 
                /* A semicolon means we've hit the end of the key, unless we're inside double quotes */
                if ( (double_quotes != 1) && (*ptr == ';')) {
@@ -70,36 +120,20 @@ char *fixed_partnum(char *supplied_partnum) {
 }
 
 
-static inline unsigned int _decode_hex(char *Source)
+static inline unsigned int _decode_hex(const char *Source)
 {
-       int ret = 0;
-       if      ((*Source >= '0') && (*Source <= '9')) {
-               ret += (*Source - '0');
-       }
-       else if ((*Source >= 'A') && (*Source <= 'F')) {
-               ret += (*Source - 'A' + 10);
-       }
-       else if ((*Source >= 'a') && (*Source <= 'f')) {
-               ret += (*Source - 'a' + 10);
-       }
-       else {
-               return '?';
-       }
-               
-       ret = ret << 4;
+       int ret = '?';
+       unsigned char LO_NIBBLE;
+       unsigned char HI_NIBBLE;
+
+       HI_NIBBLE = FromHexTable[(unsigned char) *Source];
+       LO_NIBBLE = FromHexTable[(unsigned char) *(Source+1)];
        
-       if      ((*(Source + 1) >= '0') && (*(Source + 1) <= '9')) {
-               ret |= (*(Source + 1) - '0');
-       }
-       else if ((*(Source + 1) >= 'A') && (*(Source + 1) <= 'F')) {
-               ret |= (*(Source + 1) - 'A' + 10);
-       }
-       else if ((*(Source + 1) >= 'a') && (*(Source + 1) <= 'f')) {
-               ret |= (*(Source + 1) - 'a' + 10);
-       }
-       else {
-               return '?';
-       }
+       if ((LO_NIBBLE == 0xFF) || (LO_NIBBLE == 0xFF))
+               return ret;
+       ret = HI_NIBBLE;
+       ret = ret << 4;
+       ret = ret | LO_NIBBLE;
        return ret;
 }
 
@@ -116,20 +150,26 @@ int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
 
        while (pos < sourcelen)
        {
-               if (!strncmp(&encoded[pos], "=\r\n", 3))
+               if (*(encoded + pos) == '=')
                {
-                       pos += 3;
-               }
-               else if (!strncmp(&encoded[pos], "=\n", 2))
-               {
-                       pos += 2;
-               }
-               else if (encoded[pos] == '=')
-               {
-                       ch = 0;
-                       ch = _decode_hex(&encoded[pos+1]);
-                       pos += 3;
-                       decoded[decoded_length++] = ch;
+                       pos ++;
+                       if (*(encoded + pos) == '\n')
+                       {
+                               pos ++;
+                       }
+                       else if (*(encoded + pos) == '\r')
+                       {
+                               pos ++;
+                               if (*(encoded + pos) == '\n')
+                                       pos++;
+                       }
+                       else if (encoded[pos] == '=')
+                       {
+                               ch = 0;
+                               ch = _decode_hex(&encoded[pos]);
+                               pos += 2;
+                               decoded[decoded_length++] = ch;
+                       }
                }
                else
                {
@@ -152,45 +192,11 @@ void mime_decode(char *partnum,
                 char *disposition,
                 char *id,
                 char *name, char *filename,
-                void (*CallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-                void (*PreMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-                void (*PostMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-                 void *userdata,
-                 int dont_decode
-)
+                MimeParserCallBackType CallBack,
+                MimeParserCallBackType PreMultiPartCallBack,
+                MimeParserCallBackType PostMultiPartCallBack,
+                void *userdata,
+                int dont_decode)
 {
 
        char *decoded;
@@ -255,45 +261,11 @@ void mime_decode(char *partnum,
  */
 void the_mime_parser(char *partnum,
                     char *content_start, char *content_end,
-                    void (*CallBack)
-                     (char *cbname,
-                      char *cbfilename,
-                      char *cbpartnum,
-                      char *cbdisp,
-                      void *cbcontent,
-                      char *cbtype,
-                      char *cbcharset,
-                      size_t cblength,
-                      char *cbencoding,
-                      char *cbid,
-                      void *cbuserdata),
-                    void (*PreMultiPartCallBack)
-                     (char *cbname,
-                      char *cbfilename,
-                      char *cbpartnum,
-                      char *cbdisp,
-                      void *cbcontent,
-                      char *cbtype,
-                      char *cbcharset,
-                      size_t cblength,
-                      char *cbencoding,
-                      char *cbid,
-                      void *cbuserdata),
-                    void (*PostMultiPartCallBack)
-                     (char *cbname,
-                      char *cbfilename,
-                      char *cbpartnum,
-                      char *cbdisp,
-                      void *cbcontent,
-                      char *cbtype,
-                      char *cbcharset,
-                      size_t cblength,
-                      char *cbencoding,
-                      char *cbid,
-                      void *cbuserdata),
-                     void *userdata,
-                     int dont_decode
-)
+                    MimeParserCallBackType CallBack,
+                    MimeParserCallBackType PreMultiPartCallBack,
+                    MimeParserCallBackType PostMultiPartCallBack,
+                    void *userdata,
+                    int dont_decode)
 {
 
        char *ptr;
@@ -392,9 +364,9 @@ void the_mime_parser(char *partnum,
                                memcpy (content_type, &header[13], headerlen - 12);
                                content_type_len = striplt (content_type);
 
-                               extract_key(content_type_name, content_type, content_type_len, HKEY("name="));
-                               extract_key(charset,           content_type, content_type_len, HKEY("charset="));
-                               extract_key(boundary,          header,       headerlen,        HKEY("boundary="));
+                               extract_key(content_type_name, content_type, content_type_len, HKEY("name"), '=');
+                               extract_key(charset,           content_type, content_type_len, HKEY("charset"), '=');
+                               extract_key(boundary,          header,       headerlen,        HKEY("boundary"), '=');
 
                                /* Deal with weird headers */
                                if (strchr(content_type, ' '))
@@ -405,8 +377,8 @@ void the_mime_parser(char *partnum,
                        else if (!strncasecmp(header, "Content-Disposition:", 20)) {
                                memcpy (disposition, &header[20], headerlen - 19);
                                disposition_len = striplt(disposition);
-                               extract_key(content_disposition_name, disposition, disposition_len,  HKEY("name="));
-                               extract_key(filename,                 disposition, disposition_len, HKEY("filename="));
+                               extract_key(content_disposition_name, disposition, disposition_len,  HKEY("name"), '=');
+                               extract_key(filename,                 disposition, disposition_len, HKEY("filename"), '=');
                        }
                        else if (!strncasecmp(header, "Content-ID:", 11)) {
                                strcpy(id, &header[11]);
@@ -631,50 +603,12 @@ end_parser:       /* free the buffers!  end the oppression!! */
  * considered to have ended when the parser encounters a 0x00 byte.
  */
 void mime_parser(char *content_start,
-               char *content_end,
-
-                void (*CallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-
-                void (*PreMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-
-                void (*PostMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-
-                 void *userdata,
-                 int dont_decode
-)
+                char *content_end,
+                MimeParserCallBackType CallBack,
+                MimeParserCallBackType PreMultiPartCallBack,
+                MimeParserCallBackType PostMultiPartCallBack,
+                void *userdata,
+                int dont_decode)
 {
 
        the_mime_parser("", content_start, content_end,
@@ -759,6 +693,8 @@ const char* GuessMimeByFilename(const char *what, size_t len)
                return "text/plain";
        else if ((len > 3) && !strncasecmp(&what[len - 4], ".css", 4))
                return "text/css";
+       else if ((len > 3) && !strncasecmp(&what[len - 4], ".htc", 4))
+               return "text/x-component";
        else if ((len > 3) && !strncasecmp(&what[len - 4], ".jpg", 4))
                return "image/jpeg";
        else if ((len > 3) && !strncasecmp(&what[len - 4], ".png", 4))
Citadel server, clients, utilities