Skip to content

Commit

Permalink
xplist: Fix limited but possible XXE security vulnerability with XML …
Browse files Browse the repository at this point in the history
…plists

By using a specifically crafted XML file an attacker could use plistutil
to issue a GET request to an arbitrary URL or disclose a local file.
The crafted XML file would be using a custom DTD with an external entity
reference pointing to the file. Practical abuse is limited but let's still
fix it nevertheless. Related to CVE-2013-0339 for libxml2 and CWE-827.
Reported by Loïc Bénis from calypt.com. Thanks!
  • Loading branch information
FunkyM committed Jan 23, 2015
1 parent 82a6acc commit c086cb1
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions src/xplist.c
Expand Up @@ -29,6 +29,7 @@
#include <inttypes.h>
#include <locale.h>

#include <libxml/xmlIO.h>
#include <libxml/parser.h>
#include <libxml/tree.h>

Expand Down Expand Up @@ -555,11 +556,22 @@ PLIST_API void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length)
}
}

static xmlParserInputPtr plist_xml_external_entity_loader(const char *URL, const char *ID, xmlParserCtxtPtr ctxt)
{
return NULL;
}

PLIST_API void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist)
{
xmlDocPtr plist_doc = xmlParseMemory(plist_xml, length);
xmlNodePtr root_node = xmlDocGetRootElement(plist_doc);
/* CVE-2013-0339: disable external entity loading to prevent XXE vulnerability */
xmlSetExternalEntityLoader(plist_xml_external_entity_loader);

xml_to_node(root_node, plist);
xmlFreeDoc(plist_doc);
/* read XML from memory and disable network access for security reasons */
xmlDocPtr plist_doc = xmlReadMemory(plist_xml, length, "plist_from_xml:memory", NULL, XML_PARSE_NONET);
if (plist_doc) {
xmlNodePtr root_node = xmlDocGetRootElement(plist_doc);

xml_to_node(root_node, plist);
xmlFreeDoc(plist_doc);
}
}

0 comments on commit c086cb1

Please sign in to comment.