-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sieve: add implicit_keep_target action
- Loading branch information
1 parent
d4c7b44
commit 9ff4275
Showing
19 changed files
with
424 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #!perl | ||
| use Cassandane::Tiny; | ||
|
|
||
| sub test_implicit_keep_target_bad | ||
| :min_version_3_9 :needs_component_sieve :NoAltNameSpace | ||
| { | ||
| my ($self) = @_; | ||
|
|
||
| my ($res, $errs) = $self->compile_sievec('norequire', <<EOF | ||
| implicit_keep_target :mailboxid "xxx" :specialuse "\\\\Important" "INBOX"; | ||
| EOF | ||
| ); | ||
|
|
||
| $self->assert_str_equals('failure', $res); | ||
| $self->assert_matches(qr/vnd.cyrus.implicit_keep_target extension MUST be enabled/, $errs); | ||
| $self->assert_matches(qr/mailboxid extension MUST be enabled/, $errs); | ||
| $self->assert_matches(qr/special-use extension MUST be enabled/, $errs); | ||
|
|
||
| ($res, $errs) = $self->compile_sievec('conflict', <<EOF | ||
| require [ "vnd.cyrus.implicit_keep_target", "special-use", "mailboxid"]; | ||
| implicit_keep_target :mailboxid "xxx" :specialuse "\\\\Important" "INBOX"; | ||
| EOF | ||
| ); | ||
|
|
||
| $self->assert_str_equals('failure', $res); | ||
| $self->assert_matches(qr/tag :specialuse MUST NOT be used with tag :mailboxid/, $errs); | ||
|
|
||
| ($res, $errs) = $self->compile_sievec('badsyntax', <<EOF | ||
| require [ "vnd.cyrus.implicit_keep_target", "special-use", "mailboxid"]; | ||
| implicit_keep_target :mailboxid "xxx" :specialuse "\\\\Important"; | ||
| EOF | ||
| ); | ||
|
|
||
| $self->assert_str_equals('failure', $res); | ||
| $self->assert_matches(qr/syntax error/, $errs); | ||
| } | ||
|
|
35 changes: 35 additions & 0 deletions
35
cassandane/tiny-tests/Sieve/implicit-keep-target-mailboxid
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| #!perl | ||
| use Cassandane::Tiny; | ||
|
|
||
| sub test_implicit_keep_target_mailboxid | ||
| :min_version_3_9 :needs_component_sieve :NoAltNameSpace | ||
| { | ||
| my ($self) = @_; | ||
|
|
||
| my $folder = "INBOX.foo"; | ||
|
|
||
| xlog $self, "Create folder"; | ||
| my $imaptalk = $self->{store}->get_client(); | ||
| $imaptalk->create($folder) | ||
| or die "Cannot create $folder: $@"; | ||
|
|
||
| xlog $self, "Get folder id"; | ||
| my $res = $imaptalk->status($folder, ['mailboxid']); | ||
| my $folderid = $res->{mailboxid}[0]; | ||
|
|
||
| xlog $self, "Install a script"; | ||
| $self->{instance}->install_sieve_script(<<EOF | ||
| require ["vnd.cyrus.implicit_keep_target", "mailboxid"]; | ||
| implicit_keep_target :mailboxid "$folderid" "INBOX"; | ||
| EOF | ||
| ); | ||
|
|
||
| xlog $self, "Deliver a message"; | ||
| my $msg = $self->{gen}->generate(subject => "Message 1"); | ||
| $self->{instance}->deliver($msg); | ||
|
|
||
| xlog $self, "Check that the message made it to $folder"; | ||
| $self->{store}->set_folder($folder); | ||
| $self->check_messages({ 1 => $msg }, check_guid => 0); | ||
| } | ||
|
|
31 changes: 31 additions & 0 deletions
31
cassandane/tiny-tests/Sieve/implicit-keep-target-mailboxname
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #!perl | ||
| use Cassandane::Tiny; | ||
|
|
||
| sub test_implicit_keep_target_mailboxname | ||
| :min_version_3_9 :needs_component_sieve :NoAltNameSpace | ||
| { | ||
| my ($self) = @_; | ||
|
|
||
| my $folder = "INBOX.foo"; | ||
|
|
||
| xlog $self, "Create folder"; | ||
| my $imaptalk = $self->{store}->get_client(); | ||
| $imaptalk->create($folder) | ||
| or die "Cannot create $folder: $@"; | ||
|
|
||
| xlog $self, "Install a script"; | ||
| $self->{instance}->install_sieve_script(<<EOF | ||
| require ["vnd.cyrus.implicit_keep_target"]; | ||
| implicit_keep_target "$folder"; | ||
| EOF | ||
| ); | ||
|
|
||
| xlog $self, "Deliver a message"; | ||
| my $msg = $self->{gen}->generate(subject => "Message 1"); | ||
| $self->{instance}->deliver($msg); | ||
|
|
||
| xlog $self, "Check that the message made it to $folder"; | ||
| $self->{store}->set_folder($folder); | ||
| $self->check_messages({ 1 => $msg }, check_guid => 0); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #!perl | ||
| use Cassandane::Tiny; | ||
|
|
||
| sub test_implicit_keep_target_none | ||
| :min_version_3_9 :needs_component_sieve :NoAltNameSpace | ||
| { | ||
| my ($self) = @_; | ||
|
|
||
| my $folder = "INBOX.foo"; | ||
|
|
||
| xlog $self, "Create folder"; | ||
| my $imaptalk = $self->{store}->get_client(); | ||
| $imaptalk->create($folder) | ||
| or die "Cannot create $folder: $@"; | ||
|
|
||
| xlog $self, "Allow plus address delivery"; | ||
| $imaptalk->setacl($folder, 'anyone' => 'p'); | ||
| my $imaptalk = $self->{store}->get_client(); | ||
|
|
||
| xlog $self, "Install a script"; | ||
| $self->{instance}->install_sieve_script(<<EOF | ||
| require ["vnd.cyrus.implicit_keep_target", "imap4flags"]; | ||
| if header :comparator "i;ascii-casemap" :is "Subject" "explicit" { | ||
| addflag "\\\\Flagged"; | ||
| keep; | ||
| } | ||
| EOF | ||
| ); | ||
|
|
||
| xlog $self, "Deliver a message"; | ||
| my $msg = $self->{gen}->generate(subject => "Implicit"); | ||
| $self->{instance}->deliver($msg); | ||
|
|
||
| xlog $self, "Check that the message made it to INBOX"; | ||
| $self->{store}->set_folder('INBOX'); | ||
| $self->{store}->set_fetch_attributes(qw(uid flags)); | ||
| $msg->set_attribute(uid => 1); | ||
| $msg->set_attribute(flags => [ '\\Recent' ]); | ||
| $self->check_messages({ 1 => $msg }, check_guid => 0); | ||
|
|
||
| xlog $self, "Deliver a message to plus address"; | ||
| $msg = $self->{gen}->generate(subject => "Explicit"); | ||
| $self->{instance}->deliver($msg, user => "cassandane+foo"); | ||
|
|
||
| xlog $self, "Check that the message made it to $folder"; | ||
| $self->{store}->set_folder($folder); | ||
| $msg->set_attribute(uid => 1); | ||
| $msg->set_attribute(flags => [ '\\Recent', '\\Flagged']); | ||
| $self->check_messages({ 1 => $msg }, check_guid => 0); | ||
| } | ||
|
|
31 changes: 31 additions & 0 deletions
31
cassandane/tiny-tests/Sieve/implicit-keep-target-specialuse
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #!perl | ||
| use Cassandane::Tiny; | ||
|
|
||
| sub test_implicit_keep_target_specialuse | ||
| :min_version_3_9 :needs_component_sieve :NoAltNameSpace | ||
| { | ||
| my ($self) = @_; | ||
|
|
||
| my $folder = "INBOX.foo"; | ||
|
|
||
| xlog $self, "Create folder"; | ||
| my $imaptalk = $self->{store}->get_client(); | ||
| $imaptalk->create($folder, "(use (\\Important))") | ||
| or die "Cannot create $folder: $@"; | ||
|
|
||
| xlog $self, "Install a script"; | ||
| $self->{instance}->install_sieve_script(<<EOF | ||
| require ["vnd.cyrus.implicit_keep_target", "special-use"]; | ||
| implicit_keep_target :specialuse "\\\\Important" "INBOX"; | ||
| EOF | ||
| ); | ||
|
|
||
| xlog $self, "Deliver a message"; | ||
| my $msg = $self->{gen}->generate(subject => "Message 1"); | ||
| $self->{instance}->deliver($msg); | ||
|
|
||
| xlog $self, "Check that the message made it to $folder"; | ||
| $self->{store}->set_folder($folder); | ||
| $self->check_messages({ 1 => $msg }, check_guid => 0); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
|
|
||
| Description: | ||
|
|
||
| Adds an 'implicit_keep_target' action to Sieve to change the target mailbox | ||
| for an implicit keep. | ||
|
|
||
| Syntax: | ||
|
|
||
| implicit_keep_target [ :specialuse <string> | :mailboxid <string> ] <folder: string> | ||
|
|
||
|
|
||
| Config changes: | ||
|
|
||
| The bitfield "vnd.cyrus.implicit_keep_target" has been added to | ||
| the "sieve_extensions" option to control the availability of this option. | ||
|
|
||
|
|
||
| Upgrade instructions: | ||
|
|
||
| None. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.