diff --git a/src/defs.h b/src/defs.h index 366d46a..3ac92d1 100644 --- a/src/defs.h +++ b/src/defs.h @@ -105,6 +105,7 @@ regex_t from; regex_t to; regex_t subject; + regex_t body; regex_t attachment_name; regex_t attachment_type; #endif @@ -119,7 +120,7 @@ int days; - char emptyfrom, emptyto, emptysubject, emptyaname, emptyatype; + char emptyfrom, emptyto, emptysubject, emptybody, emptyaname, emptyatype; char *rulestr; char compiled; diff --git a/src/rules.c b/src/rules.c index 4ab9751..2e3c770 100644 --- a/src/rules.c +++ b/src/rules.c @@ -12,20 +12,21 @@ void load_rules(struct session_data *sdata, struct __data *data, struct node *xhash[], char *table){ char s[SMALLBUFSIZE]; - char domain[SMALLBUFSIZE], from[SMALLBUFSIZE], to[SMALLBUFSIZE], subject[SMALLBUFSIZE], _size[SMALLBUFSIZE], attachment_name[SMALLBUFSIZE], attachment_type[SMALLBUFSIZE], _attachment_size[SMALLBUFSIZE]; + char domain[SMALLBUFSIZE], from[SMALLBUFSIZE], to[SMALLBUFSIZE], subject[SMALLBUFSIZE], body[SMALLBUFSIZE], _size[SMALLBUFSIZE], attachment_name[SMALLBUFSIZE], attachment_type[SMALLBUFSIZE], _attachment_size[SMALLBUFSIZE]; int size=0, attachment_size=0, spam=0, days=0; memset(domain, 0, sizeof(domain)); memset(from, 0, sizeof(from)); memset(to, 0, sizeof(to)); memset(subject, 0, sizeof(subject)); + memset(body, 0, sizeof(body)); memset(_size, 0, sizeof(_size)); memset(attachment_name, 0, sizeof(attachment_name)); memset(attachment_type, 0, sizeof(attachment_type)); memset(_attachment_size, 0, sizeof(_attachment_size)); - snprintf(s, sizeof(s)-1, "SELECT `domain`, `from`, `to`, `subject`, `_size`, `size`, `attachment_name`, `attachment_type`, `_attachment_size`, `attachment_size`, `spam`, `days` FROM `%s`", table); + snprintf(s, sizeof(s)-1, "SELECT `domain`, `from`, `to`, `subject`, `body`, `_size`, `size`, `attachment_name`, `attachment_type`, `_attachment_size`, `attachment_size`, `spam`, `days` FROM `%s`", table); if(prepare_sql_statement(sdata, &(data->stmt_generic), s) == ERR) return; @@ -42,6 +43,7 @@ data->sql[data->pos] = &from[0]; data->type[data->pos] = TYPE_STRING; data->len[data->pos] = sizeof(from)-2; data->pos++; data->sql[data->pos] = &to[0]; data->type[data->pos] = TYPE_STRING; data->len[data->pos] = sizeof(to)-2; data->pos++; data->sql[data->pos] = &subject[0]; data->type[data->pos] = TYPE_STRING; data->len[data->pos] = sizeof(subject)-2; data->pos++; + data->sql[data->pos] = &body[0]; data->type[data->pos] = TYPE_STRING; data->len[data->pos] = sizeof(body)-2; data->pos++; data->sql[data->pos] = &_size[0]; data->type[data->pos] = TYPE_STRING; data->len[data->pos] = sizeof(_size)-2; data->pos++; data->sql[data->pos] = (char *)&size; data->type[data->pos] = TYPE_LONG; data->len[data->pos] = sizeof(size); data->pos++; data->sql[data->pos] = &attachment_name[0]; data->type[data->pos] = TYPE_STRING; data->len[data->pos] = sizeof(attachment_name)-2; data->pos++; @@ -56,12 +58,13 @@ p_store_results(sdata, data->stmt_generic, data); while(p_fetch_results(data->stmt_generic) == OK){ - append_rule(xhash, domain, from, to, subject, _size, size, attachment_name, attachment_type, _attachment_size, attachment_size, spam, days, data); + append_rule(xhash, domain, from, to, subject, body, _size, size, attachment_name, attachment_type, _attachment_size, attachment_size, spam, days, data); memset(domain, 0, sizeof(domain)); memset(from, 0, sizeof(from)); memset(to, 0, sizeof(to)); memset(subject, 0, sizeof(subject)); + memset(body, 0, sizeof(body)); memset(_size, 0, sizeof(_size)); memset(attachment_name, 0, sizeof(attachment_name)); memset(attachment_type, 0, sizeof(attachment_type)); @@ -78,7 +81,7 @@ } -int append_rule(struct node *xhash[], char *domain, char *from, char *to, char *subject, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data){ +int append_rule(struct node *xhash[], char *domain, char *from, char *to, char *subject, char *body, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data){ struct node *q, *Q=NULL, *node; struct rule *rule; int rc=0; @@ -88,11 +91,11 @@ memset(node, 0, sizeof(struct node)); node->r = NULL; - rule = create_rule_item(domain, from, to, subject, _size, size, attachment_name, attachment_type, _attachment_size, attachment_size, spam, days, data); + rule = create_rule_item(domain, from, to, subject, body, _size, size, attachment_name, attachment_type, _attachment_size, attachment_size, spam, days, data); if(rule == NULL){ free(node); - syslog(LOG_INFO, "could not load rule=%s/%s/%s/%s/%s,%d", domain, from, to, subject, _size, size); + syslog(LOG_INFO, "could not load rule=%s/%s/%s/%s/%s/%s,%d", domain, from, to, subject, body, _size, size); return rc; } @@ -116,7 +119,7 @@ } -struct rule *create_rule_item(char *domain, char *from, char *to, char *subject, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data){ +struct rule *create_rule_item(char *domain, char *from, char *to, char *subject, char *body, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data){ struct rule *h=NULL; char empty = '\0'; int len; @@ -151,6 +154,9 @@ if(!subject || strlen(subject) < 1){ subject = ∅ h->emptysubject = 1; } if(regcomp(&(h->subject), subject, REG_ICASE | REG_EXTENDED)) h->compiled = 0; + if(!body || strlen(body) < 1){ body = ∅ h->emptybody = 1; } + if(regcomp(&(h->body), body, REG_ICASE | REG_EXTENDED)) h->compiled = 0; + h->spam = spam; h->days = days; @@ -171,12 +177,12 @@ if(!_attachment_size) _attachment_size = ∅ snprintf(h->_attachment_size, 3, "%s", _attachment_size); - len = strlen(domain)+8 + strlen(from)+6 + strlen(to)+4 + strlen(subject)+9 + strlen(_size)+6 + strlen(attachment_name)+10 + strlen(attachment_type)+10 + strlen(_attachment_size)+10 + 9 + 15 + 15; + len = strlen(domain)+8 + strlen(from)+6 + strlen(to)+4 + strlen(subject)+9 + strlen(body)+6 + strlen(_size)+6 + strlen(attachment_name)+10 + strlen(attachment_type)+10 + strlen(_attachment_size)+10 + 9 + 15 + 15; h->rulestr = malloc(len); - if(h->rulestr) snprintf(h->rulestr, len-1, "domain=%s,from=%s,to=%s,subject=%s,size%s%d,att.name=%s,att.type=%s,att.size%s%d,spam=%d", domain, from, to, subject, _size, size, attachment_name, attachment_type, _attachment_size, attachment_size, spam); + if(h->rulestr) snprintf(h->rulestr, len-1, "domain=%s,from=%s,to=%s,subject=%s,body=%s,size%s%d,att.name=%s,att.type=%s,att.size%s%d,spam=%d", domain, from, to, subject, body, _size, size, attachment_name, attachment_type, _attachment_size, attachment_size, spam); else h->compiled = 0; h->r = NULL; @@ -220,6 +226,12 @@ ismatch += RULE_UNDEF; } else if(regexec(&(p->subject), state->b_subject, nmatch, NULL, 0) == 0) ismatch += RULE_MATCH; else ismatch += RULE_NO_MATCH; + + if(p->emptybody == 1){ + ismatch += RULE_UNDEF; + } + else if(regexec(&(p->body), state->b_body, nmatch, NULL, 0) == 0) ismatch += RULE_MATCH; else ismatch += RULE_NO_MATCH; + } if(ismatch > 0){ @@ -278,6 +290,12 @@ ismatch += RULE_UNDEF; } else if(regexec(&(p->subject), state->b_subject, nmatch, NULL, 0) == 0) ismatch += RULE_MATCH; else ismatch += RULE_NO_MATCH; + + if(p->emptybody == 1){ + ismatch += RULE_UNDEF; + } + else if(regexec(&(p->body), state->b_body, nmatch, NULL, 0) == 0) ismatch += RULE_MATCH; else ismatch += RULE_NO_MATCH; + } if(ismatch > 0){ @@ -373,6 +391,8 @@ regfree(&(rule->from)); regfree(&(rule->to)); + regfree(&(rule->subject)); + regfree(&(rule->body)); regfree(&(rule->attachment_name)); regfree(&(rule->attachment_type)); diff --git a/src/rules.h b/src/rules.h index 8a26cad..f0d6311 100644 --- a/src/rules.h +++ b/src/rules.h @@ -8,8 +8,8 @@ #include "defs.h" void load_rules(struct session_data *sdata, struct __data *data, struct node *xhash[], char *table); -int append_rule(struct node *xhash[], char *domain, char *from, char *to, char *subject, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data); -struct rule *create_rule_item(char *domain, char *from, char *to, char *subject, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data); +int append_rule(struct node *xhash[], char *domain, char *from, char *to, char *subject, char *body, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data); +struct rule *create_rule_item(char *domain, char *from, char *to, char *subject, char *body, char *_size, int size, char *attachment_name, char *attachment_type, char *_attachment_size, int attachment_size, int spam, int days, struct __data *data); char *check_againt_ruleset(struct node *xhash[], struct _state *state, int size, int spam); unsigned long query_retain_period(struct __data *data, struct _state *state, int size, int spam, struct __config *cfg); int check_size_rule(int message_size, int size, char *_size); diff --git a/util/db-mysql.sql b/util/db-mysql.sql index b7059b7..23dbca3 100644 --- a/util/db-mysql.sql +++ b/util/db-mysql.sql @@ -112,6 +112,7 @@ `from` varchar(128) default null, `to` varchar(128) default null, `subject` varchar(128) default null, + `body` varchar(128) default null, `_size` char(2) default null, `size` int default 0, `attachment_name` varchar(128) default null, @@ -121,7 +122,7 @@ `spam` tinyint(1) default -1, `days` int default 0, primary key (`id`), - unique(`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`) + unique(`from`,`to`,`subject`,`body`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`) ) ENGINE=InnoDB; @@ -131,6 +132,7 @@ `from` varchar(128) default null, `to` varchar(128) default null, `subject` varchar(128) default null, + `body` varchar(128) default null, `_size` char(2) default null, `size` int default 0, `attachment_name` varchar(128) default null, @@ -140,7 +142,7 @@ `spam` tinyint(1) default -1, `days` int default 0, primary key (`id`), - unique (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`) + unique (`domain`,`from`,`to`,`subject`,`body`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`) ) ENGINE=InnoDB; @@ -180,7 +182,7 @@ `lang` char(2) default null, `ga_enabled` int default 0, `ga_secret` varchar(255) default null -); +) Engine=InnoDB; create index `user_settings_idx` on `user_settings`(`username`); diff --git a/util/db-upgrade-1.1.0-vs-1.2.0.sql b/util/db-upgrade-1.1.0-vs-1.2.0.sql new file mode 100644 index 0000000..b17d15e --- /dev/null +++ b/util/db-upgrade-1.1.0-vs-1.2.0.sql @@ -0,0 +1,9 @@ +-- 2015.03.10 + +alter table archiving_rule add column `body` varchar(128) default null; +alter table retention_rule add column `body` varchar(128) default null; + +create unique index `entry` on archiving_rule (`domain`,`from`,`to`,`subject`,`body`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`); +create unique index `entry` on retention_rule (`domain`,`from`,`to`,`subject`,`body`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`); + + diff --git a/webui/controller/policy/archiving.php b/webui/controller/policy/archiving.php index e3fc396..33c60fc 100644 --- a/webui/controller/policy/archiving.php +++ b/webui/controller/policy/archiving.php @@ -50,7 +50,7 @@ private function validate() { if($this->request->post['from'] == '' && $this->request->post['to'] == '' && - $this->request->post['subject'] == '' && $this->request->post['size'] == '' && + $this->request->post['subject'] == '' && $this->request->post['body'] == '' && $this->request->post['size'] == '' && $this->request->post['attachment_name'] == '' && $this->request->post['attachment_type'] == '' && $this->request->post['attachment_size'] == '' && $this->request->post['spam'] == -1 ) { diff --git a/webui/controller/policy/retention.php b/webui/controller/policy/retention.php index 3fe092e..7df8dfb 100644 --- a/webui/controller/policy/retention.php +++ b/webui/controller/policy/retention.php @@ -53,7 +53,7 @@ if($this->request->post['days'] == '' || $this->request->post['days'] < 1) { return false; } if($this->request->post['from'] == '' && $this->request->post['to'] == '' && - $this->request->post['subject'] == '' && $this->request->post['size'] == '' && + $this->request->post['subject'] == '' && $this->request->post['body'] == '' && $this->request->post['size'] == '' && $this->request->post['attachment_name'] == '' && $this->request->post['attachment_type'] == '' && $this->request->post['attachment_size'] == '' && $this->request->post['spam'] == -1 ) { diff --git a/webui/model/policy/archiving.php b/webui/model/policy/archiving.php index 5370d1f..2081f0e 100644 --- a/webui/model/policy/archiving.php +++ b/webui/model/policy/archiving.php @@ -5,7 +5,7 @@ public function get_rules($s = '') { if($s) { - $query = $this->db->query("SELECT * FROM " . TABLE_ARCHIVING_RULE . " WHERE `from` LIKE ? OR `to` LIKE ? OR subject LIKE ? ORDER BY domain, id", array('%' . $s . '%', '%' . $s . '%', '%' . $s . '%')); + $query = $this->db->query("SELECT * FROM " . TABLE_ARCHIVING_RULE . " WHERE `from` LIKE ? OR `to` LIKE ? OR `subject` LIKE ? OR `body` LIKE ? ORDER BY domain, id", array('%' . $s . '%', '%' . $s . '%', '%' . $s . '%', '%' . $s . '%')); } else { $query = $this->db->query("SELECT * FROM " . TABLE_ARCHIVING_RULE . " ORDER BY id"); } @@ -26,7 +26,7 @@ public function add_new_rule($data = array()) { - $query = $this->db->query("INSERT INTO " . TABLE_ARCHIVING_RULE . " (`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`) VALUES(?,?,?,?,?,?,?,?,?,?)", array($data['from'], $data['to'], $data['subject'], $data['_size'], $data['size'], $data['attachment_name'], $data['attachment_type'], $data['_attachment_size'], $data['attachment_size'], $data['spam'])); + $query = $this->db->query("INSERT INTO " . TABLE_ARCHIVING_RULE . " (`from`,`to`,`subject`,`body`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`) VALUES(?,?,?,?,?,?,?,?,?,?,?)", array($data['from'], $data['to'], $data['subject'], $data['body'], $data['_size'], $data['size'], $data['attachment_name'], $data['attachment_type'], $data['_attachment_size'], $data['attachment_size'], $data['spam'])); return $this->db->countAffected(); } diff --git a/webui/model/policy/retention.php b/webui/model/policy/retention.php index eaaae95..7bb74f2 100644 --- a/webui/model/policy/retention.php +++ b/webui/model/policy/retention.php @@ -5,7 +5,7 @@ public function get_rules($s = '') { if($s) { - $query = $this->db->query("SELECT * FROM " . TABLE_RETENTION_RULE . " WHERE domain LIKE ? OR `from` LIKE ? OR subject LIKE ? ORDER BY domain, id", array('%' . $s . '%', '%' . $s . '%', '%' . $s . '%')); + $query = $this->db->query("SELECT * FROM " . TABLE_RETENTION_RULE . " WHERE domain LIKE ? OR `from` LIKE ? OR `subject` LIKE ? OR `body` LIKE ? ORDER BY domain, id", array('%' . $s . '%', '%' . $s . '%', '%' . $s . '%', '%' . $s . '%')); } else { $query = $this->db->query("SELECT * FROM " . TABLE_RETENTION_RULE . " ORDER BY domain, id"); } @@ -30,7 +30,7 @@ if(isset($data['domain'])) { $domain = $data['domain']; } - $query = $this->db->query("INSERT INTO " . TABLE_RETENTION_RULE . " (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`,`days`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)", array($domain, $data['from'], $data['to'], $data['subject'], $data['_size'], $data['size'], $data['attachment_name'], $data['attachment_type'], $data['_attachment_size'], $data['attachment_size'], $data['spam'], $data['days']) ); + $query = $this->db->query("INSERT INTO " . TABLE_RETENTION_RULE . " (`domain`,`from`,`to`,`subject`,`body`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`,`days`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)", array($domain, $data['from'], $data['to'], $data['subject'], $data['body'], $data['_size'], $data['size'], $data['attachment_name'], $data['attachment_type'], $data['_attachment_size'], $data['attachment_size'], $data['spam'], $data['days']) ); return $this->db->countAffected(); } diff --git a/webui/view/theme/default/templates/policy/archiving.tpl b/webui/view/theme/default/templates/policy/archiving.tpl index 02b9650..382e93c 100644 --- a/webui/view/theme/default/templates/policy/archiving.tpl +++ b/webui/view/theme/default/templates/policy/archiving.tpl @@ -27,6 +27,12 @@
+ +
+ +
+
+
+
+
+
+
:
+
+
+
:
+
:
+
+
+
: