You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2016/11/21 12:47:14 UTC
svn commit: r1770677 - in /subversion/trunk/subversion: libsvn_subr/xml.c
tests/libsvn_subr/xml-test.c
Author: kotkov
Date: Mon Nov 21 12:47:13 2016
New Revision: 1770677
URL: http://svn.apache.org/viewvc?rev=1770677&view=rev
Log:
Make the XML parser stricter by prohibiting custom XML entities.
* subversion/libsvn_subr/xml.c
(expat_entity_declaration, expat_default_handler): New.
(svn_xml_make_parser, svn_xml_signal_bailout): Install new handlers.
* subversion/tests/libsvn_subr/xml-test.c
(test_xml_builtin_entity_expansion, test_xml_custom_entity_expansion,
test_xml_doctype_declaration): New tests.
(test_funcs): Reference new tests.
Modified:
subversion/trunk/subversion/libsvn_subr/xml.c
subversion/trunk/subversion/tests/libsvn_subr/xml-test.c
Modified: subversion/trunk/subversion/libsvn_subr/xml.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/xml.c?rev=1770677&r1=1770676&r2=1770677&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/xml.c (original)
+++ subversion/trunk/subversion/libsvn_subr/xml.c Mon Nov 21 12:47:13 2016
@@ -396,6 +396,28 @@ static void expat_data_handler(void *use
#endif
}
+#if XML_VERSION_AT_LEAST(1, 95, 8)
+static void expat_entity_declaration(void *userData,
+ const XML_Char *entityName,
+ int is_parameter_entity,
+ const XML_Char *value,
+ int value_length,
+ const XML_Char *base,
+ const XML_Char *systemId,
+ const XML_Char *publicId,
+ const XML_Char *notationName)
+{
+ svn_xml_parser_t *svn_parser = userData;
+
+ /* Stop the parser if an entity declaration is hit. */
+ XML_StopParser(svn_parser->parser, 0 /* resumable */);
+}
+#else
+/* A noop default_handler. */
+static void expat_default_handler(void *userData, const XML_Char *s, int len)
+{
+}
+#endif
/*** Making a parser. ***/
@@ -428,6 +450,12 @@ svn_xml_make_parser(void *baton,
XML_SetCharacterDataHandler(parser,
data_handler ? expat_data_handler : NULL);
+#if XML_VERSION_AT_LEAST(1, 95, 8)
+ XML_SetEntityDeclHandler(parser, expat_entity_declaration);
+#else
+ XML_SetDefaultHandler(parser, expat_default_handler);
+#endif
+
svn_parser = apr_pcalloc(pool, sizeof(*svn_parser));
svn_parser->parser = parser;
@@ -506,7 +534,9 @@ void svn_xml_signal_bailout(svn_error_t
/* This will cause the current XML_Parse() call to finish quickly! */
XML_SetElementHandler(svn_parser->parser, NULL, NULL);
XML_SetCharacterDataHandler(svn_parser->parser, NULL);
-
+#if XML_VERSION_AT_LEAST(1, 95, 8)
+ XML_SetEntityDeclHandler(svn_parser->parser, NULL);
+#endif
/* Once outside of XML_Parse(), the existence of this field will
cause svn_delta_parse()'s main read-loop to return error. */
svn_parser->error = error;
Modified: subversion/trunk/subversion/tests/libsvn_subr/xml-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/xml-test.c?rev=1770677&r1=1770676&r2=1770677&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/xml-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/xml-test.c Mon Nov 21 12:47:13 2016
@@ -226,6 +226,112 @@ test_parser_free(apr_pool_t *pool)
return SVN_NO_ERROR;
}
+/* Test that builtin XML entities are expanded as expected. */
+static svn_error_t *
+test_xml_builtin_entity_expansion(apr_pool_t *pool)
+{
+ const char *xml =
+ "<?xml version='1.0'?>\n"
+ "<root a='&'>&	</root>";
+
+ xml_callbacks_baton_t b;
+
+ b.buf = svn_stringbuf_create_empty(pool);
+ b.parser = svn_xml_make_parser(&b, strbuf_start_elem, strbuf_end_elem,
+ strbuf_cdata, pool);
+
+ SVN_ERR(svn_xml_parse(b.parser, xml, strlen(xml), TRUE));
+
+ SVN_TEST_STRING_ASSERT(b.buf->data,
+ "<root a=&>&\t</root>");
+
+ return SVN_NO_ERROR;
+}
+
+/* Test that custom XML entities are not allowed. */
+static svn_error_t *
+test_xml_custom_entity_expansion(apr_pool_t *pool)
+{
+ const char *xml =
+ "<?xml version='1.0'?>\n"
+ "<!DOCTYPE test ["
+ "<!ELEMENT root (#PCDATA)>"
+ "<!ENTITY xmlentity 'val'>"
+ "]>"
+ "<root>&xmlentity;</root>";
+
+ xml_callbacks_baton_t b;
+ svn_error_t *err;
+
+ b.buf = svn_stringbuf_create_empty(pool);
+ b.parser = svn_xml_make_parser(&b, strbuf_start_elem, strbuf_end_elem,
+ strbuf_cdata, pool);
+
+ err = svn_xml_parse(b.parser, xml, strlen(xml), TRUE);
+
+ /* XML entity declarations will be either silently ignored or error
+ will be returned depending on Expat version. */
+ if (err)
+ {
+ SVN_TEST_ASSERT_ERROR(err, SVN_ERR_XML_MALFORMED);
+ SVN_TEST_STRING_ASSERT(b.buf->data,
+ "");
+ }
+ else
+ {
+ SVN_TEST_STRING_ASSERT(b.buf->data,
+ "<root></root>");
+ }
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+test_xml_doctype_declaration(apr_pool_t *pool)
+{
+ const char *xml =
+ "<?xml version='1.0'?>\n"
+ "<?xml-stylesheet type='text/xsl' href='/svnindex.xsl'?>"
+ "<!DOCTYPE svn ["
+ " <!ELEMENT svn (index)>"
+ " <!ATTLIST svn version CDATA #REQUIRED"
+ " href CDATA #REQUIRED>"
+ " <!ELEMENT index (updir?, (file | dir)*)>"
+ " <!ATTLIST index name CDATA #IMPLIED"
+ " path CDATA #IMPLIED"
+ " rev CDATA #IMPLIED"
+ " base CDATA #IMPLIED>"
+ " <!ELEMENT updir EMPTY>"
+ " <!ATTLIST updir href CDATA #REQUIRED>"
+ " <!ELEMENT file EMPTY>"
+ " <!ATTLIST file name CDATA #REQUIRED"
+ " href CDATA #REQUIRED>"
+ " <!ELEMENT dir EMPTY>"
+ " <!ATTLIST dir name CDATA #REQUIRED"
+ " href CDATA #REQUIRED>"
+ "]>"
+ "<svn version='1.9.4'>"
+ " <index rev='0' path='Collection of Repositories'>"
+ " </index>"
+ "</svn>";
+
+ xml_callbacks_baton_t b;
+
+ b.buf = svn_stringbuf_create_empty(pool);
+ b.parser = svn_xml_make_parser(&b, strbuf_start_elem, strbuf_end_elem,
+ strbuf_cdata, pool);
+
+ SVN_ERR(svn_xml_parse(b.parser, xml, strlen(xml), TRUE));
+
+ SVN_TEST_STRING_ASSERT(b.buf->data,
+ "<svn version=1.9.4>"
+ " <index rev=0 path=Collection of Repositories>"
+ " </index>"
+ "</svn>");
+
+ return SVN_NO_ERROR;
+}
+
/* The test table. */
static int max_threads = 1;
@@ -242,6 +348,12 @@ static struct svn_test_descriptor_t test
"test svn_xml_signal_bailout() for invalid XML"),
SVN_TEST_PASS2(test_parser_free,
"test svn_xml_parser_free()"),
+ SVN_TEST_PASS2(test_xml_builtin_entity_expansion,
+ "test XML builtin entity expansion"),
+ SVN_TEST_PASS2(test_xml_custom_entity_expansion,
+ "test XML custom entity expansion"),
+ SVN_TEST_PASS2(test_xml_doctype_declaration,
+ "test XML doctype declaration"),
SVN_TEST_NULL
};