Compare commits
2 Commits
11_0_0-109
...
master
Author | SHA1 | Date | |
---|---|---|---|
a3fda90a85 | |||
837b855101 |
@@ -25,6 +25,8 @@ use esmith::AccountsDB::UTF8;
|
|||||||
use esmith::util;
|
use esmith::util;
|
||||||
use File::Basename;
|
use File::Basename;
|
||||||
use File::Find;
|
use File::Find;
|
||||||
|
# Set to avoid using link counts as it may not work for cifs shares.
|
||||||
|
$File::Find::dont_use_nlink = 1;
|
||||||
use File::Path qw(make_path remove_tree);
|
use File::Path qw(make_path remove_tree);
|
||||||
use esmith::Backup;
|
use esmith::Backup;
|
||||||
use esmith::BackupHistoryDB; #no UTF8 and not in use
|
use esmith::BackupHistoryDB; #no UTF8 and not in use
|
||||||
@@ -1670,7 +1672,7 @@ sub get_Backupset_options () {
|
|||||||
my $err;
|
my $err;
|
||||||
$mntdir = "/$smbshare" if ($VFSType eq 'usb');
|
$mntdir = "/$smbshare" if ($VFSType eq 'usb');
|
||||||
my $setbackuplist = sub {
|
my $setbackuplist = sub {
|
||||||
|
$c->app->log->info("File presented: $_");
|
||||||
if ($_ =~ /\.dar/) {
|
if ($_ =~ /\.dar/) {
|
||||||
my $dir = $File::Find::dir;
|
my $dir = $File::Find::dir;
|
||||||
my $backupref;
|
my $backupref;
|
||||||
@@ -1696,6 +1698,7 @@ sub get_Backupset_options () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Finding existing backups
|
# Finding existing backups
|
||||||
|
|
||||||
find { wanted => \&$setbackuplist, untaint => 1, untaint_pattern => qr|^([-+@\w\s./]+)$| }, $mntbkdir;
|
find { wanted => \&$setbackuplist, untaint => 1, untaint_pattern => qr|^([-+@\w\s./]+)$| }, $mntbkdir;
|
||||||
my %blabels = ();
|
my %blabels = ();
|
||||||
my @list;
|
my @list;
|
||||||
@@ -1703,6 +1706,7 @@ sub get_Backupset_options () {
|
|||||||
foreach $key (sort keys %backupfiles) {
|
foreach $key (sort keys %backupfiles) {
|
||||||
my $labkey = $mntbkdir . '/' . $backupfiles{$key}[0] . '/' . $backupfiles{$key}[1];
|
my $labkey = $mntbkdir . '/' . $backupfiles{$key}[0] . '/' . $backupfiles{$key}[1];
|
||||||
$blabels{$labkey} = $backupfiles{$key}[1] . " (" . $backupfiles{$key}[0] . ")";
|
$blabels{$labkey} = $backupfiles{$key}[1] . " (" . $backupfiles{$key}[0] . ")";
|
||||||
|
$c->app->log->info("Pushing $blabels{$labkey} to $labkey");
|
||||||
push @list, [ "$blabels{$labkey}" => "$labkey" ];
|
push @list, [ "$blabels{$labkey}" => "$labkey" ];
|
||||||
} ## end foreach $key (sort keys %backupfiles)
|
} ## end foreach $key (sort keys %backupfiles)
|
||||||
$error_message .= $c->bunmount($mntdir, $VFSType);
|
$error_message .= $c->bunmount($mntdir, $VFSType);
|
||||||
|
@@ -120,6 +120,20 @@ sub do_display {
|
|||||||
}
|
}
|
||||||
$c->stash(useraccounts => \@useraccounts);
|
$c->stash(useraccounts => \@useraccounts);
|
||||||
} ## end if ($trt eq 'LIST')
|
} ## end if ($trt eq 'LIST')
|
||||||
|
|
||||||
|
my $cdb = esmith::ConfigDB::UTF8->open_ro || die "Couldn't open configuration db";
|
||||||
|
my $rec = $cdb->get('passwordstrength');
|
||||||
|
$usr_datas{passwdlength} = ($rec ? ($rec->prop('length') || 12) : 12);
|
||||||
|
if ($trt eq 'PWS'){
|
||||||
|
$usr_datas{passwdstrength} = ($rec ? ($rec->prop('Admin') || 'none') : 'none');
|
||||||
|
} else {
|
||||||
|
$usr_datas{passwdstrength} = ($rec ? ($rec->prop('Users') || 'none') : 'none');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !(defined $usr_datas{passwdstrength} && $usr_datas{passwdstrength} =~ /^(none|normal|intermediate|strong)$/)) {
|
||||||
|
$usr_datas{passwdstrength} = 'strong';
|
||||||
|
}
|
||||||
|
|
||||||
$c->stash(title => $title, notif => $notif, usr_datas => \%usr_datas);
|
$c->stash(title => $title, notif => $notif, usr_datas => \%usr_datas);
|
||||||
$c->render(template => 'useraccounts');
|
$c->render(template => 'useraccounts');
|
||||||
} ## end sub do_display
|
} ## end sub do_display
|
||||||
|
@@ -50,6 +50,18 @@ sub main {
|
|||||||
$pwd_datas{jwt} = $jwt;
|
$pwd_datas{jwt} = $jwt;
|
||||||
$c->flash(success => $c->l('pwd_OK_FOR_RESET'));
|
$c->flash(success => $c->l('pwd_OK_FOR_RESET'));
|
||||||
} ## end else [ if ($c->is_logged_in) ]
|
} ## end else [ if ($c->is_logged_in) ]
|
||||||
|
|
||||||
|
my $cdb = esmith::ConfigDB::UTF8->open_ro || die "Couldn't open configuration db";
|
||||||
|
my $rec = $cdb->get('passwordstrength');
|
||||||
|
$pwd_datas{passwdlength} = ($rec ? ($rec->prop('length') || 12) : 12);
|
||||||
|
if ($c->is_admin){
|
||||||
|
$pwd_datas{passwdstrength} = ($rec ? ($rec->prop('Admin') || 'none') : 'none');
|
||||||
|
} else {
|
||||||
|
$pwd_datas{passwdstrength} = ($rec ? ($rec->prop('Users') || 'none') : 'none');
|
||||||
|
}
|
||||||
|
if ( !(defined $pwd_datas{passwdstrength} && $pwd_datas{passwdstrength} =~ /^(none|normal|intermediate|strong)$/)) {
|
||||||
|
$pwd_datas{passwdstrength} = 'strong';
|
||||||
|
}
|
||||||
$c->stash(pwd_datas => \%pwd_datas);
|
$c->stash(pwd_datas => \%pwd_datas);
|
||||||
$c->render('userpassword');
|
$c->render('userpassword');
|
||||||
} ## end sub main
|
} ## end sub main
|
||||||
|
@@ -0,0 +1 @@
|
|||||||
|
|
@@ -60,3 +60,8 @@
|
|||||||
'usr_NEW_SYSTEM_PASSWORD_VERIFY' => 'New system password (verify)',
|
'usr_NEW_SYSTEM_PASSWORD_VERIFY' => 'New system password (verify)',
|
||||||
'usr_LABEL_IPSECRW_DOWNLOAD' => 'Download digital certificate to IPSec client',
|
'usr_LABEL_IPSECRW_DOWNLOAD' => 'Download digital certificate to IPSec client',
|
||||||
'usr_ERR_OCCURRED_DELETING' => 'An error occurred while trying to delete the user.',
|
'usr_ERR_OCCURRED_DELETING' => 'An error occurred while trying to delete the user.',
|
||||||
|
'usr_NONE_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters.',
|
||||||
|
'usr_NORMAL_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters with uppercase and lowercase letters.',
|
||||||
|
'usr_INTERMEDIATE_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters with uppercase and lowercase letters and must pass a dictionary check.',
|
||||||
|
'usr_STRONG_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters with uppercase and lowercase letters, numbers and special characters and must pass a dictionary check.',
|
||||||
|
'usr_PASSWORD_WIKI' => "If you want to know more about passwords, then please refer to the <a href='https://wiki.koozali.org/SME_Server:Documentation:Administration_Manual:Chapter9#Changing_User_Passwords'>Wiki</a>",
|
@@ -19,5 +19,8 @@
|
|||||||
'pwd_PASSWORD_CHANGE_SUCCESS' => 'Your password has been successfully changed.',
|
'pwd_PASSWORD_CHANGE_SUCCESS' => 'Your password has been successfully changed.',
|
||||||
'pwd_DESCRIPTION' => '<P>To change your account password, please fill out the following form. You will need to provide the name of your account, your old password, and your desired new password. (You must type the new password twice.)</P><P>If you cannot change your password because you have forgotten the old one, your local system administrator can reset your password using the <EM>server manager</EM>.</P>',
|
'pwd_DESCRIPTION' => '<P>To change your account password, please fill out the following form. You will need to provide the name of your account, your old password, and your desired new password. (You must type the new password twice.)</P><P>If you cannot change your password because you have forgotten the old one, your local system administrator can reset your password using the <EM>server manager</EM>.</P>',
|
||||||
'pwd_DESCRIPTION_RESET' => '<P>To reset your account password, please fill out the following form. You will need to provide your desired new password. (You must type it twice.)</P><P>In cas of problem, your local system administrator can reset your password using the <EM>server manager</EM>.</P>',
|
'pwd_DESCRIPTION_RESET' => '<P>To reset your account password, please fill out the following form. You will need to provide your desired new password. (You must type it twice.)</P><P>In cas of problem, your local system administrator can reset your password using the <EM>server manager</EM>.</P>',
|
||||||
'pwd_PASSWORD_DESCRIPTION' => 'The password must be composed of at least twelve characters with uppercase and lowercase letters, numbers and non-alphanumeric characters.',
|
'pwd_NONE_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters.',
|
||||||
'pwd_PASSWORD_WIKI' => "If you want to know more about passwords, then please refer to the <a href='https://wiki.koozali.org/Useful_Commands#Password_strength'>Wiki</a>",
|
'pwd_NORMAL_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters with uppercase and lowercase letters.',
|
||||||
|
'pwd_INTERMEDIATE_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters with uppercase and lowercase letters and must pass a dictionary check.',
|
||||||
|
'pwd_STRONG_PASSWORD_DESCRIPTION' => 'The password must be composed of at least [_1] characters with uppercase and lowercase letters, numbers and special characters and must pass a dictionary check.',
|
||||||
|
'pwd_PASSWORD_WIKI' => "If you want to know more about passwords, then please refer to the <a href='https://wiki.koozali.org/SME_Server:Documentation:Administration_Manual:Chapter9#Changing_User_Passwords'>Wiki</a>",
|
@@ -14,6 +14,14 @@
|
|||||||
%= l 'usr_RESET_DESC2'
|
%= l 'usr_RESET_DESC2'
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
% my $strength = uc($usr_datas->{passwdstrength});
|
||||||
|
<%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %>
|
||||||
|
<br /><br />
|
||||||
|
<%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI')) %>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<span class=label>
|
<span class=label>
|
||||||
%=l 'PASSWORD_NEW', class => 'label'
|
%=l 'PASSWORD_NEW', class => 'label'
|
||||||
|
@@ -7,6 +7,14 @@
|
|||||||
%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'
|
%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
% my $strength = uc($usr_datas->{passwdstrength});
|
||||||
|
<%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %>
|
||||||
|
<br /><br />
|
||||||
|
<%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI')) %>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<span class=label>
|
<span class=label>
|
||||||
%=l 'usr_CURRENT_SYSTEM_PASSWORD', class => 'label'
|
%=l 'usr_CURRENT_SYSTEM_PASSWORD', class => 'label'
|
||||||
|
@@ -27,7 +27,9 @@
|
|||||||
%= $c->render_to_string( inline => l('pwd_DESCRIPTION'));
|
%= $c->render_to_string( inline => l('pwd_DESCRIPTION'));
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= $c->render_to_string( inline => l('pwd_PASSWORD_DESCRIPTION')) %><br />
|
% my $strength = uc($pwd_datas->{passwdstrength});
|
||||||
|
<%= $c->render_to_string( inline => l('pwd_'.$strength.'_PASSWORD_DESCRIPTION',$pwd_datas->{passwdlength})) %>
|
||||||
|
<br /><br />
|
||||||
<%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI')) %>
|
<%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI')) %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
|
|||||||
%define name smeserver-manager
|
%define name smeserver-manager
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
%define version 11.0.0
|
%define version 11.0.0
|
||||||
%define release 109
|
%define release 111
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
Release: %{release}%{?dist}
|
Release: %{release}%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
@@ -146,6 +146,13 @@ true
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 28 2025 Brian Read <brianr@koozali.org> 11.0.0-111.sme
|
||||||
|
- Add password strength details to passowrd panels [SME: 13081]
|
||||||
|
|
||||||
|
* Sat Jul 26 2025 Brian Read <brianr@koozali.org> 11.0.0-110.sme
|
||||||
|
- Get cifs workstation backup restore to show backup sets [SME: 12645]
|
||||||
|
Add lex file for roundcubepanel to provide lex environment for lex strings
|
||||||
|
|
||||||
* Wed Jul 16 2025 Brian Read <brianr@koozali.org> 11.0.0-109.sme
|
* Wed Jul 16 2025 Brian Read <brianr@koozali.org> 11.0.0-109.sme
|
||||||
- A few more error message corrections [SME: 13078]
|
- A few more error message corrections [SME: 13078]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user