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

Fixed basic auth to work on WRE demo servers.

Browse source
This commit is contained in:
JT Smith 2008-10-25 00:53:31 +00:00
parent 857cd94dfe
commit 91812b74eb
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -4,6 +4,7 @@
and the profile.extras field when viewing a profile. and the profile.extras field when viewing a profile.
- Added the NotifyAboutThing workflow activity. Use this activity to create - Added the NotifyAboutThing workflow activity. Use this activity to create
workflows for the add / edit / delete workflows for a thingy's things. workflows for the add / edit / delete workflows for a thingy's things.
- Fixed basic auth to work on WRE demo servers.
- fixed #8839: Documentation is wrong for Stock Ticker - fixed #8839: Documentation is wrong for Stock Ticker
- Added Guid form control. - Added Guid form control.
- Moved Asset ID and Class Name fields to the Meta tab of all assets. - Moved Asset ID and Class Name fields to the Meta tab of all assets.

16
lib/WebGUI.pm
View file

@ -53,7 +53,7 @@ These subroutines are available from this package:
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 authen ( requestObject, [ user, pass ]) =head2 authen ( requestObject, [ user, pass, config ])
HTTP Basic auth for WebGUI. HTTP Basic auth for WebGUI.
@ -69,11 +69,15 @@ The username to authenticate with. Will pull from the request object if not spec
The password to authenticate with. Will pull from the request object if not specified. The password to authenticate with. Will pull from the request object if not specified.
=head3 config
A reference to a WebGUI::Config object. One will be created if it isn't specified.
=cut =cut
sub authen { sub authen {
my ($request, $username, $password) = @_; my ($request, $username, $password, $config) = @_;
$request = Apache2::Request->new($request); $request = Apache2::Request->new($request);
my $server = Apache2::ServerUtil->server; my $server = Apache2::ServerUtil->server;
my $status = Apache2::Const::OK; my $status = Apache2::Const::OK;
@ -89,12 +93,12 @@ sub authen {
} }
} }
my $config = WebGUI::Config->new($server->dir_config('WebguiRoot'),$request->dir_config('WebguiConfig')); $config ||= WebGUI::Config->new($server->dir_config('WebguiRoot'),$request->dir_config('WebguiConfig'));
my $cookies = APR::Request::Apache2->handle($request)->jar(); my $cookies = APR::Request::Apache2->handle($request)->jar();
# determine session id # determine session id
my $sessionId = $cookies->{$config->getCookieName}; my $sessionId = $cookies->{$config->getCookieName};
my $session = WebGUI::Session->open($server->dir_config('WebguiRoot'),$request->dir_config('WebguiConfig'), $request, $server, $sessionId); my $session = WebGUI::Session->open($server->dir_config('WebguiRoot'),$config->getFilename, $request, $server, $sessionId);
my $log = $session->log; my $log = $session->log;
$request->pnotes(wgSession => $session); $request->pnotes(wgSession => $session);
@ -167,10 +171,10 @@ sub handler {
my $auth = $request->headers_in->{'Authorization'}; my $auth = $request->headers_in->{'Authorization'};
if ($auth =~ m/^Basic/) { # machine oriented if ($auth =~ m/^Basic/) { # machine oriented
$auth =~ s/Basic //; $auth =~ s/Basic //;
authen($request, split(":",MIME::Base64::decode_base64($auth))); authen($request, split(":",MIME::Base64::decode_base64($auth)), $config);
} }
else { # realm oriented else { # realm oriented
$request->push_handlers(PerlAuthenHandler => sub { return WebGUI::authen($request)}); $request->push_handlers(PerlAuthenHandler => sub { return WebGUI::authen($request, undef, undef, $config)});
} }
# url handlers # url handlers