lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

validate NAMESPACE response earlier

Browse Source 
... and don't silently fail later on.
This commit is contained in:
Oswald Buddenhagen 2016-12-04 11:14:34 +01:00
parent 1a707ab156
commit 03e25db3b8
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/drv_imap.c
View File

@ -837,33 +837,50 @@ static int parse_namespace_rsp_p2( imap_store_t *, list_t *, char * );
static int parse_namespace_rsp_p3( imap_store_t *, list_t *, char * ); static int parse_namespace_rsp_p3( imap_store_t *, list_t *, char * );
static int static int
parse_namespace_rsp_fail( void ) parse_namespace_check( list_t *list )
{ {
if (!list)
goto bad;
if (list->val == NIL)
return 0;
if (list->val != LIST)
goto bad;
for (list = list->child; list; list = list->next) {
if (list->val != LIST)
goto bad;
if (!is_atom( list->child ))
goto bad;
if (!is_atom( list->child->next ))
goto bad;
/* Namespace response extensions may follow here; we don't care. */
}
return 0;
bad:
error( "IMAP error: malformed NAMESPACE response\n" ); error( "IMAP error: malformed NAMESPACE response\n" );
return LIST_BAD; return -1;
} }
static int static int
parse_namespace_rsp( imap_store_t *ctx, list_t *list, char *s ) parse_namespace_rsp( imap_store_t *ctx, list_t *list, char *s )
{ {
if (!(ctx->ns_personal = list)) if (parse_namespace_check( (ctx->ns_personal = list) ))
return parse_namespace_rsp_fail(); return LIST_BAD;
return parse_list( ctx, s, parse_namespace_rsp_p2 ); return parse_list( ctx, s, parse_namespace_rsp_p2 );
} }
static int static int
parse_namespace_rsp_p2( imap_store_t *ctx, list_t *list, char *s ) parse_namespace_rsp_p2( imap_store_t *ctx, list_t *list, char *s )
{ {
if (!(ctx->ns_other = list)) if (parse_namespace_check( (ctx->ns_other = list) ))
return parse_namespace_rsp_fail(); return LIST_BAD;
return parse_list( ctx, s, parse_namespace_rsp_p3 ); return parse_list( ctx, s, parse_namespace_rsp_p3 );
} }
static int static int
parse_namespace_rsp_p3( imap_store_t *ctx, list_t *list, char *s ATTR_UNUSED ) parse_namespace_rsp_p3( imap_store_t *ctx, list_t *list, char *s ATTR_UNUSED )
{ {
if (!(ctx->ns_shared = list)) if (parse_namespace_check( (ctx->ns_shared = list) ))
return parse_namespace_rsp_fail(); return LIST_BAD;
return LIST_OK; return LIST_OK;
} }
@ -2142,10 +2159,8 @@ imap_open_store_namespace2( imap_store_t *ctx )
ctx->prefix = nsp_1st_ns->val; ctx->prefix = nsp_1st_ns->val;
if (!ctx->delimiter) if (!ctx->delimiter)
ctx->delimiter = nfstrdup( nsp_1st_dl->val ); ctx->delimiter = nfstrdup( nsp_1st_dl->val );
imap_open_store_finalize( ctx );
} else {
imap_open_store_bail( ctx, FAIL_FINAL );
} }
imap_open_store_finalize( ctx );
} }
static void static void