Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

http_carddav.c: Don't allow the Default addressbook to be deleted #4828

Merged
merged 1 commit into from
Mar 4, 2024
Merged

http_carddav.c: Don't allow the Default addressbook to be deleted #4828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions cassandane/Cassandane/Cyrus/Carddav.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,4 +1450,27 @@ EOF
$self->assert_matches(qr/2500 members/, $value);
}

sub test_delete_default_addressbook
:min_version_3_6 :needs_component_httpd
{
my ($self) = @_;

my $CardDAV = $self->{carddav};

my %Headers = (
'Authorization' => $CardDAV->auth_header()
);

my $Id = $CardDAV->NewAddressBook('foo');
$self->assert_not_null($Id);

my $href = $CardDAV->request_url($Id);
my $res = $CardDAV->ua->request('DELETE', $href, { headers => \%Headers });
$self->assert_num_equals(204, $res->{status});

$href = $CardDAV->request_url('Default');
$res = $CardDAV->ua->request('DELETE', $href, { headers => \%Headers });
$self->assert_num_equals(405, $res->{status});
}

1;
16 changes: 13 additions & 3 deletions imap/http_carddav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,19 @@ static void my_carddav_shutdown(void)
static int carddav_parse_path(const char *path, struct request_target_t *tgt,
const char **resultstr)
{
return calcarddav_parse_path(path, tgt,
config_getstring(IMAPOPT_ADDRESSBOOKPREFIX),
resultstr);
int r = calcarddav_parse_path(path, tgt,
config_getstring(IMAPOPT_ADDRESSBOOKPREFIX),
resultstr);
if (r) return r;

if (!tgt->resource &&
!strncmpsafe(tgt->collection,
DEFAULT_ADDRBOOK "/", strlen(DEFAULT_ADDRBOOK)+1)) {
/* Can't delete default addressbook */
tgt->allow &= ~ALLOW_DELETE;
}

return 0;
}

#ifdef HAVE_LIBICALVCARD
Expand Down
Loading