Compare commits
4 Commits
11_0_0-9_e
...
master
Author | SHA1 | Date | |
---|---|---|---|
b0d33d1017 | |||
5047976085 | |||
2710d9f93d | |||
493977906b |
@@ -1 +0,0 @@
|
|||||||
sme10
|
|
@@ -24,6 +24,7 @@ use Errno;
|
|||||||
use DirHandle;
|
use DirHandle;
|
||||||
|
|
||||||
my $event = shift || die "must give event name parameter";
|
my $event = shift || die "must give event name parameter";
|
||||||
|
exit(0) if ( grep( /^$event$/, qw(post-upgrade bootstrap-console-save) ));
|
||||||
chdir "/etc/e-smith/events/$event" or die "Couldn't chdir to event directory /etc/e-smith/events/$event: $!";
|
chdir "/etc/e-smith/events/$event" or die "Couldn't chdir to event directory /etc/e-smith/events/$event: $!";
|
||||||
my $dh = DirHandle->new("services2adjust");
|
my $dh = DirHandle->new("services2adjust");
|
||||||
|
|
||||||
|
11
root/etc/e-smith/templates-default/template-begin-ini
Normal file
11
root/etc/e-smith/templates-default/template-begin-ini
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
;------------------------------------------------------------
|
||||||
|
; !!DO NOT MODIFY THIS FILE!!
|
||||||
|
;
|
||||||
|
; Manual changes will be lost when this file is regenerated.
|
||||||
|
;
|
||||||
|
; Please read the developer's guide, which is available
|
||||||
|
; at http://www.contribs.org/development/
|
||||||
|
;
|
||||||
|
; Copyright (C) 1999-2006 Mitel Networks Corporation
|
||||||
|
;------------------------------------------------------------
|
||||||
|
|
@@ -87,7 +87,6 @@ ntpd=service|InitscriptOrder|55|status|disabled
|
|||||||
php=service|status|enabled
|
php=service|status|enabled
|
||||||
popd=service|access|private|status|enabled
|
popd=service|access|private|status|enabled
|
||||||
pppoe=service|DemandIdleTime|no|InitscriptOrder|57|SynchronousPPP|no|status|disabled
|
pppoe=service|DemandIdleTime|no|InitscriptOrder|57|SynchronousPPP|no|status|disabled
|
||||||
pptpd=service|sessions|10|status|disabled
|
|
||||||
qmail=service|InitscriptOrder|80|status|enabled
|
qmail=service|InitscriptOrder|80|status|enabled
|
||||||
random=service|InitscriptOrder|20|status|enabled
|
random=service|InitscriptOrder|20|status|enabled
|
||||||
rsyslog=service|InitscriptOrder|05|status|enabled
|
rsyslog=service|InitscriptOrder|05|status|enabled
|
||||||
@@ -99,5 +98,6 @@ squid=service|InitscriptOrder|90|status|enabled
|
|||||||
sshd=service|InitscriptOrder|85|PasswordAuthentication|yes|PermitRootLogin|yes|access|private|status|enabled
|
sshd=service|InitscriptOrder|85|PasswordAuthentication|yes|PermitRootLogin|yes|access|private|status|enabled
|
||||||
sync=service|Host|service.e-smith.com|LastId|0|SuccessId|0|SyncFrequency|1|SyncMinute|57|status|disabled
|
sync=service|Host|service.e-smith.com|LastId|0|SuccessId|0|SyncFrequency|1|SyncMinute|57|status|disabled
|
||||||
telnet=service|access|private|status|disabled
|
telnet=service|access|private|status|disabled
|
||||||
|
vpn=configuration|sessions|10|status|disabled
|
||||||
wibble=42
|
wibble=42
|
||||||
xinetd=service|InitscriptOrder|50|status|enabled
|
xinetd=service|InitscriptOrder|50|status|enabled
|
||||||
|
22
root/usr/share/perl5/vendor_perl/esmith/AccountsDB/UTF8.pm
Normal file
22
root/usr/share/perl5/vendor_perl/esmith/AccountsDB/UTF8.pm
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
#----------------------------------------------------------------------
|
||||||
|
# Copyright 2013-2025 Koozali Foundation inc.
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the same terms as Perl itself.
|
||||||
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
|
package esmith::AccountsDB::UTF8;
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
use esmith::AccountsDB;
|
||||||
|
use esmith::config::utf8;
|
||||||
|
our @ISA = qw(esmith::AccountsDB);
|
||||||
|
|
||||||
|
sub tie_class
|
||||||
|
{
|
||||||
|
return 'esmith::config::utf8';
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
|
|
@@ -1,5 +1,6 @@
|
|||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
# Copyright 1999-2008 Mitel Networks Corporation
|
# Copyright 1999-2008 Mitel Networks Corporation
|
||||||
|
# Copyright 2013-2025 Koozali Foundationi inc.
|
||||||
# This program is free software; you can redistribute it and/or
|
# This program is free software; you can redistribute it and/or
|
||||||
# modify it under the same terms as Perl itself.
|
# modify it under the same terms as Perl itself.
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
@@ -9,9 +10,9 @@ package esmith::ConfigDB::UTF8;
|
|||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
use esmith::DB::db;
|
use esmith::ConfigDB;
|
||||||
use esmith::config::utf8;
|
use esmith::config::utf8;
|
||||||
our @ISA = qw( esmith::DB::db );
|
our @ISA = qw( esmith::ConfigDB );
|
||||||
|
|
||||||
sub tie_class
|
sub tie_class
|
||||||
{
|
{
|
||||||
|
22
root/usr/share/perl5/vendor_perl/esmith/DomainsDB/UTF8.pm
Normal file
22
root/usr/share/perl5/vendor_perl/esmith/DomainsDB/UTF8.pm
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
#----------------------------------------------------------------------
|
||||||
|
# Copyright 2013-2025 Koozali Foundation inc.
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the same terms as Perl itself.
|
||||||
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
|
package esmith::DomainsDB::UTF8;
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
use esmith::DomainsDB;
|
||||||
|
use esmith::config::utf8;
|
||||||
|
our @ISA = qw(esmith::DomainsDB);
|
||||||
|
|
||||||
|
sub tie_class
|
||||||
|
{
|
||||||
|
return 'esmith::config::utf8';
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
|
|
22
root/usr/share/perl5/vendor_perl/esmith/HostsDB/UTF8.pm
Normal file
22
root/usr/share/perl5/vendor_perl/esmith/HostsDB/UTF8.pm
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
#----------------------------------------------------------------------
|
||||||
|
# Copyright 2013-2025 Koozali Foundation inc.
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the same terms as Perl itself.
|
||||||
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
|
package esmith::HostsDB::UTF8;
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
use esmith::HostsDB;
|
||||||
|
use esmith::config::utf8;
|
||||||
|
our @ISA = qw(esmith::HostsDB);
|
||||||
|
|
||||||
|
sub tie_class
|
||||||
|
{
|
||||||
|
return 'esmith::config::utf8';
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
|
|
22
root/usr/share/perl5/vendor_perl/esmith/NetworksDB/UTF8.pm
Normal file
22
root/usr/share/perl5/vendor_perl/esmith/NetworksDB/UTF8.pm
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
#----------------------------------------------------------------------
|
||||||
|
# Copyright 2013-2025 Koozali Foundation inc.
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the same terms as Perl itself.
|
||||||
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
|
package esmith::NetworksDB::UTF8;
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
use esmith::NetworksDB;
|
||||||
|
use esmith::config::utf8;
|
||||||
|
our @ISA = qw(esmith::NetworksDB);
|
||||||
|
|
||||||
|
sub tie_class
|
||||||
|
{
|
||||||
|
return 'esmith::config::utf8';
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
|
|
@@ -556,6 +556,12 @@ for example /etc/passwd, /etc/samba/smbpasswd, etc.
|
|||||||
=head2 validatePassword($password, $strength)
|
=head2 validatePassword($password, $strength)
|
||||||
|
|
||||||
Validate Unix password.
|
Validate Unix password.
|
||||||
|
length is the minimal password length, default is 12.
|
||||||
|
strength could be none,normal,intermediate or strong.
|
||||||
|
- none: only check for length
|
||||||
|
- normal: upper and lower case letters
|
||||||
|
- intermediate: upper and lower case letters not positive to cracklib
|
||||||
|
- strong : numbers, letter and special characters not positive to cracklib
|
||||||
|
|
||||||
=cut
|
=cut
|
||||||
|
|
||||||
@@ -566,14 +572,24 @@ sub validatePassword($$)
|
|||||||
|
|
||||||
$strength ||= 'normal';
|
$strength ||= 'normal';
|
||||||
|
|
||||||
|
my $length = 12;
|
||||||
|
my $db = esmith::ConfigDB->open() || undef;
|
||||||
|
my $sysconfig = $db->get("passwordstrength")|| undef if $db ;
|
||||||
|
$length = $sysconfig->prop("length") || "12" if $sysconfig;
|
||||||
|
|
||||||
my $reason = 'ok';
|
my $reason = 'ok';
|
||||||
$reason = 'it is too short' unless (length($password) > 6);
|
$reason = 'it is too short' unless (length($password) >= $length);
|
||||||
return $reason if ($reason ne 'ok' || $strength eq 'none');
|
return $reason if ($reason ne 'ok' || $strength eq 'none');
|
||||||
|
|
||||||
$reason = 'it does not contain numbers' if (not $password =~ /\d/);
|
|
||||||
$reason = 'it does not contain uppercase characters' if (not $password =~ /[A-Z]/);
|
$reason = 'it does not contain uppercase characters' if (not $password =~ /[A-Z]/);
|
||||||
$reason = 'it does not contain lowercase characters' if (not $password =~ /[a-z]/);
|
$reason = 'it does not contain lowercase characters' if (not $password =~ /[a-z]/);
|
||||||
$reason = 'it does not contain special characters' if (not $password =~ /\W|_/);
|
return $reason if ($reason ne 'ok' || $strength eq 'normal');
|
||||||
|
|
||||||
|
# we are left here with intermediate and strong
|
||||||
|
if ($strength eq 'strong') {
|
||||||
|
$reason = 'it does not contain numbers' if (not $password =~ /\d/);
|
||||||
|
$reason = 'it does not contain special characters' if (not $password =~ /\W|_/);
|
||||||
|
}
|
||||||
return $reason if ($reason ne 'ok' && $strength eq 'strong');
|
return $reason if ($reason ne 'ok' && $strength eq 'strong');
|
||||||
|
|
||||||
if ( -f '/usr/lib64/cracklib_dict.pwd' ) {
|
if ( -f '/usr/lib64/cracklib_dict.pwd' ) {
|
||||||
|
@@ -6,7 +6,7 @@ Summary: smeserver server and gateway - library module
|
|||||||
%define name smeserver-lib
|
%define name smeserver-lib
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
%define version 11.0.0
|
%define version 11.0.0
|
||||||
%define release 9
|
%define release 13
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
Release: %{release}%{?dist}
|
Release: %{release}%{?dist}
|
||||||
License: Artistic
|
License: Artistic
|
||||||
@@ -33,6 +33,21 @@ Provides: e-smith-lib
|
|||||||
smeserver server and gateway software - library module.
|
smeserver server and gateway software - library module.
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jun 08 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-13.sme
|
||||||
|
- add esmith::AccountsDB::UTF8 support [SME: 13029]
|
||||||
|
also esmith::DomainsDB::UTF8, esmith::HostsDB::UTF8,
|
||||||
|
esmith::NetworksDB::UTF8
|
||||||
|
- improve esmith::ConfigDB::UTF8 support [SME: 13028]
|
||||||
|
|
||||||
|
* Wed May 28 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-12.sme
|
||||||
|
- prevent service handling in bootstrap and post-upgrade [SME: 13002]
|
||||||
|
|
||||||
|
* Thu Feb 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme
|
||||||
|
- remove pptpd reference [SME: 11417]
|
||||||
|
- move template-begin-ini [SME: 12211]
|
||||||
|
- passwordstrength{length} default to 12 [SME: 12383]
|
||||||
|
- more password granularity (none,normal,intermediate,strong) [SME: 12384]
|
||||||
|
|
||||||
* Thu Dec 12 2024 Brian Read <brianr@koozali.org> 11.0.0-9.sme
|
* Thu Dec 12 2024 Brian Read <brianr@koozali.org> 11.0.0-9.sme
|
||||||
- add in getmyip [SME: 12810 ]
|
- add in getmyip [SME: 12810 ]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user