ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-04 19:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit from fork

Browse Source 
Co-authored-by: Jakub Karolczyk <jakub.karolczyk@signalwire.com>
This commit is contained in:
Andrey Volk
2026-05-07 20:14:34 +03:00
committed by GitHub
parent 1a97ed38e6
commit ce12717ad7
2 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/switch_xml.c
+3 -2
View File
@@ -838,6 +838,7 @@ static short switch_xml_internal_dtd(switch_xml_root_t root, char *s, switch_siz
char q, *c, *t, *n = NULL, *v, **ent, **pe;
int i, j;
char **sstmp;
switch_bool_t disable_dtd = switch_true(switch_core_get_variable("xml_disable_dtd"));
pe = (char **) memcpy(switch_must_malloc(sizeof(SWITCH_XML_NIL)), SWITCH_XML_NIL, sizeof(SWITCH_XML_NIL));
@@ -847,7 +848,7 @@ static short switch_xml_internal_dtd(switch_xml_root_t root, char *s, switch_siz
if (!*s)
break;
else if (!strncmp(s, "<!ENTITY", 8)) { /* parse entity definitions */
else if (!strncmp(s, "<!ENTITY", 8) && !disable_dtd) { /* parse entity definitions if dtd is not explicitly disabled */
int use_pe;
c = s += strspn(s + 8, SWITCH_XML_WS) + 8; /* skip white space separator */
@@ -881,7 +882,7 @@ static short switch_xml_internal_dtd(switch_xml_root_t root, char *s, switch_siz
break;
} else
ent[i] = n; /* set entity name */
} else if (!strncmp(s, "<!ATTLIST", 9)) { /* parse default attributes */
} else if (!strncmp(s, "<!ATTLIST", 9) && !disable_dtd) { /* parse default attributes if dtd is not explicitly disabled */
t = s + strspn(s + 9, SWITCH_XML_WS) + 9; /* skip whitespace separator */
if (!*t) {
switch_xml_err(root, t, "unclosed <!ATTLIST");
tests/unit/switch_xml.c
+68
View File
@@ -117,6 +117,74 @@ FST_MINCORE_BEGIN("./conf")
free(xml_string);
}
FST_TEST_END()
FST_TEST_BEGIN(test_dtd)
{
const char *text = "<xml><!DOCTYPE Response [<!ENTITY lol \"haha\"><!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">]><Response><Say>&lol1;</Say></Response></xml>";
switch_xml_t xml = switch_xml_parse_str_dynamic((char *)text, SWITCH_TRUE);
char *xml_string = NULL;
fst_requires(xml);
xml_string = switch_xml_toxml_ex(xml, SWITCH_FALSE, SWITCH_FALSE);
fst_requires(xml_string);
fst_check_string_equals(xml_string, "<xml>\n <Response>\n <Say>hahahahahahahahahahahahahahahahahahahaha</Say>\n </Response>\n</xml>\n");
free(xml_string);
switch_xml_free(xml);
}
FST_TEST_END()
FST_TEST_BEGIN(test_dtd_disable)
{
const char *text = "<xml><!DOCTYPE Response [<!ENTITY lol \"haha\"><!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">]><Response><Say>&lol1;</Say></Response></xml>";
switch_xml_t xml = NULL;
char *xml_string = NULL;
switch_core_set_variable("xml_disable_dtd", "true");
xml = switch_xml_parse_str_dynamic((char *)text, SWITCH_TRUE);
fst_requires(xml);
xml_string = switch_xml_toxml_ex(xml, SWITCH_FALSE, SWITCH_FALSE);
fst_requires(xml_string);
fst_check_string_equals(xml_string, "<xml>\n <Response>\n <Say>&amp;lol1;</Say>\n </Response>\n</xml>\n");
free(xml_string);
switch_xml_free(xml);
switch_core_set_variable("xml_disable_dtd", "false");
}
FST_TEST_END()
FST_TEST_BEGIN(test_dtd_with_comments)
{
const char *text = "<xml><!DOCTYPE Response [<!--COMMENT1--><!ENTITY lol \"haha\"><!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\"><!--COMMENT2-->]><Response><Say>&lol1;</Say></Response></xml>";
switch_xml_t xml = NULL;
char *xml_string = NULL;
xml = switch_xml_parse_str_dynamic((char *)text, SWITCH_TRUE);
fst_requires(xml);
xml_string = switch_xml_toxml_ex(xml, SWITCH_FALSE, SWITCH_FALSE);
fst_requires(xml_string);
fst_check_string_equals(xml_string, "<xml>\n <Response>\n <Say>hahahahahahahahahahahahahahahahahahahaha</Say>\n </Response>\n</xml>\n");
free(xml_string);
switch_xml_free(xml);
}
FST_TEST_END()
FST_TEST_BEGIN(test_dtd_disable_with_comments)
{
const char *text = "<xml><!DOCTYPE Response [<!--COMMENT1--><!ENTITY lol \"haha\"><!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\"><!--COMMENT2-->]><Response><Say>&lol1;</Say></Response></xml>";
switch_xml_t xml = NULL;
char *xml_string = NULL;
switch_core_set_variable("xml_disable_dtd", "true");
xml = switch_xml_parse_str_dynamic((char *)text, SWITCH_TRUE);
fst_requires(xml);
xml_string = switch_xml_toxml_ex(xml, SWITCH_FALSE, SWITCH_FALSE);
fst_requires(xml_string);
fst_check_string_equals(xml_string, "<xml>\n <Response>\n <Say>&amp;lol1;</Say>\n </Response>\n</xml>\n");
free(xml_string);
switch_xml_free(xml);
switch_core_set_variable("xml_disable_dtd", "false");
}
FST_TEST_END()
}
FST_SUITE_END()
}