Compare commits
4 Commits
11_0_0-30_
...
master
Author | SHA1 | Date | |
---|---|---|---|
![]() |
09908697a4 | ||
08d064bd3d | |||
6957c1ab9c | |||
8615e569eb |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,3 +4,4 @@
|
|||||||
*.tar.xz
|
*.tar.xz
|
||||||
*.bak
|
*.bak
|
||||||
*gz
|
*gz
|
||||||
|
*.patch
|
||||||
|
16
createlinks
16
createlinks
@@ -303,10 +303,11 @@ my $event = "smeserver-base-update";
|
|||||||
|
|
||||||
|
|
||||||
event_link("remove-templates-custom", $event, "02");
|
event_link("remove-templates-custom", $event, "02");
|
||||||
|
event_link("systemd-journald", $event, "02");
|
||||||
|
event_link("dhgenerator", $event, "03");
|
||||||
templates2events("/etc/smartmontools/smartd.conf", $event);
|
templates2events("/etc/smartmontools/smartd.conf", $event);
|
||||||
templates2events("/home/e-smith/ssl.pem/pem", $event);
|
templates2events("/home/e-smith/ssl.pem/pem", $event);
|
||||||
templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event);
|
templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event);
|
||||||
event_link("systemd-journald", $event, "02");
|
|
||||||
event_link("fix-startup", $event, "05");
|
event_link("fix-startup", $event, "05");
|
||||||
event_link("init-accounts", $event, "05");
|
event_link("init-accounts", $event, "05");
|
||||||
event_link("mail-spool-fix", $event, "05");
|
event_link("mail-spool-fix", $event, "05");
|
||||||
@@ -612,13 +613,24 @@ $event = "ldap-update";
|
|||||||
templates2events("/home/e-smith/ssl.pem/pem", $event);
|
templates2events("/home/e-smith/ssl.pem/pem", $event);
|
||||||
|
|
||||||
#--------------------------------------------------
|
#--------------------------------------------------
|
||||||
# actions for ldap-update event
|
# actions for ssl-update event
|
||||||
#--------------------------------------------------
|
#--------------------------------------------------
|
||||||
|
|
||||||
$event = "ssl-update";
|
$event = "ssl-update";
|
||||||
|
|
||||||
templates2events("/home/e-smith/ssl.pem/pem", $event);
|
templates2events("/home/e-smith/ssl.pem/pem", $event);
|
||||||
|
|
||||||
|
#--------------------------------------------------
|
||||||
|
# actions for dhparam-update event
|
||||||
|
#--------------------------------------------------
|
||||||
|
|
||||||
|
$event = "dhparam-update";
|
||||||
|
|
||||||
|
event_link("dhgenerator", $event, "03");
|
||||||
|
templates2events("/etc/crontab", $event);
|
||||||
|
# add templates to expand + service to try-restart in target packages
|
||||||
|
# templates2events("/etc/dovecot/ssl/dhparam.pem", $event);
|
||||||
|
# safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/dovecot");
|
||||||
|
|
||||||
#--------------------------------------------------
|
#--------------------------------------------------
|
||||||
# actions for email-update event:
|
# actions for email-update event:
|
||||||
|
27
root/etc/e-smith/events/actions/dhgenerator
Executable file
27
root/etc/e-smith/events/actions/dhgenerator
Executable file
@@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/perl
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use esmith::ssl;
|
||||||
|
|
||||||
|
my $event=shift||"program";
|
||||||
|
my $folder="/home/e-smith/dh.pem";
|
||||||
|
my $KeySize = 2048;
|
||||||
|
# load config db
|
||||||
|
|
||||||
|
mkdir($folder, 0700) unless(-d $folder );
|
||||||
|
# if program (or during updates) we only generate the 2048 to start all programs after install without waiting too much
|
||||||
|
if ( $event eq "program" || $event eq "temp" ) {
|
||||||
|
my $exit_code=dh_exists_good_size($KeySize,"$folder/$KeySize.pem") || system("/usr/bin/openssl","dhparam","-out","$folder/$KeySize.pem", $KeySize);
|
||||||
|
exit 0;
|
||||||
|
}
|
||||||
|
# if called as event, we generate a 4096 if 2096 exist, and then expand templates for services in need of this
|
||||||
|
# then the event will restart the service to use stronger dh.pem
|
||||||
|
else {
|
||||||
|
$KeySize = 4096 if (dh_exists_good_size($KeySize,"$folder/$KeySize.pem"));
|
||||||
|
print "Key size is $KeySize\n";
|
||||||
|
exit 0 if (dh_exists_good_size($KeySize,"$folder/$KeySize.pem"));
|
||||||
|
# here we should test if uptime > 2 hours and return if not enough uptime
|
||||||
|
system("/usr/bin/openssl","dhparam","-out","$folder/$KeySize.pem", $KeySize);
|
||||||
|
exit 0;
|
||||||
|
}
|
||||||
|
|
@@ -28,6 +28,7 @@ use Errno;
|
|||||||
use esmith::AccountsDB;
|
use esmith::AccountsDB;
|
||||||
|
|
||||||
my $a = esmith::AccountsDB->open_ro or die "Could not open accounts db";
|
my $a = esmith::AccountsDB->open_ro or die "Could not open accounts db";
|
||||||
|
my $c = esmith::ConfigDB->open_ro or die "Could not open configuration db";
|
||||||
|
|
||||||
foreach my $u ($a->users)
|
foreach my $u ($a->users)
|
||||||
{
|
{
|
||||||
@@ -40,6 +41,23 @@ foreach my $u ($a->users)
|
|||||||
|
|
||||||
system("/usr/bin/smbpasswd", "-d", $user) == 0
|
system("/usr/bin/smbpasswd", "-d", $user) == 0
|
||||||
or warn("Problem locking smbpassword for user $user\n");
|
or warn("Problem locking smbpassword for user $user\n");
|
||||||
|
|
||||||
|
my $serv = $c->get('samba') || '';
|
||||||
|
if (($serv eq 'service') && ($user ne 'administrator'))
|
||||||
|
{
|
||||||
|
my $samba = $c->get('samba')->prop('status') || 'disabled';
|
||||||
|
my $sambaip = $c->get('samba')->prop('SambaIP') || '';
|
||||||
|
my $sambapwd = $c->get('samba')->prop('Password') || '';
|
||||||
|
if ($sambaip eq '' || $sambapwd eq '')
|
||||||
|
{
|
||||||
|
$samba = 'disabled';
|
||||||
|
}
|
||||||
|
if ($samba eq 'enabled')
|
||||||
|
{
|
||||||
|
system("/usr/bin/samba-tool", "user", "disable", "$user", "-H", "ldap://$sambaip", "--username=administrator", "--password=$sambapwd") == 0
|
||||||
|
or warn("Problem locking addc password for user $user\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -134,4 +134,23 @@ if ($ldapauth ne 'enabled')
|
|||||||
system("/usr/bin/smbpasswd", "-a", "-d", "$userName")
|
system("/usr/bin/smbpasswd", "-a", "-d", "$userName")
|
||||||
and ( $x = 255, warn "Could not lock (smb) password for $userName\n" );
|
and ( $x = 255, warn "Could not lock (smb) password for $userName\n" );
|
||||||
|
|
||||||
|
my $serv = $conf->get('samba') || '';
|
||||||
|
if (($serv eq 'service') && ($userName ne 'administrator'))
|
||||||
|
{
|
||||||
|
my $samba = $conf->get('samba')->prop('status') || 'disabled';
|
||||||
|
my $sambaip = $conf->get('samba')->prop('SambaIP') || '';
|
||||||
|
my $sambapwd = $conf->get('samba')->prop('Password') || '';
|
||||||
|
if ($sambaip eq '' || $sambapwd eq '')
|
||||||
|
{
|
||||||
|
$samba = 'disabled';
|
||||||
|
}
|
||||||
|
if ($samba eq 'enabled')
|
||||||
|
{
|
||||||
|
system("/usr/bin/samba-tool", "user", "add", "$userName", "--random-password", "-H", "ldap://$sambaip", "--username=administrator", "--password=$sambapwd")
|
||||||
|
and ( $x = 255, warn "Could not create (addc) user for $userName\n" );
|
||||||
|
system("/usr/bin/samba-tool", "user", "disable", "$userName", "-H", "ldap://$sambaip", "--username=administrator", "--password=$sambapwd")
|
||||||
|
and ( $x = 255, warn "Could not lock (addc) password for $userName\n" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
exit ($x);
|
exit ($x);
|
||||||
|
@@ -75,4 +75,21 @@ $result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to delete (lda
|
|||||||
$result = $ldap->ldapdelgroup($userName);
|
$result = $ldap->ldapdelgroup($userName);
|
||||||
$result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to delete (ldap) group account $userName.\n" );
|
$result && ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to delete (ldap) group account $userName.\n" );
|
||||||
|
|
||||||
|
my $serv = $conf->get('samba') || '';
|
||||||
|
if (($serv eq 'service') && ($userName ne 'administrator'))
|
||||||
|
{
|
||||||
|
my $samba = $conf->get('samba')->prop('status') || 'disabled';
|
||||||
|
my $sambaip = $conf->get('samba')->prop('SambaIP') || '';
|
||||||
|
my $sambapwd = $conf->get('samba')->prop('Password') || '';
|
||||||
|
if ($sambaip eq '' || $sambapwd eq '')
|
||||||
|
{
|
||||||
|
$samba = 'disabled';
|
||||||
|
}
|
||||||
|
if ($samba eq 'enabled')
|
||||||
|
{
|
||||||
|
system("/usr/bin/samba-tool", "user", "delete", "$userName", "-H", "ldap://$sambaip", "--username=administrator", "--password=$sambapwd")
|
||||||
|
and ( $x = 255, warn "Failed to delete (addc) account $userName.\n" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
exit ($x);
|
exit ($x);
|
||||||
|
@@ -78,6 +78,23 @@ sub lock_user
|
|||||||
{
|
{
|
||||||
$conf->set_value('PasswordSet', 'no');
|
$conf->set_value('PasswordSet', 'no');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
my $serv = $conf->get('samba') || '';
|
||||||
|
if (($serv eq 'service') && ($userName ne 'administrator'))
|
||||||
|
{
|
||||||
|
my $samba = $conf->get('samba')->prop('status') || 'disabled';
|
||||||
|
my $sambaip = $conf->get('samba')->prop('SambaIP') || '';
|
||||||
|
my $sambapwd = $conf->get('samba')->prop('Password') || '';
|
||||||
|
if ($sambaip eq '' || $sambapwd eq '')
|
||||||
|
{
|
||||||
|
$samba = 'disabled';
|
||||||
|
}
|
||||||
|
if ($samba eq 'enabled')
|
||||||
|
{
|
||||||
|
system("/usr/bin/samba-tool", "user", "disable", "$userName", "-H", "ldap://$sambaip", "--username=administrator", "--password=$sambapwd") == 0
|
||||||
|
or ( $x = 255, warn "Error locking (addc) account $userName" );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sub bad_password_users
|
sub bad_password_users
|
||||||
|
8
root/etc/e-smith/templates/etc/crontab/dhgenerate
Normal file
8
root/etc/e-smith/templates/etc/crontab/dhgenerate
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
use esmith::ssl;
|
||||||
|
my $folder="/home/e-smith/dh.pem";
|
||||||
|
my $KeySize = 4096;
|
||||||
|
$OUT = "#4096 dhparam exists";
|
||||||
|
$OUT = '@reboot root sleep 2d && /sbin/e-smith/signal-event dhparam-update'."\n" unless (dh_exists_good_size($KeySize,"$folder/$KeySize.pem"));
|
||||||
|
}
|
||||||
|
|
7
root/etc/e-smith/templates/etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN
Executable file → Normal file
7
root/etc/e-smith/templates/etc/sysconfig/network-scripts/chat-ppp0/20LINUX_PLUGIN
Executable file → Normal file
@@ -1 +1,6 @@
|
|||||||
LINUX_PLUGIN=/usr/lib64/pppd/2.4.5/rp-pppoe.so
|
{
|
||||||
|
# Find Roaring Penguin pppoe plugin
|
||||||
|
my ($plugin) = glob "/usr/lib*/pppd/*/rp-pppoe.so";
|
||||||
|
$plugin ||= "pppoe_plugin_could_not_be_found";
|
||||||
|
$OUT .= "LINUX_PLUGIN=$plugin\n";
|
||||||
|
}
|
35
root/etc/e-smith/templates/home/e-smith/dh.pem
Normal file
35
root/etc/e-smith/templates/home/e-smith/dh.pem
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
use esmith::ssl;
|
||||||
|
# for the generation of originals in /home/e-smith/dh.pem/
|
||||||
|
# we check that 4096 exist, if not we default to 2048. If not we generate it
|
||||||
|
# for replication : we copy what we have
|
||||||
|
|
||||||
|
my $DHSize = $modSSL{DHSize} ||'4096';
|
||||||
|
my $key = "/home/e-smith/dh.pem";
|
||||||
|
for my $DHSize (qw(4096 2048))
|
||||||
|
{
|
||||||
|
# if key exists and good size, we use it
|
||||||
|
if ( dh_exists_good_size($DHSize,"$key/$DHSize.pem") )
|
||||||
|
{
|
||||||
|
# Old key file is still good. Read it out - processTemplate will work
|
||||||
|
# out that it hasn't changed, and leave the old one in place
|
||||||
|
open(K, "$key/$DHSize.pem") or die "Couldn't open key file: $!";
|
||||||
|
my @key = <K>;
|
||||||
|
chomp @key;
|
||||||
|
$OUT = join "\n", @key;
|
||||||
|
close(K);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
# if nothing have ever been generated we call the action script as program
|
||||||
|
# it will generate a 2048, which 'should' be faster than 4096
|
||||||
|
# later if uptime is sufficient 4096 will be generated.
|
||||||
|
my $program = "/etc/e-smith/events/actions/dhgenerator";
|
||||||
|
system($program);
|
||||||
|
open(K, "$key/2048.pem") or die "Couldn't open dh file: $!";
|
||||||
|
my @key = <K>;
|
||||||
|
chomp @key;
|
||||||
|
$OUT = join "\n", @key;
|
||||||
|
close(K);
|
||||||
|
return;
|
||||||
|
}
|
@@ -2,6 +2,7 @@
|
|||||||
use constant KEYLIFEINDAYS => $modSSL{KeyLifeInDays} || 365;
|
use constant KEYLIFEINDAYS => $modSSL{KeyLifeInDays} || 365;
|
||||||
use esmith::ssl;
|
use esmith::ssl;
|
||||||
use Date::Parse;
|
use Date::Parse;
|
||||||
|
use utf8;
|
||||||
use Cwd;
|
use Cwd;
|
||||||
use Net::IP qw(ip_is_ipv4 ip_is_ipv6);
|
use Net::IP qw(ip_is_ipv4 ip_is_ipv6);
|
||||||
use esmith::Logger;
|
use esmith::Logger;
|
||||||
@@ -38,65 +39,69 @@
|
|||||||
$defaultCity = substr($defaultCity, 0, 128);
|
$defaultCity = substr($defaultCity, 0, 128);
|
||||||
$defaultCompany = substr($defaultCompany, 0, 64);
|
$defaultCompany = substr($defaultCompany, 0, 64);
|
||||||
$defaultDepartment = substr($defaultDepartment, 0, 64);
|
$defaultDepartment = substr($defaultDepartment, 0, 64);
|
||||||
|
$defaultDepartment =~ s/[''"]//g;
|
||||||
$email = substr($email, 0, 64);
|
$email = substr($email, 0, 64);
|
||||||
$commonName = substr($commonName, 0, 64);
|
$commonName = substr($commonName, 0, 64);
|
||||||
|
|
||||||
# if self-signed certificate files exists, is a certificate, and is still valid
|
# if self-signed certificate files exists, is a certificate, and is still valid
|
||||||
if ( cert_exists_good_size )
|
if ( cert_exists_good_size )
|
||||||
{
|
{
|
||||||
# check expiry date, if less than 2 days from now we update it.
|
# check expiry date, if less than 2 days from now we update it.
|
||||||
my $expire = `openssl x509 -enddate -noout -in $crt`;
|
my $expire = `openssl x509 -enddate -noout -in $crt`;
|
||||||
$expire =~ s/^notAfter=//;
|
$expire =~ s/^notAfter=//;
|
||||||
$expire = str2time($expire);
|
$expire = str2time($expire);
|
||||||
my $ttl_days = ($expire - time()) / 60 / 60 / 24;
|
my $ttl_days = ($expire - time()) / 60 / 60 / 24;
|
||||||
# check the cert and the key are related, if key has been changed, then we need to change the cert
|
# check the cert and the key are related, if key has been changed, then we need to change the cert
|
||||||
my $crt_md5 = `openssl x509 -noout -modulus -in $crt | openssl md5`;
|
my $crt_md5 = `openssl x509 -noout -modulus -in $crt | openssl md5`;
|
||||||
my $key_md5 = `openssl rsa -noout -modulus -in $key | openssl md5`;
|
my $key_md5 = `openssl rsa -noout -modulus -in $key | openssl md5`;
|
||||||
|
|
||||||
if ( ($ttl_days > 2) && ( "$crt_md5" eq "$key_md5" ) ) {
|
if ( ($ttl_days > 2) && ( "$crt_md5" eq "$key_md5" ) ) {
|
||||||
my $expected_issuer = 'C = '.$Country .
|
my $expected_issuer = 'C='.$Country .
|
||||||
', ST = '.$State;
|
', ST='.$State;
|
||||||
$expected_issuer .= ', L = ' . ($defaultCity ? $defaultCity : 'Default City');
|
$expected_issuer .= ', L=' . ($defaultCity ? $defaultCity : 'Default City');
|
||||||
$expected_issuer .= ', O = ' . ($defaultCompany ? $defaultCompany : 'Default Company Ltd');
|
$expected_issuer .= ', O=' . ($defaultCompany ? $defaultCompany : 'Default Company Ltd');
|
||||||
$expected_issuer .= ", OU = $defaultDepartment" if $defaultDepartment;
|
$expected_issuer .= ", OU=$defaultDepartment" if $defaultDepartment;
|
||||||
$expected_issuer .= ", CN = $commonName" .
|
$expected_issuer .= ", CN=$commonName" .
|
||||||
", emailAddress = $email";
|
", emailAddress=$email";
|
||||||
my $issuer = `openssl x509 -issuer -noout -in $crt`;
|
# format so we can compare with right encoding
|
||||||
|
my $issuer = `openssl x509 -issuer -nameopt dump_der -noout -in $crt`;
|
||||||
chomp $issuer;
|
chomp $issuer;
|
||||||
$issuer =~ s/^issuer=//;
|
$issuer =~ s/^issuer=//;
|
||||||
|
# we remove any "
|
||||||
|
$issuer =~ s/["]//g;
|
||||||
my $signatureAlg = `openssl x509 -text -noout -in $crt | grep "Signature Algorithm" | head -1`;
|
my $signatureAlg = `openssl x509 -text -noout -in $crt | grep "Signature Algorithm" | head -1`;
|
||||||
chomp $signatureAlg;
|
chomp $signatureAlg;
|
||||||
$signatureAlg =~ s/^ *Signature Algorithm: //;
|
$signatureAlg =~ s/^ *Signature Algorithm: //;
|
||||||
|
|
||||||
# Test for expected subjectAltName
|
# Test for expected subjectAltName
|
||||||
# openssl x509 -text -noout -in /etc/dehydrated/certs/domain/cert.pem | sed -ne '/X509v3 Subject Alternative Name/{ N;s/^.*\n//;:a;s/^\( *\)\(.*\), /\2,\1/;ta;p;q; }'
|
# openssl x509 -text -noout -in /etc/dehydrated/certs/domain/cert.pem | sed -ne '/X509v3 Subject Alternative Name/{ N;s/^.*\n//;:a;s/^\( *\)\(.*\), /\2,\1/;ta;p;q; }'
|
||||||
$expected_subjectAltName = `openssl x509 -text -noout -in $crt | sed -ne '/X509v3 Subject Alternative Name/{ N;s/^.*\\n//;:a;s/^\\( *\\)\\(.*\\), /\\2,\\1/;ta;p;q; }'`;
|
$expected_subjectAltName = `openssl x509 -text -noout -in $crt | sed -ne '/X509v3 Subject Alternative Name/{ N;s/^.*\\n//;:a;s/^\\( *\\)\\(.*\\), /\\2,\\1/;ta;p;q; }'`;
|
||||||
chomp $expected_subjectAltName;
|
chomp $expected_subjectAltName;
|
||||||
print FH "Self-Signed Cert: $issuer\n expected $expected_issuer" unless ($issuer eq $expected_issuer);
|
print FH "Self-Signed Cert: $issuer\n expected $expected_issuer" unless ($issuer eq $expected_issuer);
|
||||||
print FH "Self-Signed Cert: $signatureAlg "unless ($signatureAlg ne "sha1WithRSAEncryption");
|
print FH "Self-Signed Cert: $signatureAlg "unless ($signatureAlg ne "sha1WithRSAEncryption");
|
||||||
print FH "Self-Signed Cert: $subjectAltName\n expected: $expected_subjectAltName" unless ($subjectAltName eq $expected_subjectAltName);
|
print FH "Self-Signed Cert: $subjectAltName\n expected: $expected_subjectAltName" unless ($subjectAltName eq $expected_subjectAltName);
|
||||||
if (
|
if (
|
||||||
($issuer eq $expected_issuer)
|
($issuer eq $expected_issuer)
|
||||||
&& ($signatureAlg ne "sha1WithRSAEncryption")
|
&& ($signatureAlg ne "sha1WithRSAEncryption")
|
||||||
&& ($subjectAltName eq $expected_subjectAltName)
|
&& ($subjectAltName eq $expected_subjectAltName)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
# Old key file is still good. Read it out - processTemplate will work
|
# Old key file is still good. Read it out - processTemplate will work
|
||||||
# out that it hasn't changed, and leave the old one in place
|
# out that it hasn't changed, and leave the old one in place
|
||||||
open(C, "$crt") or die "Couldn't open crt file: $!";
|
open(C, "$crt") or die "Couldn't open crt file: $!";
|
||||||
my @crt = <C>;
|
my @crt = <C>;
|
||||||
chomp @crt;
|
chomp @crt;
|
||||||
$OUT = join "\n", @crt;
|
$OUT = join "\n", @crt;
|
||||||
close(C);
|
close(C);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
# go to somewhere private and safe where we can run programs
|
# go to somewhere private and safe where we can run programs
|
||||||
# as root
|
# as root
|
||||||
unless (-e "/tmp/ssl")
|
unless (-e "/tmp/ssl")
|
||||||
{
|
{
|
||||||
mkdir "/tmp/ssl", 0700;
|
mkdir "/tmp/ssl", 0700;
|
||||||
}
|
}
|
||||||
chdir "/tmp/ssl" or die "Couldn't change to secure directory: $!";
|
chdir "/tmp/ssl" or die "Couldn't change to secure directory: $!";
|
||||||
|
|
||||||
@@ -104,21 +109,21 @@
|
|||||||
|
|
||||||
unless (open(SSL,"-|"))
|
unless (open(SSL,"-|"))
|
||||||
{
|
{
|
||||||
# child
|
# child
|
||||||
exec("/usr/bin/openssl",
|
exec("/usr/bin/openssl",
|
||||||
qw(req -new -key),
|
qw(req -new -key),
|
||||||
$key,
|
$key,
|
||||||
qw( -sha256 -x509 -days), KEYLIFEINDAYS,
|
qw( -sha256 -x509 -days), KEYLIFEINDAYS,
|
||||||
qw(-set_serial), time(),
|
qw(-set_serial), time(),
|
||||||
qw(-extensions v3_req),
|
qw(-extensions v3_req),
|
||||||
qw(-config), "/etc/openssl.conf"
|
qw(-config), "/etc/openssl.conf"
|
||||||
)
|
)
|
||||||
|| die "can't exec program: $!";
|
|| die "can't exec program: $!";
|
||||||
# NOTREACHED
|
# NOTREACHED
|
||||||
}
|
}
|
||||||
while (<SSL>)
|
while (<SSL>)
|
||||||
{
|
{
|
||||||
$OUT .= $_;
|
$OUT .= $_;
|
||||||
}
|
}
|
||||||
close(SSL) or die "Closing openssl pipe reported: $!";
|
close(SSL) or die "Closing openssl pipe reported: $!";
|
||||||
chdir $here;
|
chdir $here;
|
||||||
|
@@ -1 +1,6 @@
|
|||||||
plugin /usr/lib64/pppd/2.4.5/rp-pppoe.so
|
{
|
||||||
|
# Find Roaring Penguin pppoe plugin
|
||||||
|
my ($plugin) = glob "/usr/lib*/pppd/*/rp-pppoe.so";
|
||||||
|
$plugin ||= "pppoe_plugin_could_not_be_found";
|
||||||
|
$OUT .= "plugin $plugin\n";
|
||||||
|
}
|
@@ -93,6 +93,23 @@ sub change_password {
|
|||||||
$accountdb = esmith::AccountsDB->open();
|
$accountdb = esmith::AccountsDB->open();
|
||||||
|
|
||||||
$q->param(-name => 'status_message', -value => 'PASSWORD_CHANGE_SUCCESS');
|
$q->param(-name => 'status_message', -value => 'PASSWORD_CHANGE_SUCCESS');
|
||||||
|
|
||||||
|
my $serv = $configdb->get('samba') || '';
|
||||||
|
if (($serv eq 'service') && ($acctName ne 'administrator'))
|
||||||
|
{
|
||||||
|
my $samba = $configdb->get('samba')->prop('status') || 'disabled';
|
||||||
|
my $sambaip = $configdb->get('samba')->prop('SambaIP') || '';
|
||||||
|
my $sambapwd = $configdb->get('samba')->prop('Password') || '';
|
||||||
|
if ($sambaip eq '' || $sambapwd eq '')
|
||||||
|
{
|
||||||
|
$samba = 'disabled';
|
||||||
|
}
|
||||||
|
if ($samba eq 'enabled')
|
||||||
|
{
|
||||||
|
system("/usr/bin/samba-tool", "user", "setpassword", "$acctName", "--newpassword=$pass", "-H", "ldap://$sambaip", "--username=administrator", "--password=$sambapwd") == 0
|
||||||
|
or warn ("Error occured while modifying (addc) password for $acctName.\n" );
|
||||||
|
}
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
/sbin/modprobe dummy
|
/sbin/modprobe dummy
|
||||||
|
$(ip link show dummy0 2>/dev/null 1>&2) || exec ip link add dummy0 type dummy
|
||||||
exec ip link set dummy0 address 10:00:01:02:03:04
|
exec ip link set dummy0 address 10:00:01:02:03:04
|
||||||
|
@@ -15,12 +15,6 @@ enable networking.service
|
|||||||
enable wan.service
|
enable wan.service
|
||||||
enable masq.service
|
enable masq.service
|
||||||
enable php-fpm.service
|
enable php-fpm.service
|
||||||
enable php55-php-fpm.service
|
|
||||||
enable php56-php-fpm.service
|
|
||||||
enable php70-php-fpm.service
|
|
||||||
enable php71-php-fpm.service
|
|
||||||
enable php72-php-fpm.service
|
|
||||||
enable php73-php-fpm.service
|
|
||||||
enable php74-php-fpm.service
|
enable php74-php-fpm.service
|
||||||
enable php80-php-fpm.service
|
enable php80-php-fpm.service
|
||||||
enable httpd-e-smith.service
|
enable httpd-e-smith.service
|
||||||
@@ -73,3 +67,4 @@ disable ntpdate.service
|
|||||||
disable ftp.service
|
disable ftp.service
|
||||||
disable proftpd.service
|
disable proftpd.service
|
||||||
|
|
||||||
|
enable dhparam-generator.service
|
||||||
|
24
root/usr/lib/systemd/system/dhparam-generator.service
Normal file
24
root/usr/lib/systemd/system/dhparam-generator.service
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Diffie Hellman parameter generator
|
||||||
|
#TODO: add Requires= or Wants= to those:
|
||||||
|
Before=ftp.service
|
||||||
|
Before=dovecot.service
|
||||||
|
Before=qpsmtpd.service sqpsmtpd.service uqpsmtpd.service
|
||||||
|
Before=radiusd.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/etc/e-smith/events/actions/dhgenerator
|
||||||
|
# sqpsmtpd and uqpsmtpd use a symlink to /var/service/qpsmtpd/ssl
|
||||||
|
ExecStartPost=-/sbin/e-smith/expand-template /var/service/qpsmtpd/ssl/dhparam.pem
|
||||||
|
ExecStartPost=-/sbin/e-smith/expand-template /etc/dovecot/ssl/dhparam.pem
|
||||||
|
ExecStartPost=-/sbin/e-smith/expand-template /etc/raddb/certs/dh
|
||||||
|
|
||||||
|
PrivateTmp=true
|
||||||
|
ProtectSystem=no
|
||||||
|
ProtectHome=no
|
||||||
|
PrivateDevices=false
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sme-server.target
|
||||||
|
|
@@ -911,6 +911,29 @@ sub reset_password {
|
|||||||
|
|
||||||
$self->success($self->localise('PASSWORD_CHANGE_SUCCEEDED',
|
$self->success($self->localise('PASSWORD_CHANGE_SUCCEEDED',
|
||||||
{ acctName => $acctName}));
|
{ acctName => $acctName}));
|
||||||
|
|
||||||
|
my $serv = $configdb->get('samba') || '';
|
||||||
|
if (($serv eq 'service') && ($acctName ne 'administrator'))
|
||||||
|
{
|
||||||
|
my $samba = $configdb->get('samba')->prop('status') || 'disabled';
|
||||||
|
my $sambaip = $configdb->get('samba')->prop('SambaIP') || '';
|
||||||
|
my $sambapwd = $configdb->get('samba')->prop('Password') || '';
|
||||||
|
if ($sambaip eq '' || $sambapwd eq '')
|
||||||
|
{
|
||||||
|
$samba = 'disabled';
|
||||||
|
}
|
||||||
|
if ($samba eq 'enabled')
|
||||||
|
{
|
||||||
|
my $password = $self->{cgi}->param('password1');
|
||||||
|
unless (($password) = ($password =~ /^([ -~]+)$/ ))
|
||||||
|
{
|
||||||
|
return $self->error('TAINTED_PASSWORD');
|
||||||
|
}
|
||||||
|
$password = $1;
|
||||||
|
system("/usr/bin/samba-tool", "user", "setpassword", "$acctName", "--newpassword=$password", "-H", "ldap://$sambaip", "--username=administrator", "--password=$sambapwd") == 0
|
||||||
|
or warn ("Error occured while modifying (addc) password for $acctName.\n" );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -6,7 +6,7 @@ use esmith::ConfigDB;
|
|||||||
|
|
||||||
|
|
||||||
our @ISA = qw(Exporter);
|
our @ISA = qw(Exporter);
|
||||||
our @EXPORT = qw( key_exists_good_size cert_exists_good_size cert_is_cert key_is_key related_key_cert SSLproto SSLprotoApache SSLprotoComa SSLprotoHyphen SSLprotoMin SSLprotoLDAP SSLprotoQpsmtpd $smeCiphers $smeSSLprotocol %existingSSLprotos);
|
our @EXPORT = qw( key_exists_good_size cert_exists_good_size cert_is_cert key_is_key related_key_cert SSLproto SSLprotoApache SSLprotoComa SSLprotoHyphen SSLprotoMin SSLprotoLDAP SSLprotoQpsmtpd $smeCiphers $smeSSLprotocol %existingSSLprotos dh_exists_good_size);
|
||||||
|
|
||||||
my $configdb = esmith::ConfigDB->open_ro or die "Could not open accounts db";
|
my $configdb = esmith::ConfigDB->open_ro or die "Could not open accounts db";
|
||||||
our $SystemName = $configdb->get('SystemName')->value;
|
our $SystemName = $configdb->get('SystemName')->value;
|
||||||
@@ -162,6 +162,38 @@ sub related_key_cert {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
=head2 dh_exists_good_size
|
||||||
|
# check dh exist
|
||||||
|
# check dh is indeed dh
|
||||||
|
# check dh size
|
||||||
|
# openssl rsa -noout -modulus -in domain.key | openssl md5
|
||||||
|
# openssl x509 -noout -modulus -in domain.crt | openssl md5
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub dh_exists_good_size {
|
||||||
|
my $configdb = esmith::ConfigDB->open_ro or die "Could not open accounts db";
|
||||||
|
my %modSSL = $configdb->as_hash('modSSL');
|
||||||
|
my $KeySize = shift || $modSSL{DHSize} ||'4096';
|
||||||
|
my $dh = shift || "/home/e-smith/dh.pem/$KeySize.pem";
|
||||||
|
if ( -f $dh )
|
||||||
|
{
|
||||||
|
my $signatureKeySize = `openssl dhparam -text -noout -in $dh 2>/dev/null | grep "DH Parameters:" | head -1`;
|
||||||
|
chomp $signatureKeySize;
|
||||||
|
$signatureKeySize =~ s/^.*DH Parameters: \((.*) bit\)/$1/p;
|
||||||
|
if ( $signatureKeySize == $KeySize ) {
|
||||||
|
#print "$signatureKeySize\n";
|
||||||
|
# cert is correct size and exists, we can proceed.
|
||||||
|
# next check key and cert are related
|
||||||
|
# next check cert is still valid
|
||||||
|
# next check alt name are still the same
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##TODO write sub and migrate those actions from template fragments
|
##TODO write sub and migrate those actions from template fragments
|
||||||
# check cert is related to key
|
# check cert is related to key
|
||||||
# => /etc/e-smith/templates/home/e-smith/ssl.crt
|
# => /etc/e-smith/templates/home/e-smith/ssl.crt
|
||||||
|
@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - base module
|
|||||||
%define name smeserver-base
|
%define name smeserver-base
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
%define version 11.0.0
|
%define version 11.0.0
|
||||||
%define release 30
|
%define release 34
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
Release: %{release}%{?dist}
|
Release: %{release}%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
@@ -182,6 +182,21 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-34.sme
|
||||||
|
- fix hardcoded rp-pppoe.so location - Thanks Nestor [SME: 13074]
|
||||||
|
|
||||||
|
* Thu Jun 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-33.sme
|
||||||
|
- fix autorenew of self-signed certificate [SME: 12218]
|
||||||
|
strips unsupported characters, use utf8 encoding
|
||||||
|
|
||||||
|
* Thu Jun 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-32.sme
|
||||||
|
- Replicate user accounts to samba Active Directory [SME: 12799]
|
||||||
|
|
||||||
|
* Sun Mar 16 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-31.sme
|
||||||
|
- handle dh params with template [SME: 12826]
|
||||||
|
TODO timer and event
|
||||||
|
- foolproofing dummy.module
|
||||||
|
|
||||||
* Thu Mar 06 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-30.sme
|
* Thu Mar 06 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-30.sme
|
||||||
- systemd unit for ippp [SME: 12876]
|
- systemd unit for ippp [SME: 12876]
|
||||||
- systemd unit for wan [SME: 12875]
|
- systemd unit for wan [SME: 12875]
|
||||||
|
Reference in New Issue
Block a user