mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't blow up the config if someone enters int'l chars in an LDAP attribute/DN field. Ticket #2227

Browse Source
This commit is contained in:
jim-p 2013-07-17 10:52:25 -04:00
parent 298020b2b6
commit dc3fc54a08
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/inc/xmlparse.inc
View File

@ -232,7 +232,13 @@ function dump_xml_config_sub($arr, $indent) {
$xmlconfig .= str_repeat("\t", $indent);
if((is_bool($cval) && $cval == true) || ($cval === "")) {
$xmlconfig .= "<$ent/>\n";
} else if ((substr($ent, 0, 5) == "descr") || (substr($ent, 0, 6) == "detail")) {
} else if ((substr($ent, 0, 5) == "descr")
|| (substr($ent, 0, 6) == "detail")
|| (substr($ent, 0, 9) == "ldap_attr")
|| (substr($ent, 0, 9) == "ldap_bind")
|| (substr($ent, 0, 11) == "ldap_basedn")
|| (substr($ent, 0, 18) == "ldap_authcn")
|| (substr($ent, 0, 19) == "ldap_extended_query")) {
$xmlconfig .= "<$ent><![CDATA[" . htmlentities($cval) . "]]></$ent>\n";
} else {
$xmlconfig .= "<$ent>" . htmlentities($cval) . "</$ent>\n";
@ -256,7 +262,13 @@ function dump_xml_config_sub($arr, $indent) {
$xmlconfig .= "<$ent/>\n";
} else if (!is_bool($val)) {
$xmlconfig .= str_repeat("\t", $indent);
if ((substr($ent, 0, 5) == "descr") || (substr($ent, 0, 6) == "detail"))
if ((substr($ent, 0, 5) == "descr")
|| (substr($ent, 0, 6) == "detail")
|| (substr($ent, 0, 9) == "ldap_attr")
|| (substr($ent, 0, 9) == "ldap_bind")
|| (substr($ent, 0, 11) == "ldap_basedn")
|| (substr($ent, 0, 18) == "ldap_authcn")
|| (substr($ent, 0, 19) == "ldap_extended_query"))
$xmlconfig .= "<$ent><![CDATA[" . htmlentities($val) . "]]></$ent>\n";
else
$xmlconfig .= "<$ent>" . htmlentities($val) . "</$ent>\n";