X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Finboxrules%2Fserv_inboxrules.c;h=204b7cbc69b436c7ca5d574bbf0d5a2c41d4fb29;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=720d63fa5dbfcad340535e3d7792d336891c4d43;hpb=62f91f8a64498d5dc50419f8db979de2e33229bc;p=citadel.git diff --git a/citadel/modules/inboxrules/serv_inboxrules.c b/citadel/modules/inboxrules/serv_inboxrules.c index 720d63fa5..204b7cbc6 100644 --- a/citadel/modules/inboxrules/serv_inboxrules.c +++ b/citadel/modules/inboxrules/serv_inboxrules.c @@ -21,18 +21,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include #include #include @@ -218,7 +207,8 @@ struct inboxrules *deserialize_inbox_rules(char *serialized_rules) { // We have a rule , now parse it char rtoken[SIZ]; int nt = num_tokens(decoded_rule, '|'); - for (int t=0; t, reject message: <%s>", - msg->cm_fields[erFc822Addr], - rule->autoreply_message - ); + syslog(LOG_DEBUG, "inbox_do_reject: sender: <%s>, reject", msg->cm_fields[erFc822Addr]); // If we can't determine who sent the message, reject silently. char *sender; @@ -420,10 +407,10 @@ void inbox_do_reject(struct irule *rule, struct CtdlMessage *msg) { // Deliver the message quickie_message( - NULL, + " ", msg->cm_fields[eenVelopeTo], sender, - NULL, + MAILROOM, reject_text, FMT_RFC822, "Delivery status notification" @@ -436,10 +423,7 @@ void inbox_do_reject(struct irule *rule, struct CtdlMessage *msg) { * Perform the "vacation" action (send an automatic response) */ void inbox_do_vacation(struct irule *rule, struct CtdlMessage *msg) { - syslog(LOG_DEBUG, "inbox_do_vacation: sender: <%s>, vacation message: <%s>", - msg->cm_fields[erFc822Addr], - rule->autoreply_message - ); + syslog(LOG_DEBUG, "inbox_do_vacation: sender: <%s>, vacation", msg->cm_fields[erFc822Addr]); // If we can't determine who sent the message, no auto-reply can be sent. char *sender; @@ -482,10 +466,10 @@ void inbox_do_vacation(struct irule *rule, struct CtdlMessage *msg) { // Deliver the auto-reply. quickie_message( - NULL, + "", msg->cm_fields[eenVelopeTo], sender, - NULL, + MAILROOM, ChrPtr(reject_text), FMT_RFC822, "Delivery status notification" @@ -507,6 +491,7 @@ void inbox_do_msg(long msgnum, void *userdata) { struct MetaData smi; // If we are loading the metadata to compare, put it here. int rule_activated = 0; // On each rule, this is set if the compare succeeds and the rule activates. char compare_me[SIZ]; // On each rule, we will store the field to be compared here. + int compare_compound = 0; // Set to 1 when we are comparing both display name and email address int keep_message = 1; // Nonzero to keep the message in the inbox after processing, 0 to delete it. int i; @@ -577,12 +562,22 @@ void inbox_do_msg(long msgnum, void *userdata) { // If the rule involves a field comparison, load the field to be compared. compare_me[0] = 0; + compare_compound = 0; switch(ii->rules[i].compared_field) { - case field_from: // From: - if (!IsEmptyStr(msg->cm_fields[erFc822Addr])) { + if ( (!IsEmptyStr(msg->cm_fields[erFc822Addr])) && (!IsEmptyStr(msg->cm_fields[erFc822Addr])) ) { + snprintf(compare_me, sizeof compare_me, "%s|%s", + msg->cm_fields[eAuthor], + msg->cm_fields[erFc822Addr] + ); + compare_compound = 1; // there will be two fields to compare "name|address" + } + else if (!IsEmptyStr(msg->cm_fields[erFc822Addr])) { safestrncpy(compare_me, msg->cm_fields[erFc822Addr], sizeof compare_me); } + else if (!IsEmptyStr(msg->cm_fields[eAuthor])) { + safestrncpy(compare_me, msg->cm_fields[eAuthor], sizeof compare_me); + } break; case field_tocc: // To: or Cc: if (!IsEmptyStr(msg->cm_fields[eRecipient])) { @@ -650,39 +645,49 @@ void inbox_do_msg(long msgnum, void *userdata) { // For all of the above fields, we can compare the field we've loaded into the buffer. syslog(LOG_DEBUG, "Value of field to compare is: <%s>", compare_me); + int substring_match = (bmstrcasestr(compare_me, ii->rules[i].compared_value) ? 1 : 0); + int exact_match = 0; + if (compare_compound) { + char *sep = strchr(compare_me, '|'); + if (sep) { + *sep = 0; + exact_match = + (strcasecmp(compare_me, ii->rules[i].compared_value) ? 0 : 1) + + (strcasecmp(++sep, ii->rules[i].compared_value) ? 0 : 1) + ; + } + } + else { + exact_match = (strcasecmp(compare_me, ii->rules[i].compared_value) ? 0 : 1); + } + syslog(LOG_DEBUG, "substring match: %d", substring_match); + syslog(LOG_DEBUG, "exact match: %d", exact_match); switch(ii->rules[i].field_compare_op) { case fcomp_contains: case fcomp_matches: - rule_activated = (bmstrcasestr(compare_me, ii->rules[i].compared_value) ? 1 : 0); - syslog(LOG_DEBUG, "Does %s contain %s? %s", compare_me, ii->rules[i].compared_value, rule_activated?"yes":"no"); + rule_activated = substring_match; break; case fcomp_notcontains: case fcomp_notmatches: - rule_activated = (bmstrcasestr(compare_me, ii->rules[i].compared_value) ? 0 : 1); - syslog(LOG_DEBUG, "Does %s contain %s? %s", compare_me, ii->rules[i].compared_value, rule_activated?"yes":"no"); + rule_activated = !substring_match; break; case fcomp_is: - rule_activated = (strcasecmp(compare_me, ii->rules[i].compared_value) ? 0 : 1); - syslog(LOG_DEBUG, "Does %s equal %s? %s", compare_me, ii->rules[i].compared_value, rule_activated?"yes":"no"); + rule_activated = exact_match; break; case fcomp_isnot: - rule_activated = (strcasecmp(compare_me, ii->rules[i].compared_value) ? 1 : 0); - syslog(LOG_DEBUG, "Does %s equal %s? %s", compare_me, ii->rules[i].compared_value, rule_activated?"yes":"no"); + rule_activated = !exact_match; break; } break; case field_size: rule_activated = 0; - syslog(LOG_DEBUG, "comparing actual message size %ld to rule message size %ld", smi.meta_rfc822_length, ii->rules[i].compared_size); switch(ii->rules[i].field_compare_op) { case scomp_larger: rule_activated = ((smi.meta_rfc822_length > ii->rules[i].compared_size) ? 1 : 0); - syslog(LOG_DEBUG, "Is %ld larger than %ld? %s", smi.meta_rfc822_length, ii->rules[i].compared_size, (smi.meta_rfc822_length > ii->rules[i].compared_size) ? "yes":"no"); break; case scomp_smaller: rule_activated = ((smi.meta_rfc822_length < ii->rules[i].compared_size) ? 1 : 0); - syslog(LOG_DEBUG, "Is %ld smaller than %ld? %s", smi.meta_rfc822_length, ii->rules[i].compared_size, (smi.meta_rfc822_length < ii->rules[i].compared_size) ? "yes":"no"); break; } break; @@ -690,7 +695,7 @@ void inbox_do_msg(long msgnum, void *userdata) { rule_activated = 1; break; default: // no matches, fall through and do nothing - syslog(LOG_DEBUG, "inboxrules: an unknown field comparison was encountered"); + syslog(LOG_WARNING, "inboxrules: an unknown field comparison was encountered"); rule_activated = 0; break; } @@ -781,10 +786,6 @@ void do_inbox_processing_for_user(long usernum) { return; // config message exists but body is null } - - syslog(LOG_DEBUG, "ii->lastproc %ld", ii->lastproc); - syslog(LOG_DEBUG, "CC->user.lastproc_inboxrules %ld", CC->user.lastproc_inboxrules); - if (ii->lastproc > CC->user.lastproc_inboxrules) { // There might be a "last message processed" number left over CC->user.lastproc_inboxrules = ii->lastproc; // in the ruleset from a previous version. Use this if it is } // a higher number. @@ -825,11 +826,13 @@ int num_urip_alloc = 0; * Perform inbox processing for all rooms which require it */ void perform_inbox_processing(void) { + int i = 0; + if (num_urip == 0) { return; // no action required } - for (int i=0; iQRname[11], MAILROOM)) { @@ -853,7 +857,7 @@ int serv_inboxrules_roomhook(struct ctdlroom *room) { // first check to see if this user is already on the list if (num_urip > 0) { - for (int i=0; i<=num_urip; ++i) { + for (i=0; i<=num_urip; ++i) { if (users_requiring_inbox_processing[i] == usernum) { // already on the list! return(0); }