Merge pull request #399 from catalyst/improve-xml-errors

Improved xml parsing error handling #398
catalyst · Mar 3, 2020 · 49262f6 · 49262f6
2 parents 717e915 + ecf4a14
commit 49262f6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/classes/admin/setting_idpmetadata.php b/classes/admin/setting_idpmetadata.php
@@ -210,8 +210,20 @@ public function get_idps_data($value) {
      */
     private function get_idp_xml_path(idp_data $idp) {
         $xml = new DOMDocument();
-        if (!$xml->loadXML($idp->rawxml)) {
-            throw new setting_idpmetadata_exception(get_string('idpmetadata_invalid', 'auth_saml2'));
+
+        libxml_use_internal_errors(true);
+
+        $rawxml = $idp->rawxml;
+
+        if (!$xml->loadXML($rawxml)) {
+            $errors = libxml_get_errors();
+            $lines = explode("\n", $rawxml);
+            $msg = '';
+            foreach ($errors as $error) {
+                $msg .= "<br>Error ({$error->code}) line $error->line char  $error->column: $error->message";
+            }
+
+            throw new setting_idpmetadata_exception(get_string('idpmetadata_invalid', 'auth_saml2') . $msg);
         }
 
         $xpath = new DOMXPath($xml);

diff --git a/classes/idp_parser.php b/classes/idp_parser.php
@@ -56,7 +56,18 @@ public function parse($data) {
         return $this->idps;
     }
 
+    /**
+     * Does the field *look* like xml, mostly?
+     */
     public function check_xml($xml) {
+
+        $declaration = '<?xml';
+
+        $xml = trim($xml);
+        if (substr($xml, 0, strlen($declaration)) === $declaration) {
+            return true;
+        }
+
         libxml_use_internal_errors(true);
         if (simplexml_load_string($xml)) {
             return true;