Skip to content

Commit

Permalink
lib-sieve: Improved handling of extension conflicts.
Browse files Browse the repository at this point in the history 
Conflicts are now always tested from both sides. This is mainly important for the "ihave" test.
  • Loading branch information
@stephanbosch
stephanbosch committed Mar 25, 2016
1 parent a95b057 commit ac77b22
Show file tree
Hide file tree
Showing 9 changed files with 162 additions and 105 deletions.
44 changes: 21 additions & 23 deletions src/lib-sieve/plugins/duplicate/ext-duplicate.c
View file
Expand Up @@ -58,14 +58,16 @@ const struct sieve_extension_def vnd_duplicate_extension = {
* Validation
*/

static bool ext_duplicate_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context, struct sieve_ast_argument *require_arg);

const struct sieve_validator_extension duplicate_validator_extension = {
&vnd_duplicate_extension,
ext_duplicate_validator_extension_validate,
NULL
static bool ext_duplicate_validator_check_conflict
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other);

const struct sieve_validator_extension
duplicate_validator_extension = {
.ext = &vnd_duplicate_extension,
.check_conflict = ext_duplicate_validator_check_conflict
};

static bool ext_duplicate_validator_load
Expand All @@ -84,22 +86,18 @@ static bool ext_duplicate_validator_load
return TRUE;
}

static bool ext_duplicate_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context ATTR_UNUSED, struct sieve_ast_argument *require_arg)
static bool ext_duplicate_validator_check_conflict
(const struct sieve_extension *ext ATTR_UNUSED,
struct sieve_validator *valdtr, void *context ATTR_UNUSED,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other)
{
const struct sieve_extension *ext_dupl;

if ( (ext_dupl=sieve_extension_get_by_name
(ext->svinst, "duplicate")) != NULL ) {

/* Check for conflict with duplicate extension */
if ( sieve_validator_extension_loaded(valdtr, ext_dupl) ) {
sieve_argument_validate_error(valdtr, require_arg,
"the (deprecated) vnd.dovecot.duplicate extension cannot be used "
"together with the duplicate extension");
return FALSE;
}
/* Check for conflict with duplicate extension */
if ( sieve_extension_name_is(ext_other, "duplicate") ) {
sieve_argument_validate_error(valdtr, require_arg,
"the (deprecated) vnd.dovecot.duplicate extension "
"cannot be used together with the duplicate extension");
return FALSE;
}

return TRUE;
Expand Down
28 changes: 16 additions & 12 deletions src/lib-sieve/plugins/imap4flags/ext-imapflags.c
View file
Expand Up @@ -101,14 +101,16 @@ static bool ext_imapflags_load
* Validator
*/

static bool ext_imapflags_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context, struct sieve_ast_argument *require_arg);

const struct sieve_validator_extension imapflags_validator_extension = {
&imapflags_extension,
ext_imapflags_validator_extension_validate,
NULL
static bool ext_imapflags_validator_check_conflict
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *other_ext);

const struct sieve_validator_extension
imapflags_validator_extension = {
.ext = &imapflags_extension,
.check_conflict = ext_imapflags_validator_check_conflict
};

static bool ext_imapflags_validator_load
Expand All @@ -135,14 +137,16 @@ static bool ext_imapflags_validator_load
return TRUE;
}

static bool ext_imapflags_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context ATTR_UNUSED, struct sieve_ast_argument *require_arg)
static bool ext_imapflags_validator_check_conflict
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context ATTR_UNUSED,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other)
{
const struct sieve_extension *master_ext =
(const struct sieve_extension *) ext->context;

if ( sieve_validator_extension_loaded(valdtr, master_ext) ) {
if ( ext_other == master_ext ) {
sieve_argument_validate_error(valdtr, require_arg,
"the (deprecated) imapflags extension cannot be used "
"together with the imap4flags extension");
Expand Down
24 changes: 13 additions & 11 deletions src/lib-sieve/plugins/mime/ext-extracttext.c
View file
Expand Up @@ -75,14 +75,15 @@ static void ext_extracttext_unload
* Extension validation
*/

static bool ext_extracttext_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context, struct sieve_ast_argument *require_arg);

const struct sieve_validator_extension extracttext_validator_extension = {
&extracttext_extension,
ext_extracttext_validator_extension_validate,
NULL
static bool ext_extracttext_validator_validate
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context,
struct sieve_ast_argument *require_arg);

const struct sieve_validator_extension
extracttext_validator_extension = {
.ext = &extracttext_extension,
.validate = ext_extracttext_validator_validate
};

static bool ext_extracttext_validator_load
Expand All @@ -98,9 +99,10 @@ static bool ext_extracttext_validator_load
return TRUE;
}

static bool ext_extracttext_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context ATTR_UNUSED, struct sieve_ast_argument *require_arg)
static bool ext_extracttext_validator_validate
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context ATTR_UNUSED,
struct sieve_ast_argument *require_arg)
{
struct ext_extracttext_context *ectx =
(struct ext_extracttext_context *)ext->context;
Expand Down
38 changes: 18 additions & 20 deletions src/lib-sieve/plugins/notify/ext-notify.c
View file
Expand Up @@ -50,14 +50,15 @@ const struct sieve_extension_def notify_extension = {
* Extension validation
*/

static bool ext_notify_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context, struct sieve_ast_argument *require_arg);
static bool ext_notify_validator_check_conflict
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other);

const struct sieve_validator_extension notify_validator_extension = {
&notify_extension,
ext_notify_validator_extension_validate,
NULL
.ext = &notify_extension,
.check_conflict = ext_notify_validator_check_conflict
};

static bool ext_notify_validator_load
Expand All @@ -74,21 +75,18 @@ static bool ext_notify_validator_load
return TRUE;
}

static bool ext_notify_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context ATTR_UNUSED, struct sieve_ast_argument *require_arg)
static bool ext_notify_validator_check_conflict
(const struct sieve_extension *ext ATTR_UNUSED,
struct sieve_validator *valdtr, void *context ATTR_UNUSED,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other)
{
const struct sieve_extension *ext_entfy;

if ( (ext_entfy=sieve_extension_get_by_name(ext->svinst, "enotify")) != NULL ) {

/* Check for conflict with enotify */
if ( sieve_validator_extension_loaded(valdtr, ext_entfy) ) {
sieve_argument_validate_error(valdtr, require_arg,
"the (deprecated) notify extension cannot be used "
"together with the enotify extension");
return FALSE;
}
/* Check for conflict with enotify */
if ( sieve_extension_name_is(ext_other, "enotify") ) {
sieve_argument_validate_error(valdtr, require_arg,
"the (deprecated) notify extension cannot be used "
"together with the enotify extension");
return FALSE;
}

return TRUE;
Expand Down
31 changes: 15 additions & 16 deletions src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c
View file
Expand Up @@ -95,14 +95,15 @@ const struct sieve_extension_def virustest_extension = {
* Implementation
*/

static bool ext_spamtest_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context, struct sieve_ast_argument *require_arg);
static bool ext_spamtest_validator_check_conflict
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other);

const struct sieve_validator_extension spamtest_validator_extension = {
&spamtest_extension,
ext_spamtest_validator_extension_validate,
NULL
.ext = &spamtest_extension,
.check_conflict = ext_spamtest_validator_check_conflict
};

static bool ext_spamvirustest_validator_load
Expand All @@ -125,18 +126,16 @@ static bool ext_spamvirustest_validator_load
return TRUE;
}

static bool ext_spamtest_validator_extension_validate
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context ATTR_UNUSED, struct sieve_ast_argument *require_arg)
static bool ext_spamtest_validator_check_conflict
(const struct sieve_extension *ext ATTR_UNUSED,
struct sieve_validator *valdtr, void *context ATTR_UNUSED,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other)
{
const struct sieve_extension *ext_spamtestplus =
sieve_extension_get_by_name(ext->svinst, "spamtestplus");

if ( ext_spamtestplus != NULL &&
sieve_validator_extension_loaded(valdtr, ext_spamtestplus) ) {
if ( sieve_extension_name_is(ext_other, "spamtestplus") ) {
sieve_argument_validate_warning(valdtr, require_arg,
"the spamtest and spamtestplus extensions should not be specified "
"at the same time");
"the spamtest and spamtestplus extensions should "
"not be specified at the same time");
}

return TRUE;
Expand Down
2 changes: 1 addition & 1 deletion src/lib-sieve/sieve-types.h
View file
Expand Up @@ -28,7 +28,7 @@ struct sieve_exec_status;

enum sieve_flag {
/* Relative paths are resolved to HOME */
SIEVE_FLAG_HOME_RELATIVE = (1 << 0),
SIEVE_FLAG_HOME_RELATIVE = (1 << 0)
};

/* Sieve evaluation can be performed at various different points as messages
Expand Down
63 changes: 56 additions & 7 deletions src/lib-sieve/sieve-validator.c
View file
Expand Up @@ -550,12 +550,50 @@ static struct sieve_tag_registration *sieve_validator_command_tag_get
* Extension support
*/

static bool sieve_validator_extensions_check_conficts
(struct sieve_validator *valdtr,
struct sieve_ast_argument *ext_arg,
const struct sieve_extension *ext)
{
struct sieve_validator_extension_reg *ext_reg = NULL;
struct sieve_validator_extension_reg *regs;
unsigned int count, i;

if ( ext->id >= 0 ) {
ext_reg = array_idx_modifiable
(&valdtr->extensions, (unsigned int) ext->id);
}

regs = array_get_modifiable(&valdtr->extensions, &count);
for ( i = 0; i < count; i++ ) {
if (regs[i].ext == NULL)
continue;

/* Check this extension vs other extension */
if ( ext_reg != NULL && ext_reg->valext != NULL &&
ext_reg->valext->check_conflict != NULL ) {
if ( !ext_reg->valext->check_conflict(ext, valdtr,
ext_reg->context, ext_arg, regs[i].ext) )
return FALSE;
}

/* Check other extension vs this extension */
if ( regs[i].valext != NULL &&
regs[i].valext->check_conflict != NULL ) {
if ( !regs[i].valext->check_conflict(regs[i].ext,
valdtr, regs[i].context, regs[i].arg, ext) )
return FALSE;
}
}
return TRUE;
}

bool sieve_validator_extension_load
(struct sieve_validator *valdtr, struct sieve_command *cmd,
struct sieve_ast_argument *ext_arg, const struct sieve_extension *ext)
{
const struct sieve_extension_def *extdef = ext->def;
struct sieve_validator_extension_reg *reg;
struct sieve_validator_extension_reg *reg = NULL;

if ( ext->global && (valdtr->flags & SIEVE_COMPILE_FLAG_NOGLOBAL) != 0 ) {
if ( cmd != NULL && ext_arg != NULL ) {
Expand All @@ -568,6 +606,15 @@ bool sieve_validator_extension_load
return FALSE;
}

if ( ext->id >= 0 ) {
reg = array_idx_modifiable
(&valdtr->extensions, (unsigned int) ext->id);
i_assert(reg->ext == NULL || reg->ext == ext);
reg->ext = ext;
if ( reg->arg == NULL )
reg->arg = ext_arg;
}

if ( !sieve_ast_extension_link(valdtr->ast, ext) ) {
/*if ( cmd != NULL && ext_arg != NULL ) {
sieve_argument_validate_warning(valdtr, ext_arg,
Expand All @@ -588,14 +635,15 @@ bool sieve_validator_extension_load
}
}

/* Check conflicts with other extensions */
if ( !sieve_validator_extensions_check_conficts
(valdtr, ext_arg, ext) )
return FALSE;

/* Register extension no matter what and store the AST argument registering it
*/
if ( ext->id >= 0 ) {
reg = array_idx_modifiable(&valdtr->extensions, (unsigned int) ext->id);
if ( reg->arg == NULL )
reg->arg = ext_arg;
if ( reg != NULL )
reg->loaded = TRUE;
}

return TRUE;
}
Expand Down Expand Up @@ -669,8 +717,9 @@ void sieve_validator_extension_register
if ( ext->id < 0 ) return;

reg = array_idx_modifiable(&valdtr->extensions, (unsigned int) ext->id);
reg->valext = valext;
i_assert(reg->ext == NULL || reg->ext == ext);
reg->ext = ext;
reg->valext = valext;
reg->context = context;
}

Expand Down
14 changes: 10 additions & 4 deletions src/lib-sieve/sieve-validator.h
View file
Expand Up @@ -127,13 +127,19 @@ bool sieve_validate_tag_parameter
struct sieve_validator_extension {
const struct sieve_extension_def *ext;

bool (*check_conflict)
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context,
struct sieve_ast_argument *require_arg,
const struct sieve_extension *ext_other);
bool (*validate)
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context, struct sieve_ast_argument *require_arg);
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context,
struct sieve_ast_argument *require_arg);

void (*free)
(const struct sieve_extension *ext, struct sieve_validator *valdtr,
void *context);
(const struct sieve_extension *ext,
struct sieve_validator *valdtr, void *context);
};

bool sieve_validator_extension_load
Expand Down

0 comments on commit ac77b22

Please sign in to comment.