Skip to content

XML::Parser entity (non-)expansion improvements #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

XML::Parser entity (non-)expansion improvements #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29e437a
Report empty instead of external entity system id
scop Jan 3, 2019
1a4078e
Prevent internal subset entity expansion with XML::Parser
scop Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/XML/Simple.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,9 @@ sub build_tree_xml_parser {
sub new_xml_parser {
my($self) = @_;

my $xp = XML::Parser->new(Style => 'Tree', @{$self->{opt}->{parseropts}});
$xp->setHandlers(ExternEnt => sub {return $_[2]});
my $xp = XML::Parser->new(Style => 'Tree', NoExpand => 1,
@{$self->{opt}->{parseropts}});
$xp->setHandlers(ExternEnt => sub {return ''}, Default => sub {});

return $xp;
}
Expand Down
2 changes: 1 addition & 1 deletion t/C_External_Entities.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ my $xml = qq(<?xml version="1.0"?>

my $opt = XMLin($xml);
isnt($opt->{'user'}, 'bad', 'External entity not retrieved');
like($opt->{'user'}, qr/^file/, 'External entity left as URL');
is_deeply($opt->{'user'}, {}, 'External entity left as empty');

unlink($filename) if (-f $filename);
exit(0);
26 changes: 26 additions & 0 deletions t/E_Internal_Entities.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
use strict;
use warnings;
use Test::More;

eval { require XML::Parser; };
if($@) {
plan skip_all => 'no XML::Parser';
}

plan tests => 2;

use XML::Simple;

$XML::Simple::PREFERRED_PARSER = 'XML::Parser';

my $xml = qq(<?xml version="1.0"?>
<!DOCTYPE foo [
<!ENTITY b "XML bomb" >]>
<foo>&b;</foo>
);

my $opt = XMLin($xml);
isnt($opt, 'XML bomb', 'Internal subset entity not expanded');
is_deeply($opt, {}, 'Internal subset entity left as empty');

exit(0);