Added a new plugin handler system that is both faster and more secure.
This commit is contained in:
parent
e12c6a105e
commit
de0ac26cd1
4 changed files with 19 additions and 27 deletions
|
|
@ -16,6 +16,7 @@ package WebGUI::Operation::Auth;
|
|||
use strict qw(vars subs);
|
||||
use URI;
|
||||
use WebGUI::Operation::Shared;
|
||||
use WebGUI::Pluggable;
|
||||
use WebGUI::SQL;
|
||||
use WebGUI::User;
|
||||
use WebGUI::Utility;
|
||||
|
|
@ -37,13 +38,13 @@ sub getInstance {
|
|||
$authMethod = $_[0] if($_[0] && isIn($_[0], @{$session->config->get("authMethods")}));
|
||||
my $userId = $_[1];
|
||||
#Create Auth Object
|
||||
my $cmd = "WebGUI::Auth::".$authMethod;
|
||||
my $load = "use ".$cmd;
|
||||
eval($load);
|
||||
$session->errorHandler->fatal("Authentication module failed to compile: $cmd.".$@) if($@);
|
||||
my $auth = eval{$cmd->new($session, $authMethod,$userId)};
|
||||
$session->errorHandler->fatal("Couldn't instantiate authentication module: $authMethod. Root cause: ".$@) if($@);
|
||||
return $auth;
|
||||
my $auth = eval { WebGUI::Pluggable::instanciate("WebGUI::Auth::".$authMethod, "new", [ $session, $authMethod, $userId ] ) };
|
||||
if ($@) {
|
||||
$session->errorHandler->fatal($@);
|
||||
}
|
||||
else {
|
||||
return $auth;
|
||||
};
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ package WebGUI::URL::Content;
|
|||
use strict;
|
||||
use Apache2::Const -compile => qw(OK DECLINED);
|
||||
use WebGUI::Affiliate;
|
||||
use WebGUI::Pluggable;
|
||||
use WebGUI::Session;
|
||||
|
||||
=head1 NAME
|
||||
|
|
@ -51,17 +52,11 @@ sub handler {
|
|||
$request->push_handlers(PerlResponseHandler => sub {
|
||||
my $session = WebGUI::Session->open($server->dir_config('WebguiRoot'), $config->getFilename, $request, $server);
|
||||
foreach my $handler (@{$config->get("contentHandlers")}) {
|
||||
my $handlerPath = $handler.".pm";
|
||||
$handlerPath =~ s{::}{/}g;
|
||||
eval { require $handlerPath };
|
||||
my $output = eval { WebGUI::Pluggable::run($handler, "handler", [ $session ] ) };
|
||||
if ( $@ ) {
|
||||
$session->errorHandler->error("Couldn't load content handler $handler.");
|
||||
$session->errorHandler->error($@);
|
||||
}
|
||||
else {
|
||||
my $command = $handler."::handler";
|
||||
no strict qw(refs);
|
||||
my $output = &$command($session);
|
||||
use strict;
|
||||
if ($output) {
|
||||
if ($output eq "cached") {
|
||||
return Apache2::Const::OK;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue