oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix possible vulnerability loading template parser

Browse source
This commit is contained in:
Doug Bell 2010-08-11 15:37:04 -05:00
parent 0f475dd013
commit 4e9a2c07c2
3 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/WebGUI/Asset/Template.pm
View file

@ -21,6 +21,7 @@ use WebGUI::Asset::Template::HTMLTemplate;
use WebGUI::Utility; use WebGUI::Utility;
use WebGUI::Form; use WebGUI::Form;
use WebGUI::Exception; use WebGUI::Exception;
use List::MoreUtils qw{ any };
use Tie::IxHash; use Tie::IxHash;
use Clone qw/clone/; use Clone qw/clone/;
use HTML::Packer; use HTML::Packer;
@ -434,14 +435,23 @@ A parser class to use. Defaults to "WebGUI::Asset::Template::HTMLTemplate"
sub getParser { sub getParser {
my $class = shift; my $class = shift;
my $session = shift; my $session = shift;
my $parser = shift || $session->config->get("defaultTemplateParser") || "WebGUI::Asset::Template::HTMLTemplate"; my $parser = shift;
if ($parser eq "") { # If parser is not in the config, throw an error message
return WebGUI::Asset::Template::HTMLTemplate->new($session); if ( $parser && $parser ne $session->config->get('defaultTemplateParser')
} else { && !any { $_ eq $parser } @{$session->config->get('templateParsers')} ) {
eval("use $parser"); WebGUI::Error::NotInConfig->throw(
return $parser->new($session); error => "Attempted to load template parser '$parser' that is not in config file",
module => $parser,
configKey => 'templateParsers',
);
} }
else {
$parser ||= $session->config->get("defaultTemplateParser") || "WebGUI::Asset::Template::HTMLTemplate";
}
WebGUI::Pluggable::load( $parser );
return $parser->new($session);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

5
lib/WebGUI/Exception.pm
View file

@ -58,6 +58,11 @@ use Exception::Class (
isa => 'WebGUI::Error', isa => 'WebGUI::Error',
description => "A template has errors that prevent it from being processed.", description => "A template has errors that prevent it from being processed.",
}, },
'WebGUI::Error::NotInConfig' => {
isa => 'WebGUI::Error',
description => 'A module was requested that does not exist in the configuration file.',
fields => [qw{ module configKey }],
},
); );
sub WebGUI::Error::full_message { sub WebGUI::Error::full_message {

27
t/Asset/Template.t
View file

@ -16,9 +16,10 @@ use WebGUI::Test;
use WebGUI::Session; use WebGUI::Session;
use WebGUI::Asset::Template; use WebGUI::Asset::Template;
use Exception::Class; use Exception::Class;
use Test::More tests => 48; # increment this value for each test you create use Test::More tests => 53; # increment this value for each test you create
use Test::Deep; use Test::Deep;
use Data::Dumper; use Data::Dumper;
use Test::Exception;
use JSON qw{ from_json }; use JSON qw{ from_json };
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
@ -215,3 +216,27 @@ is($session->setting->get('userFunctionStyleId'), $userStyleTemplate->getId, 'Re
$userStyleTemplate->purge; $userStyleTemplate->purge;
is($session->setting->get('userFunctionStyleId'), 'PBtmpl0000000000000060', 'purge resets the user function style template to Fail Safe'); is($session->setting->get('userFunctionStyleId'), 'PBtmpl0000000000000060', 'purge resets the user function style template to Fail Safe');
#----------------------------------------------------------------------------
# Verify getParser
WebGUI::Test->originalConfig( 'defaultTemplateParser' );
WebGUI::Test->originalConfig( 'templateParsers' );
$session->config->set( 'templateParsers', [ 'WebGUI::Asset::Template::HTMLTemplateExpr' ] );
# Leaving out 'WebGUI::Asset::Template::TemplateToolkit' on purpose
$session->config->set( 'defaultTemplateParser', 'WebGUI::Asset::Template::HTMLTemplateExpr' );
my $class = 'WebGUI::Asset::Template';
dies_ok { $class->getParser( $session, '::HI::' ) } "Invalid parser dies";
isa_ok $class->getParser( $session ), 'WebGUI::Asset::Template::HTMLTemplateExpr', 'no parser passed in gets the default parser';
$session->config->delete( 'defaultTemplateParser' );
isa_ok $class->getParser( $session ), 'WebGUI::Asset::Template::HTMLTemplate', 'no parser passed and no default gets HTMLTemplate';
$session->config->set( 'defaultTemplateParser', 'WebGUI::Asset::Template::HTMLTemplateExpr' );
throws_ok
{ $class->getParser( $session, 'WebGUI::Asset::Template::TemplateToolkit') }
'WebGUI::Error::NotInConfig',
'Parser not in config dies';
isa_ok $class->getParser( $session, 'WebGUI::Asset::Template::HTMLTemplateExpr'), 'WebGUI::Asset::Template::HTMLTemplateExpr', 'parser in config is created';