From bece6db9e9d284defbe59c316d6e6fc03b0fdf60 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Fri, 10 Apr 2009 14:13:35 +0200
Subject: [PATCH] Definitively fixed handling group specifications in mailbox
lists of address headers.
---
.../plugins/subaddress/ext-subaddress.c | 4 ---
src/lib-sieve/sieve-address-parts.c | 19 ++++++------
tests/address.svtest | 25 +++++++++++++++
tests/extensions/subaddress/basic.svtest | 31 +++++++++++++++----
4 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/src/lib-sieve/plugins/subaddress/ext-subaddress.c b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
index 1d85469f7..01f1c892f 100644
--- a/src/lib-sieve/plugins/subaddress/ext-subaddress.c
+++ b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
@@ -119,8 +119,6 @@ static const char *subaddress_user_extract_from
{
const char *sep;
- if ( address->local_part == NULL ) return NULL;
-
sep = strstr(address->local_part, sieve_subaddress_sep);
if ( sep == NULL ) return address->local_part;
@@ -133,8 +131,6 @@ static const char *subaddress_detail_extract_from
{
const char *sep;
- if ( address->local_part == NULL ) return NULL;
-
if ( (sep=strstr(address->local_part, sieve_subaddress_sep)) == NULL )
return NULL;
diff --git a/src/lib-sieve/sieve-address-parts.c b/src/lib-sieve/sieve-address-parts.c
index 208b0f814..064c358de 100644
--- a/src/lib-sieve/sieve-address-parts.c
+++ b/src/lib-sieve/sieve-address-parts.c
@@ -242,14 +242,15 @@ int sieve_address_match
struct sieve_address address;
const char *part;
- address.local_part = addr->mailbox;
- address.domain = addr->domain;
-
- part = addrp->extract_from(&address);
-
- if ( part != NULL )
- result = sieve_match_value(mctx, part, strlen(part));
+ if ( addr->domain != NULL ) {
+ address.local_part = addr->mailbox;
+ address.domain = addr->domain;
+
+ part = addrp->extract_from(&address);
+ if ( part != NULL )
+ result = sieve_match_value(mctx, part, strlen(part));
+ }
addr = addr->next;
}
}
@@ -340,8 +341,8 @@ bool sieve_addrmatch_default_get_optionals
static const char *addrp_all_extract_from
(const struct sieve_address *address)
{
- const char *local_part = address->local_part == NULL ? "" : address->local_part;
- const char *domain = address->domain == NULL ? "" : address->domain;
+ const char *local_part = address->local_part;
+ const char *domain = address->domain;
return t_strconcat(local_part, "@", domain, NULL);
}
diff --git a/tests/address.svtest b/tests/address.svtest
index 8842c058c..2b54bb06e 100644
--- a/tests/address.svtest
+++ b/tests/address.svtest
@@ -58,6 +58,29 @@ test "Invalid address list" {
}
}
+/*
+ * Undisclosed recipients
+ */
+
+test_set "message" text:
+From: stephan@
+To: undisclosed-recipients:;
+Subject: Invalid addresses
+
+Test.
+.
+;
+
+test "Undisclosed recipients" {
+ if address :is :domain "to" "undisclosed-recipients:;" {
+ test_fail ":domain matched group name";
+ }
+
+ if address :is :localpart "to" "undisclosed-recipients:;" {
+ test_fail ":localpart matched group name";
+ }
+}
+
/*
* Strange
*/
@@ -84,3 +107,5 @@ test "Questionable address" {
test_fail "message domain not recognized";
}
}
+
+
diff --git a/tests/extensions/subaddress/basic.svtest b/tests/extensions/subaddress/basic.svtest
index 1292ed0bd..695d29997 100644
--- a/tests/extensions/subaddress/basic.svtest
+++ b/tests/extensions/subaddress/basic.svtest
@@ -14,7 +14,7 @@ Test!
test_set "envelope.to" "friep+frop@dovecot.org";
test_set "envelope.from" "list+request@lists.dovecot.org";
-test "USER-message-from" {
+test "Address from :user" {
if not address :is :user "from" "stephan" {
test_fail "wrong user part extracted";
}
@@ -24,7 +24,7 @@ test "USER-message-from" {
}
}
-test "DETAIL-message-from" {
+test "Address from :detail" {
if not address :is :detail "from" "sieve" {
test_fail "wrong user part extracted";
}
@@ -34,7 +34,7 @@ test "DETAIL-message-from" {
}
}
-test "USER-message-to" {
+test "Address to :user" {
if not address :contains :user "to" "est" {
test_fail "wrong user part extracted";
}
@@ -44,7 +44,7 @@ test "USER-message-to" {
}
}
-test "DETAIL-message-to" {
+test "Address to :detail" {
if not address :contains :detail "to" "fai" {
test_fail "wrong user part extracted";
}
@@ -55,7 +55,7 @@ test "DETAIL-message-to" {
}
-test "ENVELOPE-to" {
+test "Envelope :user" {
if not envelope :is :user "to" "friep" {
test_fail "wrong user part extracted 1";
}
@@ -69,7 +69,7 @@ test "ENVELOPE-to" {
}
}
-test "ENVELOPE-from" {
+test "Envelope :detail" {
if not envelope :comparator "i;ascii-casemap" :contains :detail "from" "QUES" {
test_fail "wrong user part extracted";
}
@@ -78,3 +78,22 @@ test "ENVELOPE-from" {
test_fail "address test failed";
}
}
+
+test_set "message" text:
+From: frop@examples.com
+To: undisclosed-recipients:;
+Subject: subaddress test
+
+Test!
+.
+;
+
+test "Undisclosed-recipients" {
+ if address :detail :contains "to" "undisclosed-recipients" {
+ test_fail ":detail matched group name";
+ }
+
+ if address :user :contains "to" "undisclosed-recipients" {
+ test_fail ":user matched group name";
+ }
+}
--
GitLab