fix(agent): fixed XML inventory request, it must be on base64

flyve-mdm · Jan 18, 2018 · 31018f9 · 31018f9
1 parent 8f6b5d9
commit 31018f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -1005,7 +1005,8 @@ protected function enrollByInvitationToken($input) {
       $lastname         = isset($input['lastname']) ? $input['lastname'] : null;
       $version          = isset($input['version']) ? $input['version'] : null;
       $mdmType          = isset($input['type']) ? $input['type'] : null;
-      $inventory        = isset($input['inventory']) ? htmlspecialchars_decode($input['inventory'], ENT_XML1) : null;
+      $inventory        = isset($input['inventory']) ? htmlspecialchars_decode(base64_decode($input['inventory']),
+         ENT_COMPAT | ENT_XML1) : null;
       $systemPermission = isset($input['has_system_permission']) ? $input['has_system_permission'] : 0;
       // For non-android agents, system permssion might be forced to 1 depending on the lack of such cosntraint
 

diff --git a/tests/src/TestingCommonTools.php b/tests/src/TestingCommonTools.php
@@ -232,6 +232,6 @@ public static function AgentXmlInventory($serial, $macAddress = '', $deviceId =
                 </BATTERIES>
               </CONTENT>
             </REQUEST>";
-      return htmlspecialchars($xml);
+      return base64_encode($xml);
    }
 }