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

Properly parse carddav address-data - fixes #1017 #1027

Merged
merged 1 commit into from Jan 22, 2018
Merged

Properly parse carddav address-data - fixes #1017 #1027

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/CardDAV/Xml/Filter/AddressData.php
View file
Open in desktop
Expand Up @@ -52,12 +52,15 @@ static function xmlDeserialize(Reader $reader) {
];

$elems = (array)$reader->parseInnerTree();
$elems = array_filter($elems, function($element) {
return $element['name'] === '{urn:ietf:params:xml:ns:carddav}prop' &&
isset($element['attributes']['name']);
});
$result['addressDataProperties'] = array_map(function($element) {
return $element['attributes']['name'];
}, $elems);

return $result;

}

}
71 changes: 56 additions & 15 deletions tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetTest.php
View file
Open in desktop
Expand Up @@ -10,18 +10,11 @@ class AddressBookMultiGetTest extends XmlTest {
'{urn:ietf:params:xml:ns:carddav}addressbook-multiget' => 'Sabre\\CardDAV\\Xml\\Request\AddressBookMultiGetReport',
];

function testDeserialize() {

/* lines look a bit odd but this triggers an XML parsing bug */
$xml = <<<XML
<?xml version='1.0' encoding='UTF-8' ?>
<CARD:addressbook-multiget xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
<prop>
<getcontenttype />
<getetag />
<CARD:address-data content-type="text/vcard" version="4.0" /></prop><href>/foo.vcf</href>
</CARD:addressbook-multiget>
XML;
/**
* @dataProvider providesAddressDataXml
* @param $xml
*/
function testDeserialize($xml, $expectedProps, $expectedVersion = '3.0') {

$result = $this->parse($xml);
$addressBookMultiGetReport = new AddressBookMultiGetReport();
Expand All @@ -32,8 +25,8 @@ function testDeserialize() {
];
$addressBookMultiGetReport->hrefs = ['/foo.vcf'];
$addressBookMultiGetReport->contentType = 'text/vcard';
$addressBookMultiGetReport->version = '4.0';
$addressBookMultiGetReport->addressDataProperties = [];
$addressBookMultiGetReport->version = $expectedVersion;
$addressBookMultiGetReport->addressDataProperties = $expectedProps;


$this->assertEquals(
Expand All @@ -43,5 +36,53 @@ function testDeserialize() {

}


function providesAddressDataXml()
{
$simpleXml = <<<XML
<?xml version='1.0' encoding='UTF-8' ?>
<CARD:addressbook-multiget xmlns:d="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
<d:prop>
<d:getcontenttype />
<d:getetag />
<CARD:address-data content-type="text/vcard" version="4.0"/>
</d:prop>
<d:href>/foo.vcf</d:href>
</CARD:addressbook-multiget>
XML;
$allPropsXml = <<<XML
<?xml version='1.0' encoding='UTF-8' ?>
<CARD:addressbook-multiget xmlns:d="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
<d:prop>
<d:getcontenttype />
<d:getetag />
<CARD:address-data>
<CARD:allprop/>
</CARD:address-data>
</d:prop>
<d:href>/foo.vcf</d:href>
</CARD:addressbook-multiget>
XML;
$multiplePropsXml = <<<XML
<?xml version='1.0' encoding='UTF-8' ?>
<CARD:addressbook-multiget xmlns:d="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
<d:prop>
<d:getcontenttype />
<d:getetag />
<CARD:address-data>
<CARD:prop name="VERSION"/>
<CARD:prop name="UID"/>
<CARD:prop name="NICKNAME"/>
<CARD:prop name="EMAIL"/>
<CARD:prop name="FN"/>
</CARD:address-data>
</d:prop>
<d:href>/foo.vcf</d:href>
</CARD:addressbook-multiget>
XML;
return [
'address data with version' => [$simpleXml, [], '4.0'],
'address data with inner all props' => [$allPropsXml, []],
'address data with mutliple props' => [$multiplePropsXml, ['VERSION', 'UID', 'NICKNAME', 'EMAIL', 'FN']]
];
}
}