added services to create, update, and delete users
This commit is contained in:
Doug Bell
parent
0cf79f7264
commit
18e095faee
2 changed files with 263 additions and 0 deletions
|
|
@ -194,6 +194,9 @@ sub getOperations {
|
||||||
'setPersonalStyle' => 'Style',
|
'setPersonalStyle' => 'Style',
|
||||||
'unsetPersonalStyle' => 'Style',
|
'unsetPersonalStyle' => 'Style',
|
||||||
|
|
||||||
|
'ajaxCreateUser' => 'User',
|
||||||
|
'ajaxDeleteUser' => 'User',
|
||||||
|
'ajaxUpdateUser' => 'User',
|
||||||
'becomeUser' => 'User',
|
'becomeUser' => 'User',
|
||||||
'deleteUser' => 'User',
|
'deleteUser' => 'User',
|
||||||
'editUser' => 'User',
|
'editUser' => 'User',
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,8 @@ use WebGUI::SQL;
|
||||||
use WebGUI::TabForm;
|
use WebGUI::TabForm;
|
||||||
use WebGUI::User;
|
use WebGUI::User;
|
||||||
use WebGUI::Utility;
|
use WebGUI::Utility;
|
||||||
|
use JSON;
|
||||||
|
use XML::Simple;
|
||||||
|
|
||||||
=head1 NAME
|
=head1 NAME
|
||||||
|
|
||||||
|
|
@ -125,6 +127,23 @@ sub canEdit {
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
=head2 canUseService ( session )
|
||||||
|
|
||||||
|
Returns true if the current session is allowed to use the web service, i.e.
|
||||||
|
is in one of the configured CIDR subnets in the config file.
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub canUseService {
|
||||||
|
my ( $session ) = @_;
|
||||||
|
my $subnets = $session->config->get('serviceSubnets');
|
||||||
|
return 1 if !$subnets || !@{$subnets};
|
||||||
|
return 1 if WebGUI::Utility::isInSubnet( $session->env->getIp, $subnets );
|
||||||
|
return 0; # Don't go away mad, just go away
|
||||||
|
}
|
||||||
|
|
||||||
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
=head2 canView ( session [, user] )
|
=head2 canView ( session [, user] )
|
||||||
|
|
||||||
Returns true if the user is allowed to see this module. user defaults to the
|
Returns true if the user is allowed to see this module. user defaults to the
|
||||||
|
|
@ -140,6 +159,27 @@ sub canView {
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
|
|
||||||
|
=head2 createServiceResponse ( format, data )
|
||||||
|
|
||||||
|
Create a string with the correct C<format> from the given C<data>.
|
||||||
|
|
||||||
|
Possible formats are "json" and "xml".
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub createServiceResponse {
|
||||||
|
my ( $format, $data ) = @_;
|
||||||
|
|
||||||
|
if ( lc $format eq "xml" ) {
|
||||||
|
return XML::Simple::XMLout($data, NoAttr => 1, RootName => "response" );
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return JSON->new->encode($data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------
|
||||||
|
|
||||||
=head2 doUserSearch ( session, op, returnPaginator, userFilter )
|
=head2 doUserSearch ( session, op, returnPaginator, userFilter )
|
||||||
|
|
||||||
Subroutine that actually performs the SQL search for users.
|
Subroutine that actually performs the SQL search for users.
|
||||||
|
|
@ -285,6 +325,226 @@ sub getUserSearchForm {
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD:lib/WebGUI/Operation/User.pm
|
||||||
|
=======
|
||||||
|
#-------------------------------------------------------------------
|
||||||
|
|
||||||
|
=head2 www_ajaxCreateUser ( )
|
||||||
|
|
||||||
|
Create a user using a web service.
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub www_ajaxCreateUser {
|
||||||
|
my ( $session ) = @_;
|
||||||
|
|
||||||
|
### Get desired output format first (for future error messages)
|
||||||
|
my $outputFormat = "json";
|
||||||
|
my $mimeType = "application/json";
|
||||||
|
|
||||||
|
# Allow XML
|
||||||
|
if ( lc $session->form->get('as') eq "xml" ) {
|
||||||
|
$outputFormat = "xml";
|
||||||
|
$mimeType = "application/xml";
|
||||||
|
}
|
||||||
|
|
||||||
|
$session->http->setMimeType( $mimeType );
|
||||||
|
|
||||||
|
# Verify access
|
||||||
|
if ( !canAdd($session) || !canUseService($session) ) {
|
||||||
|
# We need an automatic way to send a request for an http basic auth
|
||||||
|
$session->http->setStatus(401,'Unauthorized');
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
error => "WebGUI::Error::Unauthorized",
|
||||||
|
message => "",
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
### Verify data
|
||||||
|
# User data is <PROPERTY_NAME> in form
|
||||||
|
my %userParam = (
|
||||||
|
map { $_ => $session->form->get($_) }
|
||||||
|
grep { !/^auth:/ && $_ ne "op" }
|
||||||
|
( $session->form->param )
|
||||||
|
);
|
||||||
|
|
||||||
|
# Auth data is auth:<AUTH_METHOD>:<PROPERTY_NAME> in form
|
||||||
|
my %authParam = ();
|
||||||
|
for my $formParam ( grep { /^auth:[^:]+:.+$/ } $session->form->get ) {
|
||||||
|
my ( $authMethod, $property ) = $formParam =~ /^auth:([^:]+):(.+)$/;
|
||||||
|
$authParam{$authMethod}{$property} = $session->form->get($formParam);
|
||||||
|
}
|
||||||
|
|
||||||
|
# User must have a username
|
||||||
|
if ( !$userParam{username} ) {
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
error => "WebGUI::Error::InvalidParam",
|
||||||
|
param => "username",
|
||||||
|
message => "",
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
### Create user
|
||||||
|
my $user = WebGUI::User->create( $session );
|
||||||
|
$user->update( \%userParam );
|
||||||
|
for my $authMethod ( keys %authParam ) {
|
||||||
|
my $auth = WebGUI::Operation::Auth::getInstance($session,$authMethod,$user->getId);
|
||||||
|
|
||||||
|
# XXX Special handling for WebGUI passwords. This should be removed when
|
||||||
|
# Auth is fixed in WebGUI 8
|
||||||
|
if ( $authMethod eq 'WebGUI' && exists $authParam{$authMethod}{identifier} ) {
|
||||||
|
$authParam{$authMethod}{identifier}
|
||||||
|
= $auth->hashPassword( $authParam{$authMethod}{identifier} );
|
||||||
|
}
|
||||||
|
|
||||||
|
$auth->saveParams( $user->getId, $auth->authMethod, $authParam{$authMethod} );
|
||||||
|
}
|
||||||
|
|
||||||
|
### Send new user's data
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
user => $user->get,
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------
|
||||||
|
|
||||||
|
=head2 www_ajaxDeleteUser ( )
|
||||||
|
|
||||||
|
Delete a user using a web service.
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub www_ajaxDeleteUser {
|
||||||
|
my ( $session ) = @_;
|
||||||
|
|
||||||
|
### Get desired output format first (for future error messages)
|
||||||
|
my $outputFormat = "json";
|
||||||
|
my $mimeType = "application/json";
|
||||||
|
|
||||||
|
# Allow XML
|
||||||
|
if ( lc $session->form->get('as') eq "xml" ) {
|
||||||
|
$outputFormat = "xml";
|
||||||
|
$mimeType = "application/xml";
|
||||||
|
}
|
||||||
|
|
||||||
|
$session->http->setMimeType( $mimeType );
|
||||||
|
|
||||||
|
# Verify access
|
||||||
|
if ( !canEdit($session) || !canUseService($session) ) {
|
||||||
|
# We need an automatic way to send a request for an http basic auth
|
||||||
|
$session->http->setStatus(401,'Unauthorized');
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
error => "WebGUI::Error::Unauthorized",
|
||||||
|
message => "",
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
# Verify data
|
||||||
|
my $userId = $session->form->get('userId');
|
||||||
|
if ( !$userId ) {
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
error => "WebGUI::Error::InvalidParam",
|
||||||
|
param => "userId",
|
||||||
|
message => "",
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
elsif ( $userId eq "1" || $userId eq "3" ) {
|
||||||
|
$session->http->setStatus(403,"Forbidden");
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
error => 'WebGUI::Error::InvalidParam',
|
||||||
|
param => 'userId',
|
||||||
|
message => 'Cannot delete system user',
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
### Delete user
|
||||||
|
my $user = WebGUI::User->new( $session, $userId );
|
||||||
|
$user->delete;
|
||||||
|
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
message => 'User deleted',
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------
|
||||||
|
|
||||||
|
=head2 www_ajaxUpdateUser ( )
|
||||||
|
|
||||||
|
Update a user using a web service.
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub www_ajaxUpdateUser {
|
||||||
|
my ( $session ) = @_;
|
||||||
|
|
||||||
|
### Get desired output format first (for future error messages)
|
||||||
|
my $outputFormat = "json";
|
||||||
|
my $mimeType = "application/json";
|
||||||
|
|
||||||
|
# Allow XML
|
||||||
|
if ( lc $session->form->get('as') eq "xml" ) {
|
||||||
|
$outputFormat = "xml";
|
||||||
|
$mimeType = "application/xml";
|
||||||
|
}
|
||||||
|
|
||||||
|
$session->http->setMimeType( $mimeType );
|
||||||
|
|
||||||
|
# Verify access
|
||||||
|
if ( !canEdit($session) || !canUseService($session) ) {
|
||||||
|
# We need an automatic way to send a request for an http basic auth
|
||||||
|
$session->http->setStatus(401,'Unauthorized');
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
error => "WebGUI::Error::Unauthorized",
|
||||||
|
message => "",
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
### Verify data
|
||||||
|
# User data is <PROPERTY_NAME> in form
|
||||||
|
my %userParam = (
|
||||||
|
map { $_ => $session->form->get($_) }
|
||||||
|
grep { !/^auth:/ && $_ ne "op" }
|
||||||
|
( $session->form->param )
|
||||||
|
);
|
||||||
|
|
||||||
|
# Auth data is auth:<AUTH_METHOD>:<PROPERTY_NAME> in form
|
||||||
|
my %authParam = ();
|
||||||
|
for my $formParam ( grep { /^auth:[^:]+:.+$/ } $session->form->param ) {
|
||||||
|
my ( $authMethod, $property ) = $formParam =~ /^auth:([^:]+):(.+)$/;
|
||||||
|
$authParam{$authMethod}{$property} = $session->form->get($formParam);
|
||||||
|
}
|
||||||
|
|
||||||
|
# User must have a userId
|
||||||
|
if ( !$userParam{userId} ) {
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
error => "WebGUI::Error::InvalidParam",
|
||||||
|
param => "userId",
|
||||||
|
message => "",
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
|
### Update user
|
||||||
|
my $user = WebGUI::User->new( $session, delete $userParam{userId} );
|
||||||
|
$user->update( \%userParam );
|
||||||
|
for my $authMethod ( keys %authParam ) {
|
||||||
|
my $auth = WebGUI::Operation::Auth::getInstance($session,$authMethod,$user->getId);
|
||||||
|
|
||||||
|
# XXX Special handling for WebGUI passwords. This should be removed when
|
||||||
|
# Auth is fixed in WebGUI 8
|
||||||
|
if ( $authMethod eq 'WebGUI' && exists $authParam{$authMethod}{identifier} ) {
|
||||||
|
$authParam{$authMethod}{identifier}
|
||||||
|
= $auth->hashPassword( $authParam{$authMethod}{identifier} );
|
||||||
|
}
|
||||||
|
|
||||||
|
$auth->saveParams( $user->getId, $auth->authMethod, $authParam{$authMethod} );
|
||||||
|
}
|
||||||
|
|
||||||
|
### Send user's data
|
||||||
|
return createServiceResponse( $outputFormat, {
|
||||||
|
user => $user->get,
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
>>>>>>> added services to create, update, and delete users:lib/WebGUI/Operation/User.pm
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue