smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reformat Controller perl code using perltidy

Browse Source
This commit is contained in:
Brian Read
2025-01-14 12:49:31 +00:00
parent 7ff51625c0
commit c1915a722b
38 changed files with 5870 additions and 7437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

472
root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm
View File

@@ -11,329 +11,252 @@ package SrvMngr::Controller::Groups;
use strict;
use warnings;
use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session);
#use Data::Dumper;
#use esmith::FormMagick::Panel::groups;
use esmith::AccountsDB;
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
my %grp_datas = ();
my $title = $c->l('grp_FORM_TITLE');
my $title = $c->l('grp_FORM_TITLE');
$grp_datas{trt} = 'LST';
my @groups;
if ($adb) {
@groups = $adb->groups();
}
$c->stash( title => $title, grp_datas => \%grp_datas, groups => \@groups );
$c->stash(title => $title, grp_datas => \%grp_datas, groups => \@groups);
$c->render(template => 'groups');
};
} ## end sub main
sub do_display {
my $c = shift;
$c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LST');
my $group = $c->param('group');
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LST');
my $group = $c->param('group');
my %grp_datas = ();
my $title = $c->l('grp_FORM_TITLE');
my $title = $c->l('grp_FORM_TITLE');
$grp_datas{'trt'} = $trt;
if ( $trt eq 'ADD' ) {
#nothing
}
if ($trt eq 'ADD') {
#nothing
}
if ( $trt eq 'UPD' ) {
my %members = ();
my %users = ();
if ($trt eq 'UPD') {
my %members = ();
my %users = ();
my $rec = $adb->get($group);
my $rec = $adb->get($group);
if ($rec and $rec->prop('type') eq 'group') {
if ($rec and $rec->prop('type') eq 'group') {
$grp_datas{group} = $group;
$grp_datas{description} = $rec->prop('Description') || '';
%members = @{ $c->gen_members_list($group) };
} ## end if ($rec and $rec->prop...)
$c->stash(members => \%members, users => \%users);
} ## end if ($trt eq 'UPD')
$grp_datas{group} = $group;
$grp_datas{description} = $rec->prop('Description') || '';
if ($trt eq 'DEL') {
my %members = ();
my %ibays = ();
my $rec = $adb->get($group);
%members = @{$c->gen_members_list( $group )};
}
if ($rec and $rec->prop('type') eq 'group') {
$grp_datas{group} = $group;
$grp_datas{description} = $rec->prop('Description') || '';
%members = @{ $c->gen_members_list($group) };
%ibays = @{ $c->gen_ibays_list($group) };
} ## end if ($rec and $rec->prop...)
$c->stash(members => \%members, ibays => \%ibays);
} ## end if ($trt eq 'DEL')
$c->stash( members => \%members, users => \%users );
}
if ( $trt eq 'DEL' ) {
my %members = ();
my %ibays = ();
my $rec = $adb->get($group);
if ($rec and $rec->prop('type') eq 'group') {
$grp_datas{group} = $group;
$grp_datas{description} = $rec->prop('Description') || '';
%members = @{$c->gen_members_list($group)};
%ibays = @{$c->gen_ibays_list($group)};
}
$c->stash( members => \%members, ibays => \%ibays );
if ($trt eq 'LST') {
my @groups;
if ($adb) {
@groups = $adb->groups();
}
if ( $trt eq 'LST' ) {
my @groups;
if ($adb) {
@groups = $adb->groups();
}
$c->stash( groups => \@groups );
}
$c->stash( title => $title, grp_datas => \%grp_datas );
$c->render( template => 'groups' );
};
$c->stash(groups => \@groups);
} ## end if ($trt eq 'LST')
$c->stash(title => $title, grp_datas => \%grp_datas);
$c->render(template => 'groups');
} ## end sub do_display
sub do_update {
my $c = shift;
$c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LST');
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LST');
my $groupName = $c->param('groupName') || '';
my $title = $c->l('grp_FORM_TITLE');
my $title = $c->l('grp_FORM_TITLE');
my ($res, $result) = '';
my %grp_datas = ();
$grp_datas{'trt'} = $trt;
$grp_datas{'trt'} = $trt;
$grp_datas{'group'} = $groupName;
my @members = ();
if ( $trt eq 'ADD' ) {
if ($trt eq 'ADD') {
my $groupDesc = $c->param('groupDesc');
@members = @{$c->every_param('groupMembers')};
@members = @{ $c->every_param('groupMembers') };
my $members = join(",", @members);
my $members = join ( ",", @members );
# controls
$res = $c->validate_group($groupName);
$result .= $res . '<br>' unless $res eq 'OK';
$res = $c->validate_group_length($groupName);
$result .= $res . '<br>' unless $res eq 'OK';
$res = $c->validate_group_naming_conflict($groupName);
$result .= $res . '<br>' unless $res eq 'OK';
$res = $c->validate_description($groupDesc);
$result .= $res . '<br>' unless $res eq 'OK';
$res = $c->validate_group_has_members(@members);
$result .= $res . '<br>' unless $res eq 'OK';
my %props = ('type', 'group', 'Description', $groupDesc, 'Members', $members);
$res = '';
# controls
$res = $c->validate_group( $groupName );
$result .= $res . '<br>' unless $res eq 'OK';
if (!$result) {
$adb->new_record($groupName, \%props);
$res = $c->validate_group_length( $groupName );
$result .= $res . '<br>' unless $res eq 'OK';
# Untaint groupName before use in system()
($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
system("/sbin/e-smith/signal-event", "group-create", "$groupName") == 0
or $result .= $c->l('qgp_CREATE_ERROR') . "\n";
} ## end if (!$result)
$res = $c->validate_group_naming_conflict( $groupName );
$result .= $res . '<br>' unless $res eq 'OK';
$res = $c->validate_description( $groupDesc );
$result .= $res . '<br>' unless $res eq 'OK';
$res = $c->validate_group_has_members( @members );
$result .= $res . '<br>' unless $res eq 'OK';
my %props = (
'type', 'group', 'Description',
$groupDesc, 'Members', $members
);
$res = '';
if ( ! $result ) {
$adb->new_record( $groupName, \%props );
# Untaint groupName before use in system()
($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
system("/sbin/e-smith/signal-event", "group-create", "$groupName") == 0
or $result .= $c->l('qgp_CREATE_ERROR')."\n";
}
if ( ! $result ) {
$result = $c->l('grp_CREATED_GROUP') . ' ' . $groupName;
$res = 'OK';
}
}
if ( $trt eq 'UPD' ) {
if (!$result) {
$result = $c->l('grp_CREATED_GROUP') . ' ' . $groupName;
$res = 'OK';
}
} ## end if ($trt eq 'ADD')
if ($trt eq 'UPD') {
my $groupDesc = $c->param('groupDesc');
@members = @{$c->every_param('groupMembers')};
my $members = join ( ",", @members );
@members = @{ $c->every_param('groupMembers') };
my $members = join(",", @members);
# controls
$res = '';
$res = validate_description( $c, $groupDesc );
$result .= $res . '<br>' unless $res eq 'OK';
# controls
$res = '';
$res = validate_description($c, $groupDesc);
$result .= $res . '<br>' unless $res eq 'OK';
$res = validate_group_has_members($c, @members);
$result .= $res . '<br>' unless $res eq 'OK';
$res = '';
$res = validate_group_has_members( $c, @members );
$result .= $res . '<br>' unless $res eq 'OK';
if (!$result) {
$adb->get($groupName)->set_prop('Members', $members);
$adb->get($groupName)->set_prop('Description', $groupDesc);
$res = '';
if ( ! $result ) {
# Untaint groupName before use in system()
($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
system("/sbin/e-smith/signal-event", "group-modify", "$groupName") == 0
or $result .= $c->l('qgp_MODIFY_ERROR') . "\n";
} ## end if (!$result)
$adb->get($groupName)->set_prop( 'Members', $members );
$adb->get($groupName)->set_prop( 'Description', $groupDesc );
if (!$result) {
$result = $c->l('grp_MODIFIED_GROUP') . ' ' . $groupName;
$res = 'OK';
}
} ## end if ($trt eq 'UPD')
# Untaint groupName before use in system()
($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
if ($trt eq 'DEL') {
if ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/) {
$groupName = $1;
} else {
$result .= $c->l('grp_ERR_INTERNAL_FAILURE') . ':' . $groupName;
}
my $rec = $adb->get($groupName);
$result .= $c->l('grp_ERR_INTERNAL_FAILURE') . ':' . $groupName unless ($rec);
$res = '';
system("/sbin/e-smith/signal-event", "group-modify", "$groupName") ==0
or $result .= $c->l('qgp_MODIFY_ERROR')."\n";
}
if (!$result) {
$res = delete_group($c, $groupName);
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$result = $c->l('grp_MODIFIED_GROUP') . ' ' . $groupName;
$res = 'OK';
}
}
if ( $trt eq 'DEL' ) {
if ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/) {
$groupName = $1;
} else {
$result .= $c->l('grp_ERR_INTERNAL_FAILURE') . ':' . $groupName;
}
my $rec = $adb->get($groupName);
$result .= $c->l('grp_ERR_INTERNAL_FAILURE') . ':' . $groupName unless ($rec);
$res = '';
if ( ! $result ) {
$res = delete_group( $c, $groupName );
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$result = $c->l('grp_DELETED_GROUP') . ' ' . $groupName;
$res = 'OK';
}
}
}
if (!$result) {
$result = $c->l('grp_DELETED_GROUP') . ' ' . $groupName;
$res = 'OK';
}
} ## end if (!$result)
} ## end if ($trt eq 'DEL')
# common parts
if ($res ne 'OK') {
$c->stash( error => $result );
my %members = @{$c->gen_members_list($groupName)};
$c->stash( title => $title, members => \%members, grp_datas => \%grp_datas );
return $c->render('groups');
}
$c->stash(error => $result);
my %members = @{ $c->gen_members_list($groupName) };
$c->stash(title => $title, members => \%members, grp_datas => \%grp_datas);
return $c->render('groups');
} ## end if ($res ne 'OK')
my $message = "'Groups' updates ($trt) DONE";
$c->app->log->info($message);
$c->flash( success => $result );
$c->flash(success => $result);
$c->redirect_to('/groups');
};
} ## end sub do_update
sub delete_group {
my ( $c, $groupName ) = @_;
my ($c, $groupName) = @_;
# Update the db account (1)
$adb->get($groupName)->set_prop('type', 'group-deleted');
# Untaint groupName before use in system()
($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/);
return (system ("/sbin/e-smith/signal-event", "group-delete", "$groupName") ||
! $adb->get($groupName)->delete()) ?
$c->l('DELETE_ERROR') : 'OK';
}
return (system("/sbin/e-smith/signal-event", "group-delete", "$groupName") || !$adb->get($groupName)->delete())
? $c->l('DELETE_ERROR')
: 'OK';
} ## end sub delete_group
sub gen_members_list {
my ( $c, $group ) = @_;
my ($c, $group) = @_;
my @members = ();
my $rec = $adb->get($group);
@members = split ( /,/, $rec->prop('Members') ) if ( $rec );
my $rec = $adb->get($group);
@members = split(/,/, $rec->prop('Members')) if ($rec);
my %names;
foreach my $m (@members) {
my $name;
if ( $m eq 'admin' ) {
if ($m eq 'admin') {
$name = "Administrator";
} else {
$name = $adb->get($m)->prop('FirstName') . " " . $adb->get($m)->prop('LastName');
}
else {
$name = $adb->get($m)->prop('FirstName') . " "
. $adb->get($m)->prop('LastName');
}
$names{$m} = $name;
}
$names{$m} = $name;
} ## end foreach my $m (@members)
@members = %names;
return \@members;
}
} ## end sub gen_members_list
sub gen_ibays_list {
my ( $c, $group ) = @_;
my ($c, $group) = @_;
my %names;
foreach my $ibay ( $adb->ibays ) {
if ( $ibay->prop('Group') eq $group ) {
$names{$ibay->key} = $ibay->prop('Name');
foreach my $ibay ($adb->ibays) {
if ($ibay->prop('Group') eq $group) {
$names{ $ibay->key } = $ibay->prop('Name');
}
}
} ## end foreach my $ibay ($adb->ibays)
my @ibays = %names;
return \@ibays;
}
} ## end sub gen_ibays_list
sub gen_users_list {
my $c = shift;
my @users = sort { $a->key() cmp $b->key() } $adb->users();
my %names;
foreach my $user ( @users ) {
$names{$user->key} = $user->prop('FirstName') . " "
. $user->prop('LastName');
foreach my $user (@users) {
$names{ $user->key } = $user->prop('FirstName') . " " . $user->prop('LastName');
}
return \%names;
}
} ## end sub gen_users_list
=head1 VALIDATION
@@ -350,21 +273,17 @@ ok($panel->validate_is_group('ro2ot') eq 'NOT_A_GROUP', "Ro2ot is not a group");
=cut
sub validate_is_group () {
my $c = shift;
my $group = shift;
my $c = shift;
my $group = shift;
my @groups = $adb->groups();
my %groups = map { $_->key => 1 } @groups;
unless ( exists $groups{$group} ) {
unless (exists $groups{$group}) {
return ($c->l('grp_NOT_A_GROUP'));
}
return ("OK");
}
} ## end sub validate_is_group
=head2 validate_group_naming_conflict FM GROUPNAME
@@ -375,29 +294,21 @@ Returns "NAME_CONFLICT" if this group name conflicts with anything else
ok (undef, 'need testing for validate_naming_Conflicts');
=cut
sub validate_group_naming_conflict
{
my $c = shift;
sub validate_group_naming_conflict {
my $c = shift;
my $groupName = shift;
my $account = $adb->get($groupName);
my $account = $adb->get($groupName);
my $type;
if (defined $account)
{
$type = $account->prop('type');
}
elsif (defined getpwnam($groupName) || defined getgrnam($groupName))
{
$type = "system";
}
else
{
return('OK');
if (defined $account) {
$type = $account->prop('type');
} elsif (defined getpwnam($groupName) || defined getgrnam($groupName)) {
$type = "system";
} else {
return ('OK');
}
return ($c->l('grp_ACCOUNT_CONFLICT', $groupName, $type));
}
} ## end sub validate_group_naming_conflict
=head2 validate_group FM groupname
@@ -414,14 +325,14 @@ ok(validate_group('','f&oo') eq 'GROUP_CONTAINS_INVALD', 'f&oo is not a valid gr
=cut
sub validate_group {
my $c = shift;
my $c = shift;
my $groupName = shift;
unless ( $groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/ ) {
unless ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/) {
return $c->l('grp_GROUP_NAMING');
}
return ('OK');
}
} ## end sub validate_group
=head2 validate_group_length FM GROUPNAME
@@ -438,22 +349,21 @@ ok(($panel->validate_group_length('fooooooooooooooooo') eq 'GROUP_TOO_LONG'), "a
=cut
sub validate_group_length {
my $c = shift;
my $groupName = shift;
my $c = shift;
my $groupName = shift;
my $maxGroupNameLength = (
$cdb->get('maxGroupNameLength')
? $cdb->get('maxGroupNameLength')->prop('type')
: ""
)
|| 12;
my $maxGroupNameLength = ($cdb->get('maxGroupNameLength')
? $cdb->get('maxGroupNameLength')->prop('type')
: "") || 12;
if ( length $groupName > $maxGroupNameLength ) {
if (length $groupName > $maxGroupNameLength) {
return $c->l('grp_GROUP_TOO_LONG', $maxGroupNameLength);
}
else {
} else {
return ('OK');
}
}
} ## end sub validate_group_length
=head2 validate_group_has_members FM MEMBERS
@@ -473,17 +383,16 @@ ok(validate_group_has_members('') eq 'NO_MEMBERS', "We do ok with a group with
=cut
sub validate_group_has_members {
my $c = shift;
my $c = shift;
my @members = (@_);
my $count = @members;
if ( $count == 0 ) {
if ($count == 0) {
return ($c->l('grp_NO_MEMBERS'));
}
else {
} else {
return ('OK');
}
}
} ## end sub validate_group_has_members
=pod
@@ -492,16 +401,13 @@ Checks the supplied description. Period is allowed in description
=cut
sub validate_description
{
sub validate_description {
my ($c, $description) = @_;
if ( $description =~ /^([\-\'\w][\-\'\w\s\.]*)$/ ) {
if ($description =~ /^([\-\'\w][\-\'\w\s\.]*)$/) {
return ('OK');
}
else {
} else {
return ($c->l('FM_ERR_UNEXPECTED_DESC'));
}
}
} ## end sub validate_description
1