Skip to content

Commit

Permalink
fix(macos): fix software inventory when proxy is used
Browse files Browse the repository at this point in the history
Don't validate XML against DTD to skip downloading DTD as it would
fail if a proxy is enable.

Closes fusioninventory#453
  • Loading branch information
g-bougard committed Sep 27, 2018
1 parent b94034e commit 10d6503
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ inventory:
* Fix #442: kaspersky not fully recognized in russia
* Fix #501: wrong status was reported when windows defender was disabled
* Enhanced software inventory under Arch Linux
* Fix #453: under MacOS, skip XML DTD validation for software inventory as
parsing may fail if a proxy is enabled

deploy:
* Bump Deploy task version to 2.7
Expand Down
4 changes: 4 additions & 0 deletions lib/FusionInventory/Agent/Tools/MacOS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ sub _initXmlParser {
} elsif ($params{file}) {
$xmlParser = XML::XPath->new(filename => $params{file});
}

# Don't validate XML against DTD, parsing may fail if a proxy is active
$XML::XPath::ParseParamEnt = 0;

return $xmlParser;
}

Expand Down

0 comments on commit 10d6503

Please sign in to comment.