[Dovecot] dovecot-1.2-sieve sending vacation replies regardless of recipient (patch)

[Mark Washenberger]

I want a way to send VAR messages without having to specify up front all of the 
addresses for which such VARs should be sent. 

I realize this goes against rfc 3834, but it seemed reasonable to add a tag to 
the vacation command to skip the [to, cc, bcc, ...] recipients check. The patch 
I made is attached. The new usage with this patch is:

vacation [":days" number] [":subject" string]
         [":x_any_address"]
         [":from" string] [":addresses" string-list]
         [":mime"] [":handle" string] <reason: string>

What do you think of this patch? Is there a better way to accomplish the same 
thing without writing a patch? Is there a better way to write this patch to 
make it a cleaner feature or easier to maintain? Could this ever be part of the 
mainline?


Mark Washenberger
Rackspace Hosting
Software Developer, Email & Apps
mark.washenber...@rackspace.com
diff -r 0e89d5a7e00b src/lib-sieve/plugins/vacation/cmd-vacation.c
--- a/src/lib-sieve/plugins/vacation/cmd-vacation.c	Sun Mar 28 18:16:21 2010 +0200
+++ b/src/lib-sieve/plugins/vacation/cmd-vacation.c	Wed Mar 31 21:04:20 2010 +0000
@@ -38,6 +38,7 @@
 static const struct sieve_argument_def vacation_subject_tag;
 static const struct sieve_argument_def vacation_from_tag;
 static const struct sieve_argument_def vacation_addresses_tag;
+static const struct sieve_argument_def vacation_x_any_address;
 static const struct sieve_argument_def vacation_mime_tag;
 static const struct sieve_argument_def vacation_handle_tag;
 
@@ -47,6 +48,7 @@
  * Syntax: 
  *    vacation [":days" number] [":subject" string]
  *                 [":from" string] [":addresses" string-list]
+ *                 [":x_any_address"]
  *                 [":mime"] [":handle" string] <reason: string>
  */
 
@@ -86,6 +88,9 @@
 static bool cmd_vacation_validate_stringlist_tag
 	(struct sieve_validator *valdtr, struct sieve_ast_argument **arg, 
 		struct sieve_command *cmd);
+static bool cmd_vacation_validate_x_any_address_tag
+	(struct sieve_validator *valdtr, struct sieve_ast_argument **arg, 
+		struct sieve_command *cmd);
 static bool cmd_vacation_validate_mime_tag
 	(struct sieve_validator *valdtr, struct sieve_ast_argument **arg, 
 		struct sieve_command *cmd);
@@ -120,6 +125,13 @@
 	NULL, NULL, NULL 
 };
 
+static const struct sieve_argument_def vacation_x_any_address_tag = { 
+	"x_any_address",	
+	NULL, 
+	cmd_vacation_validate_x_any_address_tag,
+	NULL, NULL, NULL
+};
+
 static const struct sieve_argument_def vacation_mime_tag = { 
 	"mime",	
 	NULL, 
@@ -142,6 +154,7 @@
 	OPT_SUBJECT,
 	OPT_FROM,
 	OPT_ADDRESSES,
+	OPT_X_ANY_ADDRESS,
 	OPT_MIME
 };
 
@@ -205,6 +218,7 @@
 	sieve_number_t days;
 	const char *subject;
 	const char *handle;
+	bool x_any_address;
 	bool mime;
 	const char *from;
 	const char *from_normalized;	
@@ -219,6 +233,7 @@
 	string_t *from;
 	string_t *subject;
 	
+	bool x_any_address;
 	bool mime;
 	
 	string_t *handle;
@@ -341,6 +356,21 @@
 	return TRUE;
 }
 
+static bool cmd_vacation_validate_x_any_address_tag
+(struct sieve_validator *valdtr ATTR_UNUSED, struct sieve_ast_argument **arg, 
+	struct sieve_command *cmd)
+{
+	struct cmd_vacation_context_data *ctx_data = 
+		(struct cmd_vacation_context_data *) cmd->data; 
+
+	ctx_data->x_any_address = TRUE;
+
+	/* Skip tag */
+	*arg = sieve_ast_argument_next(*arg);
+	
+	return TRUE;
+}
+
 static bool cmd_vacation_validate_mime_tag
 (struct sieve_validator *valdtr ATTR_UNUSED, struct sieve_ast_argument **arg, 
 	struct sieve_command *cmd)
@@ -373,6 +403,8 @@
 	sieve_validator_register_tag
 		(valdtr, cmd_reg, ext, &vacation_addresses_tag, OPT_ADDRESSES); 	
 	sieve_validator_register_tag
+		(valdtr, cmd_reg, ext, &vacation_x_any_address_tag, OPT_X_ANY_ADDRESS); 
+	sieve_validator_register_tag
 		(valdtr, cmd_reg, ext, &vacation_mime_tag, OPT_MIME); 	
 	sieve_validator_register_tag
 		(valdtr, cmd_reg, ext, &vacation_handle_tag, 0); 	
@@ -520,6 +552,9 @@
 				if ( !sieve_opr_stringlist_dump(denv, address, "addresses") )
 					return FALSE;
 				break;
+			case OPT_X_ANY_ADDRESS:
+				sieve_code_dumpf(denv, "x_any_address");	
+				break;
 			case OPT_MIME:
 				sieve_code_dumpf(denv, "mime");	
 				break;
@@ -549,6 +584,7 @@
 	pool_t pool;
 	int opt_code = 1;
 	sieve_number_t days = 7;
+	bool x_any_address = FALSE;
 	bool mime = FALSE;
 	struct sieve_coded_stringlist *addresses = NULL;
 	string_t *reason, *subject = NULL, *from = NULL, *handle = NULL; 
@@ -609,6 +645,9 @@
 					return SIEVE_EXEC_BIN_CORRUPT;
 				}
 				break;
+			case OPT_X_ANY_ADDRESS:
+				x_any_address = TRUE;
+				break;
 			case OPT_MIME:
 				mime = TRUE;
 				break;
@@ -659,6 +698,7 @@
 	act->reason = p_strdup(pool, str_c(reason));
 	act->handle = p_strdup(pool, str_c(handle));
 	act->days = days;
+	act->x_any_address = x_any_address;
 	act->mime = mime;
 	if ( subject != NULL )
 		act->subject = p_strdup(pool, str_c(subject));
@@ -1114,7 +1154,7 @@
 		hdsp++;
 	}	
 
-	if ( *hdsp == NULL ) {
+	if ( *hdsp == NULL && !ctx->x_any_address ) {
 		/* No, bail out */
 		sieve_result_log(aenv, 
 			"discarding vacation response for message implicitly delivered to <%s>",