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

* Mon May 19 2025 Brian Read <brianr@koozali.org> 11.0.0-1.sme

Browse Source 
- Add in SM2 panels
This commit is contained in:
Brian Read 2025-05-20 11:34:43 +01:00
parent 76a4ff6b43
commit 1f12f73a2a
2 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
root/usr/share/smanager/lib/SrvMngr/Controller/Remoteuseraccess-Custom.pm
View File

@ -20,9 +20,9 @@ use constant TRUE => 1;
#The most common ones #The most common ones
my $cdb; my $cdb;
my $adb; my $adb;
#my $ndb #my $ndb;
#my $hdb #my $hdb;
#my $ddb #my $ddb;
# Validation routines - parameters for each panel # Validation routines - parameters for each panel
@ -42,22 +42,24 @@ my $adb;
# Validation for each field # Validation for each field
my $ret = ""; my $ret = "";
if (! TRUE) #validate $c->param('Account') #if (! TRUE) #validate $c->param('Account')
{$ret .= 'Validation for Account failed';} #{$ret .= 'Validation for Account failed';}
if (! TRUE) #validate $c->param('User_Name') #if (! TRUE) #validate $c->param('User_Name')
{$ret .= 'Validation for User_Name failed';} #{$ret .= 'Validation for User_Name failed';}
if (! TRUE) #validate $c->param('Shell') #if (! TRUE) #validate $c->param('Shell')
{$ret .= 'Validation for Shell failed';} #{$ret .= 'Validation for Shell failed';}
if (! TRUE) #validate $c->param('Sudoer') #if (! TRUE) #validate $c->param('Sudoer')
{$ret .= 'Validation for Sudoer failed';} #{$ret .= 'Validation for Sudoer failed';}
if (! TRUE) #validate $c->param('VPNClientAccess') #if (! TRUE) #validate $c->param('VPNClientAccess')
{$ret .= 'Validation for VPNClientAccess failed';} #{$ret .= 'Validation for VPNClientAccess failed';}
if (! TRUE) #validate $c->param('ChrootDir2') #if (! TRUE) #validate $c->param('ChrootDir2')
{$ret .= 'Validation for ChrootDir2 failed';} #{$ret .= 'Validation for ChrootDir2 failed';}
if (! TRUE) #validate $c->param('ChrootDir') #if (! TRUE) #validate $c->param('ChrootDir')
{$ret .= 'Validation for ChrootDir failed';} #{$ret .= 'Validation for ChrootDir failed';}
if (! TRUE) #validate $c->param('sshKeys') #if (! TRUE) #validate $c->param('sshKeys')
{$ret .= 'Validation for sshKeys failed';} #{$ret .= 'Validation for sshKeys failed';}
#just check chroot in place
$ret = $c->CheckChrootDirExists();
if ($ret eq "") {$ret = 'ok';} if ($ret eq "") {$ret = 'ok';}
return $ret; return $ret;
} }
@ -81,7 +83,8 @@ my $adb;
my $c = shift; my $c = shift;
my $user = $c->param('Selected'); my $user = $c->param('Selected');
$adb = esmith::AccountsDB->open(); $adb = esmith::AccountsDB->open();
$userrec = $adb->get_record($user) || return {}; #die("$user");
$userrec = $adb->get($user) || return ('Account' => "$user not found");
my %ret = ( my %ret = (
# fields from Inputs in PARAMS $fields['PARAMS'] # fields from Inputs in PARAMS $fields['PARAMS']
@ -105,11 +108,11 @@ my $adb;
# Define a constant hash for field name mapping # Define a constant hash for field name mapping
use constant getAllUsers_FIELD_MAPPING => ( use constant getAllUsers_FIELD_MAPPING => (
'Account' => 'User', 'Account' => 'User',
'User_Name' => 'Full_Name', 'User_Name' => 'User_Name',
'Shell_Access' => 'Shell', 'Shell_Access' => 'shell',
'Sudo' => 'Sudoer', 'Sudo' => 'Sudoer',
'SSH_Keys' => 'Keys', 'SSH_Keys' => 'SSH_Keys',
'Chroot_Path' => 'Chroot', 'Chroot_Path' => 'Chroot_Path',
'RSSH_+_VPN_Access' => 'VPNClientAccess', 'RSSH_+_VPN_Access' => 'VPNClientAccess',
'Modify' => 'Modify' 'Modify' => 'Modify'
#'target_field2' => 'source_field2', #'target_field2' => 'source_field2',
@ -149,15 +152,14 @@ sub actual_getAllUsers {
push @data, push @data,
{ User => $user->key, { User => $user->key,
FullName => $user->prop('FirstName') . " " . User_Name => $user->prop('FirstName') . " " .$user->prop('LastName'),
$user->prop('LastName'),
Sudoer => $user->prop('Sudoer') || 'no', Sudoer => $user->prop('Sudoer') || 'no',
VPNClientAccess => $user->prop('VPNClientAccess') || 'no', VPNClientAccess => $user->prop('VPNClientAccess') || 'no',
shell => $shell, shell => $shell,
chroot => $ChrootDir, Chroot_Path => $ChrootDir,
ChrootDir => $user->prop('ChrootDir') || "/home/e-smith/files/users/$username/home", ChrootDir => $user->prop('ChrootDir') || "/home/e-smith/files/users/$username/home",
sudo => $c->l($sudo), sudo => $c->l($sudo),
keys => $c->l($keys), SSH_Keys => $c->l($keys),
vpn => $c->l($vpn), vpn => $c->l($vpn),
Modify => "<a href='remoteuseraccessd?trt=PARAMS&Selected=$acc'>".$c->l('MODIFY')."</a>", Modify => "<a href='remoteuseraccessd?trt=PARAMS&Selected=$acc'>".$c->l('MODIFY')."</a>",
} }
@ -267,13 +269,6 @@ sub get_full_name {
$adb->get_prop($user, "LastName"); $adb->get_prop($user, "LastName");
} }
sub get_chroot_options {
my $c = shift;
my $user = $c->params('Selected');
return [ [] ];
}
sub get_ssh_keys{ sub get_ssh_keys{
my $c = shift; my $c = shift;
@ -336,7 +331,7 @@ sub userpanel_change_settings
$user = $1; $user = $1;
} }
my $sshKeys = $c->param ('sshKeys'); my $sshKeys = $c->param ('ssh_keys');
if ($sshKeys ne '') if ($sshKeys ne '')
{ {
my $file = "/home/e-smith/files/users/$user/.ssh/authorized_keys2"; my $file = "/home/e-smith/files/users/$user/.ssh/authorized_keys2";
@ -397,5 +392,31 @@ sub userpanel_change_settings
return 'ok'; #$self->success("SUCCESS"); return 'ok'; #$self->success("SUCCESS");
} }
sub CheckChrootDirExists
{
my $c = shift;
my $ChrootDir = $c->param ('ChrootDir') || '';
my $ChrootDir2 = $c->param ('ChrootDir2') || '';
if ($ChrootDir2 eq '')
{
if ($ChrootDir eq '')
{
return "CHROOT_PATH_NOT_GIVEN";
}
else
{
if ((-e $ChrootDir ) || ($ChrootDir eq 'home'))
{ return "OK"; }
else
{ return "CHROOT_PATH_NON_EXISTANT"; }
}
}
else
{ return "ok"; }
}
1; 1;

4
root/usr/share/smanager/themes/default/templates/partials/_rua_PARAMS.html.ep
View File

@ -50,14 +50,14 @@
%=l('rua_Account') %=l('rua_Account')
</span><span class=data> </span><span class=data>
% param 'Account' => $rua_data->{Account} unless param 'Account'; % param 'Account' => $rua_data->{Account} unless param 'Account';
%= text_field 'Account', size => '50', class => 'textinput Account' , pattern=>'.*' , placeholder=>'Account', title =>'Pattern regex mismatch', id => 'Account_text' %= text_field 'Account', size => '50', class => 'textinput Account' , pattern=>'.*' , placeholder=>'Account', title =>'Pattern regex mismatch', id => 'Account_text', readonly => 1
<br></span></p> <br></span></p>
<p><span class=label> <p><span class=label>
%=l('rua_User_Name') %=l('rua_User_Name')
</span><span class=data> </span><span class=data>
% param 'User_Name' => $rua_data->{User_Name} unless param 'User_Name'; % param 'User_Name' => $rua_data->{User_Name} unless param 'User_Name';
%= text_field 'User_Name', size => '50', class => 'textinput User_Name' , pattern=>'.*' , placeholder=>'User_Name', title =>'Pattern regex mismatch', id => 'User_Name_text' %= text_field 'User_Name', size => '50', class => 'textinput User_Name' , pattern=>'.*' , placeholder=>'User_Name', title =>'Pattern regex mismatch', id => 'User_Name_text', readonly => 1
<br></span></p> <br></span></p>
<p><span class=label> <p><span class=label>