/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2004 by the Claws Mail Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002-2014 by the Claws Mail Team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include <glib.h>
#include "prefs_common.h"
#include "log.h"
#include "tags.h"
+#include "folder_item_prefs.h"
+#include "procmsg.h"
/*!
*\brief Keyword lookup element
{MATCHCRITERIA_NOT_WATCH_THREAD, "~watch_thread"},
{MATCHCRITERIA_SPAM, "spam"},
{MATCHCRITERIA_NOT_SPAM, "~spam"},
+ {MATCHCRITERIA_HAS_ATTACHMENT, "has_attachment"},
+ {MATCHCRITERIA_HAS_NO_ATTACHMENT, "~has_attachment"},
+ {MATCHCRITERIA_SIGNED, "signed"},
+ {MATCHCRITERIA_NOT_SIGNED, "~signed"},
/* msginfo headers */
{MATCHCRITERIA_SUBJECT, "subject"},
{MATCHCRITERIA_NOT_TAGGED, "~tagged"},
{MATCHCRITERIA_AGE_GREATER, "age_greater"},
{MATCHCRITERIA_AGE_LOWER, "age_lower"},
+ {MATCHCRITERIA_AGE_GREATER_HOURS, "age_greater_hours"},
+ {MATCHCRITERIA_AGE_LOWER_HOURS, "age_lower_hours"},
{MATCHCRITERIA_NEWSGROUPS, "newsgroups"},
{MATCHCRITERIA_NOT_NEWSGROUPS, "~newsgroups"},
+ {MATCHCRITERIA_MESSAGEID, "messageid"},
+ {MATCHCRITERIA_NOT_MESSAGEID, "~messageid"},
{MATCHCRITERIA_INREPLYTO, "inreplyto"},
{MATCHCRITERIA_NOT_INREPLYTO, "~inreplyto"},
{MATCHCRITERIA_REFERENCES, "references"},
{MATCHCRITERIA_NOT_HEADER, "~header"},
{MATCHCRITERIA_HEADERS_PART, "headers_part"},
{MATCHCRITERIA_NOT_HEADERS_PART, "~headers_part"},
+ {MATCHCRITERIA_HEADERS_CONT, "headers_cont"},
+ {MATCHCRITERIA_NOT_HEADERS_CONT, "~headers_cont"},
{MATCHCRITERIA_MESSAGE, "message"},
{MATCHCRITERIA_NOT_MESSAGE, "~message"},
{MATCHCRITERIA_BODY_PART, "body_part"},
MATCH_ONE = 2
};
+enum {
+ CONTEXT_SUBJECT,
+ CONTEXT_FROM,
+ CONTEXT_TO,
+ CONTEXT_CC,
+ CONTEXT_NEWSGROUPS,
+ CONTEXT_MESSAGEID,
+ CONTEXT_IN_REPLY_TO,
+ CONTEXT_REFERENCES,
+ CONTEXT_HEADER,
+ CONTEXT_HEADER_LINE,
+ CONTEXT_BODY_LINE,
+ CONTEXT_TAG,
+ N_CONTEXT_STRS
+};
+
+static gchar *context_str[N_CONTEXT_STRS];
+
+void matcher_init(void)
+{
+ if (context_str[CONTEXT_SUBJECT] != NULL)
+ return;
+
+ context_str[CONTEXT_SUBJECT] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Subject:"));
+ context_str[CONTEXT_FROM] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("From:"));
+ context_str[CONTEXT_TO] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
+ context_str[CONTEXT_CC] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
+ context_str[CONTEXT_NEWSGROUPS] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Newsgroups:"));
+ context_str[CONTEXT_MESSAGEID] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Message-ID:"));
+ context_str[CONTEXT_IN_REPLY_TO] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("In-Reply-To:"));
+ context_str[CONTEXT_REFERENCES] = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("References:"));
+ context_str[CONTEXT_HEADER] = g_strdup(_("header"));
+ context_str[CONTEXT_HEADER_LINE] = g_strdup(_("header line"));
+ context_str[CONTEXT_BODY_LINE] = g_strdup(_("body line"));
+ context_str[CONTEXT_TAG] = g_strdup(_("tag"));
+}
+
+void matcher_done(void)
+{
+ int i;
+ for (i = 0; i < N_CONTEXT_STRS; i++) {
+ g_free(context_str[i]);
+ context_str[i] = NULL;
+ }
+}
+
extern gboolean debug_filtering_session;
/*!
prop->criteria = criteria;
prop->header = header != NULL ? g_strdup(header) : NULL;
- if (matchtype == MATCHTYPE_MATCHCASE ||
- matchtype == MATCHTYPE_REGEXPCASE)
- prop->expr = expr != NULL ? g_utf8_casefold(expr, -1) : NULL;
- else
- prop->expr = expr != NULL ? g_strdup(expr) : NULL;
-
- prop->matchtype = matchtype;
- prop->preg = NULL;
- prop->value = value;
- prop->error = 0;
-
- return prop;
-}
-
-/*!
- *\brief Allocate a structure for a filtering / scoring
- * "condition" (a matcher structure)
- * Same as matcherprop_new, except it doesn't change the expr's
- * case.
- *
- *\param criteria Criteria ID (MATCHCRITERIA_XXXX)
- *\param header Header string (if criteria is MATCHCRITERIA_HEADER
- or MATCHCRITERIA_FOUND_IN_ADDRESSBOOK)
- *\param matchtype Type of action (MATCHTYPE_XXX)
- *\param expr String value or expression to check
- *\param value Integer value to check
- *
- *\return MatcherProp * Pointer to newly allocated structure
- */
-MatcherProp *matcherprop_new_create(gint criteria, const gchar *header,
- gint matchtype, const gchar *expr,
- int value)
-{
- MatcherProp *prop;
-
- prop = g_new0(MatcherProp, 1);
- prop->criteria = criteria;
- prop->header = header != NULL ? g_strdup(header) : NULL;
-
prop->expr = expr != NULL ? g_strdup(expr) : NULL;
prop->matchtype = matchtype;
+#ifndef G_OS_WIN32
prop->preg = NULL;
+#endif
prop->value = value;
prop->error = 0;
{
g_free(prop->expr);
g_free(prop->header);
+#ifndef G_OS_WIN32
if (prop->preg != NULL) {
regfree(prop->preg);
g_free(prop->preg);
}
+#endif
g_free(prop);
}
prop->expr = src->expr ? g_strdup(src->expr) : NULL;
prop->matchtype = src->matchtype;
+#ifndef G_OS_WIN32
prop->preg = NULL; /* will be re-evaluated */
+#endif
prop->value = src->value;
prop->error = src->error;
return prop;
gboolean found = FALSE;
gchar *path = NULL;
- g_return_val_if_fail(address_list != NULL, FALSE);
+ cm_return_val_if_fail(address_list != NULL, FALSE);
debug_print("match_with_addresses_in_addressbook(%d, %s)\n",
g_slist_length(address_list), folderpath?folderpath:"(null)");
if (folderpath == NULL ||
- strcasecmp(folderpath, _("Any")) == 0 ||
+ strcasecmp(folderpath, "Any") == 0 ||
*folderpath == '\0')
path = NULL;
else
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH
&& !found) {
log_print(LOG_DEBUG_FILTERING,
- "address [ %s ] doesn't match\n",
+ "address [ %s ] does NOT match\n",
(gchar *)walk->data);
}
g_free(walk->data);
const gchar *debug_context)
{
gchar *str1;
+ gchar *down_expr;
gboolean ret = FALSE;
gboolean should_free = FALSE;
if (str == NULL)
if (prop->matchtype == MATCHTYPE_REGEXPCASE ||
prop->matchtype == MATCHTYPE_MATCHCASE) {
str1 = g_utf8_casefold(str, -1);
+ down_expr = g_utf8_casefold(prop->expr, -1);
should_free = TRUE;
} else {
str1 = (gchar *)str;
+ down_expr = (gchar *)prop->expr;
should_free = FALSE;
}
switch (prop->matchtype) {
case MATCHTYPE_REGEXPCASE:
case MATCHTYPE_REGEXP:
+#ifndef G_OS_WIN32
if (!prop->preg && (prop->error == 0)) {
prop->preg = g_new0(regex_t, 1);
/* if regexp then don't use the escaped string */
- if (regcomp(prop->preg, prop->expr,
+ if (regcomp(prop->preg, down_expr,
REG_NOSUB | REG_EXTENDED
| ((prop->matchtype == MATCHTYPE_REGEXPCASE)
? REG_ICASE : 0)) != 0) {
prop->preg = NULL;
}
}
- if (prop->preg == NULL)
- return FALSE;
+ if (prop->preg == NULL) {
+ ret = FALSE;
+ goto free_strs;
+ }
if (regexec(prop->preg, str1, 0, NULL, 0) == 0)
ret = TRUE;
prop->matchtype == MATCHTYPE_REGEXP ? _("Case sensitive"):_("Case insensitive"));
} else {
log_print(LOG_DEBUG_FILTERING,
- "%s value [ %s ] doesn't matches regular expression [ %s ] (%s)\n",
+ "%s value [ %s ] does NOT match regular expression [ %s ] (%s)\n",
debug_context, stripped, prop->expr,
prop->matchtype == MATCHTYPE_REGEXP ? _("Case sensitive"):_("Case insensitive"));
}
g_free(stripped);
}
break;
-
+#endif
case MATCHTYPE_MATCHCASE:
case MATCHTYPE_MATCH:
- ret = (strstr(str1, prop->expr) != NULL);
+ ret = (strstr(str1, down_expr) != NULL);
/* debug output */
if (debug_filtering_session
prop->matchtype == MATCHTYPE_MATCH ? _("Case sensitive"):_("Case insensitive"));
} else {
log_print(LOG_DEBUG_FILTERING,
- "%s value [ %s ] doesn't contains [ %s ] (%s)\n",
+ "%s value [ %s ] does NOT contain [ %s ] (%s)\n",
debug_context, stripped, prop->expr,
prop->matchtype == MATCHTYPE_MATCH ? _("Case sensitive"):_("Case insensitive"));
}
break;
}
+free_strs:
if (should_free) {
g_free(str1);
+ g_free(down_expr);
}
return ret;
}
return FALSE;
}
-/* FIXME body search is a hack. */
-static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *str,
- const gchar *debug_context)
+static gboolean matcherprop_header_line_match(MatcherProp *prop, const gchar *hdr,
+ const gchar *str, const gboolean both,
+ const gchar *debug_context)
{
- gchar *utf = NULL;
- gchar tmp[BUFFSIZE];
gboolean res = FALSE;
- if (str == NULL)
+ if (hdr == NULL || str == NULL)
return FALSE;
- /* we try to decode QP first, because it's faster than base64 */
- qp_decode_const(tmp, BUFFSIZE-1, str);
- if (!g_utf8_validate(tmp, -1, NULL)) {
- utf = conv_codeset_strdup
- (tmp, conv_get_locale_charset_str_no_utf8(),
- CS_INTERNAL);
- res = matcherprop_string_match(prop, utf, debug_context);
- g_free(utf);
+ if (both) {
+ /* Search in all header names and content.
+ */
+ gchar *line = g_strdup_printf("%s %s", hdr, str);
+ res = matcherprop_string_match(prop, line, debug_context);
+ g_free(line);
} else {
- res = matcherprop_string_match(prop, tmp, debug_context);
- }
-
- if (res == FALSE && (strchr(prop->expr, '=') || strchr(prop->expr, '_')
- || strchr(str, '=') || strchr(str, '_'))) {
- /* if searching for something with an equal char, maybe
- * we should try to match the non-decoded string.
- * In case it was not qp-encoded. */
- if (!g_utf8_validate(str, -1, NULL)) {
- utf = conv_codeset_strdup
- (str, conv_get_locale_charset_str_no_utf8(),
- CS_INTERNAL);
- res = matcherprop_string_match(prop, utf, debug_context);
- g_free(utf);
- } else {
- res = matcherprop_string_match(prop, str, debug_context);
- }
+ /* Search only in content and exclude private headers.
+ * E.g.: searching for "H foo" in folder x/foo would return
+ * *all* mail as SCF and RMID will match.
+ * Searching for "H sent" would return all resent messages
+ * as "Resent-From: whatever" will match.
+ */
+ if (procheader_header_is_internal(hdr))
+ return FALSE;
+ res = matcherprop_string_match(prop, str, debug_context);
}
- /* FIXME base64 decoding is too slow, especially since text can
- * easily be handled as base64. Don't even try now. */
-
return res;
}
#endif
file = procmsg_get_message_file(info);
- if (file == NULL)
+ if (file == NULL) {
+#ifdef USE_PTHREAD
+ g_free(td);
+#endif
return FALSE;
+ }
g_free(file);
cmd = matching_build_command(prop->expr, info);
- if (cmd == NULL)
+ if (cmd == NULL) {
+#ifdef USE_PTHREAD
+ g_free(td);
+#endif
return FALSE;
+}
#ifdef USE_PTHREAD
/* debug output */
*
*\return gboolean TRUE if a match
*/
-gboolean matcherprop_match(MatcherProp *prop,
- MsgInfo *info)
+static gboolean matcherprop_match(MatcherProp *prop,
+ MsgInfo *info)
{
time_t t;
+ gint age_mult_hours = 1;
switch(prop->criteria) {
case MATCHCRITERIA_ALL:
return MSG_IS_SPAM(info->flags);
case MATCHCRITERIA_NOT_SPAM:
return !MSG_IS_SPAM(info->flags);
+ case MATCHCRITERIA_HAS_ATTACHMENT:
+ return MSG_IS_WITH_ATTACHMENT(info->flags);
+ case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+ return !MSG_IS_WITH_ATTACHMENT(info->flags);
+ case MATCHCRITERIA_SIGNED:
+ return MSG_IS_SIGNED(info->flags);
+ case MATCHCRITERIA_NOT_SIGNED:
+ return !MSG_IS_SIGNED(info->flags);
case MATCHCRITERIA_COLORLABEL:
{
gint color = MSG_GET_COLORLABEL_VALUE(info->flags);
color, prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message color value [ %d ] doesn't matches color value [ %d ]\n",
+ "message color value [ %d ] does NOT match color value [ %d ]\n",
color, prop->value);
}
}
color, prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message color value [ %d ] doesn't matches color value [ %d ]\n",
+ "message color value [ %d ] does NOT match color value [ %d ]\n",
color, prop->value);
}
}
case MATCHCRITERIA_NOT_WATCH_THREAD:
return !MSG_IS_WATCH_THREAD(info->flags);
case MATCHCRITERIA_SUBJECT:
- return matcherprop_string_match(prop, info->subject,
- prefs_common_translated_header_name("Subject:"));
+ return matcherprop_string_match(prop, info->subject, context_str[CONTEXT_SUBJECT]);
case MATCHCRITERIA_NOT_SUBJECT:
- return !matcherprop_string_match(prop, info->subject,
- prefs_common_translated_header_name("Subject:"));
+ return !matcherprop_string_match(prop, info->subject, context_str[CONTEXT_SUBJECT]);
case MATCHCRITERIA_FROM:
+ return matcherprop_string_match(prop, info->from, context_str[CONTEXT_FROM]);
case MATCHCRITERIA_NOT_FROM:
- {
- gchar *context;
- gboolean ret;
-
- context = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("From:"));
- ret = matcherprop_string_match(prop, info->from, context);
- g_free(context);
- return (prop->criteria == MATCHCRITERIA_FROM)? ret : !ret;
- }
+ return !matcherprop_string_match(prop, info->from, context_str[CONTEXT_FROM]);
case MATCHCRITERIA_TO:
+ return matcherprop_string_match(prop, info->to, context_str[CONTEXT_TO]);
case MATCHCRITERIA_NOT_TO:
- {
- gchar *context;
- gboolean ret;
-
- context = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
- ret = matcherprop_string_match(prop, info->to, context);
- g_free(context);
- return (prop->criteria == MATCHCRITERIA_TO)? ret : !ret;
- }
+ return !matcherprop_string_match(prop, info->to, context_str[CONTEXT_TO]);
case MATCHCRITERIA_CC:
+ return matcherprop_string_match(prop, info->cc, context_str[CONTEXT_CC]);
case MATCHCRITERIA_NOT_CC:
- {
- gchar *context;
- gboolean ret;
-
- context = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
- ret = matcherprop_string_match(prop, info->cc, context);
- g_free(context);
- return (prop->criteria == MATCHCRITERIA_CC)? ret : !ret;
- }
+ return !matcherprop_string_match(prop, info->cc, context_str[CONTEXT_CC]);
case MATCHCRITERIA_TO_OR_CC:
- {
- gchar *context1, *context2;
- gboolean ret;
-
- context1 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
- context2 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
- ret = matcherprop_string_match(prop, info->to, context1)
- || matcherprop_string_match(prop, info->cc, context2);
- g_free(context1);
- g_free(context2);
- return ret;
- }
+ return matcherprop_string_match(prop, info->to, context_str[CONTEXT_TO])
+ || matcherprop_string_match(prop, info->cc, context_str[CONTEXT_CC]);
case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
- {
- gchar *context1, *context2;
- gboolean ret;
-
- context1 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
- context2 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
- ret = !(matcherprop_string_match(prop, info->to, context1)
- || matcherprop_string_match(prop, info->cc, context2));
- g_free(context1);
- g_free(context2);
- return ret;
- }
+ return !matcherprop_string_match(prop, info->to, context_str[CONTEXT_TO])
+ && !matcherprop_string_match(prop, info->cc, context_str[CONTEXT_CC]);
case MATCHCRITERIA_TAG:
+ return matcherprop_tag_match(prop, info, context_str[CONTEXT_TAG]);
case MATCHCRITERIA_NOT_TAG:
- {
- gboolean ret;
-
- ret = matcherprop_tag_match(prop, info, _("Tag"));
- return (prop->criteria == MATCHCRITERIA_TAG)? ret : !ret;
- }
+ return !matcherprop_tag_match(prop, info, context_str[CONTEXT_TAG]);
case MATCHCRITERIA_TAGGED:
+ return info->tags != NULL;
case MATCHCRITERIA_NOT_TAGGED:
- {
- gboolean ret;
-
- ret = (info->tags != NULL);
- return (prop->criteria == MATCHCRITERIA_TAGGED)? ret : !ret;
- }
+ return info->tags == NULL;
case MATCHCRITERIA_AGE_GREATER:
+ age_mult_hours = 24;
+ /* Fallthrough intended */
+ case MATCHCRITERIA_AGE_GREATER_HOURS:
{
gboolean ret;
gint age;
t = time(NULL);
- age = ((t - info->date_t) / (60 * 60 * 24));
- ret = (age > prop->value);
+ age = ((t - info->date_t) / (60 * 60 * age_mult_hours));
+ ret = (age >= prop->value);
/* debug output */
if (debug_filtering_session
return ret;
}
case MATCHCRITERIA_AGE_LOWER:
+ age_mult_hours = 24;
+ /* Fallthrough intended */
+ case MATCHCRITERIA_AGE_LOWER_HOURS:
{
gboolean ret;
gint age;
t = time(NULL);
- age = ((t - info->date_t) / (60 * 60 * 24));
+ age = ((t - info->date_t) / (60 * 60 * age_mult_hours));
ret = (age < prop->value);
/* debug output */
}
case MATCHCRITERIA_SIZE_GREATER:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->size > (off_t) prop->value);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->size > (goffset) prop->value);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is greater than [ %d ]\n",
- info->size, prop->value);
+ "message size is greater than [ %d ]\n",
+ prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is not greater than [ %d ]\n",
- info->size, prop->value);
+ "message size is not greater than [ %d ]\n",
+ prop->value);
}
}
return ret;
}
case MATCHCRITERIA_SIZE_SMALLER:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->size < (off_t) prop->value);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->size < (goffset) prop->value);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is smaller than [ %d ]\n",
- info->size, prop->value);
+ "message size is smaller than [ %d ]\n",
+ prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is not smaller than [ %d ]\n",
- info->size, prop->value);
+ "message size is not smaller than [ %d ]\n",
+ prop->value);
}
}
return ret;
}
case MATCHCRITERIA_SIZE_EQUAL:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->size == (off_t) prop->value);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->size == (goffset) prop->value);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is equal to [ %d ]\n",
- info->size, prop->value);
+ "message size is equal to [ %d ]\n",
+ prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is not equal to [ %d ]\n",
- info->size, prop->value);
+ "message size is not equal to [ %d ]\n",
+ prop->value);
}
}
return ret;
}
case MATCHCRITERIA_PARTIAL:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->total_size != 0 && info->size != (off_t)info->total_size);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->total_size != 0 && info->size != (goffset)info->total_size);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message is partially downloaded, size [ %ld ] is less than total size [ %d ])\n",
- info->size, info->total_size);
+ "message is partially downloaded, size is less than total size [ %d ])\n",
+ info->total_size);
} else {
log_print(LOG_DEBUG_FILTERING,
"message is not partially downloaded\n");
}
case MATCHCRITERIA_NOT_PARTIAL:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->total_size == 0 || info->size == (off_t)info->total_size);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->total_size == 0 || info->size == (goffset)info->total_size);
/* debug output */
if (debug_filtering_session
"message is not partially downloaded\n");
} else {
log_print(LOG_DEBUG_FILTERING,
- "message is partially downloaded, size [ %ld ] is less than total size [ %d ])\n",
- info->size, info->total_size);
+ "message is partially downloaded, size is less than total size [ %d ])\n",
+ info->total_size);
}
}
return ret;
}
case MATCHCRITERIA_NEWSGROUPS:
+ return matcherprop_string_match(prop, info->newsgroups, context_str[CONTEXT_NEWSGROUPS]);
case MATCHCRITERIA_NOT_NEWSGROUPS:
- {
- gchar *context;
- gboolean ret;
-
- context = g_strdup_printf(_("%s header"),
- prefs_common_translated_header_name("Newsgroups:"));
- ret = matcherprop_string_match(prop, info->newsgroups, context);
- g_free(context);
- return (prop->criteria == MATCHCRITERIA_NEWSGROUPS)? ret : !ret;
- }
+ return !matcherprop_string_match(prop, info->newsgroups, context_str[CONTEXT_NEWSGROUPS]);
+ case MATCHCRITERIA_MESSAGEID:
+ return matcherprop_string_match(prop, info->msgid, context_str[CONTEXT_MESSAGEID]);
+ case MATCHCRITERIA_NOT_MESSAGEID:
+ return !matcherprop_string_match(prop, info->msgid, context_str[CONTEXT_MESSAGEID]);
case MATCHCRITERIA_INREPLYTO:
+ return matcherprop_string_match(prop, info->inreplyto, context_str[CONTEXT_IN_REPLY_TO]);
case MATCHCRITERIA_NOT_INREPLYTO:
- {
- gchar *context;
- gboolean ret;
-
- context = g_strdup_printf(_("%s header"),
- prefs_common_translated_header_name("In-Reply-To:"));
- ret = matcherprop_string_match(prop, info->inreplyto, context);
- g_free(context);
- return (prop->criteria == MATCHCRITERIA_INREPLYTO)? ret : !ret;
- }
+ return !matcherprop_string_match(prop, info->inreplyto, context_str[CONTEXT_IN_REPLY_TO]);
case MATCHCRITERIA_REFERENCES:
+ return matcherprop_list_match(prop, info->references, context_str[CONTEXT_REFERENCES]);
case MATCHCRITERIA_NOT_REFERENCES:
- {
- gchar *context;
- gboolean ret;
-
- context = g_strdup_printf(_("%s header"),
- prefs_common_translated_header_name("References:"));
- ret = matcherprop_list_match(prop, info->references, context);
- g_free(context);
- return (prop->criteria == MATCHCRITERIA_REFERENCES)? ret : !ret;
- }
+ return !matcherprop_list_match(prop, info->references, context_str[CONTEXT_REFERENCES]);
case MATCHCRITERIA_TEST:
return matcherprop_match_test(prop, info);
case MATCHCRITERIA_NOT_TEST:
return cond;
}
+#ifdef G_OS_UNIX
+/*!
+ *\brief Builds a single regular expresion from an array of srings.
+ *
+ *\param strings The lines containing the different sub-regexp.
+ *
+ *\return The newly allocated regexp string.
+ */
+static gchar *build_complete_regexp(gchar **strings)
+{
+ int i = 0;
+ gchar *expr = NULL;
+ while (strings && strings[i] && *strings[i]) {
+ int old_len = expr ? strlen(expr):0;
+ int new_len = 0;
+ gchar *tmpstr = NULL;
+
+ if (g_utf8_validate(strings[i], -1, NULL))
+ tmpstr = g_strdup(strings[i]);
+ else
+ tmpstr = conv_codeset_strdup(strings[i],
+ conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+
+ if (strstr(tmpstr, "\n"))
+ *(strstr(tmpstr, "\n")) = '\0';
+
+ new_len = strlen(tmpstr);
+
+ expr = g_realloc(expr,
+ expr ? (old_len + strlen("|()") + new_len + 1)
+ : (strlen("()") + new_len + 1));
+
+ if (old_len) {
+ strcpy(expr + old_len, "|(");
+ strcpy(expr + old_len + 2, tmpstr);
+ strcpy(expr + old_len + 2 + new_len, ")");
+ } else {
+ strcpy(expr+old_len, "(");
+ strcpy(expr+old_len + 1, tmpstr);
+ strcpy(expr+old_len + 1 + new_len, ")");
+ }
+ g_free(tmpstr);
+ i++;
+ }
+ return expr;
+}
+#endif
+
+/*!
+ *\brief Create a new list of matchers from a multi-line string
+ *
+ *\param lines String with "\n"-separated expressions
+ *\param bool_and Operator
+ *\param case_sensitive If the matching is case sensitive or not
+ *
+ *\return MatcherList * New matcher list
+ */
+MatcherList *matcherlist_new_from_lines(gchar *lines, gboolean bool_and,
+ gboolean case_sensitive)
+{
+ MatcherProp *m = NULL;
+ GSList *matchers = NULL;
+ gchar **strings = g_strsplit(lines, "\n", -1);
+
+#ifdef G_OS_UNIX
+ gchar *expr = NULL;
+ expr = build_complete_regexp(strings);
+ debug_print("building matcherprop for expr '%s'\n", expr?expr:"NULL");
+
+ m = matcherprop_new(MATCHCRITERIA_SUBJECT, NULL,
+ case_sensitive? MATCHTYPE_REGEXP: MATCHTYPE_REGEXPCASE,
+ expr, 0);
+ if (m == NULL) {
+ /* print error message */
+ debug_print("failed to allocate memory for matcherprop\n");
+ } else {
+ matchers = g_slist_append(matchers, m);
+ }
+
+ g_free(expr);
+#else
+ int i = 0;
+ while (strings && strings[i] && *strings[i]) {
+ m = matcherprop_new(MATCHCRITERIA_SUBJECT, NULL,
+ case_sensitive? MATCHTYPE_MATCH: MATCHTYPE_MATCHCASE,
+ strings[i], 0);
+ if (m == NULL) {
+ /* print error message */
+ debug_print("failed to allocate memory for matcherprop\n");
+ } else {
+ matchers = g_slist_append(matchers, m);
+ }
+ i++;
+ }
+#endif
+ g_strfreev(strings);
+
+ return matcherlist_new(matchers, bool_and);
+}
+
/*!
*\brief Frees a list of matchers
*
{
GSList *l;
- g_return_if_fail(cond);
+ cm_return_if_fail(cond);
for (l = cond->matchers ; l != NULL ; l = g_slist_next(l)) {
matcherprop_free((MatcherProp *) l->data);
}
+ g_slist_free(cond->matchers);
g_free(cond);
}
if (procheader_headername_equal(header->name,
matcher->header)) {
if (matcher->criteria == MATCHCRITERIA_HEADER)
- result = matcherprop_string_match(matcher, header->body, _("header"));
+ result = matcherprop_string_match(matcher, header->body, context_str[CONTEXT_HEADER]);
else
- result = !matcherprop_string_match(matcher, header->body, _("header"));
+ result = !matcherprop_string_match(matcher, header->body, context_str[CONTEXT_HEADER]);
procheader_header_free(header);
return result;
}
}
break;
case MATCHCRITERIA_HEADERS_PART:
- return matcherprop_string_match(matcher, buf, _("header line"));
- case MATCHCRITERIA_NOT_HEADERS_PART:
- return !matcherprop_string_match(matcher, buf, _("headers line"));
+ case MATCHCRITERIA_HEADERS_CONT:
case MATCHCRITERIA_MESSAGE:
- return matcherprop_string_decode_match(matcher, buf, _("message line"));
+ header = procheader_parse_header(buf);
+ if (!header)
+ return FALSE;
+ result = matcherprop_header_line_match(matcher,
+ header->name, header->body,
+ (matcher->criteria == MATCHCRITERIA_HEADERS_PART),
+ context_str[CONTEXT_HEADER_LINE]);
+ procheader_header_free(header);
+ return result;
+ case MATCHCRITERIA_NOT_HEADERS_CONT:
+ case MATCHCRITERIA_NOT_HEADERS_PART:
case MATCHCRITERIA_NOT_MESSAGE:
- return !matcherprop_string_decode_match(matcher, buf, _("message line"));
+ header = procheader_parse_header(buf);
+ if (!header)
+ return FALSE;
+ result = !matcherprop_header_line_match(matcher,
+ header->name, header->body,
+ (matcher->criteria == MATCHCRITERIA_NOT_HEADERS_PART),
+ context_str[CONTEXT_HEADER_LINE]);
+ procheader_header_free(header);
+ return result;
case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
{
gint match = MATCH_ONE;
gboolean found = FALSE;
- /* how many address headers are me trying to mach? */
- if (strcasecmp(matcher->header, _("Any")) == 0)
+ /* how many address headers are we trying to match? */
+ if (strcasecmp(matcher->header, "Any") == 0)
match = MATCH_ANY;
- else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
+ else if (strcasecmp(matcher->header, "All") == 0)
match = MATCH_ALL;
if (match == MATCH_ONE) {
case MATCHCRITERIA_HEADER:
case MATCHCRITERIA_NOT_HEADER:
case MATCHCRITERIA_HEADERS_PART:
+ case MATCHCRITERIA_HEADERS_CONT:
case MATCHCRITERIA_NOT_HEADERS_PART:
- return TRUE;
+ case MATCHCRITERIA_NOT_HEADERS_CONT:
case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
- if (!strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) ||
- !strcasecmp(matcher->header, _("Any")) ||
- !strcasecmp(matcher->header, "Sender") ||
- !strcasecmp(matcher->header, "Reply-To"))
- return TRUE;
- else
- return FALSE;
+ return TRUE;
default:
return FALSE;
}
/* determine the match range (all, any are our concern here) */
if (matcher->criteria == MATCHCRITERIA_NOT_HEADERS_PART ||
+ matcher->criteria == MATCHCRITERIA_NOT_HEADERS_CONT ||
matcher->criteria == MATCHCRITERIA_NOT_MESSAGE) {
match = MATCH_ALL;
procheader_headername_equal(header->name, "Reply-To") ||
procheader_headername_equal(header->name, "Sender"))) {
- if (strcasecmp(matcher->header, _("Any")) == 0)
+ if (strcasecmp(matcher->header, "Any") == 0)
match = MATCH_ANY;
- else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
+ else if (strcasecmp(matcher->header, "All") == 0)
match = MATCH_ALL;
else
match = MATCH_ONE;
return FALSE;
}
}
-
-/*!
- *\brief Check if a (line) string matches the criteria
- * described by a matcher structure
- *
- *\param matcher Matcher structure
- *\param line String
- *
- *\return gboolean TRUE if string matches criteria
- */
-static gboolean matcherprop_match_line(MatcherProp *matcher, const gchar *line)
-{
- switch (matcher->criteria) {
- case MATCHCRITERIA_BODY_PART:
- case MATCHCRITERIA_MESSAGE:
- return matcherprop_string_decode_match(matcher, line, _("body line"));
- case MATCHCRITERIA_NOT_BODY_PART:
- case MATCHCRITERIA_NOT_MESSAGE:
- return !matcherprop_string_decode_match(matcher, line, _("body line"));
- }
- return FALSE;
-}
-
-/*!
- *\brief Check if a line in a message file's body matches
- * the criteria
- *
- *\param matchers List of conditions
- *\param fp Message file
- *
- *\return gboolean TRUE if succesful match
- */
-static gboolean matcherlist_match_body(MatcherList *matchers, FILE *fp)
+
+static gboolean matcherlist_match_binary_content(MatcherList *matchers, MimeInfo *partinfo)
{
- GSList *l;
+ FILE *outfp;
gchar buf[BUFFSIZE];
-
- while (fgets(buf, sizeof(buf), fp) != NULL) {
+ GSList *l;
+
+ if (!partinfo || partinfo->type == MIMETYPE_TEXT)
+ return FALSE;
+ else
+ outfp = procmime_get_binary_content(partinfo);
+
+ if (!outfp)
+ return FALSE;
+
+ while (fgets(buf, sizeof(buf), outfp) != NULL) {
+ strretchomp(buf);
+
for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
MatcherProp *matcher = (MatcherProp *) l->data;
-
+
if (matcher->done)
continue;
+ /* Don't scan non-text parts when looking in body, only
+ * when looking in whole message
+ */
+ if (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
+ matcher->criteria == MATCHCRITERIA_BODY_PART)
+ continue;
+
/* if the criteria is ~body_part or ~message, ZERO lines
- * must NOT match for the rule to match. */
+ * must match for the rule to match.
+ */
if (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
matcher->criteria == MATCHCRITERIA_NOT_MESSAGE) {
- if (matcherprop_match_line(matcher, buf)) {
- matcher->result = TRUE;
- } else {
+ if (matcherprop_string_match(matcher, buf,
+ context_str[CONTEXT_BODY_LINE])) {
matcher->result = FALSE;
matcher->done = TRUE;
- }
+ } else
+ matcher->result = TRUE;
/* else, just one line has to match */
} else if (matcherprop_criteria_body(matcher) ||
- matcherprop_criteria_message(matcher)) {
- if (matcherprop_match_line(matcher, buf)) {
+ matcherprop_criteria_message(matcher)) {
+ if (matcherprop_string_match(matcher, buf,
+ context_str[CONTEXT_BODY_LINE])) {
matcher->result = TRUE;
matcher->done = TRUE;
}
/* if the matchers are OR'ed and the rule matched,
* no need to check the others. */
if (matcher->result && matcher->done) {
- if (!matchers->bool_and)
+ if (!matchers->bool_and) {
+ fclose(outfp);
return TRUE;
+ }
+ }
+ }
+ }
+
+ fclose(outfp);
+ return FALSE;
+}
+
+static gboolean match_content_cb(const gchar *buf, gpointer data)
+{
+ MatcherList *matchers = (MatcherList *)data;
+ gboolean all_done = TRUE;
+ GSList *l;
+
+ for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
+ MatcherProp *matcher = (MatcherProp *) l->data;
+
+ if (matcher->done)
+ continue;
+
+ /* if the criteria is ~body_part or ~message, ZERO lines
+ * must match for the rule to match.
+ */
+ if (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
+ matcher->criteria == MATCHCRITERIA_NOT_MESSAGE) {
+ if (matcherprop_string_match(matcher, buf,
+ context_str[CONTEXT_BODY_LINE])) {
+ matcher->result = FALSE;
+ matcher->done = TRUE;
+ } else
+ matcher->result = TRUE;
+ /* else, just one line has to match */
+ } else if (matcherprop_criteria_body(matcher) ||
+ matcherprop_criteria_message(matcher)) {
+ if (matcherprop_string_match(matcher, buf,
+ context_str[CONTEXT_BODY_LINE])) {
+ matcher->result = TRUE;
+ matcher->done = TRUE;
+ }
+ }
+
+ /* if the matchers are OR'ed and the rule matched,
+ * no need to check the others. */
+ if (matcher->result && matcher->done) {
+ if (!matchers->bool_and) {
+ return TRUE;
+ }
+ }
+
+ if (!matcher->done)
+ all_done = FALSE;
+ }
+ return all_done;
+}
+
+static gboolean matcherlist_match_text_content(MatcherList *matchers, MimeInfo *partinfo)
+{
+ if (partinfo->type != MIMETYPE_TEXT)
+ return FALSE;
+
+ return procmime_scan_text_content(partinfo, match_content_cb, matchers);
+}
+
+/*!
+ *\brief Check if a line in a message file's body matches
+ * the criteria
+ *
+ *\param matchers List of conditions
+ *\param fp Message file
+ *
+ *\return gboolean TRUE if succesful match
+ */
+static gboolean matcherlist_match_body(MatcherList *matchers, gboolean body_only, MsgInfo *info)
+{
+ MimeInfo *mimeinfo = NULL;
+ MimeInfo *partinfo = NULL;
+ gboolean first_text_found = FALSE;
+
+ cm_return_val_if_fail(info != NULL, FALSE);
+
+ mimeinfo = procmime_scan_message(info);
+
+ /* Skip headers */
+ partinfo = procmime_mimeinfo_next(mimeinfo);
+
+ for (; partinfo != NULL; partinfo = procmime_mimeinfo_next(partinfo)) {
+
+ if (partinfo->type != MIMETYPE_TEXT && body_only)
+ continue;
+
+ if (partinfo->type == MIMETYPE_TEXT) {
+ first_text_found = TRUE;
+ if (matcherlist_match_text_content(matchers, partinfo)) {
+ procmime_mimeinfo_free_all(mimeinfo);
+ return TRUE;
}
+ } else if (matcherlist_match_binary_content(matchers, partinfo)) {
+ procmime_mimeinfo_free_all(mimeinfo);
+ return TRUE;
}
+
+ if (body_only && first_text_found)
+ break;
}
+ procmime_mimeinfo_free_all(mimeinfo);
+
return FALSE;
}
{
gboolean read_headers;
gboolean read_body;
+ gboolean body_only;
GSList *l;
FILE *fp;
gchar *file;
read_headers = FALSE;
read_body = FALSE;
+ body_only = TRUE;
for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
MatcherProp *matcher = (MatcherProp *) l->data;
if (matcherprop_criteria_message(matcher)) {
read_headers = TRUE;
read_body = TRUE;
+ body_only = FALSE;
}
matcher->result = FALSE;
matcher->done = FALSE;
/* read the body */
if (read_body) {
- matcherlist_match_body(matchers, fp);
+ matcherlist_match_body(matchers, body_only, info);
}
for (l = matchers->matchers; l != NULL; l = g_slist_next(l)) {
case MATCHCRITERIA_NOT_LOCKED:
case MATCHCRITERIA_SPAM:
case MATCHCRITERIA_NOT_SPAM:
+ case MATCHCRITERIA_HAS_ATTACHMENT:
+ case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+ case MATCHCRITERIA_SIGNED:
+ case MATCHCRITERIA_NOT_SIGNED:
case MATCHCRITERIA_COLORLABEL:
case MATCHCRITERIA_NOT_COLORLABEL:
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_TAGGED:
case MATCHCRITERIA_AGE_GREATER:
case MATCHCRITERIA_AGE_LOWER:
+ case MATCHCRITERIA_AGE_GREATER_HOURS:
+ case MATCHCRITERIA_AGE_LOWER_HOURS:
case MATCHCRITERIA_NEWSGROUPS:
case MATCHCRITERIA_NOT_NEWSGROUPS:
+ case MATCHCRITERIA_MESSAGEID:
+ case MATCHCRITERIA_NOT_MESSAGEID:
case MATCHCRITERIA_INREPLYTO:
case MATCHCRITERIA_NOT_INREPLYTO:
case MATCHCRITERIA_REFERENCES:
switch (matcher->criteria) {
case MATCHCRITERIA_AGE_GREATER:
case MATCHCRITERIA_AGE_LOWER:
+ case MATCHCRITERIA_AGE_GREATER_HOURS:
+ case MATCHCRITERIA_AGE_LOWER_HOURS:
case MATCHCRITERIA_SCORE_GREATER:
case MATCHCRITERIA_SCORE_LOWER:
case MATCHCRITERIA_SCORE_EQUAL:
case MATCHCRITERIA_NOT_LOCKED:
case MATCHCRITERIA_SPAM:
case MATCHCRITERIA_NOT_SPAM:
+ case MATCHCRITERIA_HAS_ATTACHMENT:
+ case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+ case MATCHCRITERIA_SIGNED:
+ case MATCHCRITERIA_NOT_SIGNED:
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
case MATCHCRITERIA_IGNORE_THREAD:
/* matching_build_command() - preferably cmd should be unescaped */
/*!
- *\brief Build the command line to execute
+ *\brief Build the command-line to execute
*
- *\param cmd String with command line specifiers
+ *\param cmd String with command-line specifiers
*\param info Message info to use for command
*
*\return gchar * Newly allocated string
MATCHER_RC, NULL);
if ((pfile = prefs_write_open(rcpath)) == NULL) {
- g_warning("failed to write configuration to file\n");
+ g_warning("failed to write configuration to file");
g_free(rcpath);
return;
}
g_free(rcpath);
if (prefs_matcher_save(pfile->fp) < 0) {
- g_warning("failed to write configuration to file\n");
+ g_warning("failed to write configuration to file");
prefs_file_close_revert(pfile);
} else if (prefs_file_close(pfile) < 0) {
- g_warning("failed to save configuration to file\n");
+ g_warning("failed to save configuration to file");
}
}
FILE *dst = g_fopen(newpath, "wb");
gchar buf[BUFFSIZE];
int r;
+
+ if (src == NULL) {
+ perror("fopen");
+ if (dst)
+ fclose(dst);
+ g_free(newpath);
+ return;
+ }
if (dst == NULL) {
perror("fopen");
+ if (src)
+ fclose(src);
g_free(newpath);
return;
}
&& strncmp(buf, "disabled rulename \"", 18)) {
r = fwrite("enabled rulename \"\" ",
strlen("enabled rulename \"\" "), 1, dst);
+ if (r != 1) {
+ g_message("cannot fwrite rulename\n");
+ }
}
r = fwrite(buf, strlen(buf), 1, dst);
+ if (r != 1) {
+ g_message("cannot fwrite rule\n");
+ }
}
fclose(dst);
fclose(src);
projects / claws.git / blobdiff