Added support for long email addresses to mitigate sphinx <=3.1.1 issue

Signed-off-by: Janos SUTO <sj@acts.hu>

src/config.h

@@ -39,6 +39,13 @@
 #define IPLEN 16+1
 #define KEYLEN 56
 #define MIN_EMAIL_ADDRESS_LEN 9
+// Sphinx 3.1.1 has an issue with tokens longer than 41 characters.
+// Sphinx-3.3.1+ seems to be fine, and not affected.
+//
+// Note that we use 42, because the parser adds a trailing space to the tokens
+// See https://www.mailpiler.org/wiki/current:sphinx3 and
+// https://bitbucket.org/jsuto/piler/issues/1082/no-sphinx-results-with-long-email for more
+#define MAX_EMAIL_ADDRESS_SPHINX_LEN 42
 
 #define CRLF "\n"
 

src/defs.h

@@ -14,6 +14,7 @@
    #include <tre/regex.h>
 #endif
 
+#include <openssl/md5.h>
 #include <openssl/sha.h>
 #include <openssl/ssl.h>
 #include <netinet/in.h>

src/digest.c

@@ -132,3 +132,27 @@ void digest_string(char *s, char *digest){
       snprintf(digest + i*2, 2*DIGEST_LENGTH, "%02x", md[i]);
 
 }
+
+
+void md5_string(char *s, char *digest){
+   int i;
+   unsigned char md[MD5_DIGEST_LENGTH];
+   MD5_CTX context;
+
+   memset(digest, 0, 2*MD5_DIGEST_LENGTH+2);
+
+   MD5_Init(&context);
+
+   MD5_Update(&context, s, strlen(s));
+
+   MD5_Final(md, &context);
+
+   for(i=0;i<MD5_DIGEST_LENGTH;i++)
+      snprintf(digest + i*2, 2*MD5_DIGEST_LENGTH, "%02x", md[i]);
+}
+
+
+void create_md5_from_email_address(char *puf, char *md5buf){
+   md5_string(puf, md5buf);
+   md5buf[2*MD5_DIGEST_LENGTH] = ' ';
+}

src/piler.h

@@ -38,6 +38,7 @@ int do_av_check(char *filename, struct config *cfg);
 int make_digests(struct session_data *sdata, struct config *cfg);
 void digest_file(char *filename, char *digest);
 void digest_string(char *s, char *digest);
+void create_md5_from_email_address(char *puf, char *md5buf);
 
 void remove_stripped_attachments(struct parser_state *state);
 int process_message(struct session_data *sdata, struct parser_state *state, struct data *data, struct config *cfg);

src/tokenizer.c

@@ -50,6 +50,8 @@ void tokenize(char *buf, struct parser_state *state, struct session_data *sdata,
          continue;
       }
 
+      char md5buf[2*MD5_DIGEST_LENGTH+2];
+
       if(state->message_state == MSG_FROM && state->is_1st_header == 1 && strlen(state->b_from) < SMALLBUFSIZE-len-1){
          strtolower(puf);
 
@@ -69,6 +71,11 @@ void tokenize(char *buf, struct parser_state *state, struct session_data *sdata,
 
             if(is_email_address_on_my_domains(puf, data) == 1) sdata->internal_sender = 1;
 
+            if(len >= MAX_EMAIL_ADDRESS_SPHINX_LEN && strlen(state->b_from) < SMALLBUFSIZE-len-1){
+               create_md5_from_email_address(puf, md5buf);
+               memcpy(&(state->b_from[strlen(state->b_from)]), md5buf, strlen(md5buf));
+            }
+
             if(strlen(state->b_from) < SMALLBUFSIZE-len-1){
                split_email_address(puf);
                memcpy(&(state->b_from[strlen(state->b_from)]), puf, len);
@@ -88,6 +95,11 @@ void tokenize(char *buf, struct parser_state *state, struct session_data *sdata,
                memcpy(&(state->b_sender_domain), q+1, strlen(q+1)-1);
             }
 
+            if(len >= MAX_EMAIL_ADDRESS_SPHINX_LEN && strlen(state->b_sender) < SMALLBUFSIZE-len-1){
+               create_md5_from_email_address(puf, md5buf);
+               memcpy(&(state->b_sender[strlen(state->b_sender)]), md5buf, strlen(md5buf));
+            }
+
             if(strlen(state->b_sender) < SMALLBUFSIZE-len-1){
                split_email_address(puf);
                memcpy(&(state->b_sender[strlen(state->b_sender)]), puf, len);
@@ -108,6 +120,11 @@ void tokenize(char *buf, struct parser_state *state, struct session_data *sdata,
             if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: journal rcpt: '%s'", sdata->ttmpfile, puf);
          }
 
+         if(len >= MAX_EMAIL_ADDRESS_SPHINX_LEN){
+            create_md5_from_email_address(puf, md5buf);
+            add_recipient(md5buf, strlen(md5buf), sdata, state, data, cfg);
+         }
+
          add_recipient(puf, len, sdata, state, data, cfg);
       }
       else if(state->message_state == MSG_BODY && len >= (unsigned int)(cfg->min_word_len) && state->bodylen < BIGBUFSIZE-len-1){