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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2556
root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
View File

File diff suppressed because it is too large Load Diff

149
root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm
View File

@ -4,172 +4,143 @@ package SrvMngr::Controller::Bugreport;
# heading : Investigation # heading : Investigation
# description : Report a bug # description : Report a bug
# navigation : 7000 500 # navigation : 7000 500
# routes : end # routes : end
#------------------------------ #------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
use Text::Template; use Text::Template;
use File::Basename; use File::Basename;
use esmith::FormMagick qw( gen_locale_date_string ); use esmith::FormMagick qw( gen_locale_date_string );
our $cdb = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n"; our $cdb = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n";
# Get some basic info on the current SME install # Get some basic info on the current SME install
our $sysconfig = $cdb->get('sysconfig'); our $sysconfig = $cdb->get('sysconfig');
our $systemmode = $cdb->get('SystemMode')->value; our $systemmode = $cdb->get('SystemMode')->value;
our $previoussystemmode = $sysconfig->prop('PreviousSystemMode'); our $previoussystemmode = $sysconfig->prop('PreviousSystemMode');
our $releaseversion = $sysconfig->prop('ReleaseVersion'); our $releaseversion = $sysconfig->prop('ReleaseVersion');
# Prepare some filehandles for templates and reports # Prepare some filehandles for templates and reports
our $templatefile = '/tmp/bugreport_template.txt'; our $templatefile = '/tmp/bugreport_template.txt';
our $configreportfile = '/tmp/configreport.txt'; our $configreportfile = '/tmp/configreport.txt';
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %bugr_datas = (); my %bugr_datas = ();
my $title = $c->l('bugr_FORM_TITLE');
my $title = $c->l('bugr_FORM_TITLE'); my $modul = $c->render_to_string(inline => $c->l('bugr_DESCRIPTION'));
my $modul = $c->render_to_string( inline => $c->l('bugr_DESCRIPTION'));
$bugr_datas{'trt'} = 'SHOW'; $bugr_datas{'trt'} = 'SHOW';
$c->stash(title => $title, modul => $modul, bugr_datas => \%bugr_datas); $c->stash(title => $title, modul => $modul, bugr_datas => \%bugr_datas);
$c->render(template => 'bugreport'); $c->render(template => 'bugreport');
}; } ## end sub main
sub do_report { sub do_report {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('bugr_FORM_TITLE');
my $title = $c->l('bugr_FORM_TITLE'); my $trt = $c->param('trt') || 'SHOW';
my $trt = $c->param('trt') || 'SHOW';
my %bugr_datas = (); my %bugr_datas = ();
$bugr_datas{'trt'} = $trt; $bugr_datas{'trt'} = $trt;
if ( $trt eq 'SHOW' ) { if ($trt eq 'SHOW') {
create_configuration_report(); create_configuration_report();
my $out = $c->render_to_string(inline => show_config_report()); my $out = $c->render_to_string(inline => show_config_report());
$bugr_datas{'trt'} = 'DOWN';
$c->stash(title => $title, modul => $out, bugr_datas => \%bugr_datas);
$c->render(template => 'bugreport2');
} ## end if ($trt eq 'SHOW')
$bugr_datas{'trt'} = 'DOWN'; if ($trt eq 'DOWN') {
my $modul = 'Bug report download';
$c->stash(title => $title, modul => $out, bugr_datas => \%bugr_datas);
$c->render(template => 'bugreport2');
}
if ( $trt eq 'DOWN' ) {
my $modul = 'Bug report download';
# $c->render_file(
# 'filepath' => "$configreportfile",
# 'format' => 'x-download',
# 'content_disposition' => 'attachment',
# 'cleanup' => 1,
# );
# the following in this sub will not be used !!!
# $bugr_datas{'trt'} = 'DOWN';
# $c->stash(title => $title, modul => $modul, bugr_datas => \%bugr_datas);
# $c->render(template => 'bugreport');
}
};
# $c->render_file(
# 'filepath' => "$configreportfile",
# 'format' => 'x-download',
# 'content_disposition' => 'attachment',
# 'cleanup' => 1,
# );
# the following in this sub will not be used !!!
# $bugr_datas{'trt'} = 'DOWN';
# $c->stash(title => $title, modul => $modul, bugr_datas => \%bugr_datas);
# $c->render(template => 'bugreport');
} ## end if ($trt eq 'DOWN')
} ## end sub do_report
sub create_configuration_report { sub create_configuration_report {
my $c = shift; my $c = shift;
# TBD: possibly check $q for a boolean value eg. from a checkbox # TBD: possibly check $q for a boolean value eg. from a checkbox
# indicating the user has read privacy warning etc. # indicating the user has read privacy warning etc.
# create the reporting template # create the reporting template
my $configreport_template = Text::Template->new(TYPE => 'FILE', SOURCE => '/etc/e-smith/web/common/configuration_report.tmpl', UNTAINT => 1); my $configreport_template = Text::Template->new(
TYPE => 'FILE',
SOURCE => '/etc/e-smith/web/common/configuration_report.tmpl',
UNTAINT => 1
);
my $report_creation_time = gen_locale_date_string; my $report_creation_time = gen_locale_date_string;
# curent kernel # curent kernel
my $curkernel = `uname -r`; my $curkernel = `uname -r`;
# get additional RPMs # get additional RPMs
my @newrpms = `/sbin/e-smith/audittools/newrpms`; my @newrpms = `/sbin/e-smith/audittools/newrpms`;
# get additional Repositories # get additional Repositories
my @repositories = `/sbin/e-smith/audittools/repositories`; my @repositories = `/sbin/e-smith/audittools/repositories`;
#print @repositories;
#print @repositories;
# get templates # get templates
my @templates = `/sbin/e-smith/audittools/templates`; my @templates = `/sbin/e-smith/audittools/templates`;
# get events # get events
my @events = `/sbin/e-smith/audittools/events`; my @events = `/sbin/e-smith/audittools/events`;
# set template variables # set template variables
my %vars = (report_creation_time => \$report_creation_time, my %vars = (
releaseversion => \$releaseversion, report_creation_time => \$report_creation_time,
curkernel => \$curkernel, releaseversion => \$releaseversion,
systemmode => \$systemmode, curkernel => \$curkernel,
previoussystemmode => \$previoussystemmode, systemmode => \$systemmode,
newrpms => \@newrpms, previoussystemmode => \$previoussystemmode,
templates => \@templates, newrpms => \@newrpms,
events => \@events, templates => \@templates,
repositories => \@repositories, events => \@events,
); repositories => \@repositories,
);
# prcess template # prcess template
my $result = $configreport_template->fill_in(HASH => \%vars); my $result = $configreport_template->fill_in(HASH => \%vars);
# write processed template to file # write processed template to file
open (my $cfgrep, '>', $configreportfile) or die "Could not create temporary file for config report!"; open(my $cfgrep, '>', $configreportfile) or die "Could not create temporary file for config report!";
print $cfgrep $result; print $cfgrep $result;
close $cfgrep; close $cfgrep;
} } ## end sub create_configuration_report
sub show_config_report { sub show_config_report {
my $c = shift; my $c = shift;
my $out = ''; my $out = '';
$out .= sprintf "<PRE>"; $out .= sprintf "<PRE>";
open(my $cfgrep, '<', $configreportfile) or die "Could not find temporary config report file!";
open (my $cfgrep, '<', $configreportfile) or die "Could not find temporary config report file!";
while (<$cfgrep>) { while (<$cfgrep>) {
$out .= sprintf("%s", $_); $out .= sprintf("%s", $_);
} }
$out .= sprintf "</PRE>"; $out .= sprintf "</PRE>";
return $out; return $out;
} ## end sub show_config_report
}
sub download_config_report { sub download_config_report {
my $c = shift; my $c = shift;
$c->render_file( $c->render_file(
'filepath' => "$configreportfile", 'filepath' => "$configreportfile",
'format' => 'x-download', 'format' => 'x-download',
'content_disposition' => 'attachment', 'content_disposition' => 'attachment',
'cleanup' => 1, 'cleanup' => 1,
); );
} } ## end sub download_config_report
1; 1;

105
root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm
View File

@ -7,107 +7,84 @@ package SrvMngr::Controller::Clamav;
# #
# routes : end # routes : end
#------------------------------ #------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#package esmith::FormMagick::Panel::clamav; #package esmith::FormMagick::Panel::clamav;
our $db = esmith::ConfigDB->open() || die "Couldn't open config db"; our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %clm_datas = (); my %clm_datas = ();
my $title = $c->l('clm_FORM_TITLE'); my $title = $c->l('clm_FORM_TITLE');
my $modul = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD')); my $modul = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD'));
$clm_datas{'FilesystemScan'} = ($db->get_prop('clamav', 'FilesystemScan')) || 'disabled';
$clm_datas{'FilesystemScan'} = ($db->get_prop('clamav','FilesystemScan')) || 'disabled'; $clm_datas{'Quarantine'} = ($db->get_prop('clamav', 'Quarantine')) || 'disabled';
$clm_datas{'Quarantine'} = ($db->get_prop('clamav','Quarantine')) || 'disabled'; $clm_datas{'clam_versions'} = get_clam_versions();
$c->stash(title => $title, modul => $modul, clm_datas => \%clm_datas);
$clm_datas{'clam_versions'} = get_clam_versions();
$c->stash( title => $title, modul => $modul, clm_datas => \%clm_datas );
$c->render(template => 'clamav'); $c->render(template => 'clamav');
}; } ## end sub main
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $http_clamav_status = $c->param('http_clamav_status') || 'disabled'; my $http_clamav_status = $c->param('http_clamav_status') || 'disabled';
my $smtp_clamav_status = $c->param('smtp_clamav_status') || ''; my $smtp_clamav_status = $c->param('smtp_clamav_status') || '';
my $result = "";
my $result = "";
$c->change_settings(); $c->change_settings();
# Update the system # Update the system
system("/sbin/e-smith/signal-event clamav-update") == 0 system("/sbin/e-smith/signal-event clamav-update") == 0
or $result = $c->l('clm_ERROR_UPDATING_CONFIGURATION'); or $result = $c->l('clm_ERROR_UPDATING_CONFIGURATION');
if ( ! $result ) { if (!$result) {
$result = $c->l('clm_SUCCESS') ; $result = $c->l('clm_SUCCESS');
$c->flash( success => $result ); $c->flash(success => $result);
} else { } else {
$c->flash( error => $result ); $c->flash(error => $result);
} }
$c->redirect_to('/clamav'); $c->redirect_to('/clamav');
}; } ## end sub do_update
sub change_settings { sub change_settings {
my $c = shift; my $c = shift;
my $status = $c->param('status');
my $status = $c->param('status'); my $FilesystemScan = ($c->param('FilesystemScan') || 'disabled');
my $Quarantine = ($c->param('Quarantine') || 'disabled');
my $FilesystemScan = ( $c->param('FilesystemScan') || 'disabled' ); my $DatabaseMirror = ($c->param('DatabaseMirror') || 'db.us.clamav.net');
my $Quarantine = ( $c->param('Quarantine') || 'disabled' ); my $UpdateOfficeHrs = ($c->param('UpdateOfficeHrs') || 'disabled');
my $UpdateNonOfficeHrs = ($c->param('UpdateNonOfficeHrs') || 'disabled');
my $DatabaseMirror = ( $c->param('DatabaseMirror') || 'db.us.clamav.net' ); my $UpdateWeekend = ($c->param('UpdateWeekend') || 'disabled');
my $UpdateOfficeHrs = ( $c->param('UpdateOfficeHrs') || 'disabled' ); my $HTTPProxyServer = ($c->param('HTTPProxyServer') || '');
my $UpdateNonOfficeHrs = ( $c->param('UpdateNonOfficeHrs') || 'disabled' ); my $HTTPProxyPort = ($c->param('HTTPProxyPort') || '');
my $UpdateWeekend = ( $c->param('UpdateWeekend') || 'disabled' ); my $HTTPProxyUsername = ($c->param('HTTPProxyUsername') || '');
my $HTTPProxyPassword = ($c->param('HTTPProxyPassword') || '');
my $HTTPProxyServer = ( $c->param('HTTPProxyServer') || '' ); my $clamav = $db->get('clamav') || $db->new_record('clamav', { type => 'service' });
my $HTTPProxyPort = ( $c->param('HTTPProxyPort') || '' );
my $HTTPProxyUsername = ( $c->param('HTTPProxyUsername') || '' );
my $HTTPProxyPassword = ( $c->param('HTTPProxyPassword') || '' );
my $clamav = $db->get('clamav') || $db->new_record('clamav', {type=>'service'});
$status ||= $clamav->prop('status'); $status ||= $clamav->prop('status');
$clamav->merge_props( $clamav->merge_props(
status => $status, status => $status,
FilesystemScan => $FilesystemScan, FilesystemScan => $FilesystemScan,
Quarantine => $Quarantine, Quarantine => $Quarantine,
DatabaseMirror => $DatabaseMirror, DatabaseMirror => $DatabaseMirror,
UpdateOfficeHrs => $UpdateOfficeHrs, UpdateOfficeHrs => $UpdateOfficeHrs,
UpdateNonOfficeHrs => $UpdateNonOfficeHrs, UpdateNonOfficeHrs => $UpdateNonOfficeHrs,
UpdateWeekend => $UpdateWeekend, UpdateWeekend => $UpdateWeekend,
HTTPProxyServer => $HTTPProxyServer, HTTPProxyServer => $HTTPProxyServer,
HTTPProxyPort => $HTTPProxyPort, HTTPProxyPort => $HTTPProxyPort,
HTTPProxyUsername => $HTTPProxyUsername, HTTPProxyUsername => $HTTPProxyUsername,
HTTPProxyPassword => $HTTPProxyPassword, HTTPProxyPassword => $HTTPProxyPassword,
); );
} ## end sub change_settings
sub get_clam_versions {
}
sub get_clam_versions
{
my $version = `/usr/bin/freshclam -V`; my $version = `/usr/bin/freshclam -V`;
chomp $version; chomp $version;
$version =~ s/^ClamAV //; $version =~ s/^ClamAV //;
return $version; return $version;
} } ## end sub get_clam_versions
1; 1;

342
root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
View File

@ -4,191 +4,162 @@ package SrvMngr::Controller::Datetime;
# heading : System # heading : System
# description : Date and time # description : Date and time
# navigation : 4000 400 # navigation : 4000 400
# routes : end # routes : end
#------------------------------ #------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
use esmith::FormMagick; use esmith::FormMagick;
use esmith::util; use esmith::util;
our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %dat_datas = (); my %dat_datas = ();
my $title = $c->l('dat_FORM_TITLE'); my $title = $c->l('dat_FORM_TITLE');
my $modul = $c->l('dat_INITIAL_DESC'); my $modul = $c->l('dat_INITIAL_DESC');
$dat_datas{ntpstatus} = 'disabled'; $dat_datas{ntpstatus} = 'disabled';
my $rec = $cdb->get('ntpd'); my $rec = $cdb->get('ntpd');
if ($rec) { if ($rec) {
$dat_datas{'ntpserver'} = $rec->prop('NTPServer') || ''; $dat_datas{'ntpserver'} = $rec->prop('NTPServer') || '';
if ( $rec->prop('status') eq 'enabled' ) {
$dat_datas{ntpstatus} = 'enabled'
unless ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' and $dat_datas{ntpserver} =~ m#^\s*$#;
}
}
($dat_datas{weekday}, $dat_datas{monthname}, if ($rec->prop('status') eq 'enabled') {
$dat_datas{month}, $dat_datas{day}, $dat_datas{year}, $dat_datas{ntpstatus} = 'enabled'
$dat_datas{hour}, $dat_datas{minute}, $dat_datas{second}, unless ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' and $dat_datas{ntpserver} =~ m#^\s*$#;
$dat_datas{ampm}) = split /\|/, }
`/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`; } ## end if ($rec)
( $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month}, $dat_datas{day}, $dat_datas{year},
$dat_datas{hour}, $dat_datas{minute}, $dat_datas{second}, $dat_datas{ampm}
)
= split /\|/,
`/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
# get rid of trailing carriage return on last field # get rid of trailing carriage return on last field
chop ($dat_datas{ampm}); chop($dat_datas{ampm});
$dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string(); $dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string();
$c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
$c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas );
$c->render('datetime'); $c->render('datetime');
}; } ## end sub main
sub do_update { sub do_update {
my $c = shift;
my $c = shift;
my %dat_datas = (); my %dat_datas = ();
my $title = $c->l('dat_FORM_TITLE'); my $title = $c->l('dat_FORM_TITLE');
my $modul = $c->l('dat_INITIAL_DESC'); my $modul = $c->l('dat_INITIAL_DESC');
my $result; my $result;
my $success; my $success;
my $old_ntpstatus = $c->param('Old_ntpstatus'); my $old_ntpstatus = $c->param('Old_ntpstatus');
$dat_datas{ntpstatus} = $c->param('Ntpstatus'); $dat_datas{ntpstatus} = $c->param('Ntpstatus');
if ($dat_datas{ntpstatus} ne $old_ntpstatus) {
if ($dat_datas{ntpstatus} eq 'disabled') {
( $dat_datas{weekday}, $dat_datas{monthname}, $dat_datas{month},
$dat_datas{day}, $dat_datas{year}, $dat_datas{hour},
$dat_datas{minute}, $dat_datas{second}, $dat_datas{ampm}
)
= split /\|/,
`/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
if ( $dat_datas{ntpstatus} ne $old_ntpstatus) { # get rid of trailing carriage return on last field
chop($dat_datas{ampm});
} else {
$dat_datas{ntpserver} = ($cdb->get_prop('ntpd', 'NTPServer')) || '';
}
$dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
$c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
return $c->render('datetime');
} ## end if ($dat_datas{ntpstatus...})
if ( $dat_datas{ntpstatus} eq 'disabled' ) { if ($dat_datas{ntpstatus} eq 'enabled') {
($dat_datas{weekday},
$dat_datas{monthname},
$dat_datas{month},
$dat_datas{day},
$dat_datas{year},
$dat_datas{hour},
$dat_datas{minute},
$dat_datas{second},
$dat_datas{ampm}) = split /\|/,
`/bin/date '+%A|%B|%-m|%-d|%Y|%-I|%M|%S|%p'`;
# get rid of trailing carriage return on last field
chop ($dat_datas{ampm});
} else {
$dat_datas{ntpserver} = ($cdb->get_prop('ntpd','NTPServer')) || '';
}
$dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string();
$c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas );
return $c->render('datetime');
}
if ( $dat_datas{ntpstatus} eq 'enabled' ) {
# update ntpserver
# update ntpserver
$dat_datas{ntpserver} = $c->param('Ntpserver') || ''; $dat_datas{ntpserver} = $c->param('Ntpserver') || '';
if ( $dat_datas{ntpserver} eq "pool.ntp.org" ) { if ($dat_datas{ntpserver} eq "pool.ntp.org") {
$result .= $c->l('dat_INVALID_NTP_ADDR'); $result .= $c->l('dat_INVALID_NTP_ADDR');
} elsif ( $dat_datas{ntpserver} =~ /^([a-zA-Z0-9\.\-]+)$/ ) { } elsif ($dat_datas{ntpserver} =~ /^([a-zA-Z0-9\.\-]+)$/) {
$dat_datas{ntpserver} = $1; $dat_datas{ntpserver} = $1;
# } elsif ( $dat_datas{ntpserver} =~ /^\s*$/ ) {
# $dat_datas{ntpserver} = ""; # } elsif ( $dat_datas{ntpserver} =~ /^\s*$/ ) {
# $dat_datas{ntpserver} = "";
} else { } else {
$result .= $c->l('dat_INVALID_NTP_ADDR'); $result .= $c->l('dat_INVALID_NTP_ADDR');
} }
if ( ! $result ) { if (!$result) {
$success = update_ntpserver( $c, $dat_datas{ntpserver} ); $success = update_ntpserver($c, $dat_datas{ntpserver});
} }
} else { } else {
# set Locale time & clean ntpserver # set Locale time & clean ntpserver
#my $servername = ($c->param('ServerName') || 'WS');
if (!$result) {
$result = validate_change_datetime($c);
#my $servername = ($c->param('ServerName') || 'WS'); if ($result eq 'OK') {
if ( ! $result ) { $success = $c->l('dat_UPDATING_CLOCK');
$result = validate_change_datetime( $c ); $result = '';
if ( $result eq 'OK' ) { disable_ntp();
$success = $c->l('dat_UPDATING_CLOCK'); $success .= '<br>' . $c->l('dat_SERVER_DISABLED_DESC');
$result = ''; } ## end if ($result eq 'OK')
disable_ntp(); } ## end if (!$result)
$success .= '<br>'. $c->l('dat_SERVER_DISABLED_DESC'); } ## end else [ if ($dat_datas{ntpstatus...})]
}
}
}
if ($result) {
$c->stash(error => $result);
$c->stash(title => $title, modul => $modul, dat_datas => \%dat_datas);
return $c->render('datetime');
} ## end if ($result)
if ( $result ) {
$c->stash( error => $result );
$c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas );
return $c->render('datetime');
}
#$result = $c->l('dat_SUCCESS'); #$result = $c->l('dat_SUCCESS');
my $message = "'Datetime' update DONE"; my $message = "'Datetime' update DONE";
$c->app->log->info($message); $c->app->log->info($message);
$c->flash( success => $success ); $c->flash(success => $success);
$c->redirect_to('/datetime'); $c->redirect_to('/datetime');
}; } ## end sub do_update
sub validate_change_datetime { sub validate_change_datetime {
my $c = shift; my $c = shift;
#-------------------------------------------------- #--------------------------------------------------
# Untaint parameters and check for validity # Untaint parameters and check for validity
#-------------------------------------------------- #--------------------------------------------------
my $timezone = $c->param('Timezone');
my $timezone = $c->param ('Timezone');
if ($timezone =~ /^([\w\-]+\/?[\w\-+]*)$/) { if ($timezone =~ /^([\w\-]+\/?[\w\-+]*)$/) {
$timezone = $1; $timezone = $1;
} else { } else {
$timezone = "US/Eastern"; $timezone = "US/Eastern";
} }
my $month = $c->param('Month');
my $month = $c->param ('Month');
if ($month =~ /^(\d{1,2})$/) { if ($month =~ /^(\d{1,2})$/) {
$month = $1; $month = $1;
} else { } else {
$month = "1"; $month = "1";
} }
if (($month < 1) || ($month > 12)) {
return $c->l('dat_INVALID_MONTH')." $month. ". $c->l('dat_MONTH_BETWEEN_1_AND_12');
}
my $day = $c->param ('Day'); if (($month < 1) || ($month > 12)) {
return $c->l('dat_INVALID_MONTH') . " $month. " . $c->l('dat_MONTH_BETWEEN_1_AND_12');
}
my $day = $c->param('Day');
if ($day =~ /^(\d{1,2})$/) { if ($day =~ /^(\d{1,2})$/) {
$day = $1; $day = $1;
} else { } else {
$day = "1"; $day = "1";
} }
if (($day < 1) || ($day > 31)) {
return $c->l('dat_INVALID_DAY')." $day. ". $c->l('dat_BETWEEN_1_AND_31');
}
my $year = $c->param ('Year'); if (($day < 1) || ($day > 31)) {
return $c->l('dat_INVALID_DAY') . " $day. " . $c->l('dat_BETWEEN_1_AND_31');
}
my $year = $c->param('Year');
if ($year =~ /^(\d{4})$/) { if ($year =~ /^(\d{4})$/) {
$year = $1; $year = $1;
} else { } else {
@ -196,20 +167,21 @@ sub validate_change_datetime {
} }
if (($year < 1900) || ($year > 2200)) { if (($year < 1900) || ($year > 2200)) {
return $c->l('dat_INVALID_YEAR')." $year. ". $c->l('dat_FOUR_DIGIT_YEAR'); return $c->l('dat_INVALID_YEAR') . " $year. " . $c->l('dat_FOUR_DIGIT_YEAR');
} }
my $hour = $c->param('Hour');
my $hour = $c->param ('Hour');
if ($hour =~ /^(\d{1,2})$/) { if ($hour =~ /^(\d{1,2})$/) {
$hour = $1; $hour = $1;
} else { } else {
$hour = "12"; $hour = "12";
} }
if (($hour < 1) || ($hour > 12)) {
return $c->l('dat_INVALID_HOUR')." $hour. ". $c->l('dat_BETWEEN_1_AND_12');
}
my $minute = $c->param ('Minute'); if (($hour < 1) || ($hour > 12)) {
return $c->l('dat_INVALID_HOUR') . " $hour. " . $c->l('dat_BETWEEN_1_AND_12');
}
my $minute = $c->param('Minute');
if ($minute =~ /^(\d{1,2})$/) { if ($minute =~ /^(\d{1,2})$/) {
$minute = $1; $minute = $1;
} else { } else {
@ -217,10 +189,10 @@ sub validate_change_datetime {
} }
if (($minute < 0) || ($minute > 59)) { if (($minute < 0) || ($minute > 59)) {
return $c->l('datINVALID_MINUTE')." $minute. ".$c->l('dat_BETWEEN_0_AND_59'); return $c->l('datINVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59');
} }
my $second = $c->param('Second');
my $second = $c->param ('Second');
if ($second =~ /^(\d{1,2})$/) { if ($second =~ /^(\d{1,2})$/) {
$second = $1; $second = $1;
} else { } else {
@ -228,10 +200,10 @@ sub validate_change_datetime {
} }
if (($second < 0) || ($second > 59)) { if (($second < 0) || ($second > 59)) {
return $c->l('dat_INVALID_SECOND')." $second. ". $c->l('dat_BETWEEN_0_AND_59'); return $c->l('dat_INVALID_SECOND') . " $second. " . $c->l('dat_BETWEEN_0_AND_59');
} }
my $ampm = $c->param('Ampm');
my $ampm = $c->param ('Ampm');
if ($ampm =~ /^(AM|PM)$/) { if ($ampm =~ /^(AM|PM)$/) {
$ampm = $1; $ampm = $1;
} else { } else {
@ -239,8 +211,8 @@ sub validate_change_datetime {
} }
# convert to 24 hour time # convert to 24 hour time
$hour = $hour % 12; $hour = $hour % 12;
if ($ampm eq "PM") { if ($ampm eq "PM") {
$hour = $hour + 12; $hour = $hour + 12;
} }
@ -248,12 +220,12 @@ sub validate_change_datetime {
#-------------------------------------------------- #--------------------------------------------------
# Store time zone in configuration database # Store time zone in configuration database
#-------------------------------------------------- #--------------------------------------------------
my $conf = esmith::ConfigDB->open(); my $conf = esmith::ConfigDB->open();
my $old = $conf->get('UnsavedChanges')->value; my $old = $conf->get('UnsavedChanges')->value;
my $rec = $conf->get('TimeZone'); my $rec = $conf->get('TimeZone');
unless ($rec) { unless ($rec) {
$rec = $conf->new_record('TimeZone',undef); $rec = $conf->new_record('TimeZone', undef);
} }
$rec->set_value($timezone); $rec->set_value($timezone);
$conf->get('UnsavedChanges')->set_value($old); $conf->get('UnsavedChanges')->set_value($old);
@ -262,71 +234,56 @@ sub validate_change_datetime {
# Signal event to change time zone, system time # Signal event to change time zone, system time
# and hardware clock # and hardware clock
#-------------------------------------------------- #--------------------------------------------------
my $newdate = sprintf "%02d%02d%02d%02d%04d.%02d", $month, $day, $hour, $minute, $year, $second;
my $newdate = sprintf "%02d%02d%02d%02d%04d.%02d", esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timezone-update", $newdate);
$month, $day, $hour, $minute, $year, $second;
esmith::util::backgroundCommand(2,
"/sbin/e-smith/signal-event","timezone-update",$newdate);
return 'OK'; return 'OK';
} } ## end sub validate_change_datetime
sub update_ntpserver { sub update_ntpserver {
my $c = shift;
my $c = shift;
my $ntpserver = shift; my $ntpserver = shift;
my $msg; my $msg;
#------------------------------------------------------------
# Looks good; go ahead and change the parameters.
#------------------------------------------------------------
#------------------------------------------------------------
# Looks good; go ahead and change the parameters.
#------------------------------------------------------------
my $old = $cdb->get('UnsavedChanges')->value; my $old = $cdb->get('UnsavedChanges')->value;
my $rec = $cdb->get('ntpd'); my $rec = $cdb->get('ntpd');
if ($rec) { if ($rec) {
$rec->set_prop('status','enabled'); $rec->set_prop('status', 'enabled');
$rec->set_prop('NTPServer',$ntpserver); $rec->set_prop('NTPServer', $ntpserver);
} else { } else {
$rec = $cdb->new_record( 'ntpd', $rec = $cdb->new_record('ntpd',
{ type=>'service', status=>'enabled', SyncToHWClockSupported => 'yes', NTPServer=>$ntpserver } ); { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => $ntpserver });
} }
$cdb->get('UnsavedChanges')->set_value($old); $cdb->get('UnsavedChanges')->set_value($old);
$msg = $c->l('dat_SETTINGS_CHANGED'); $msg = $c->l('dat_SETTINGS_CHANGED');
if ( $ntpserver =~ /^\s*$/ ) { if ($ntpserver =~ /^\s*$/) {
$rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled'); $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
$rec->set_prop('NTPServer', ''); $rec->set_prop('NTPServer', '');
$msg = $c->l('dat_INVALID_NTP_SERVER') if ($rec->prop('SyncToHWClockSupported') || 'yes') ne 'yes'; $msg = $c->l('dat_INVALID_NTP_SERVER') if ($rec->prop('SyncToHWClockSupported') || 'yes') ne 'yes';
} } ## end if ($ntpserver =~ /^\s*$/)
esmith::util::backgroundCommand(2, "/sbin/e-smith/signal-event", "timeserver-update");
esmith::util::backgroundCommand( 2, "/sbin/e-smith/signal-event", "timeserver-update" );
return $msg; return $msg;
} } ## end sub update_ntpserver
sub disable_ntp { sub disable_ntp {
# make sure that the parameters are set for disabled # make sure that the parameters are set for disabled
my $old = $cdb->get('UnsavedChanges')->value; my $old = $cdb->get('UnsavedChanges')->value;
my $rec = $cdb->get('ntpd'); my $rec = $cdb->get('ntpd');
if ($rec) { if ($rec) {
$rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled'); $rec->set_prop('status', ($rec->prop('SyncToHWClockSupported') || 'yes') eq 'yes' ? 'enabled' : 'disabled');
$rec->set_prop('NTPServer',''); $rec->set_prop('NTPServer', '');
} else { } else {
$rec = $cdb->new_record('ntpd', $rec = $cdb->new_record('ntpd',
{type=>'service', status=>'enabled', SyncToHWClockSupported => 'yes', NTPServer=>''}); { type => 'service', status => 'enabled', SyncToHWClockSupported => 'yes', NTPServer => '' });
} }
$cdb->get('UnsavedChanges')->set_value($old); $cdb->get('UnsavedChanges')->set_value($old);
} ## end sub disable_ntp
}
sub getTimezone { sub getTimezone {
@ -336,69 +293,64 @@ sub getTimezone {
# If that is not defined, try and get it from /etc/localtime. # If that is not defined, try and get it from /etc/localtime.
# If that doesn't work, default to US/Eastern. # If that doesn't work, default to US/Eastern.
#-------------------------------------------------- #--------------------------------------------------
my $localtime; my $localtime;
my $timezonedefault = "US/Eastern"; my $timezonedefault = "US/Eastern";
if (defined $cdb->get('TimeZone')) { if (defined $cdb->get('TimeZone')) {
$timezonedefault = $cdb->get('TimeZone')->value; $timezonedefault = $cdb->get('TimeZone')->value;
} else { } else {
if (defined ($localtime = readlink '/etc/localtime')) {
my $pos = index $localtime, 'zoneinfo/';
if ( $pos > -1 ) {
$timezonedefault = substr $localtime, ($pos + 9);
}
}
}
return $timezonedefault;
}
if (defined($localtime = readlink '/etc/localtime')) {
my $pos = index $localtime, 'zoneinfo/';
if ($pos > -1) {
$timezonedefault = substr $localtime, ($pos + 9);
}
} ## end if (defined($localtime...))
} ## end else [ if (defined $cdb->get(...))]
return $timezonedefault;
} ## end sub getTimezone
sub getZone_list { sub getZone_list {
my $c = shift; my $c = shift;
#-------------------------------------------------- #--------------------------------------------------
# Get a sorted list of time zones # Get a sorted list of time zones
#-------------------------------------------------- #--------------------------------------------------
$ENV{BASH_ENV} = ''; $ENV{BASH_ENV} = '';
if (! open (ZONES, "cd /usr/share/zoneinfo; /usr/bin/find . -type f -or -type l | /bin/grep '^./[A-Z]' |"))
{ if (!open(ZONES, "cd /usr/share/zoneinfo; /usr/bin/find . -type f -or -type l | /bin/grep '^./[A-Z]' |")) {
warn ( $c->l('COULD_NOT_OPEN_TZ_FILE').$!.'.' ); warn($c->l('COULD_NOT_OPEN_TZ_FILE') . $! . '.');
return undef; return undef;
} }
my $zone; my $zone;
my @zones = (); my @zones = ();
while (defined ($zone = <ZONES>)) while (defined($zone = <ZONES>)) {
{ chop($zone);
chop ($zone);
$zone =~ s/^.\///; $zone =~ s/^.\///;
push @zones, $zone; push @zones, $zone;
} } ## end while (defined($zone = <ZONES>...))
close ZONES; close ZONES;
my @zt = sort @zones; my @zt = sort @zones;
return \@zt; return \@zt;
} } ## end sub getZone_list
sub getMonth_list { sub getMonth_list {
my $c = shift; my $c = shift;
return [[ $c->l('dat_JANUARY') => '1'], return [
[ $c->l('dat_FEBRUARY') => '2'], [ $c->l('dat_JANUARY') => '1' ],
[ $c->l('dat_MARCH') => '3'], [ $c->l('dat_FEBRUARY') => '2' ],
[ $c->l('dat_APRIL') => '4'], [ $c->l('dat_MARCH') => '3' ],
[ $c->l('dat_MAY') => '5'], [ $c->l('dat_APRIL') => '4' ],
[ $c->l('dat_JUNE') => '6'], [ $c->l('dat_MAY') => '5' ],
[ $c->l('dat_JULY') => '7'], [ $c->l('dat_JUNE') => '6' ],
[ $c->l('dat_AUGUST') => '8'], [ $c->l('dat_JULY') => '7' ],
[ $c->l('dat_SEPTEMBER') => '9'], [ $c->l('dat_AUGUST') => '8' ],
[ $c->l('dat_OCTOBER') => '10'], [ $c->l('dat_SEPTEMBER') => '9' ],
[ $c->l('dat_NOVEMBER') => '11'], [ $c->l('dat_OCTOBER') => '10' ],
[ $c->l('dat_DECEMBER') => '12']]; [ $c->l('dat_NOVEMBER') => '11' ],
} [ $c->l('dat_DECEMBER') => '12' ]
];
} ## end sub getMonth_list
1; 1;

97
root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm
View File

@ -7,91 +7,72 @@ package SrvMngr::Controller::Directory;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use esmith::util qw(ldapBase); #use esmith::util qw(ldapBase);
use esmith::FormMagick::Panel::directory; use esmith::FormMagick::Panel::directory;
our $db = esmith::ConfigDB->open() || die "Couldn't open config db"; our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %dir_datas = (); my %dir_datas = ();
my $title = $c->l('dir_FORM_TITLE'); my $title = $c->l('dir_FORM_TITLE');
my $modul = $c->render_to_string(inline => $c->l('dir_DESCRIPTION')); my $modul = $c->render_to_string(inline => $c->l('dir_DESCRIPTION'));
$dir_datas{'root'} = get_ldap_base();
$dir_datas{'root'} = get_ldap_base(); $dir_datas{'access'} = ($db->get_prop('ldap', 'access')) || 'private';
$dir_datas{'department'} = ($db->get_prop('ldap', 'defaultDepartment')) || '';
$dir_datas{'access'} = ($db->get_prop('ldap','access')) || 'private'; $dir_datas{'company'} = ($db->get_prop('ldap', 'defaultCompany')) || '';
$dir_datas{'department'} = ($db->get_prop('ldap','defaultDepartment')) || ''; $dir_datas{'street'} = ($db->get_prop('ldap', 'defaultStreet')) || '';
$dir_datas{'company'} = ($db->get_prop('ldap','defaultCompany')) || ''; $dir_datas{'city'} = ($db->get_prop('ldap', 'defaultCity')) || '';
$dir_datas{'street'} = ($db->get_prop('ldap','defaultStreet')) || ''; $dir_datas{'phonenumber'} = ($db->get_prop('ldap', 'defaultPhoneNumber')) || '';
$dir_datas{'city'} = ($db->get_prop('ldap','defaultCity')) || ''; $c->stash(title => $title, modul => $modul, dir_datas => \%dir_datas);
$dir_datas{'phonenumber'} = ($db->get_prop('ldap','defaultPhoneNumber')) || '';
$c->stash( title => $title, modul => $modul, dir_datas => \%dir_datas );
$c->render(template => 'directory'); $c->render(template => 'directory');
}; } ## end sub main
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $access = $c->param('access');
my $access = $c->param('access'); my $department = $c->param('department');
my $department = $c->param('department'); my $company = $c->param('company');
my $company = $c->param('company'); my $street = $c->param('street');
my $street = $c->param('street'); my $city = $c->param('city');
my $city = $c->param('city');
my $phonenumber = $c->param('phonenumber'); my $phonenumber = $c->param('phonenumber');
my $existing = $c->param('existing'); my $existing = $c->param('existing');
my $result = "";
my $result = ""; $db->get('ldap')->set_prop('access', $access);
$db->get('ldap')->set_prop('defaultDepartment', $department);
$db->get('ldap')->set_prop('access', $access); $db->get('ldap')->set_prop('defaultCompany', $company);
$db->get('ldap')->set_prop('defaultDepartment', $department); $db->get('ldap')->set_prop('defaultStreet', $street);
$db->get('ldap')->set_prop('defaultCompany', $company); $db->get('ldap')->set_prop('defaultCity', $city);
$db->get('ldap')->set_prop('defaultStreet', $street);
$db->get('ldap')->set_prop('defaultCity', $city);
$db->get('ldap')->set_prop('defaultPhoneNumber', $phonenumber); $db->get('ldap')->set_prop('defaultPhoneNumber', $phonenumber);
if ($existing eq 'update') { if ($existing eq 'update') {
my $ac = esmith::AccountsDB->open() || die "Couldn't open accounts db"; my $ac = esmith::AccountsDB->open() || die "Couldn't open accounts db";
my @users = $ac->users(); my @users = $ac->users();
foreach my $user (@users) { foreach my $user (@users) {
$user->set_prop('Phone', $phonenumber); $user->set_prop('Phone', $phonenumber);
$user->set_prop('Company', $company); $user->set_prop('Company', $company);
$user->set_prop('Dept', $department); $user->set_prop('Dept', $department);
$user->set_prop('City', $city); $user->set_prop('City', $city);
$user->set_prop('Street', $street); $user->set_prop('Street', $street);
} } ## end foreach my $user (@users)
} } ## end if ($existing eq 'update')
# #
# Update the system # Update the system
# #
system("/sbin/e-smith/signal-event ldap-update") == 0
system ("/sbin/e-smith/signal-event ldap-update") == 0 or $result = $c->l('ERROR_UPDATING_CONFIGURATION');
or $result = $c->l('ERROR_UPDATING_CONFIGURATION');
my $title = $c->l('dir_FORM_TITLE'); my $title = $c->l('dir_FORM_TITLE');
if ($result eq '') { $result = $c->l('dir_SUCCESS'); }
if ( $result eq '' ) { $result = $c->l('dir_SUCCESS'); } $c->stash(title => $title, modul => $result);
$c->stash( title => $title, modul => $result );
$c->render(template => 'module'); $c->render(template => 'module');
} ## end sub do_update
};
1; 1;

523
root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm
View File

@ -10,493 +10,412 @@ package SrvMngr::Controller::Domains;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use Data::Dumper; #use Data::Dumper;
#use esmith::FormMagick::Panel::domains; #use esmith::FormMagick::Panel::domains;
use esmith::DomainsDB; use esmith::DomainsDB;
use esmith::AccountsDB; use esmith::AccountsDB;
#use URI::Escape; #use URI::Escape;
our $ddb = esmith::DomainsDB->open || die "Couldn't open domains db";
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
our $ddb = esmith::DomainsDB->open || die "Couldn't open domains db";
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db"; our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+); our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %dom_datas = (); my %dom_datas = ();
my $title = $c->l('dom_FORM_TITLE'); my $title = $c->l('dom_FORM_TITLE');
$dom_datas{trt} = 'LST'; $dom_datas{trt} = 'LST';
my @domains; my @domains;
for ($ddb->domains())
{ for ($ddb->domains()) {
my $ns = $_->prop('Nameservers') || 'internet'; my $ns = $_->prop('Nameservers') || 'internet';
push @domains,
push @domains, {
{ Domain => $_->key, $_->props, Domain => $_->key,
Nameservers => $ns, $_->props,
} Nameservers => $ns,
} };
$dom_datas{forwarder} = $cdb->get_prop('dnscache', 'Forwarder'); } ## end for ($ddb->domains())
$dom_datas{forwarder2} = $cdb->get_prop('dnscache', 'Forwarder2') || ''; $dom_datas{forwarder} = $cdb->get_prop('dnscache', 'Forwarder');
$dom_datas{forwarder2} = $cdb->get_prop('dnscache', 'Forwarder2') || '';
$c->stash( title => $title, dom_datas => \%dom_datas, domains => \@domains ); $c->stash(title => $title, dom_datas => \%dom_datas, domains => \@domains);
$c->render(template => 'domains'); $c->render(template => 'domains');
} ## end sub main
};
sub do_display { sub do_display {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = $c->param('trt');
my $trt = $c->param('trt');
my $domain = $c->param('Domain') || ''; my $domain = $c->param('Domain') || '';
#$trt = 'DEL' if ( $rt eq 'domaindel1' ); #$trt = 'DEL' if ( $rt eq 'domaindel1' );
#$trt = 'UPD' if ( $rt eq 'domainupd1' ); #$trt = 'UPD' if ( $rt eq 'domainupd1' );
#$trt = 'UP2' if ( $rt eq 'domainup21' ); #$trt = 'UP2' if ( $rt eq 'domainup21' );
#$trt = 'ADD' if ( $rt eq 'domainadd1' ); #$trt = 'ADD' if ( $rt eq 'domainadd1' );
my %dom_datas = (); my %dom_datas = ();
my $title = $c->l('dom_FORM_TITLE'); my $title = $c->l('dom_FORM_TITLE');
my $result = ''; my $result = '';
$dom_datas{'trt'} = $trt; $dom_datas{'trt'} = $trt;
if ( $trt ne 'ADD' and $trt ne 'UPD' and $trt ne 'UP2' and $trt ne 'DEL' ) {
$result = "Trt unknown ( $trt ) !"
}
if ( $trt eq 'ADD' ) { if ($trt ne 'ADD' and $trt ne 'UPD' and $trt ne 'UP2' and $trt ne 'DEL') {
#nothing $result = "Trt unknown ( $trt ) !";
}
if ( $trt eq 'UPD' ) {
my $rec = $ddb->get($domain);
if ( $rec ) {
$dom_datas{domain} = $domain;
$dom_datas{description} = $rec->prop('Description') || '';
$dom_datas{content} = $rec->prop('Content') || '';
$dom_datas{nameservers} = $rec->prop('Nameservers') || 'internet';
} else {
$result = "Domain $domain not found !"
}
}
if ( $trt eq 'UP2' ) {
$dom_datas{forwarder} = $cdb->get_prop('dnscache', 'Forwarder') || '';
$dom_datas{forwarder2} = $cdb->get_prop('dnscache', 'Forwarder2') || '';
}
if ( $trt eq 'DEL' ) {
my $rec = $ddb->get($domain);
if ( $rec ) {
$dom_datas{domain} = $domain;
$dom_datas{description} = $rec->prop('Description') || '';
}
}
if ( $trt eq 'LST' ) {
my @domains;
if ($adb) {
@domains = $ddb->domains();
}
$c->stash( domains => \@domains );
}
if ( ! $result ) {
$c->stash( error => $result );
} }
$c->stash( title => $title, dom_datas => \%dom_datas );
$c->render( template => 'domains' );
}; if ($trt eq 'ADD') {
#nothing
}
if ($trt eq 'UPD') {
my $rec = $ddb->get($domain);
if ($rec) {
$dom_datas{domain} = $domain;
$dom_datas{description} = $rec->prop('Description') || '';
$dom_datas{content} = $rec->prop('Content') || '';
$dom_datas{nameservers} = $rec->prop('Nameservers') || 'internet';
} else {
$result = "Domain $domain not found !";
}
} ## end if ($trt eq 'UPD')
if ($trt eq 'UP2') {
$dom_datas{forwarder} = $cdb->get_prop('dnscache', 'Forwarder') || '';
$dom_datas{forwarder2} = $cdb->get_prop('dnscache', 'Forwarder2') || '';
}
if ($trt eq 'DEL') {
my $rec = $ddb->get($domain);
if ($rec) {
$dom_datas{domain} = $domain;
$dom_datas{description} = $rec->prop('Description') || '';
}
} ## end if ($trt eq 'DEL')
if ($trt eq 'LST') {
my @domains;
if ($adb) {
@domains = $ddb->domains();
}
$c->stash(domains => \@domains);
} ## end if ($trt eq 'LST')
if (!$result) {
$c->stash(error => $result);
}
$c->stash(title => $title, dom_datas => \%dom_datas);
$c->render(template => 'domains');
} ## end sub do_display
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = $c->param('trt');
my $trt = $c->param('trt');
my %dom_datas = (); my %dom_datas = ();
my ($res, $result) = ''; my ($res, $result) = '';
#my $domain = uri_unescape($c->param('domain')); #my $domain = uri_unescape($c->param('domain'));
my $domain = $c->param('Domain'); my $domain = $c->param('Domain');
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
my $account = $c->param('Account'); my $account = $c->param('Account');
# controls (validate ?????) # controls (validate ?????)
#? validate_new_domain_name( $c, $domain, $account ); #? validate_new_domain_name( $c, $domain, $account );
#$result .= $res unless $res eq 'OK'; #$result .= $res unless $res eq 'OK';
#$result .= ' blocked';
$res = '';
#$result .= ' blocked'; if (!$result) {
$res = $c->create_modify_domain('create', $domain);
$res = ''; $result .= $res unless $res eq 'OK';
if ( ! $result ) { }
$res = $c->create_modify_domain( 'create', $domain );
$result .= $res unless $res eq 'OK';
}
if ( ! $result ) {
$result = $c->l('dom_SUCCESSFULLY_CREATED') . " $domain";
}
}
if ( $trt eq 'UPD' ) { if (!$result) {
$result = $c->l('dom_SUCCESSFULLY_CREATED') . " $domain";
}
} ## end if ($trt eq 'ADD')
if ($trt eq 'UPD') {
my $description = $c->param('Description'); my $description = $c->param('Description');
my $content = $c->param('Content'); my $content = $c->param('Content');
my $nameservers = $c->param('Nameservers'); my $nameservers = $c->param('Nameservers');
# controls # controls
#$res = validate_description( $c, $account ); #$res = validate_description( $c, $account );
#$result .= $res unless $res eq 'OK'; #$result .= $res unless $res eq 'OK';
#$result .= 'blocked';
$res = '';
#$result .= 'blocked'; if (!$result) {
$res = $c->create_modify_domain('modify', $domain);
$result .= $res unless $res eq 'OK';
}
$res = ''; if (!$result) {
if ( ! $result ) { $result = $c->l('dom_SUCCESSFULLY_MODIFIED') . " $domain";
$res = $c->create_modify_domain( 'modify', $domain ); }
$result .= $res unless $res eq 'OK'; } ## end if ($trt eq 'UPD')
}
if ( ! $result ) { if ($trt eq 'UP2') {
$result = $c->l('dom_SUCCESSFULLY_MODIFIED') . " $domain"; my $forwarder = $c->param('Forwarder');
}
}
if ( $trt eq 'UP2' ) {
my $forwarder = $c->param('Forwarder');
my $forwarder2 = $c->param('Forwarder2'); my $forwarder2 = $c->param('Forwarder2');
# controls # controls
$res = $c->ip_number_or_blank($forwarder);
$result .= $res unless $res eq 'OK';
$res = $c->ip_number_or_blank($forwarder2);
$result .= $res unless $res eq 'OK';
$res = $c->ip_number_or_blank( $forwarder ); #$result .= 'blocked';
$result .= $res unless $res eq 'OK'; $res = '';
$res = $c->ip_number_or_blank( $forwarder2 ); if (!$result) {
$result .= $res unless $res eq 'OK'; $res = $c->modify_dns($forwarder, $forwarder2);
$result .= $res unless $res eq 'OK';
#$result .= 'blocked'; }
$res = '';
if ( ! $result ) {
$res = $c->modify_dns( $forwarder, $forwarder2 );
$result .= $res unless $res eq 'OK';
}
if ( ! $result ) {
$result = $c->l('SUCCESS') . " $forwarder $forwarder2";
}
}
if (!$result) {
$result = $c->l('SUCCESS') . " $forwarder $forwarder2";
}
} ## end if ($trt eq 'UP2')
if ( $trt eq 'DEL' ) { if ($trt eq 'DEL') {
# controls # controls
#$res = validate_is_domain($c, $domain); #$res = validate_is_domain($c, $domain);
#$result .= $res unless $res eq 'OK'; #$result .= $res unless $res eq 'OK';
#$result .= 'blocked';
#$result .= 'blocked'; $res = '';
$res = ''; if (!$result) {
if ( ! $result ) { $res = $c->delete_domain($domain);
$res = $c->delete_domain( $domain ); $result .= $res unless $res eq 'OK';
$result .= $res unless $res eq 'OK'; }
}
if ( ! $result ) { if (!$result) {
$result = $c->l('dom_SUCCESSFULLY_DELETED') . " $domain"; $result = $c->l('dom_SUCCESSFULLY_DELETED') . " $domain";
} }
} } ## end if ($trt eq 'DEL')
# common parts # common parts
if ($res ne 'OK') { if ($res ne 'OK') {
my $title = $c->l('dom_FORM_TITLE'); my $title = $c->l('dom_FORM_TITLE');
$dom_datas{'domain'} = $domain; $dom_datas{'domain'} = $domain;
$dom_datas{'trt'} = $trt; $dom_datas{'trt'} = $trt;
$c->stash(error => $result . "($res)");
$c->stash( error => $result . "($res)" ); $c->stash(title => $title, dom_datas => \%dom_datas);
$c->stash( title => $title, dom_datas => \%dom_datas ); return $c->render('domains');
return $c->render( 'domains' ); } ## end if ($res ne 'OK')
}
my $message = "'Domains' updates ($trt) DONE"; my $message = "'Domains' updates ($trt) DONE";
$c->app->log->info($message); $c->app->log->info($message);
$c->flash(success => $result);
$c->flash( success => $result );
$c->redirect_to('/domains'); $c->redirect_to('/domains');
} ## end sub do_update
};
sub create_modify_domain { sub create_modify_domain {
my ($c, $action, $domain) = @_; my ($c, $action, $domain) = @_;
$domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); $domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/);
unless ($domain) {
return ($c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN'
: 'dom_ERROR_MODIFYING_DOMAIN') . ' Ctl');
}
unless ($domain) {
return (
$c->l(
$action eq 'create'
? 'dom_ERROR_CREATING_DOMAIN'
: 'dom_ERROR_MODIFYING_DOMAIN'
)
. ' Ctl'
);
} ## end unless ($domain)
my $rec = $ddb->get($domain); my $rec = $ddb->get($domain);
if ($rec and $action eq 'create') { if ($rec and $action eq 'create') {
return $c->l('dom_DOMAIN_IN_USE_ERROR'); return $c->l('dom_DOMAIN_IN_USE_ERROR');
} }
if (not $rec and $action eq 'modify') { if (not $rec and $action eq 'modify') {
return $c->l('dom_NONEXISTENT_DOMAIN_ERROR'); return $c->l('dom_NONEXISTENT_DOMAIN_ERROR');
} }
$rec ||= $ddb->new_record($domain, { type => 'domain' }); $rec ||= $ddb->new_record($domain, { type => 'domain' });
my %props; my %props;
$props{$_} = $c->param($_) for ( qw(Content Description Nameservers) ); $props{$_} = $c->param($_) for (qw(Content Description Nameservers));
$rec->merge_props(%props); $rec->merge_props(%props);
if ( system( "/sbin/e-smith/signal-event", if (system("/sbin/e-smith/signal-event", "domain-$action", "$domain") != 0) {
"domain-$action", "$domain" ) != 0 ) { return (
return ($c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' $c->l(
: 'dom_ERROR_MODIFYING_DOMAIN') . " Exe $action"); $action eq 'create'
} ? 'dom_ERROR_CREATING_DOMAIN'
: 'dom_ERROR_MODIFYING_DOMAIN'
)
. " Exe $action"
);
} ## end if (system("/sbin/e-smith/signal-event"...))
return 'OK'; return 'OK';
} } ## end sub create_modify_domain
sub delete_domain { sub delete_domain {
my ($c, $domain) = @_; my ($c, $domain) = @_;
$domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); $domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/);
return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . ' Ctl') unless ($domain); return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . ' Ctl') unless ($domain);
my $rec = $ddb->get($domain); my $rec = $ddb->get($domain);
return ($c->l('dom_NONEXISTENT_DOMAIN_ERROR')) if (not $rec); return ($c->l('dom_NONEXISTENT_DOMAIN_ERROR')) if (not $rec);
$rec->set_prop('type', 'domain-deleted'); $rec->set_prop('type', 'domain-deleted');
if (system("/sbin/e-smith/signal-event", "domain-delete", "$domain") != 0) { if (system("/sbin/e-smith/signal-event", "domain-delete", "$domain") != 0) {
return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . 'Exe'); return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . 'Exe');
} }
$rec->delete; $rec->delete;
return 'OK'; return 'OK';
} } ## end sub delete_domain
sub modify_dns { sub modify_dns {
my ($c, $forwarder, $forwarder2) = @_; my ($c, $forwarder, $forwarder2) = @_;
my $dnscache = $cdb->get('dnscache'); my $dnscache = $cdb->get('dnscache');
($forwarder, $forwarder2) = ($forwarder2, '') ($forwarder, $forwarder2) = ($forwarder2, '')
if ($forwarder2 and not $forwarder); if ($forwarder2 and not $forwarder);
if ($forwarder) { if ($forwarder) {
$dnscache->set_prop('Forwarder', $forwarder); $dnscache->set_prop('Forwarder', $forwarder);
} else { } else {
$dnscache->delete_prop('Forwarder'); $dnscache->delete_prop('Forwarder');
}
if ($forwarder2) {
$dnscache->set_prop('Forwarder2', $forwarder2);
} else {
$dnscache->delete_prop('Forwarder2');
} }
unless ( system( "/sbin/e-smith/signal-event", "dns-update" ) == 0 ) if ($forwarder2) {
{ $dnscache->set_prop('Forwarder2', $forwarder2);
} else {
$dnscache->delete_prop('Forwarder2');
}
unless (system("/sbin/e-smith/signal-event", "dns-update") == 0) {
return $c->l('dom_ERROR_UPDATING'); return $c->l('dom_ERROR_UPDATING');
} }
return 'OK'; return 'OK';
} } ## end sub modify_dns
sub existing_accounts_list { sub existing_accounts_list {
my $c = shift; my $c = shift;
my @existingAccounts = ([ 'Administrator' => 'admin' ]);
my @existingAccounts = ( ['Administrator' => 'admin']);
foreach my $a ($adb->get_all) { foreach my $a ($adb->get_all) {
if ($a->prop('type') =~ /(user|group)/) { if ($a->prop('type') =~ /(user|group)/) {
push @existingAccounts, [ $a->key => $a->key ]; push @existingAccounts, [ $a->key => $a->key ];
} }
if ($a->prop('type') eq "domain") { if ($a->prop('type') eq "domain") {
my $target = $adb->get($a->prop('Account')); my $target = $adb->get($a->prop('Account'));
unless ($target) unless ($target) {
{ warn "WARNING: domain (" . $a->key . ") => missing Account(" . $a->prop('Account') . ")\n";
warn "WARNING: domain (" . $a->key . ") => missing Account("
. $a->prop('Account') . ")\n";
next; next;
} }
push @existingAccounts, [ $a->key, $a->key ] push @existingAccounts, [ $a->key, $a->key ]
unless ($target->prop('type') eq "domain"); unless ($target->prop('type') eq "domain");
} } ## end if ($a->prop('type') eq...)
} } ## end foreach my $a ($adb->get_all)
return (\@existingAccounts);
return(\@existingAccounts); } ## end sub existing_accounts_list
}
sub content_options_list { sub content_options_list {
my $c = shift; my $c = shift;
my @options = ([ $c->l('dom_PRIMARY_SITE') => 'Primary' ]);
my @options = ( [ $c->l('dom_PRIMARY_SITE') => 'Primary' ]);
foreach ($adb->ibays) { foreach ($adb->ibays) {
push @options, [ $_->prop('Name') => $_->key ] push @options, [ $_->prop('Name') => $_->key ]
if ($_->key ne 'Primary'); if ($_->key ne 'Primary');
} }
return \@options;
} ## end sub content_options_list
return \@options sub get_content_value {
} my $c = shift;
sub get_content_value
{
my $c = shift;
my $domain = shift; my $domain = shift;
return $domain ? $ddb->get_prop($domain, 'Content') : 'Primary'; return $domain ? $ddb->get_prop($domain, 'Content') : 'Primary';
} } ## end sub get_content_value
sub get_description_value {
sub get_description_value
{
my $c = shift; my $c = shift;
my $domain = $c->param('Domain') || undef; my $domain = $c->param('Domain') || undef;
return $ddb->get_prop($domain, 'Description'); return $ddb->get_prop($domain, 'Description');
} } ## end sub get_description_value
sub nameserver_options_list { sub nameserver_options_list {
my $c = shift;
my $c = shift;
my $domain = $c->param('Domain') || undef; my $domain = $c->param('Domain') || undef;
my @opts = qw(localhost internet);
my @opts = qw(localhost internet);
push @opts, 'corporate' if ($cdb->get_prop('dnscache', 'Forwarder')); push @opts, 'corporate' if ($cdb->get_prop('dnscache', 'Forwarder'));
my $ns = ($ddb->get_prop($domain, 'Nameservers') || 'internet'); my $ns = ($ddb->get_prop($domain, 'Nameservers') || 'internet');
push @opts, $ns unless scalar grep { /^$ns$/ } @opts; push @opts, $ns unless scalar grep {/^$ns$/} @opts;
my @options; my @options;
foreach (@opts) { foreach (@opts) {
push @options, [ $c->l( "dom_$_" ) => $_ ]; push @options, [ $c->l("dom_$_") => $_ ];
} }
return \@options; return \@options;
} } ## end sub nameserver_options_list
sub get_nameserver_value { sub get_nameserver_value {
my $c = shift; my $c = shift;
my $domain = $c->param('Domain') || undef; my $domain = $c->param('Domain') || undef;
return ($ddb->get_prop($domain, 'Nameservers') || 'internet'); return ($ddb->get_prop($domain, 'Nameservers') || 'internet');
} } ## end sub get_nameserver_value
sub validate_Domain {
sub validate_Domain my $c = shift;
{
my $c = shift;
my $domain = lc shift; my $domain = lc shift;
return ($domain =~ /^($REGEXP_DOMAIN)$/)
? 'OK'
: 'DOMAIN_NAME_VALIDATION_ERROR';
} ## end sub validate_Domain
return ($domain =~ /^($REGEXP_DOMAIN)$/) ? 'OK' : sub validate_Description {
'DOMAIN_NAME_VALIDATION_ERROR';
}
sub validate_Description
{
# XXX - FIXME - NOTREACHED # XXX - FIXME - NOTREACHED
# We used to use the Description in the Appletalk volume name # We used to use the Description in the Appletalk volume name
# which meant it needed validation. I don't see any reason to # which meant it needed validation. I don't see any reason to
# do this any more # do this any more
my $c = shift;
my $c = shift;
my $description = shift; my $description = shift;
return ($description =~ /^([\-\'\w][\-\'\w\s\.]*)$/)
return ($description =~ /^([\-\'\w][\-\'\w\s\.]*)$/) ? 'OK' : ? 'OK'
'DOMAIN_DESCRIPTION_VALIDATION_ERROR'; : 'DOMAIN_DESCRIPTION_VALIDATION_ERROR';
} } ## end sub validate_Description
sub ip_number_or_blank { sub ip_number_or_blank {
# XXX - FIXME - we should push this down into CGI::FormMagick # XXX - FIXME - we should push this down into CGI::FormMagick
my $c = shift;
my $c = shift;
my $ip = shift; my $ip = shift;
if (!defined($ip) || $ip eq "") if (!defined($ip) || $ip eq "") {
{
return 'OK'; return 'OK';
} }
return ip_number($c, $ip);
return ip_number( $c, $ip ); } ## end sub ip_number_or_blank
}
sub ip_number { sub ip_number {
# from CGI::FormMagick::Validator qw( ip_number ); # from CGI::FormMagick::Validator qw( ip_number );
my ($c, $data) = @_; my ($c, $data) = @_;
return undef unless defined $data; return undef unless defined $data;
return $c->l('FM_IP_NUMBER1') unless $data =~ /^[\d.]+$/; return $c->l('FM_IP_NUMBER1') unless $data =~ /^[\d.]+$/;
my @octets = split /\./, $data; my @octets = split /\./, $data;
my $dots = ($data =~ tr/.//); my $dots = ($data =~ tr/.//);
return $c->l('FM_IP_NUMBER2') unless (scalar @octets == 4 and $dots == 3); return $c->l('FM_IP_NUMBER2') unless (scalar @octets == 4 and $dots == 3);
foreach my $octet (@octets) { foreach my $octet (@octets) {
return $c->l("FM_IP_NUMBER3", $octet) if $octet > 255; return $c->l("FM_IP_NUMBER3", $octet) if $octet > 255;
} }
return 'OK'; return 'OK';
} } ## end sub ip_number
1; 1;

1141
root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm
View File

File diff suppressed because it is too large Load Diff

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

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

439
root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm
View File

@ -11,16 +11,12 @@ package SrvMngr::Controller::Hostentries;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use Data::Dumper; #use Data::Dumper;
#use esmith::FormMagick::Panel::hostentries; #use esmith::FormMagick::Panel::hostentries;
use esmith::DomainsDB; use esmith::DomainsDB;
use esmith::AccountsDB; use esmith::AccountsDB;
use esmith::HostsDB; use esmith::HostsDB;
@ -29,89 +25,73 @@ use HTML::Entities;
use Net::IPv4Addr qw(ipv4_in_network); use Net::IPv4Addr qw(ipv4_in_network);
#use URI::Escape; #use URI::Escape;
our $ddb = esmith::DomainsDB->open || die "Couldn't open hostentries db"; our $ddb = esmith::DomainsDB->open || die "Couldn't open hostentries db";
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db"; our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
our $hdb = esmith::HostsDB->open || die "Couldn't open hosts db"; our $hdb = esmith::HostsDB->open || die "Couldn't open hosts db";
our $ndb = esmith::NetworksDB->open || die "Couldn't open networks db"; our $ndb = esmith::NetworksDB->open || die "Couldn't open networks db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my %hos_datas = (); my %hos_datas = ();
my $title = $c->l('hos_FORM_TITLE'); my $title = $c->l('hos_FORM_TITLE');
my $notif = ''; my $notif = '';
$hos_datas{trt} = 'LIST'; $hos_datas{trt} = 'LIST';
my %dom_hosts = (); my %dom_hosts = ();
foreach my $d ( @{ domains_list() } ) { foreach my $d (@{ domains_list() }) {
$dom_hosts{$d} = { COUNT => 0, HOSTS => [] }; $dom_hosts{$d} = { COUNT => 0, HOSTS => [] };
if ( my @hosts = $hdb->get_hosts_by_domain($d) ) { if (my @hosts = $hdb->get_hosts_by_domain($d)) {
$dom_hosts{$d}{'COUNT'} = scalar(@hosts); $dom_hosts{$d}{'COUNT'} = scalar(@hosts);
# my @entries; # my @entries;
push @{ $dom_hosts{$d}{'HOSTS'} }, host_data($_) foreach (@hosts); push @{ $dom_hosts{$d}{'HOSTS'} }, host_data($_) foreach (@hosts);
} } ## end if (my @hosts = $hdb->...)
} } ## end foreach my $d (@{ domains_list...})
$c->stash( $c->stash(
title => $title, title => $title,
notif => $notif, notif => $notif,
hos_datas => \%hos_datas, hos_datas => \%hos_datas,
dom_hosts => \%dom_hosts dom_hosts => \%dom_hosts
); );
$c->render( template => 'hostentries' ); $c->render(template => 'hostentries');
} ## end sub main
}
sub do_display { sub do_display {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my $rt = $c->current_route; my $rt = $c->current_route;
my $trt = $c->param('trt') || 'LST'; my $trt = $c->param('trt') || 'LST';
my $hostname = $c->param('Hostname') || ''; my $hostname = $c->param('Hostname') || '';
$trt = 'ADD' if ($rt eq 'hostentryadd');
$trt = 'ADD' if ( $rt eq 'hostentryadd' ); $trt = 'LST' if ($trt ne 'DEL' && $trt ne 'UPD' && $trt ne 'ADD');
$trt = 'LST' if ( $trt ne 'DEL' && $trt ne 'UPD' && $trt ne 'ADD' );
my %hos_datas = (); my %hos_datas = ();
my $title = $c->l('hos_FORM_TITLE'); my $title = $c->l('hos_FORM_TITLE');
my $notif = ''; my $notif = '';
$hos_datas{'trt'} = $trt; $hos_datas{'trt'} = $trt;
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
} }
if ( $trt eq 'UPD' or $trt eq 'DEL' ) { if ($trt eq 'UPD' or $trt eq 'DEL') {
my $rec = $hdb->get($hostname); my $rec = $hdb->get($hostname);
if ($rec) { if ($rec) {
$hos_datas{hostname} = $rec->key; $hos_datas{hostname} = $rec->key;
( $hos_datas{name}, $hos_datas{domain} ) = ($hos_datas{name}, $hos_datas{domain})
split_hostname($hostname); = split_hostname($hostname);
$hos_datas{internalip} = $rec->prop('InternalIP') || ''; $hos_datas{internalip} = $rec->prop('InternalIP') || '';
$hos_datas{externalip} = $rec->prop('ExternalIP') || ''; $hos_datas{externalip} = $rec->prop('ExternalIP') || '';
$hos_datas{macaddress} = $rec->prop('MACAddress') || ''; $hos_datas{macaddress} = $rec->prop('MACAddress') || '';
$hos_datas{hosttype} = $rec->prop('HostType'); $hos_datas{hosttype} = $rec->prop('HostType');
$hos_datas{comment} = $hos_datas{comment} = HTML::Entities::encode($rec->prop('Comment'));
HTML::Entities::encode( $rec->prop('Comment') ); } else {
}
else {
$notif = "Hostname $hostname not found !"; $notif = "Hostname $hostname not found !";
} }
} } ## end if ($trt eq 'UPD' or $trt...)
#if ( $trt eq 'DEL' ) { #if ( $trt eq 'DEL' ) {
# my $rec = $hdb->get($hostname); # my $rec = $hdb->get($hostname);
# if ( $rec ) { # if ( $rec ) {
# get_hos_datas( $rec, %hos_datas ); # get_hos_datas( $rec, %hos_datas );
@ -119,29 +99,21 @@ sub do_display {
# $notif = "Hostname $hostname not found !" # $notif = "Hostname $hostname not found !"
# } # }
#} #}
if ($trt eq 'LIST') {
if ( $trt eq 'LIST' ) {
} }
$c->stash(title => $title, notif => $notif, hos_datas => \%hos_datas);
$c->stash( title => $title, notif => $notif, hos_datas => \%hos_datas ); $c->render(template => 'hostentries');
$c->render( template => 'hostentries' ); } ## end sub do_display
}
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LIST');
my $trt = ( $c->param('trt') || 'LIST' );
my %hos_datas = (); my %hos_datas = ();
my $title = $c->l('hos_FORM_TITLE'); my $title = $c->l('hos_FORM_TITLE');
my $notif = ''; my $notif = '';
my $result = ''; my $result = '';
$hos_datas{'name'} = lc $c->param('Name'); $hos_datas{'name'} = lc $c->param('Name');
$hos_datas{'domain'} = lc $c->param('Domain'); $hos_datas{'domain'} = lc $c->param('Domain');
$hos_datas{'hostname'} = $c->param('Hostname'); $hos_datas{'hostname'} = $c->param('Hostname');
@ -151,199 +123,180 @@ sub do_update {
$hos_datas{'macaddress'} = $c->param('Macaddress'); $hos_datas{'macaddress'} = $c->param('Macaddress');
$hos_datas{'externalip'} = $c->param('Externalip'); $hos_datas{'externalip'} = $c->param('Externalip');
my $hostname = "$hos_datas{'name'}.$hos_datas{'domain'}"; my $hostname = "$hos_datas{'name'}.$hos_datas{'domain'}";
if ( $trt eq 'ADD' ) {
if ($trt eq 'ADD') {
$hos_datas{'hostname'} = $hostname; $hos_datas{'hostname'} = $hostname;
# controls # controls
my $res = ''; my $res = '';
unless ( $hos_datas{'name'} =~ /^[a-z0-9][a-z0-9-]*$/ ) {
unless ($hos_datas{'name'} =~ /^[a-z0-9][a-z0-9-]*$/) {
$result .= $c->l('hos_HOSTNAME_VALIDATOR_ERROR') . '<br>'; $result .= $c->l('hos_HOSTNAME_VALIDATOR_ERROR') . '<br>';
} }
unless ( $hos_datas{comment} =~ /^([a-zA-Z0-9][\_\.\-,A-Za-z0-9\s]*)$/ unless ($hos_datas{comment} =~ /^([a-zA-Z0-9][\_\.\-,A-Za-z0-9\s]*)$/
|| $hos_datas{comment} eq '' ) || $hos_datas{comment} eq '')
{ {
$result .= $c->l('hos_HOSTNAME_COMMENT_ERROR') . '<br>'; $result .= $c->l('hos_HOSTNAME_COMMENT_ERROR') . '<br>';
} } ## end unless ($hos_datas{comment...})
# Look for duplicate hosts. # Look for duplicate hosts.
my $hostrec = undef; my $hostrec = undef;
if ( $hostrec = $hdb->get($hostname) ) {
if ($hostrec = $hdb->get($hostname)) {
$result .= $c->l( $result .= $c->l(
'hos_HOSTNAME_EXISTS_ERROR', 'hos_HOSTNAME_EXISTS_ERROR',
{ { fullHostName => $hostname,
fullHostName => $hostname,
type => $hostrec->prop('HostType') type => $hostrec->prop('HostType')
} }
) . '<br>',; ) . '<br>',;
} } ## end if ($hostrec = $hdb->get...)
if ( !$result and $hos_datas{hosttype} ne 'Self' ) { if (!$result and $hos_datas{hosttype} ne 'Self') {
if ( $hos_datas{hosttype} eq 'Local' ) { if ($hos_datas{hosttype} eq 'Local') {
$hos_datas{'trt'} = 'ALC'; # ADD/LOCAL $hos_datas{'trt'} = 'ALC'; # ADD/LOCAL
} } else {
else {
$hos_datas{'trt'} = 'ARM'; # ADD/REMOVE $hos_datas{'trt'} = 'ARM'; # ADD/REMOVE
} }
$c->stash(title => $title, notif => '', hos_datas => \%hos_datas);
$c->stash( title => $title, notif => '', hos_datas => \%hos_datas ); return $c->render(template => 'hostentries');
return $c->render( template => 'hostentries' ); } ## end if (!$result and $hos_datas...)
}
#!#$result .= ' blocked'; #!#$result .= ' blocked';
if (!$result) {
if ( !$result ) { $res = create_modify_hostentry($c, $trt, %hos_datas);
$res = create_modify_hostentry( $c, $trt, %hos_datas );
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
} }
if ( !$result ) {
if (!$result) {
$result = $c->l('hos_CREATE_OR_MODIFY_SUCCEEDED') . ' ' . $hostname; $result = $c->l('hos_CREATE_OR_MODIFY_SUCCEEDED') . ' ' . $hostname;
$trt = 'SUC'; $trt = 'SUC';
} }
} } ## end if ($trt eq 'ADD')
if ( $trt eq 'UPD' ) { if ($trt eq 'UPD') {
# controls # controls
my $res = ''; my $res = '';
#$res = validate_description( $c, $account ); #$res = validate_description( $c, $account );
#$result .= $res unless $res eq 'OK'; #$result .= $res unless $res eq 'OK';
unless ($hos_datas{comment} =~ /^([a-zA-Z0-9][\_\.\-,A-Za-z0-9\s]*)$/
unless ( $hos_datas{comment} =~ /^([a-zA-Z0-9][\_\.\-,A-Za-z0-9\s]*)$/ || $hos_datas{comment} eq '')
|| $hos_datas{comment} eq '' )
{ {
$result .= $c->l('hos_HOSTNAME_COMMENT_ERROR') . '<br>'; $result .= $c->l('hos_HOSTNAME_COMMENT_ERROR') . '<br>';
} }
if ( !$result and $hos_datas{hosttype} ne 'Self' ) { if (!$result and $hos_datas{hosttype} ne 'Self') {
if ( $hos_datas{hosttype} eq 'Local' ) { if ($hos_datas{hosttype} eq 'Local') {
$hos_datas{'trt'} = 'ULC'; # UPDATE/LOCAL $hos_datas{'trt'} = 'ULC'; # UPDATE/LOCAL
} } else {
else {
$hos_datas{'trt'} = 'URM'; # UPDATE/REMOVE $hos_datas{'trt'} = 'URM'; # UPDATE/REMOVE
} }
$c->stash(title => $title, notif => '', hos_datas => \%hos_datas);
$c->stash( title => $title, notif => '', hos_datas => \%hos_datas ); return $c->render(template => 'hostentries');
return $c->render( template => 'hostentries' ); } ## end if (!$result and $hos_datas...)
}
#!#$result .= 'blocked'; #!#$result .= 'blocked';
if (!$result) {
if ( !$result ) { $res = create_modify_hostentry($c, $trt, %hos_datas);
$res = create_modify_hostentry( $c, $trt, %hos_datas );
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
} }
if ( !$result ) { if (!$result) {
$result = $c->l('hos_MODIFY_SUCCEEDED') . ' ' . $hostname; $result = $c->l('hos_MODIFY_SUCCEEDED') . ' ' . $hostname;
$trt = 'SUC'; $trt = 'SUC';
} }
} } ## end if ($trt eq 'UPD')
if ( $trt =~ /^.LC$/ ) { if ($trt =~ /^.LC$/) {
# controls # controls
my $res = ''; my $res = '';
$res = ip_number( $c, $hos_datas{internalip} ); $res = ip_number($c, $hos_datas{internalip});
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
$res = not_in_dhcp_range($c, $hos_datas{internalip});
$res = not_in_dhcp_range( $c, $hos_datas{internalip} );
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
$res = not_taken($c, $hos_datas{internalip});
$res = not_taken( $c, $hos_datas{internalip} );
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
$res = must_be_local($c, $hos_datas{internalip});
$res = must_be_local( $c, $hos_datas{internalip} );
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
$res = mac_address_or_blank($c, $hos_datas{macaddress});
$res = mac_address_or_blank( $c, $hos_datas{macaddress} );
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
#!#$result .= 'blocked'; #!#$result .= 'blocked';
if (!$result) {
if ( !$result ) { $res = create_modify_hostentry($c, $trt, %hos_datas);
$res = create_modify_hostentry( $c, $trt, %hos_datas );
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
} }
if ( !$result ) { if (!$result) {
$result = $c->l('hos_MODIFY_SUCCEEDED') . ' ' . $hostname; $result = $c->l('hos_MODIFY_SUCCEEDED') . ' ' . $hostname;
$trt = 'SUC'; $trt = 'SUC';
} }
} } ## end if ($trt =~ /^.LC$/)
if ( $trt =~ /^.RM$/ ) { if ($trt =~ /^.RM$/) {
# controls # controls
my $res = ''; my $res = '';
$res = ip_number_or_blank( $c, $hos_datas{externalip} ); $res = ip_number_or_blank($c, $hos_datas{externalip});
$result .= $res . '<br>' unless $res eq 'OK'; $result .= $res . '<br>' unless $res eq 'OK';
#!#$result .= 'blocked'; #!#$result .= 'blocked';
if (!$result) {
if ( !$result ) { $res = create_modify_hostentry($c, $trt, %hos_datas);
$res = create_modify_hostentry( $c, $trt, %hos_datas );
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
} }
if ( !$result ) { if (!$result) {
$result = $c->l('hos_MODIFY_SUCCEEDED') . ' ' . $hostname; $result = $c->l('hos_MODIFY_SUCCEEDED') . ' ' . $hostname;
$trt = 'SUC'; $trt = 'SUC';
} }
} ## end if ($trt =~ /^.RM$/)
}
#if ( $trt eq 'ULC' ) { #if ( $trt eq 'ULC' ) {
#} #}
#if ( $trt eq 'URM' ) { #if ( $trt eq 'URM' ) {
#} #}
if ($trt eq 'DEL') {
if ( $trt eq 'DEL' ) {
# controls # controls
my $res = ''; my $res = '';
#$res = validate_is_hostentry($c, $hostname); #$res = validate_is_hostentry($c, $hostname);
#$result .= $res unless $res eq 'OK'; #$result .= $res unless $res eq 'OK';
#!#$result .= 'blocked'; #!#$result .= 'blocked';
if (!$result) {
if ( !$result ) { my $res = delete_hostentry($c, $hos_datas{hostname});
my $res = delete_hostentry( $c, $hos_datas{hostname} );
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
} }
if ( !$result ) {
if (!$result) {
$result = $c->l('hos_REMOVE_SUCCEEDED') . ' ' . $hostname; $result = $c->l('hos_REMOVE_SUCCEEDED') . ' ' . $hostname;
$trt = 'SUC'; $trt = 'SUC';
} }
} } ## end if ($trt eq 'DEL')
$hos_datas{'hostname'} = $hostname; $hos_datas{'hostname'} = $hostname;
$hos_datas{'trt'} = $trt; $hos_datas{'trt'} = $trt;
$c->stash(title => $title, notif => $result, hos_datas => \%hos_datas);
$c->stash( title => $title, notif => $result, hos_datas => \%hos_datas ); if ($hos_datas{trt} ne 'SUC') {
return $c->render(template => 'hostentries');
if ( $hos_datas{trt} ne 'SUC' ) {
return $c->render( template => 'hostentries' );
} }
$c->redirect_to('/hostentries'); $c->redirect_to('/hostentries');
} ## end sub do_update
}
sub create_modify_hostentry { sub create_modify_hostentry {
my ($c, $trt, %hos_datas) = @_;
my ( $c, $trt, %hos_datas ) = @_;
my $hostname = $hos_datas{hostname}; my $hostname = $hos_datas{hostname};
my $action; my $action;
if ( $trt eq 'ADD' or $trt eq 'ALC' or $trt eq 'ARM' ) { if ($trt eq 'ADD' or $trt eq 'ALC' or $trt eq 'ARM') {
$action = 'create'; $action = 'create';
} }
if ( $trt eq 'UPD' or $trt eq 'ULC' or $trt eq 'URM' ) {
if ($trt eq 'UPD' or $trt eq 'ULC' or $trt eq 'URM') {
$action = 'modify'; $action = 'modify';
} }
@ -353,20 +306,20 @@ sub create_modify_hostentry {
? $c->l('hos_ERROR_CREATING_HOST') ? $c->l('hos_ERROR_CREATING_HOST')
: $c->l('hos_ERROR_MODIFYING_HOST') : $c->l('hos_ERROR_MODIFYING_HOST')
); );
} } ## end unless ($hostname)
# Untaint and lowercase $hostname # Untaint and lowercase $hostname
$hostname =~ /([\w\.-]+)/; $hostname =~ /([\w\.-]+)/;
$hostname = lc($1); $hostname = lc($1);
my $rec = $hdb->get($hostname); my $rec = $hdb->get($hostname);
if ( $rec and $action eq 'create' ) {
if ($rec and $action eq 'create') {
return $c->l('hos_HOSTNAME_IN_USE_ERROR'); return $c->l('hos_HOSTNAME_IN_USE_ERROR');
} }
if ( not $rec and $action eq 'modify' ) {
if (not $rec and $action eq 'modify') {
return $c->l('hos_NONEXISTENT_HOSTNAME_ERROR'); return $c->l('hos_NONEXISTENT_HOSTNAME_ERROR');
} }
my %props = ( my %props = (
type => 'host', type => 'host',
HostType => $hos_datas{hosttype}, HostType => $hos_datas{hosttype},
@ -376,224 +329,178 @@ sub create_modify_hostentry {
Comment => $hos_datas{comment}, Comment => $hos_datas{comment},
); );
if ( $action eq 'create' ) { if ($action eq 'create') {
if ( $hdb->new_record( $hostname, \%props ) ) { if ($hdb->new_record($hostname, \%props)) {
if (
system( "/sbin/e-smith/signal-event", "host-$action", if (system("/sbin/e-smith/signal-event", "host-$action", $hostname) != 0) {
$hostname ) != 0
)
{
return $c->l('hos_ERROR_WHILE_CREATING_HOST'); return $c->l('hos_ERROR_WHILE_CREATING_HOST');
} }
} } ## end if ($hdb->new_record($hostname...))
} } ## end if ($action eq 'create')
if ( $action eq 'modify' ) { if ($action eq 'modify') {
if ( $rec->merge_props(%props) ) { if ($rec->merge_props(%props)) {
if (
system( "/sbin/e-smith/signal-event", "host-$action", if (system("/sbin/e-smith/signal-event", "host-$action", $hostname) != 0) {
$hostname ) != 0
)
{
rturn $c->l('hos_ERROR_WHILE_MODIFYING_HOST'); rturn $c->l('hos_ERROR_WHILE_MODIFYING_HOST');
} }
} } ## end if ($rec->merge_props(...))
} } ## end if ($action eq 'modify')
return 'OK'; return 'OK';
} ## end sub create_modify_hostentry
}
sub delete_hostentry { sub delete_hostentry {
my ($c, $hostname) = @_;
my ( $c, $hostname ) = @_;
# Untaint $hostname before use in system() # Untaint $hostname before use in system()
$hostname =~ /([\w\.-]+)/; $hostname =~ /([\w\.-]+)/;
$hostname = $1; $hostname = $1;
return ($c->l('hos_ERROR_WHILE_REMOVING_HOST')) unless ($hostname);
return ( $c->l('hos_ERROR_WHILE_REMOVING_HOST') ) unless ($hostname);
my $rec = $hdb->get($hostname); my $rec = $hdb->get($hostname);
return ( $c->l('hos_NONEXISTENT_HOST_ERROR') ) if ( not $rec ); return ($c->l('hos_NONEXISTENT_HOST_ERROR')) if (not $rec);
if ( $rec->delete() ) { if ($rec->delete()) {
if ( if (system("/sbin/e-smith/signal-event", "host-delete", "$hostname") == 0) {
system( "/sbin/e-smith/signal-event", "host-delete", "$hostname" )
== 0 )
{
return 'OK'; return 'OK';
} }
} } ## end if ($rec->delete())
return ( $c->l('hos_ERROR_WHILE_DELETING_HOST') ); return ($c->l('hos_ERROR_WHILE_DELETING_HOST'));
} } ## end sub delete_hostentry
sub domains_list { sub domains_list {
my $d = esmith::DomainsDB->open_ro() or die "Couldn't open DomainsDB"; my $d = esmith::DomainsDB->open_ro() or die "Couldn't open DomainsDB";
my @domains; my @domains;
for ( $d->domains ) {
my $ns = $_->prop("Nameservers") || 'localhost';
push @domains, $_->key if ( $ns eq 'localhost' );
}
for ($d->domains) {
my $ns = $_->prop("Nameservers") || 'localhost';
push @domains, $_->key if ($ns eq 'localhost');
}
return \@domains; return \@domains;
} } ## end sub domains_list
sub host_data { sub host_data {
my $host_record = shift; my $host_record = shift;
my $ht = $host_record->prop('HostType');
my $ht = $host_record->prop('HostType'); my $ip
my $ip = = ($ht eq 'Self') ? $cdb->get_value('LocalIP')
( $ht eq 'Self' ) ? $cdb->get_value('LocalIP') : ($ht eq 'Remote') ? $host_record->prop('ExternalIP')
: ( $ht eq 'Remote' ) ? $host_record->prop('ExternalIP') : $host_record->prop('InternalIP');
: $host_record->prop('InternalIP');
my %data = ( my %data = (
'IP' => $ip, 'IP' => $ip,
'HostName' => $host_record->key(), 'HostName' => $host_record->key(),
'HostType' => $host_record->prop('HostType'), 'HostType' => $host_record->prop('HostType'),
'MACAddress' => ( $host_record->prop('MACAddress') || '' ), 'MACAddress' => ($host_record->prop('MACAddress') || ''),
'Comment' => ( $host_record->prop('Comment') || '' ), 'Comment' => ($host_record->prop('Comment') || ''),
'static' => ( $host_record->prop('static') || 'no' ) 'static' => ($host_record->prop('static') || 'no')
); );
return \%data return \%data;
} ## end sub host_data
}
sub hosttype_list { sub hosttype_list {
my $c = shift; my $c = shift;
return [ [ $c->l('SELF') => 'Self' ], [ $c->l('LOCAL') => 'Local' ], [ $c->l('REMOTE') => 'Remote' ] ];
return [
[ $c->l('SELF') => 'Self' ],
[ $c->l('LOCAL') => 'Local' ],
[ $c->l('REMOTE') => 'Remote' ]
];
} }
sub split_hostname { sub split_hostname {
my $hostname = shift; my $hostname = shift;
return ( $hostname =~ /^([^\.]+)\.(.+)$/ ); return ($hostname =~ /^([^\.]+)\.(.+)$/);
} }
sub mac_address_or_blank { sub mac_address_or_blank {
my ( $c, $data ) = @_; my ($c, $data) = @_;
return "OK" unless $data; return "OK" unless $data;
return mac_address( $c, $data ); return mac_address($c, $data);
} } ## end sub mac_address_or_blank
sub mac_address { sub mac_address {
# from CGI::FormMagick::Validator::Network # from CGI::FormMagick::Validator::Network
my ($c, $data) = @_;
my ( $c, $data ) = @_;
$_ = lc $data; # easier to match on $_ $_ = lc $data; # easier to match on $_
if ( not defined $_ ) {
if (not defined $_) {
return $c->l('FM_MAC_ADDRESS1'); return $c->l('FM_MAC_ADDRESS1');
} } elsif (/^([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f]){5})$/) {
elsif (/^([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f]){5})$/) {
return "OK"; return "OK";
} } else {
else {
return $c->l('FM_MAC_ADDRESS2'); return $c->l('FM_MAC_ADDRESS2');
} }
} } ## end sub mac_address
sub ip_number_or_blank { sub ip_number_or_blank {
# XXX - FIXME - we should push this down into CGI::FormMagick # XXX - FIXME - we should push this down into CGI::FormMagick
my $c = shift; my $c = shift;
my $ip = shift; my $ip = shift;
if ( !defined($ip) || $ip eq "" ) { if (!defined($ip) || $ip eq "") {
return 'OK'; return 'OK';
} }
return ip_number($c, $ip);
return ip_number( $c, $ip ); } ## end sub ip_number_or_blank
}
sub ip_number { sub ip_number {
# from CGI::FormMagick::Validator qw( ip_number ); # from CGI::FormMagick::Validator qw( ip_number );
my ($c, $data) = @_;
my ( $c, $data ) = @_;
return undef unless defined $data; return undef unless defined $data;
return $c->l('FM_IP_NUMBER1') unless $data =~ /^[\d.]+$/; return $c->l('FM_IP_NUMBER1') unless $data =~ /^[\d.]+$/;
my @octets = split /\./, $data; my @octets = split /\./, $data;
my $dots = ( $data =~ tr/.// ); my $dots = ($data =~ tr/.//);
return $c->l('FM_IP_NUMBER2') unless (scalar @octets == 4 and $dots == 3);
return $c->l('FM_IP_NUMBER2') unless ( scalar @octets == 4 and $dots == 3 );
foreach my $octet (@octets) { foreach my $octet (@octets) {
return $c->l( "FM_IP_NUMBER3", $octet ) if $octet > 255; return $c->l("FM_IP_NUMBER3", $octet) if $octet > 255;
} }
return 'OK'; return 'OK';
} } ## end sub ip_number
sub not_in_dhcp_range { sub not_in_dhcp_range {
my $c = shift; my $c = shift;
my $address = shift; my $address = shift;
my $status = $cdb->get('dhcpd')->prop('status') || "disabled";
my $status = $cdb->get('dhcpd')->prop('status') || "disabled";
return 'OK' unless $status eq "enabled"; return 'OK' unless $status eq "enabled";
my $start = $cdb->get('dhcpd')->prop('start'); my $start = $cdb->get('dhcpd')->prop('start');
my $end = $cdb->get('dhcpd')->prop('end'); my $end = $cdb->get('dhcpd')->prop('end');
return ( esmith::util::IPquadToAddr($start) <= esmith::util::IPquadToAddr($address)
return ( esmith::util::IPquadToAddr($start) <= && esmith::util::IPquadToAddr($address) <= esmith::util::IPquadToAddr($end))
esmith::util::IPquadToAddr($address) ? $c->l('hos_ADDR_IN_DHCP_RANGE')
&& esmith::util::IPquadToAddr($address) <= : 'OK';
esmith::util::IPquadToAddr($end) ) } ## end sub not_in_dhcp_range
? $c->l('hos_ADDR_IN_DHCP_RANGE')
: 'OK';
}
sub not_taken { sub not_taken {
my $c = shift;
my $c = shift; my $localip = shift;
my $localip = shift; my $server_localip = $cdb->get_value('LocalIP') || '';
my $server_gateway = $cdb->get_value('GatewayIP') || '';
my $server_localip = $cdb->get_value('LocalIP') || '';
my $server_gateway = $cdb->get_value('GatewayIP') || '';
my $server_extip = $cdb->get_value('ExternalIP') || ''; my $server_extip = $cdb->get_value('ExternalIP') || '';
#$c->debug_msg("\$localip is $localip"); #$c->debug_msg("\$localip is $localip");
#$c->debug_msg("\$server_localip is $server_localip"); #$c->debug_msg("\$server_localip is $server_localip");
#$c->debug_msg("\$server_gateway is $server_gateway"); #$c->debug_msg("\$server_gateway is $server_gateway");
#$c->debug_msg("\$server_extip is $server_extip"); #$c->debug_msg("\$server_extip is $server_extip");
if ($localip eq $server_localip) {
if ( $localip eq $server_localip ) {
return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY'); return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY');
} }
if ( $localip eq $server_gateway ) { if ($localip eq $server_gateway) {
return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY'); return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY');
} }
if ( ( $cdb->get_value('SystemMode') ne 'serveronly' ) if ( ($cdb->get_value('SystemMode') ne 'serveronly')
&& ( $server_extip eq $localip ) ) && ($server_extip eq $localip))
{ {
return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY'); return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY');
} } ## end if (($cdb->get_value('SystemMode'...)))
if ( $localip eq '127.0.0.1' ) { if ($localip eq '127.0.0.1') {
return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY'); return $c->l('hos_ERR_IP_IS_LOCAL_OR_GATEWAY');
} } else {
else {
return 'OK'; return 'OK';
} }
} } ## end sub not_taken
sub must_be_local { sub must_be_local {
my $c = shift; my $c = shift;
my $localip = shift; my $localip = shift;
@ -603,13 +510,13 @@ sub must_be_local {
foreach my $spec (@local_list) { foreach my $spec (@local_list) {
next if $spec eq '127.0.0.1'; next if $spec eq '127.0.0.1';
if ( eval { Net::IPv4Addr::ipv4_in_network( $spec, $localip ) } ) {
if (eval { Net::IPv4Addr::ipv4_in_network($spec, $localip) }) {
return 'OK'; return 'OK';
} }
} } ## end foreach my $spec (@local_list)
# Not OK. The IP is not on any of our local networks. # Not OK. The IP is not on any of our local networks.
return $c->l('hos_ERR_IP_NOT_LOCAL'); return $c->l('hos_ERR_IP_NOT_LOCAL');
} } ## end sub must_be_local
1; 1;

548
root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm
View File

@ -4,289 +4,255 @@ package SrvMngr::Controller::Ibays;
# heading : Network # heading : Network
# description : Shared areas (was ibays) # description : Shared areas (was ibays)
# navigation : 6000 100 # navigation : 6000 100
# #
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw( theme_list init_session is_normal_password ); use SrvMngr qw( theme_list init_session is_normal_password );
use esmith::AccountsDB; use esmith::AccountsDB;
use esmith::ConfigDB; use esmith::ConfigDB;
use esmith::DomainsDB; use esmith::DomainsDB;
#use esmith::FormMagick::Panel::ibays; #use esmith::FormMagick::Panel::ibays;
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db"; our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %iba_datas = (); my %iba_datas = ();
my $title = $c->l('iba_FORM_TITLE'); my $title = $c->l('iba_FORM_TITLE');
$iba_datas{'trt'} = 'LIST'; $iba_datas{'trt'} = 'LIST';
my @ibays; my @ibays;
if ($adb)
{ if ($adb) {
@ibays = $adb->ibays(); @ibays = $adb->ibays();
} }
$c->stash(title => $title, iba_datas => \%iba_datas, ibays => \@ibays);
$c->stash( title => $title, iba_datas => \%iba_datas, ibays => \@ibays );
$c->render(template => 'ibays'); $c->render(template => 'ibays');
} ## end sub main
};
sub do_display { sub do_display {
my $c = shift;
my $c = shift; my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LIST');
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LIST');
my $ibay = $c->param('ibay') || ''; my $ibay = $c->param('ibay') || '';
#$trt = 'DEL' if ( $ibay ); #$trt = 'DEL' if ( $ibay );
#$trt = 'ADD' if ( $rt eq 'ibayadd' ); #$trt = 'ADD' if ( $rt eq 'ibayadd' );
my %iba_datas = (); my %iba_datas = ();
my $title = $c->l('iba_FORM_TITLE'); my $title = $c->l('iba_FORM_TITLE');
my $modul = ''; my $modul = '';
$iba_datas{'trt'} = $trt; $iba_datas{'trt'} = $trt;
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
$iba_datas{ibay} = '';
$iba_datas{description} = '';
$iba_datas{group} = '';
$iba_datas{userAccess} = '';
$iba_datas{publicAccess} = '';
$iba_datas{CgiBin} = '';
$iba_datas{SSL} = '';
} ## end if ($trt eq 'ADD')
$iba_datas{ibay} = ''; if ($trt eq 'UPD') {
$iba_datas{description} = ''; my $rec = $adb->get($ibay);
$iba_datas{group} = '';
$iba_datas{userAccess} = '';
$iba_datas{publicAccess} = '';
$iba_datas{CgiBin} = '';
$iba_datas{SSL} = '';
if ($rec and $rec->prop('type') eq 'ibay') {
$iba_datas{ibay} = $ibay;
$iba_datas{description} = $rec->prop('Name') || '';
$iba_datas{group} = $rec->prop('Group') || '';
$iba_datas{userAccess} = $rec->prop('UserAccess') || '';
$iba_datas{publicAccess} = $rec->prop('PublicAccess') || '';
$iba_datas{CgiBin} = $rec->prop('CgiBin') || 'disabled';
$iba_datas{SSL} = $rec->prop('SSL') || 'disabled';
} ## end if ($rec and $rec->prop...)
} ## end if ($trt eq 'UPD')
if ($trt eq 'DEL') {
my $rec = $adb->get($ibay);
if ($rec and $rec->prop('type') eq 'ibay') {
$iba_datas{ibay} = $ibay;
$iba_datas{description} = $rec->prop('Name') || '';
$modul .= print_vhost_message($c, $ibay);
} ## end if ($rec and $rec->prop...)
} ## end if ($trt eq 'DEL')
if ($trt eq 'PWD') {
my $rec = $adb->get($ibay);
if ($rec and $rec->prop('type') eq 'ibay') {
$iba_datas{ibay} = $ibay;
$iba_datas{description} = $rec->prop('Name') || '';
} }
} ## end if ($trt eq 'PWD')
if ( $trt eq 'UPD' ) { if ($trt eq 'LIST') {
my @ibays;
$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
my $rec = $adb->get($ibay); if ($adb) {
if ($rec and $rec->prop('type') eq 'ibay') { @ibays = $adb->ibays();
$iba_datas{ibay} = $ibay;
$iba_datas{description} = $rec->prop('Name') || '';
$iba_datas{group} = $rec->prop('Group') || '';
$iba_datas{userAccess} = $rec->prop('UserAccess') || '';
$iba_datas{publicAccess} = $rec->prop('PublicAccess') || '';
$iba_datas{CgiBin} = $rec->prop('CgiBin') || 'disabled';
$iba_datas{SSL} = $rec->prop('SSL') || 'disabled';
}
} }
$c->stash(ibays => \@ibays);
if ( $trt eq 'DEL' ) { } ## end if ($trt eq 'LIST')
$c->stash(title => $title, modul => $modul, iba_datas => \%iba_datas);
my $rec = $adb->get($ibay); $c->render(template => 'ibays');
if ($rec and $rec->prop('type') eq 'ibay') { } ## end sub do_display
$iba_datas{ibay} = $ibay;
$iba_datas{description} = $rec->prop('Name') || '';
$modul .= print_vhost_message( $c, $ibay );
}
}
if ( $trt eq 'PWD' ) {
my $rec = $adb->get($ibay);
if ($rec and $rec->prop('type') eq 'ibay') {
$iba_datas{ibay} = $ibay;
$iba_datas{description} = $rec->prop('Name') || '';
}
}
if ( $trt eq 'LIST' ) {
my @ibays;
$adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
if ($adb)
{
@ibays = $adb->ibays();
}
$c->stash( ibays => \@ibays );
}
$c->stash( title => $title, modul => $modul, iba_datas => \%iba_datas );
$c->render( template => 'ibays' );
};
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LIST');
my $trt = ($c->param('trt') || 'LIST');
my %iba_datas = (); my %iba_datas = ();
my $title = $c->l('iba_FORM_TITLE'); my $title = $c->l('iba_FORM_TITLE');
$iba_datas{'trt'} = $trt; $iba_datas{'trt'} = $trt;
my $result = ''; my $result = '';
my $res; my $res;
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
my $name = ($c->param('ibay') || '');
my $name = ($c->param('ibay') || ''); # controls
$res = validate_ibay($c, $name);
$result .= $res unless $res eq 'OK';
# controls if (!$result) {
$res = validate_ibay( $c, $name ); $res = create_ibay($c, $name);
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
if ( ! $result ) { if (!$result) {
$res = create_ibay( $c, $name ); $result = $c->l('iba_SUCCESSFULLY_CREATED_IBAY') . ' ' . $name;
$result .= $res unless $res eq 'OK'; $iba_datas{trt} = 'LST';
if ( ! $result ) { }
$result = $c->l('iba_SUCCESSFULLY_CREATED_IBAY') . ' ' . $name; } ## end if (!$result)
$iba_datas{trt} = 'LST'; } ## end if ($trt eq 'ADD')
}
}
}
if ( $trt eq 'UPD' ) { if ($trt eq 'UPD') {
my $name = ($c->param('ibay') || '');
my $name = ($c->param('ibay') || ''); # controls
$res = '';
# controls if (!$result) {
$res = ''; $res = modify_ibay($c, $name);
$result .= $res unless $res eq 'OK';
if ( ! $result ) { if (!$result) {
$res = modify_ibay( $c, $name ); $result = $c->l('iba_SUCCESSFULLY_MODIFIED_IBAY') . ' ' . $name;
$result .= $res unless $res eq 'OK'; $iba_datas{trt} = 'LST';
if ( ! $result ) { }
$result = $c->l('iba_SUCCESSFULLY_MODIFIED_IBAY') . ' ' . $name; } ## end if (!$result)
$iba_datas{trt} = 'LST'; } ## end if ($trt eq 'UPD')
}
}
}
if ( $trt eq 'PWD' ) { if ($trt eq 'PWD') {
my $ibay = ($c->param('ibay') || '');
my $ibay = ($c->param('ibay') || ''); my $pass1 = ($c->param('newPass') || '');
my $pass1 = ($c->param('newPass') || '');
my $pass2 = ($c->param('newPassVerify') || ''); my $pass2 = ($c->param('newPassVerify') || '');
# controls # controls
unless ($pass1 eq $pass2) { unless ($pass1 eq $pass2) {
$result .= $c->l('iba_IBAY_PASSWD_VERIFY_ERROR') . ' - '; $result .= $c->l('iba_IBAY_PASSWD_VERIFY_ERROR') . ' - ';
} }
$res = check_password($c, $pass1);
$result .= $res unless $res eq 'OK';
$res = check_password( $c, $pass1 ); if (!$result) {
$result .= $res unless $res eq 'OK'; $res = reset_password($c, $ibay, $pass1);
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$res = reset_password( $c, $ibay, $pass1 );
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$result = $c->l('iba_SUCCESSFULLY_RESET_PASSWORD') . ' ' . $ibay;
$iba_datas{trt} = 'LST';
}
}
}
if ( $trt eq 'DEL' ) { if (!$result) {
$result = $c->l('iba_SUCCESSFULLY_RESET_PASSWORD') . ' ' . $ibay;
my $ibay = $c->param ('ibay'); $iba_datas{trt} = 'LST';
}
} ## end if (!$result)
} ## end if ($trt eq 'PWD')
if ($ibay =~ /^([a-z][a-z0-9]*)$/) { if ($trt eq 'DEL') {
$ibay = $1; my $ibay = $c->param('ibay');
} else {
$result .= $c->l('iba_ERR_INTERNAL_FAILURE') . ':' . $ibay;
}
if ( ! $result ) { if ($ibay =~ /^([a-z][a-z0-9]*)$/) {
$res = remove_ibay( $c, $ibay ); $ibay = $1;
$result .= $res unless $res eq 'OK'; } else {
if ( ! $result ) { $result .= $c->l('iba_ERR_INTERNAL_FAILURE') . ':' . $ibay;
$result = $c->l('iba_SUCCESSFULLY_DELETED_IBAY') . ' ' . $ibay; }
$iba_datas{trt} = 'LST';
} if (!$result) {
} $res = remove_ibay($c, $ibay);
} $result .= $res unless $res eq 'OK';
if (!$result) {
$result = $c->l('iba_SUCCESSFULLY_DELETED_IBAY') . ' ' . $ibay;
$iba_datas{trt} = 'LST';
}
} ## end if (!$result)
} ## end if ($trt eq 'DEL')
# common parts # common parts
if ($res ne 'OK') { if ($res ne 'OK') {
$c->stash( error => $result ); $c->stash(error => $result);
$c->stash( title => $title, iba_datas => \%iba_datas ); $c->stash(title => $title, iba_datas => \%iba_datas);
return $c->render('ibays'); return $c->render('ibays');
} }
my $message = "'Ibays' updates ($trt) DONE"; my $message = "'Ibays' updates ($trt) DONE";
$c->app->log->info($message); $c->app->log->info($message);
$c->flash( success => $result ); $c->flash(success => $result);
$c->redirect_to('/ibays'); $c->redirect_to('/ibays');
}; } ## end sub do_update
sub validate_ibay { sub validate_ibay {
my ($c, $name) = @_; my ($c, $name) = @_;
my $msg = validate_name($c, $name); my $msg = validate_name($c, $name);
unless ($msg eq "OK")
{ unless ($msg eq "OK") {
return ($msg); return ($msg);
} }
$msg = max_ibay_name_length($c, $name); $msg = max_ibay_name_length($c, $name);
unless ($msg eq "OK")
{ unless ($msg eq "OK") {
return ($msg); return ($msg);
} }
$msg = conflict_check($c, $name); $msg = conflict_check($c, $name);
unless ($msg eq "OK")
{ unless ($msg eq "OK") {
return ($msg); return ($msg);
} }
return ('OK'); return ('OK');
} } ## end sub validate_ibay
sub create_ibay { sub create_ibay {
my ($c, $name) = @_; my ($c, $name) = @_;
my $msg; my $msg;
my $uid = $adb->get_next_uid(); my $uid = $adb->get_next_uid();
if (my $acct = $adb->new_record($name, {
Name => $c->param('ibayDesc'), if (my $acct = $adb->new_record(
CgiBin => $c->param('CgiBin'), $name,
Group => $c->param('group'), { Name => $c->param('ibayDesc'),
PublicAccess => $c->param('publicAccess'), CgiBin => $c->param('CgiBin'),
SSL => $c->param('SSL'), Group => $c->param('group'),
UserAccess => $c->param('userAccess'), PublicAccess => $c->param('publicAccess'),
Uid => $uid, SSL => $c->param('SSL'),
Gid => $uid, UserAccess => $c->param('userAccess'),
PasswordSet => 'no', Uid => $uid,
type => 'ibay', Gid => $uid,
}) ) PasswordSet => 'no',
type => 'ibay',
}
)
)
{ {
# Untaint $name before use in system() # Untaint $name before use in system()
$name =~ /(.+)/; $name = $1; $name =~ /(.+)/;
if (system ("/sbin/e-smith/signal-event", "ibay-create", $name) == 0) { $name = $1;
if (system("/sbin/e-smith/signal-event", "ibay-create", $name) == 0) {
$msg = 'OK'; $msg = 'OK';
} else { } else {
$msg = $c->l('iba_ERROR_WHILE_CREATING_IBAY'); $msg = $c->l('iba_ERROR_WHILE_CREATING_IBAY');
@ -295,14 +261,12 @@ sub create_ibay {
$msg = $c->l('iba_CANT_CREATE_IBAY'); $msg = $c->l('iba_CANT_CREATE_IBAY');
} }
return $msg; return $msg;
} ## end sub create_ibay
}
sub modify_ibay { sub modify_ibay {
my ($c, $name) = @_; my ($c, $name) = @_;
my $msg; my $msg;
if (my $acct = $adb->get($name)) { if (my $acct = $adb->get($name)) {
if ($acct->prop('type') eq 'ibay') { if ($acct->prop('type') eq 'ibay') {
$acct->merge_props( $acct->merge_props(
@ -315,10 +279,10 @@ sub modify_ibay {
); );
# Untaint $name before use in system() # Untaint $name before use in system()
$name =~ /(.+)/; $name = $1; $name =~ /(.+)/;
if (system ("/sbin/e-smith/signal-event", "ibay-modify", $name = $1;
$name) == 0)
{ if (system("/sbin/e-smith/signal-event", "ibay-modify", $name) == 0) {
$msg = 'OK'; $msg = 'OK';
} else { } else {
$msg = $c->l('iba_ERROR_WHILE_MODIFYING_IBAY'); $msg = $c->l('iba_ERROR_WHILE_MODIFYING_IBAY');
@ -329,53 +293,47 @@ sub modify_ibay {
} else { } else {
$msg = $c->l('iba_CANT_FIND_IBAY'); $msg = $c->l('iba_CANT_FIND_IBAY');
} }
return $msg; return $msg;
} ## end sub modify_ibay
}
sub print_vhost_message { sub print_vhost_message {
my $c = shift; my $c = shift;
my $name = $c->param('ibay'); my $name = $c->param('ibay');
my $result = '';
my $domaindb = esmith::DomainsDB->open();
my @domains = $domaindb->get_all_by_prop(Content => $name);
my $vhostListItems = join "\n", (map ($_->key . " " . $_->prop('Description'), @domains));
my $result = ''; if ($vhostListItems) {
my $domaindb = esmith::DomainsDB->open();
my @domains = $domaindb->get_all_by_prop(Content => $name);
my $vhostListItems = join "\n",
(map ($_->key." ".$_->prop('Description'), @domains));
if ($vhostListItems)
{
$result = $c->l('iba_VHOST_MESSAGE') . "<br><ul>"; $result = $c->l('iba_VHOST_MESSAGE') . "<br><ul>";
foreach ( $vhostListItems ) {
$result .= "<li> $_ </li>";
}
$result .= '</ul>'
}
return $result;
}
foreach ($vhostListItems) {
$result .= "<li> $_ </li>";
}
$result .= '</ul>';
} ## end if ($vhostListItems)
return $result;
} ## end sub print_vhost_message
sub remove_ibay { sub remove_ibay {
my ($c, $name) = @_; my ($c, $name) = @_;
my $msg = ''; my $msg = '';
if (my $acct = $adb->get($name)) { if (my $acct = $adb->get($name)) {
if ($acct->prop('type') eq 'ibay') { if ($acct->prop('type') eq 'ibay') {
$acct->set_prop('type', 'ibay-deleted'); $acct->set_prop('type', 'ibay-deleted');
my $domains_db = esmith::DomainsDB->open(); my $domains_db = esmith::DomainsDB->open();
my @domains = $domains_db->get_all_by_prop(Content=>$name); my @domains = $domains_db->get_all_by_prop(Content => $name);
foreach my $d (@domains) { foreach my $d (@domains) {
$d->set_prop(Content => 'Primary'); $d->set_prop(Content => 'Primary');
} }
# Untaint $name before use in system() # Untaint $name before use in system()
$name =~ /(.+)/; $name = $1; $name =~ /(.+)/;
if (system ("/sbin/e-smith/signal-event", "ibay-delete", $name = $1;
$name) == 0)
{ if (system("/sbin/e-smith/signal-event", "ibay-delete", $name) == 0) {
$msg = 'OK'; $msg = 'OK';
$acct->delete(); $acct->delete();
} else { } else {
@ -384,27 +342,25 @@ sub remove_ibay {
} else { } else {
$msg = $c->l('iba_CANT_FIND_IBAY'); $msg = $c->l('iba_CANT_FIND_IBAY');
} }
} else { } else {
$msg = $c->l('iba_CANT_FIND_IBAY'); $msg = $c->l('iba_CANT_FIND_IBAY');
} }
return $msg; return $msg;
} } ## end sub remove_ibay
sub reset_password { sub reset_password {
my ($c, $name, $newPass) = @_; my ($c, $name, $newPass) = @_;
my ($msg, $acct); my ($msg, $acct);
if (($acct = $adb->get($name)) && ($acct->prop('type') eq 'ibay')) { if (($acct = $adb->get($name)) && ($acct->prop('type') eq 'ibay')) {
esmith::util::setIbayPassword ($acct->key, $newPass); esmith::util::setIbayPassword($acct->key, $newPass);
$acct->set_prop('PasswordSet', 'yes'); $acct->set_prop('PasswordSet', 'yes');
# Untaint $name before use in system() # Untaint $name before use in system()
$name =~ /(.+)/; $name = $1; $name =~ /(.+)/;
if (system ("/sbin/e-smith/signal-event", "password-modify", $name = $1;
$name) == 0)
{ if (system("/sbin/e-smith/signal-event", "password-modify", $name) == 0) {
$msg = 'OK'; $msg = 'OK';
} else { } else {
$msg = $c->l('iba_ERROR_WHILE_RESETTING_PASSWORD'); $msg = $c->l('iba_ERROR_WHILE_RESETTING_PASSWORD');
@ -413,52 +369,41 @@ sub reset_password {
$msg = $c->l('iba_CANT_FIND_IBAY'); $msg = $c->l('iba_CANT_FIND_IBAY');
} }
return $msg; return $msg;
} } ## end sub reset_password
sub check_password { sub check_password {
my ($c, $password) = @_; my ($c, $password) = @_;
my $strength; my $strength;
my $rec = $cdb->get('passwordstrength'); my $rec = $cdb->get('passwordstrength');
$strength = ($rec ? ($rec->prop('Ibays') || 'none') : 'none'); $strength = ($rec ? ($rec->prop('Ibays') || 'none') : 'none');
return validate_password($c, $strength, $password);
return validate_password( $c, $strength, $password ); } ## end sub check_password
}
sub validate_password { sub validate_password {
my ($c, $strength, $pass) = @_; my ($c, $strength, $pass) = @_;
use Crypt::Cracklib; use Crypt::Cracklib;
my $reason; my $reason;
if ($strength eq "none") { if ($strength eq "none") {
return $c->l("Passwords must be at least 7 characters long") unless (length($pass) > 6); return $c->l("Passwords must be at least 7 characters long") unless (length($pass) > 6);
return "OK"; return "OK";
} }
$reason = is_normal_password($c, $pass, undef); $reason = is_normal_password($c, $pass, undef);
return $reason unless ($reason eq "OK"); return $reason unless ($reason eq "OK");
return "OK" unless ($strength eq "strong"); return "OK" unless ($strength eq "strong");
if ( -f '/usr/lib64/cracklib_dict.pwd' ) { if (-f '/usr/lib64/cracklib_dict.pwd') {
$reason = fascist_check($pass, '/usr/lib64/cracklib_dict'); $reason = fascist_check($pass, '/usr/lib64/cracklib_dict');
} else { } else {
$reason = fascist_check($pass, '/usr/lib/cracklib_dict'); $reason = fascist_check($pass, '/usr/lib/cracklib_dict');
} }
$reason ||= "Software error: password check failed"; $reason ||= "Software error: password check failed";
return "OK" if ($reason eq "ok"); return "OK" if ($reason eq "ok");
return
return $c->l("Bad Password Choice") . ": " $c->l("Bad Password Choice") . ": "
. $c->l("The password you have chosen is not a good choice, because") . $c->l("The password you have chosen is not a good choice, because") . " "
. " " . $c->($reason) . "."; . $c->($reason) . ".";
} } ## end sub validate_password
=head2 group_list() =head2 group_list()
@ -468,18 +413,14 @@ drop down list.
=cut =cut
sub group_list_m { sub group_list_m {
my @groups = $adb->groups(); my @groups = $adb->groups();
my @grps = ([ 'Admin' => 'admin' ], [ 'Everyone' => 'shared' ]);
my @grps = ( ['Admin' => 'admin'], ['Everyone' => 'shared']);
foreach my $g (@groups) { foreach my $g (@groups) {
push @grps, [ $g->prop('Description')." (". $g->key.")", $g->key() ]; push @grps, [ $g->prop('Description') . " (" . $g->key . ")", $g->key() ];
} }
return \@grps; return \@grps;
} } ## end sub group_list_m
=head2 userAccess_list =head2 userAccess_list
@ -489,13 +430,13 @@ drop down list.
=cut =cut
sub userAccess_list_m { sub userAccess_list_m {
my $c = shift; my $c = shift;
return [[ $c->l('WARG') => 'wr-admin-rd-group'], return [
[ $c->l('WGRE') => 'wr-group-rd-everyone'], [ $c->l('WARG') => 'wr-admin-rd-group' ],
[ $c->l('WGRG') => 'wr-group-rd-group']]; [ $c->l('WGRE') => 'wr-group-rd-everyone' ],
[ $c->l('WGRG') => 'wr-group-rd-group' ]
} ];
} ## end sub userAccess_list_m
=head2 publicAccess_list =head2 publicAccess_list
@ -505,19 +446,18 @@ access drop down list.
=cut =cut
sub publicAccess_list_m { sub publicAccess_list_m {
my $c = shift; my $c = shift;
return [[ $c->l('NONE') => 'none'], return [
[ $c->l('LOCAL_NETWORK_NO_PASSWORD') => 'local'], [ $c->l('NONE') => 'none' ],
[ $c->l('LOCAL_NETWORK_PASSWORD') => 'local-pw'], [ $c->l('LOCAL_NETWORK_NO_PASSWORD') => 'local' ],
[ $c->l('ENTIRE_INTERNET_NO_PASSWORD') => 'global'], [ $c->l('LOCAL_NETWORK_PASSWORD') => 'local-pw' ],
[ $c->l('ENTIRE_INTERNET_PASSWORD') => 'global-pw'], [ $c->l('ENTIRE_INTERNET_NO_PASSWORD') => 'global' ],
[ $c->l('ENTIRE_INTERNET_PASSWORD_REMOTE') => 'global-pw-remote']]; [ $c->l('ENTIRE_INTERNET_PASSWORD') => 'global-pw' ],
} [ $c->l('ENTIRE_INTERNET_PASSWORD_REMOTE') => 'global-pw-remote' ]
];
} ## end sub publicAccess_list_m
sub max_ibay_name_length { sub max_ibay_name_length {
my ($c, $data) = @_; my ($c, $data) = @_;
$cdb->reload(); $cdb->reload();
my $max = $cdb->get('maxIbayNameLength')->value; my $max = $cdb->get('maxIbayNameLength')->value;
@ -526,52 +466,42 @@ sub max_ibay_name_length {
return "OK"; return "OK";
} else { } else {
return $c->l('iba_MAX_IBAY_NAME_LENGTH_ERROR', $data, $max, $max); return $c->l('iba_MAX_IBAY_NAME_LENGTH_ERROR', $data, $max, $max);
# {acctName => $data,
# maxIbayNameLength => $max,
# maxLength => $max});
}
}
# {acctName => $data,
# maxIbayNameLength => $max,
# maxLength => $max});
} ## end else [ if (length($data) <= $max)]
} ## end sub max_ibay_name_length
sub conflict_check { sub conflict_check {
my ($c, $name) = @_; my ($c, $name) = @_;
my $rec = $adb->get($name); my $rec = $adb->get($name);
my $type; my $type;
if (defined $rec)
{
my $type = $rec->prop('type');
if ($type eq "pseudonym")
{
my $acct = $rec->prop("Account");
my $acct_type = $adb->get($acct)->prop('type');
return $c->l('iba_ACCT_CLASHES_WITH_PSEUDONYM', $name, $acct_type, $acct); if (defined $rec) {
} my $type = $rec->prop('type');
}
elsif (defined getpwnam($name) || defined getgrnam($name)) if ($type eq "pseudonym") {
{ my $acct = $rec->prop("Account");
my $acct_type = $adb->get($acct)->prop('type');
return $c->l('iba_ACCT_CLASHES_WITH_PSEUDONYM', $name, $acct_type, $acct);
} ## end if ($type eq "pseudonym")
} elsif (defined getpwnam($name) || defined getgrnam($name)) {
$type = 'system'; $type = 'system';
} } else {
else
{
# No account record and no account # No account record and no account
return 'OK'; return 'OK';
} }
return $c->l('iba_ACCOUNT_EXISTS', $name, $type); return $c->l('iba_ACCOUNT_EXISTS', $name, $type);
} } ## end sub conflict_check
sub validate_name { sub validate_name {
my ($c, $acctName) = @_; my ($c, $acctName) = @_;
unless ($acctName =~ /^([a-z][\_\.\-a-z0-9]*)$/) unless ($acctName =~ /^([a-z][\_\.\-a-z0-9]*)$/) {
{
return $c->l('iba_ACCT_NAME_HAS_INVALID_CHARS', $acctName); return $c->l('iba_ACCT_NAME_HAS_INVALID_CHARS', $acctName);
} }
return "OK"; return "OK";
} } ## end sub validate_name
1 1

15
root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm
View File

@ -9,29 +9,18 @@ package SrvMngr::Controller::Initial;
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use SrvMngr::Model::Main; #use SrvMngr::Model::Main;
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('initial_FORM_TITLE'); my $title = $c->l('initial_FORM_TITLE');
my $modul = $c->render_to_string(inline => $c->l('initial_FRAMES_BODY')); my $modul = $c->render_to_string(inline => $c->l('initial_FRAMES_BODY'));
$c->stash(title => $title, modul => $modul);
$c->stash( title => $title, modul => $modul );
$c->render(template => 'initial'); $c->render(template => 'initial');
} ## end sub main
}
1; 1;

26
root/usr/share/smanager/lib/SrvMngr/Controller/Legacypanel.pm
View File

@ -10,37 +10,27 @@ package SrvMngr::Controller::Legacypanel;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use SrvMngr::Model::Main; #use SrvMngr::Model::Main;
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('legacy panel');
my $title = $c->l('legacy panel'); my $legacy_url = $c->param('url');
my $legacy_url = $c->param('url');
my $legacy_height = $c->param('height') | 600; my $legacy_height = $c->param('height') | 600;
$c->stash( title => $title, modul => $legacy_url, height => $legacy_height ); $c->stash(title => $title, modul => $legacy_url, height => $legacy_height);
$c->render(template => 'embedded'); $c->render(template => 'embedded');
} ## end sub main
}
sub getlegacyurl { sub getlegacyurl {
my $c = shift; my $c = shift;
my $url = shift; my $url = shift;
return "/smanager/legacypanel?url=$url"; return "/smanager/legacypanel?url=$url";
} } ## end sub getlegacyurl
1; 1;

860
root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
View File

@ -1,5 +1,5 @@
# #
# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-16 10:30:16 # Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-16 10:30:16
# #
# #
# Routines to be edited by the developer to provide content and validation for parameters # Routines to be edited by the developer to provide content and validation for parameters
@ -12,461 +12,555 @@ use esmith::HostsDB;
use esmith::AccountsDB; use esmith::AccountsDB;
use esmith::NetworksDB; use esmith::NetworksDB;
use esmith::DomainsDB; use esmith::DomainsDB;
use constant FALSE => 0; use constant FALSE => 0;
use constant TRUE => 1; use constant TRUE => 1;
#The most common ones #The most common ones
our $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); our $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
our $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); our $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
# Validation routines - parameters for each panel # Validation routines - parameters for each panel
sub validate_LIST {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
# Validation for each field
my $ret = "";
sub validate_LIST { if (!TRUE) #validate $c->param('InternalIP')
my $c = shift; {
my $prefix_data = shift; #Data hash as parameter $ret .= 'Validation for InternalIP failed';
# Validation for each field }
my $ret = "";
if (! TRUE) #validate $c->param('InternalIP')
{$ret .= 'Validation for InternalIP failed';}
if (! TRUE) #validate $c->param('ExternalIP')
{$ret .= 'Validation for ExternalIP failed';}
if (! TRUE) #validate $c->param('InternetIP')
{$ret .= 'Validation for InternetIP failed';}
if (! TRUE) #validate $c->param('Issuer')
{$ret .= 'Validation for Issuer failed';}
if (! TRUE) #validate $c->param('Expiry')
{$ret .= 'Validation for Expiry failed';}
if (! TRUE) #validate $c->param('NotBefore')
{$ret .= 'Validation for NotBefore failed';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub validate_PARAMS { if (!TRUE) #validate $c->param('ExternalIP')
my $c = shift; {
my $prefix_data = shift; #Data hash as parameter $ret .= 'Validation for ExternalIP failed';
# Validation for each field }
my $ret = "";
if (! TRUE) #validate $c->param('status')
{$ret .= 'Validation for status failed';}
if (! TRUE) #validate $c->param('hookScript')
{$ret .= 'Validation for hookScript failed';}
if (! TRUE) #validate $c->param('hostOverride')
{$ret .= 'Validation for hostOverride failed';}
if (! TRUE) #validate $c->param('ACCEPT_TERMS')
{$ret .= 'Validation for ACCEPT_TERMS failed';}
if (! TRUE) #validate $c->param('API')
{$ret .= 'Validation for API failed';}
if (! TRUE) #validate $c->param('keysize')
{$ret .= 'Validation for keysize failed';}
if (! TRUE) #validate $c->param('configure')
{$ret .= 'Validation for configure failed';}
if (! TRUE) #validate $c->param('Email')
{$ret .= 'Validation for Email failed';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub validate_CHECKALLDOMAINS { if (!TRUE) #validate $c->param('InternetIP')
my $c = shift; {
my $prefix_data = shift; #Data hash as parameter $ret .= 'Validation for InternetIP failed';
# Validation for each field }
my $ret = "";
if (! TRUE) #validate $c->param('AllDomainsCheck')
{$ret .= 'Validation for AllDomainsCheck failed';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub validate_CHECKALLENABLEDDOMAINS { if (!TRUE) #validate $c->param('Issuer')
my $c = shift; {
my $prefix_data = shift; #Data hash as parameter $ret .= 'Validation for Issuer failed';
# Validation for each field }
my $ret = "";
if (! TRUE) #validate $c->param('EnabledDomainsCheck')
{$ret .= 'Validation for EnabledDomainsCheck failed';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub validate_CHECKONEDOMAIN { if (!TRUE) #validate $c->param('Expiry')
my $c = shift; {
my $prefix_data = shift; #Data hash as parameter $ret .= 'Validation for Expiry failed';
# Validation for each field }
my $ret = "";
if (! TRUE) #validate $c->param('OneDomainToCheck')
{$ret .= 'Validation for OneDomainToCheck failed';}
if (! TRUE) #validate $c->param('OneDomainsCheck')
{$ret .= 'Validation for OneDomainsCheck failed';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
if (!TRUE) #validate $c->param('NotBefore')
{
$ret .= 'Validation for NotBefore failed';
}
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub validate_LIST
sub validate_PARAMS {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
# Validation for each field
my $ret = "";
if (!TRUE) #validate $c->param('status')
{
$ret .= 'Validation for status failed';
}
if (!TRUE) #validate $c->param('hookScript')
{
$ret .= 'Validation for hookScript failed';
}
if (!TRUE) #validate $c->param('hostOverride')
{
$ret .= 'Validation for hostOverride failed';
}
if (!TRUE) #validate $c->param('ACCEPT_TERMS')
{
$ret .= 'Validation for ACCEPT_TERMS failed';
}
if (!TRUE) #validate $c->param('API')
{
$ret .= 'Validation for API failed';
}
if (!TRUE) #validate $c->param('keysize')
{
$ret .= 'Validation for keysize failed';
}
if (!TRUE) #validate $c->param('configure')
{
$ret .= 'Validation for configure failed';
}
if (!TRUE) #validate $c->param('Email')
{
$ret .= 'Validation for Email failed';
}
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub validate_PARAMS
sub validate_CHECKALLDOMAINS {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
# Validation for each field
my $ret = "";
if (!TRUE) #validate $c->param('AllDomainsCheck')
{
$ret .= 'Validation for AllDomainsCheck failed';
}
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub validate_CHECKALLDOMAINS
sub validate_CHECKALLENABLEDDOMAINS {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
# Validation for each field
my $ret = "";
if (!TRUE) #validate $c->param('EnabledDomainsCheck')
{
$ret .= 'Validation for EnabledDomainsCheck failed';
}
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub validate_CHECKALLENABLEDDOMAINS
sub validate_CHECKONEDOMAIN {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
# Validation for each field
my $ret = "";
if (!TRUE) #validate $c->param('OneDomainToCheck')
{
$ret .= 'Validation for OneDomainToCheck failed';
}
if (!TRUE) #validate $c->param('OneDomainsCheck')
{
$ret .= 'Validation for OneDomainsCheck failed';
}
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub validate_CHECKONEDOMAIN
# Get singleton data for each panel # Get singleton data for each panel
sub get_data_for_panel_LIST {
sub get_data_for_panel_LIST { # Return a hash with the fields required which will be loaded into the shared data
# Return a hash with the fields required which will be loaded into the shared data my $c = shift;
my $c = shift;
# my ($reply, $err, $server_cert) = Net::SSLeay::sslcat('localhost', 443, '/');
# my $issuer = Net::SSLeay::X509_NAME_oneline(Net::SSLeay::X509_get_issuer_name($server_cert));
# my $before = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notBefore($server_cert));
# my $expiry = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notAfter($server_cert));
my %ret = ( # my ($reply, $err, $server_cert) = Net::SSLeay::sslcat('localhost', 443, '/');
'Data1'=>'Data for LIST', #Example # my $issuer = Net::SSLeay::X509_NAME_oneline(Net::SSLeay::X509_get_issuer_name($server_cert));
# fields from Inputs in LIST $fields['LIST'] # my $before = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notBefore($server_cert));
'InternalIP'=>$cdb->get_prop('InternalInterface','IPAddress'), # my $expiry = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notAfter($server_cert));
'ExternalIP'=>$cdb->get_prop('ExternalInterface','IPAddress'), my %ret = (
'InternetIP'=>$c->get_my_ip(), 'Data1' => 'Data for LIST', #Example
'Issuer'=>'$issuer', # fields from Inputs in LIST $fields['LIST']
'Expiry'=>'$expiry', 'InternalIP' => $cdb->get_prop('InternalInterface', 'IPAddress'),
'NotBefore'=>'$before', 'ExternalIP' => $cdb->get_prop('ExternalInterface', 'IPAddress'),
); 'InternetIP' => $c->get_my_ip(),
return %ret; 'Issuer' => '$issuer',
} 'Expiry' => '$expiry',
'NotBefore' => '$before',
);
return %ret;
} ## end sub get_data_for_panel_LIST
sub get_data_for_panel_PARAMS { sub get_data_for_panel_PARAMS {
# Return a hash with the fields required which will be loaded into the shared data
my $c = shift;
my %ret = (
'Data1'=>'Data for PARAMS', #Example
# fields from Inputs in PARAMS $fields['PARAMS']
'status'=>$cdb->get_prop('letsencrypt', 'status', 'disabled'),
'hookScript'=>$cdb->get_prop('letsencrypt', 'hookScript', 'disabled'),
'hostOverride'=>$cdb->get_prop('letsencrypt', 'hostOverride', 'disabled'),
'ACCEPT_TERMS'=>$cdb->get_prop('letsencrypt', 'ACCEPT_TERMS', ''),
'API'=>$cdb->get_prop('letsencrypt', 'API', '2'),
'keysize'=>$cdb->get_prop('letsencrypt', 'keysize', '4096'),
'configure'=>$cdb->get_prop('letsencrypt', 'configure', 'none' ),
'email'=>$cdb->get_prop('letsencrypt', 'email')
);
return %ret;
}
sub get_data_for_panel_CHECKALLDOMAINS { # Return a hash with the fields required which will be loaded into the shared data
# Return a hash with the fields required which will be loaded into the shared data my $c = shift;
my $c = shift; my %ret = (
my %ret = ( 'Data1' => 'Data for PARAMS', #Example
'Data1'=>'Data for CHECKALLDOMAINS', #Example # fields from Inputs in PARAMS $fields['PARAMS']
# fields from Inputs in CHECKALLDOMAINS $fields['CHECKALLDOMAINS'] 'status' => $cdb->get_prop('letsencrypt', 'status', 'disabled'),
'AllDomainsCheck'=>$c->update_all_domains(), 'hookScript' => $cdb->get_prop('letsencrypt', 'hookScript', 'disabled'),
'hostOverride' => $cdb->get_prop('letsencrypt', 'hostOverride', 'disabled'),
); 'ACCEPT_TERMS' => $cdb->get_prop('letsencrypt', 'ACCEPT_TERMS', ''),
return %ret; 'API' => $cdb->get_prop('letsencrypt', 'API', '2'),
} 'keysize' => $cdb->get_prop('letsencrypt', 'keysize', '4096'),
'configure' => $cdb->get_prop('letsencrypt', 'configure', 'none'),
'email' => $cdb->get_prop('letsencrypt', 'email')
);
return %ret;
} ## end sub get_data_for_panel_PARAMS
sub get_data_for_panel_CHECKALLENABLEDDOMAINS { sub get_data_for_panel_CHECKALLDOMAINS {
# Return a hash with the fields required which will be loaded into the shared data
my $c = shift;
my %ret = (
'Data1'=>'Data for CHECKALLENABLEDDOMAINS', #Example
# fields from Inputs in CHECKALLENABLEDDOMAINS $fields['CHECKALLENABLEDDOMAINS']
'EnabledDomainsCheck'=>$c->update_enabled_domains(),
);
return %ret;
}
sub get_data_for_panel_CHECKONEDOMAIN { # Return a hash with the fields required which will be loaded into the shared data
# Return a hash with the fields required which will be loaded into the shared data my $c = shift;
my $c = shift; my %ret = (
my %ret = ( 'Data1' => 'Data for CHECKALLDOMAINS', #Example
'Data1'=>'Data for CHECKONEDOMAIN', #Example # fields from Inputs in CHECKALLDOMAINS $fields['CHECKALLDOMAINS']
# fields from Inputs in CHECKONEDOMAIN $fields['CHECKONEDOMAIN'] 'AllDomainsCheck' => $c->update_all_domains(),
'OneDomainToCheck'=>$c->param("CHECKONEDOMAIN"), );
'OneDomainsCheck'=>$c->update_one_domain($c->param("CHECKONEDOMAIN")) return %ret;
); } ## end sub get_data_for_panel_CHECKALLDOMAINS
return %ret;
}
sub get_data_for_panel_CHECKALLENABLEDDOMAINS {
# Return a hash with the fields required which will be loaded into the shared data
my $c = shift;
my %ret = (
'Data1' => 'Data for CHECKALLENABLEDDOMAINS', #Example
# fields from Inputs in CHECKALLENABLEDDOMAINS $fields['CHECKALLENABLEDDOMAINS']
'EnabledDomainsCheck' => $c->update_enabled_domains(),
);
return %ret;
} ## end sub get_data_for_panel_CHECKALLENABLEDDOMAINS
sub get_data_for_panel_CHECKONEDOMAIN {
# Return a hash with the fields required which will be loaded into the shared data
my $c = shift;
my %ret = (
'Data1' => 'Data for CHECKONEDOMAIN', #Example
# fields from Inputs in CHECKONEDOMAIN $fields['CHECKONEDOMAIN']
'OneDomainToCheck' => $c->param("CHECKONEDOMAIN"),
'OneDomainsCheck' => $c->update_one_domain($c->param("CHECKONEDOMAIN"))
);
return %ret;
} ## end sub get_data_for_panel_CHECKONEDOMAIN
# Get control data for table(s) # Get control data for table(s)
# Define a constant hash for field name mapping
use constant DomainList_FIELD_MAPPING => (
'Table1-Domain name / HOSTNAME' => 'Domain',
'Table1-Brief description' => 'Description',
'Table1-Content' => 'Content',
'Table1-LABEL_NAMESERVERS' => 'Nameservers',
'Table1-LABEL_POINT' => 'Source-for-Table1-LABEL_POINT',
'Table1-LABEL_LECERT' => 'letsencryptSSLcert',
'Table1-IS_IN_CERT' => 'isincert',
'Table1-CHECK' => 'Check'
# Define a constant hash for field name mapping #'target_field2' => 'source_field2',
use constant DomainList_FIELD_MAPPING => ( # Add more mappings as needed
'Table1-Domain name / HOSTNAME' => 'Domain', );
'Table1-Brief description' => 'Description',
'Table1-Content' => 'Content',
'Table1-LABEL_NAMESERVERS' => 'Nameservers',
'Table1-LABEL_POINT' => 'Source-for-Table1-LABEL_POINT',
'Table1-LABEL_LECERT' => 'letsencryptSSLcert',
'Table1-IS_IN_CERT' => 'isincert',
'Table1-CHECK' => 'Check'
#'target_field2' => 'source_field2',
# Add more mappings as needed
);
use constant TEST_DOMAIN_LIST => ( use constant TEST_DOMAIN_LIST => (
{ "domain" => "Domain1","fred" => "fred1" , "description"=>"Description1"}, { "domain" => "Domain1", "fred" => "fred1", "description" => "Description1" },
{ "domain" => "Domain2", "fred" => "fred2", "description"=>"Description2" }, { "domain" => "Domain2", "fred" => "fred2", "description" => "Description2" },
{ "domain" => "Domain3", "fred" => "fred3", "description"=>"Description3" }, { "domain" => "Domain3", "fred" => "fred3", "description" => "Description3" },
# Add more test entries as needed # Add more test entries as needed
); );
sub actual_DomainList { sub actual_DomainList {
my $c = shift; my $c = shift;
# Actual code for extracting DomainList
my @list = (); # Actual code for extracting DomainList
# my @rv = Net::SSLeay::X509_get_subjectAltNames($server_cert); my @list = ();
# foreach my $element (@rv) {
# next if $element =~ /^\d+$/; ; # my @rv = Net::SSLeay::X509_get_subjectAltNames($server_cert);
# #print $element . "\n"; # foreach my $element (@rv) {
# push @list, $element; # next if $element =~ /^\d+$/; ;
# } # #print $element . "\n";
my @data = (); # push @list, $element;
my $check = $c->l('Check Domain'); # }
for ($ddb->domains) my @data = ();
{ my $check = $c->l('Check Domain');
my $ns = $_->prop('Nameservers') || 'internet';
my $le = $_->prop('letsencryptSSLcert') || 'disabled';#letsencrypt configure all for ($ddb->domains) {
my $dname= $_->key; my $ns = $_->prop('Nameservers') || 'internet';
my $isincert = "N"; my $le = $_->prop('letsencryptSSLcert') || 'disabled'; #letsencrypt configure all
my $link = $c->create_link("letsencryptd","CHECKONEDOMAIN",""); my $dname = $_->key;
my $checklink = "<a href='".$link."&CHECKONEDOMAIN=".$_->key."'>".$check."</a>"; my $isincert = "N";
#my $checklink = "<a href=''>check</a>"; my $link = $c->create_link("letsencryptd", "CHECKONEDOMAIN", "");
$isincert = "Y" if ( $dname ~~ @list); my $checklink = "<a href='" . $link . "&CHECKONEDOMAIN=" . $_->key . "'>" . $check . "</a>";
# domain
push @data, #my $checklink = "<a href=''>check</a>";
{ Domain => $_->key, $isincert = "Y" if ($dname ~~ @list);
$_->props,
letsencryptSSLcert => $le, # domain
isincert => $isincert, push @data,
Check => $checklink, {
Nameservers => $ns, Domain => $_->key,
}; $_->props,
#and hosts letsencryptSSLcert => $le,
for my $h ($hdb->get_hosts_by_domain($dname)) isincert => $isincert,
{ Check => $checklink,
next if $ddb->get($h->key); Nameservers => $ns,
next unless ($h->prop('HostType') eq "Self" || $h->prop('HostType') eq "Local"); };
$le = $h->prop('letsencryptSSLcert') || 'disabled';#letsencrypt configure all
$isincert = "N"; #and hosts
$isincert = "Y" if ( $h->key ~~ @list); for my $h ($hdb->get_hosts_by_domain($dname)) {
push @data, next if $ddb->get($h->key);
{ Domain => "--> ". $h->key, next unless ($h->prop('HostType') eq "Self" || $h->prop('HostType') eq "Local");
$h->props, $le = $h->prop('letsencryptSSLcert') || 'disabled'; #letsencrypt configure all
Description=>$h->prop('ExternalIP')|| $h->prop('InternalIP')||"", $isincert = "N";
Content => $h->prop('HostType'), $isincert = "Y" if ($h->key ~~ @list);
isincert => $isincert, push @data, {
Check => "", #$checklink Domain => "--> " . $h->key,
Nameservers => $c->l($ns), $h->props,
} Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "",
} Content => $h->prop('HostType'),
} isincert => $isincert,
return @data; Check => "", #$checklink
} Nameservers => $c->l($ns),
};
} ## end for my $h ($hdb->get_hosts_by_domain...)
} ## end for ($ddb->domains)
return @data;
} ## end sub actual_DomainList
sub get_DomainList { sub get_DomainList {
# Return an array of hashes of the contents for each row and column for DomainList # Return an array of hashes of the contents for each row and column for DomainList
my $c = shift; my $c = shift;
my @source_records = $c->actual_DomainList(); #TEST_DOMAIN_LIST #Replace by code or call to produce contents of table; my @source_records
= $c->actual_DomainList(); #TEST_DOMAIN_LIST #Replace by code or call to produce contents of table;
my @transformed_records; my @transformed_records;
my %Field_Mapping = DomainList_FIELD_MAPPING; my %Field_Mapping = DomainList_FIELD_MAPPING;
# Iterate over each record in the source array # Iterate over each record in the source array
for my $source_record (@source_records) { for my $source_record (@source_records) {
my %transformed_record; my %transformed_record;
# Iterate over each key-value pair in the $Field_Mapping constant # Iterate over each key-value pair in the $Field_Mapping constant
while (my ($target, $source) = each %Field_Mapping) { while (my ($target, $source) = each %Field_Mapping) {
# Check if the source field exists in the source record # Check if the source field exists in the source record
if (exists $source_record->{$source}) { if (exists $source_record->{$source}) {
# Assign the source field value to the target field in the transformed record # Assign the source field value to the target field in the transformed record
$transformed_record{$target} = $source_record->{$source}; $transformed_record{$target} = $source_record->{$source};
} }
} } ## end while (my ($target, $source...))
# Add transformed record to the array if it's not empty # Add transformed record to the array if it's not empty
push @transformed_records, \%transformed_record if %transformed_record; push @transformed_records, \%transformed_record if %transformed_record;
} } ## end for my $source_record (...)
return \@transformed_records; return \@transformed_records;
} } ## end sub get_DomainList
# Return hash with values from row in which link clicked on table # Return hash with values from row in which link clicked on table
sub get_selected_LIST {
my $c = shift;
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
} ## end sub get_selected_LIST
sub get_selected_LIST { sub get_selected_PARAMS {
my $c = shift; my $c = shift;
my $selected = shift; #Parameter is name of selected row. my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults) my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {}; my %ret = {};
return $ret; return $ret;
} } ## end sub get_selected_PARAMS
sub get_selected_PARAMS { sub get_selected_CHECKALLDOMAINS {
my $c = shift; my $c = shift;
my $selected = shift; #Parameter is name of selected row. my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults) my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {}; my %ret = {};
return $ret; return $ret;
} } ## end sub get_selected_CHECKALLDOMAINS
sub get_selected_CHECKALLDOMAINS { sub get_selected_CHECKALLENABLEDDOMAINS {
my $c = shift; my $c = shift;
my $selected = shift; #Parameter is name of selected row. my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults) my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {}; my %ret = {};
return $ret; return $ret;
} } ## end sub get_selected_CHECKALLENABLEDDOMAINS
sub get_selected_CHECKALLENABLEDDOMAINS {
my $c = shift;
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
}
sub get_selected_CHECKONEDOMAIN {
my $c = shift;
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
}
sub get_selected_CHECKONEDOMAIN {
my $c = shift;
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
} ## end sub get_selected_CHECKONEDOMAIN
#after sucessful modify or create or whatever and submit then perfom (if the params validate) #after sucessful modify or create or whatever and submit then perfom (if the params validate)
sub perform_LIST {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
sub perform_LIST { if (!TRUE
my $c = shift; ) #copy or perform with value: InternalIP e.g. $db->set_prop($dbkey,'InternalIP',$c->param('InternalIP'),type=>'service'))
my $prefix_data = shift; #Data hash as parameter {
my $ret = ""; $ret .= 'Perform/save failed for InternalIP';
my $db = $cdb; #maybe one of the others } ## end if (!TRUE)
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: InternalIP e.g. $db->set_prop($dbkey,'InternalIP',$c->param('InternalIP'),type=>'service'))
{$ret .= 'Perform/save failed for InternalIP';}
if (! TRUE) #copy or perform with value: ExternalIP e.g. $db->set_prop($dbkey,'ExternalIP',$c->param('ExternalIP'),type=>'service'))
{$ret .= 'Perform/save failed for ExternalIP';}
if (! TRUE) #copy or perform with value: InternetIP e.g. $db->set_prop($dbkey,'InternetIP',$c->param('InternetIP'),type=>'service'))
{$ret .= 'Perform/save failed for InternetIP';}
if (! TRUE) #copy or perform with value: Issuer e.g. $db->set_prop($dbkey,'Issuer',$c->param('Issuer'),type=>'service'))
{$ret .= 'Perform/save failed for Issuer';}
if (! TRUE) #copy or perform with value: Expiry e.g. $db->set_prop($dbkey,'Expiry',$c->param('Expiry'),type=>'service'))
{$ret .= 'Perform/save failed for Expiry';}
if (! TRUE) #copy or perform with value: NotBefore e.g. $db->set_prop($dbkey,'NotBefore',$c->param('NotBefore'),type=>'service'))
{$ret .= 'Perform/save failed for NotBefore';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub perform_PARAMS { if (!TRUE
my $c = shift; ) #copy or perform with value: ExternalIP e.g. $db->set_prop($dbkey,'ExternalIP',$c->param('ExternalIP'),type=>'service'))
my $prefix_data = shift; #Data hash as parameter {
my $ret = ""; $ret .= 'Perform/save failed for ExternalIP';
my $db = $cdb; #maybe one of the others } ## end if (!TRUE)
my $dbkey = 'letsencrypt';
# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
if (! $db->set_prop($dbkey,'status',$c->param('status'),type=>'service'))
{$ret .= 'Perform/save failed for status';}
if (! $db->set_prop($dbkey,'hookScript',$c->param('hookScript'),type=>'service'))
{$ret .= 'Perform/save failed for hookScript';}
if (! $db->set_prop($dbkey,'hostOverride',$c->param('hostOverride'),type=>'service'))
{$ret .= 'Perform/save failed for hostOverride';}
if (! $db->set_prop($dbkey,'ACCEPT_TERMS',$c->param('ACCEPT_TERMS'),type=>'service'))
{$ret .= 'Perform/save failed for ACCEPT_TERMS';}
if (! $db->set_prop($dbkey,'API',$c->param('API'),type=>'service'))
{$ret .= 'Perform/save failed for API';}
if (! $db->set_prop($dbkey,'keysize',$c->param('keysize'),type=>'service'))
{$ret .= 'Perform/save failed for keysize';}
if (! $db->set_prop($dbkey,'configure',$c->param('configure'),type=>'service'))
{$ret .= 'Perform/save failed for configure';}
if (! $db->set_prop($dbkey,'email',$c->param('email'),type=>'service'))
{$ret .= 'Perform/save failed for email';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub perform_CHECKALLDOMAINS {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: AllDomainsCheck e.g. $db->set_prop($dbkey,'AllDomainsCheck',$c->param('AllDomainsCheck'),type=>'service'))
{$ret .= 'Perform/save failed for AllDomainsCheck';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub perform_CHECKALLENABLEDDOMAINS { if (!TRUE
my $c = shift; ) #copy or perform with value: InternetIP e.g. $db->set_prop($dbkey,'InternetIP',$c->param('InternetIP'),type=>'service'))
my $prefix_data = shift; #Data hash as parameter {
my $ret = ""; $ret .= 'Perform/save failed for InternetIP';
my $db = $cdb; #maybe one of the others } ## end if (!TRUE)
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: EnabledDomainsCheck e.g. $db->set_prop($dbkey,'EnabledDomainsCheck',$c->param('EnabledDomainsCheck'),type=>'service'))
{$ret .= 'Perform/save failed for EnabledDomainsCheck';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
sub perform_CHECKONEDOMAIN { if (!TRUE
my $c = shift; ) #copy or perform with value: Issuer e.g. $db->set_prop($dbkey,'Issuer',$c->param('Issuer'),type=>'service'))
my $prefix_data = shift; #Data hash as parameter {
my $ret = ""; $ret .= 'Perform/save failed for Issuer';
my $db = $cdb; #maybe one of the others } ## end if (!TRUE)
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: OneDomainToCheck e.g. $db->set_prop($dbkey,'OneDomainToCheck',$c->param('OneDomainToCheck'),type=>'service'))
{$ret .= 'Perform/save failed for OneDomainToCheck';}
if (! TRUE) #copy or perform with value: OneDomainsCheck e.g. $db->set_prop($dbkey,'OneDomainsCheck',$c->param('OneDomainsCheck'),type=>'service'))
{$ret .= 'Perform/save failed for OneDomainsCheck';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
}
if (!TRUE
) #copy or perform with value: Expiry e.g. $db->set_prop($dbkey,'Expiry',$c->param('Expiry'),type=>'service'))
{
$ret .= 'Perform/save failed for Expiry';
} ## end if (!TRUE)
sub create_link{ if (!TRUE
# WIP ) #copy or perform with value: NotBefore e.g. $db->set_prop($dbkey,'NotBefore',$c->param('NotBefore'),type=>'service'))
my ($c,$route, $panel, $index) = @_; {
my $link = "$route?trt=$panel&Selected=$index"; $ret .= 'Perform/save failed for NotBefore';
return $link; } ## end if (!TRUE)
} if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub perform_LIST
sub get_my_ip sub perform_PARAMS {
{ my $c = shift;
my $prefix_data = shift; #Data hash as parameter
my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'letsencrypt';
# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
if (!$db->set_prop($dbkey, 'status', $c->param('status'), type => 'service')) {
$ret .= 'Perform/save failed for status';
}
if (!$db->set_prop($dbkey, 'hookScript', $c->param('hookScript'), type => 'service')) {
$ret .= 'Perform/save failed for hookScript';
}
if (!$db->set_prop($dbkey, 'hostOverride', $c->param('hostOverride'), type => 'service')) {
$ret .= 'Perform/save failed for hostOverride';
}
if (!$db->set_prop($dbkey, 'ACCEPT_TERMS', $c->param('ACCEPT_TERMS'), type => 'service')) {
$ret .= 'Perform/save failed for ACCEPT_TERMS';
}
if (!$db->set_prop($dbkey, 'API', $c->param('API'), type => 'service')) { $ret .= 'Perform/save failed for API'; }
if (!$db->set_prop($dbkey, 'keysize', $c->param('keysize'), type => 'service')) {
$ret .= 'Perform/save failed for keysize';
}
if (!$db->set_prop($dbkey, 'configure', $c->param('configure'), type => 'service')) {
$ret .= 'Perform/save failed for configure';
}
if (!$db->set_prop($dbkey, 'email', $c->param('email'), type => 'service')) {
$ret .= 'Perform/save failed for email';
}
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub perform_PARAMS
sub perform_CHECKALLDOMAINS {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (!TRUE
) #copy or perform with value: AllDomainsCheck e.g. $db->set_prop($dbkey,'AllDomainsCheck',$c->param('AllDomainsCheck'),type=>'service'))
{
$ret .= 'Perform/save failed for AllDomainsCheck';
} ## end if (!TRUE)
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub perform_CHECKALLDOMAINS
sub perform_CHECKALLENABLEDDOMAINS {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (!TRUE
) #copy or perform with value: EnabledDomainsCheck e.g. $db->set_prop($dbkey,'EnabledDomainsCheck',$c->param('EnabledDomainsCheck'),type=>'service'))
{
$ret .= 'Perform/save failed for EnabledDomainsCheck';
} ## end if (!TRUE)
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub perform_CHECKALLENABLEDDOMAINS
sub perform_CHECKONEDOMAIN {
my $c = shift;
my $prefix_data = shift; #Data hash as parameter
my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (!TRUE
) #copy or perform with value: OneDomainToCheck e.g. $db->set_prop($dbkey,'OneDomainToCheck',$c->param('OneDomainToCheck'),type=>'service'))
{
$ret .= 'Perform/save failed for OneDomainToCheck';
} ## end if (!TRUE)
if (!TRUE
) #copy or perform with value: OneDomainsCheck e.g. $db->set_prop($dbkey,'OneDomainsCheck',$c->param('OneDomainsCheck'),type=>'service'))
{
$ret .= 'Perform/save failed for OneDomainsCheck';
} ## end if (!TRUE)
if ($ret eq "") { $ret = 'ok'; }
return $ret;
} ## end sub perform_CHECKONEDOMAIN
sub create_link {
# WIP
my ($c, $route, $panel, $index) = @_;
my $link = "$route?trt=$panel&Selected=$index";
return $link;
} ## end sub create_link
sub get_my_ip {
my ($self, $item, $prop, $default) = @_; my ($self, $item, $prop, $default) = @_;
my $output = `/usr/sbin/e-smith/getmyip`; my $output = `/usr/sbin/e-smith/getmyip`;
return $output || "IP"; return $output || "IP";
} } ## end sub get_my_ip
sub update_one_domain sub update_one_domain {
{ my ($self, $domain) = @_;
my ($self,$domain) = @_;
return "$domain not domain" unless ($ddb->get($domain) || $hdb->get($domain)); return "$domain not domain" unless ($ddb->get($domain) || $hdb->get($domain));
($domain) = ($domain =~ /([\w\p{L}.]+)/); ($domain) = ($domain =~ /([\w\p{L}.]+)/);
my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains " " $domain `; my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains " " $domain `;
return $output || "-empty-"; return $output || "-empty-";
} } ## end sub update_one_domain
sub update_all_domains sub update_all_domains {
{ my $self = shift;
my $self = shift;
my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains "" "" all `; my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains "" "" all `;
return $output || "-empty-"; return $output || "-empty-";
} } ## end sub update_all_domains
sub update_enabled_domains sub update_enabled_domains {
{ my $self = shift;
my $self = shift;
my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains "" "" enabled `; my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains "" "" enabled `;
return $output || "-empty-"; return $output || "-empty-";
} } ## end sub update_enabled_domains
1;
1;

725
root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt.pm
View File

@ -1,6 +1,6 @@
package SrvMngr::Controller::Letsencrypt; package SrvMngr::Controller::Letsencrypt;
# #
# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 # Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
# #
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# heading : Network # heading : Network
@ -15,25 +15,19 @@ package SrvMngr::Controller::Letsencrypt;
# #
# Documentation: https://wiki.contribs.org/Letsencrypt # Documentation: https://wiki.contribs.org/Letsencrypt
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# #
# Scheme of things: # Scheme of things:
# #
# TBA!! # TBA!!
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use constant FALSE => 0; use constant FALSE => 0;
use constant TRUE => 1; use constant TRUE => 1;
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
use Data::Dumper; use Data::Dumper;
use esmith::util; use esmith::util;
use esmith::util::network; use esmith::util::network;
use esmith::ConfigDB; use esmith::ConfigDB;
@ -41,389 +35,414 @@ use esmith::AccountsDB;
use esmith::NetworksDB; use esmith::NetworksDB;
use esmith::HostsDB; use esmith::HostsDB;
use esmith::DomainsDB; use esmith::DomainsDB;
require
'/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm'; #The code that is to be added by the developer
require '/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm'; #The code that is to be added by the developer
sub main { sub main {
# #
# Initial entry - route is "/<whatever>" # Initial entry - route is "/<whatever>"
# #
#set initial panel #set initial panel
#for initial panel: #for initial panel:
#Specifiy panel to enter #Specifiy panel to enter
#load up _data hash with DB fields #load up _data hash with DB fields
#load up stash with pointer(s) to control fields hash(= get-)) #load up stash with pointer(s) to control fields hash(= get-))
#and a pointer to the prefix_data hash #and a pointer to the prefix_data hash
#render initial panel #render initial panel
my $c = shift;
$c->app->log->info( $c->log_req );
#The most common ones
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %lets_data = ();
my $title = $c->l('lets_Letsencrypt_certificate');
my $modul = '';
$lets_data{'trt'} = 'LIST';
#Load any DB entries into the <prefix>_data area so as they are preset in the form
# which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
my $db = $cdb; #pickup local or global db or Default to config
$c->do_display($lets_data{'trt'});
}
# Post request with params - submit from the form
sub do_update {
#
# Return after submit pushed on panel (this is a post) - route is "/<whatever>u"
# parameters in the params hash.
#
#load up all params into prefix_data hash:
#By panel (series of if statements - only one executed):
#call validate-PANEL() - return ret = ok or error message
#if validation not ok:
#render back to current panel with error message in stash
#otherwise:
#By panel (series of if statements - only one executed):
#do whatever is required: call perform-PANEL() - return "ok" or Error Message
#call signal-event for any global actions specified (check it exists - error and continue?)
#if action smeserver-<whatever>-update exists
#signal_event smeserver-<whatever>-update
#call signal-event for any specific actions for thids panel (check it exists first - error and continue)
#set success in stash
#if no "nextpanel" entry:
#set firstpanel
#else
#set nextpanel
#call render
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $modul = '';
#The most common ones - you might want to comment out any not used.
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
#The most common ones
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %lets_data = (); my %lets_data = ();
my $title = $c->l('lets_Letsencrypt_certificate'); my $title = $c->l('lets_Letsencrypt_certificate');
my $modul = '';
$lets_data{'trt'} = 'LIST';
# Accessing all POST parameters #Load any DB entries into the <prefix>_data area so as they are preset in the form
# which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
my $db = $cdb; #pickup local or global db or Default to config
$c->do_display($lets_data{'trt'});
} ## end sub main
# Post request with params - submit from the form
sub do_update {
#
# Return after submit pushed on panel (this is a post) - route is "/<whatever>u"
# parameters in the params hash.
#
#load up all params into prefix_data hash:
#By panel (series of if statements - only one executed):
#call validate-PANEL() - return ret = ok or error message
#if validation not ok:
#render back to current panel with error message in stash
#otherwise:
#By panel (series of if statements - only one executed):
#do whatever is required: call perform-PANEL() - return "ok" or Error Message
#call signal-event for any global actions specified (check it exists - error and continue?)
#if action smeserver-<whatever>-update exists
#signal_event smeserver-<whatever>-update
#call signal-event for any specific actions for thids panel (check it exists first - error and continue)
#set success in stash
#if no "nextpanel" entry:
#set firstpanel
#else
#set nextpanel
#call render
my $c = shift;
$c->app->log->info($c->log_req);
my $modul = '';
#The most common ones - you might want to comment out any not used.
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %lets_data = ();
my $title = $c->l('lets_Letsencrypt_certificate');
# Accessing all POST parameters
my %params = $c->req->params->to_hash; my %params = $c->req->params->to_hash;
# Get number of POST parameters # Get number of POST parameters
my $num_params = keys %params; my $num_params = keys %params;
#Params are available in the hash "params" - copy to the prefix_data hash #Params are available in the hash "params" - copy to the prefix_data hash
#while (my ($key, $value) = each %{$c->req->params->to_hash}) { #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
# $lets_data{$key} = $value; # $lets_data{$key} = $value;
#} #}
# the value of trt will tell you which panel has returned
# the value of trt will tell you which panel has returned my $trt = $c->param('trt') || 'LIST'; #hidden control on every form.
my $trt = $c->param('trt') || 'LIST'; #hidden control on every form.
my $ret = 'ok'; my $ret = 'ok';
#Validate the parameters in a custom sub one for each panel (although only one of these will be executed) #Validate the parameters in a custom sub one for each panel (although only one of these will be executed)
my $thispanel; my $thispanel;
if ($trt eq 'LIST'){ if ($trt eq 'LIST') {
#Validate form parameters for panel LIST
$ret = $c->validate_LIST(\%lets_data); #Validate form parameters for panel LIST
$thispanel = 'LIST'; $ret = $c->validate_LIST(\%lets_data);
} $thispanel = 'LIST';
} ## end if ($trt eq 'LIST')
if ($trt eq 'PARAMS'){
#Validate form parameters for panel PARAMS if ($trt eq 'PARAMS') {
$ret = $c->validate_PARAMS(\%lets_data);
$thispanel = 'PARAMS'; #Validate form parameters for panel PARAMS
} $ret = $c->validate_PARAMS(\%lets_data);
$thispanel = 'PARAMS';
if ($trt eq 'CHECKALLDOMAINS'){ } ## end if ($trt eq 'PARAMS')
#Validate form parameters for panel CHECKALLDOMAINS
$ret = $c->validate_CHECKALLDOMAINS(\%lets_data); if ($trt eq 'CHECKALLDOMAINS') {
$thispanel = 'CHECKALLDOMAINS';
} #Validate form parameters for panel CHECKALLDOMAINS
$ret = $c->validate_CHECKALLDOMAINS(\%lets_data);
if ($trt eq 'CHECKALLENABLEDDOMAINS'){ $thispanel = 'CHECKALLDOMAINS';
#Validate form parameters for panel CHECKALLENABLEDDOMAINS } ## end if ($trt eq 'CHECKALLDOMAINS')
$ret = $c->validate_CHECKALLENABLEDDOMAINS(\%lets_data);
$thispanel = 'CHECKALLENABLEDDOMAINS'; if ($trt eq 'CHECKALLENABLEDDOMAINS') {
}
#Validate form parameters for panel CHECKALLENABLEDDOMAINS
if ($trt eq 'CHECKONEDOMAIN'){ $ret = $c->validate_CHECKALLENABLEDDOMAINS(\%lets_data);
#Validate form parameters for panel CHECKONEDOMAIN $thispanel = 'CHECKALLENABLEDDOMAINS';
$ret = $c->validate_CHECKONEDOMAIN(\%lets_data); } ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
$thispanel = 'CHECKONEDOMAIN';
} if ($trt eq 'CHECKONEDOMAIN') {
if ($ret ne "ok"){ #Validate form parameters for panel CHECKONEDOMAIN
$c->do_display($thispanel); $ret = $c->validate_CHECKONEDOMAIN(\%lets_data);
} else { $thispanel = 'CHECKONEDOMAIN';
#Do whatever is needed, including writing values to the DB } ## end if ($trt eq 'CHECKONEDOMAIN')
if ($ret ne "ok") {
if ($trt eq 'LIST'){ $c->do_display($thispanel);
#do whatever is required ... } else {
$ret = $c->perform_LIST(\%lets_data);
if ($ret ne "ok") { #Do whatever is needed, including writing values to the DB
# return to the panel with error message if ($trt eq 'LIST') {
$c->stash(error => $c->l($ret));
$c->stash( #do whatever is required ...
title => $title, $ret = $c->perform_LIST(\%lets_data);
modul => $modul,
lets_data => \%lets_data if ($ret ne "ok") {
);
$c->render(template => "letsencrypt"); # return to the panel with error message
} else { $c->stash(error => $c->l($ret));
$c->stash( success => $c->l('lets_LIST_panel_action_was_successful')); #A bit bland - edit it in the lex file $c->stash(
} title => $title,
} modul => $modul,
lets_data => \%lets_data
if ($trt eq 'PARAMS'){ );
#do whatever is required ... $c->render(template => "letsencrypt");
$ret = $c->perform_PARAMS(\%lets_data); } else {
if ($ret ne "ok") { $c->stash(success => $c->l('lets_LIST_panel_action_was_successful'))
# return to the panel with error message ; #A bit bland - edit it in the lex file
$c->stash(error => $c->l($ret)); }
$c->stash( } ## end if ($trt eq 'LIST')
title => $title,
modul => $modul, if ($trt eq 'PARAMS') {
lets_data => \%lets_data
); #do whatever is required ...
$c->render(template => "letsencrypt"); $ret = $c->perform_PARAMS(\%lets_data);
} else {
$c->stash( success => $c->l('lets_PARAMS_panel_action_was_successful')); #A bit bland - edit it in the lex file if ($ret ne "ok") {
}
} # return to the panel with error message
$c->stash(error => $c->l($ret));
if ($trt eq 'CHECKALLDOMAINS'){ $c->stash(
#do whatever is required ... title => $title,
$ret = $c->perform_CHECKALLDOMAINS(\%lets_data); modul => $modul,
if ($ret ne "ok") { lets_data => \%lets_data
# return to the panel with error message );
$c->stash(error => $c->l($ret)); $c->render(template => "letsencrypt");
$c->stash( } else {
title => $title, $c->stash(success => $c->l('lets_PARAMS_panel_action_was_successful'))
modul => $modul, ; #A bit bland - edit it in the lex file
lets_data => \%lets_data }
); } ## end if ($trt eq 'PARAMS')
$c->render(template => "letsencrypt");
} else { if ($trt eq 'CHECKALLDOMAINS') {
$c->stash( success => $c->l('lets_CHECKALLDOMAINS_panel_action_was_successful')); #A bit bland - edit it in the lex file
} #do whatever is required ...
} $ret = $c->perform_CHECKALLDOMAINS(\%lets_data);
if ($trt eq 'CHECKALLENABLEDDOMAINS'){ if ($ret ne "ok") {
#do whatever is required ...
$ret = $c->perform_CHECKALLENABLEDDOMAINS(\%lets_data); # return to the panel with error message
if ($ret ne "ok") { $c->stash(error => $c->l($ret));
# return to the panel with error message $c->stash(
$c->stash(error => $c->l($ret)); title => $title,
$c->stash( modul => $modul,
title => $title, lets_data => \%lets_data
modul => $modul, );
lets_data => \%lets_data $c->render(template => "letsencrypt");
); } else {
$c->render(template => "letsencrypt"); $c->stash(success => $c->l('lets_CHECKALLDOMAINS_panel_action_was_successful'))
} else { ; #A bit bland - edit it in the lex file
$c->stash( success => $c->l('lets_CHECKALLENABLEDDOMAINS_panel_action_was_successful')); #A bit bland - edit it in the lex file }
} } ## end if ($trt eq 'CHECKALLDOMAINS')
}
if ($trt eq 'CHECKALLENABLEDDOMAINS') {
if ($trt eq 'CHECKONEDOMAIN'){
#do whatever is required ... #do whatever is required ...
$ret = $c->perform_CHECKONEDOMAIN(\%lets_data); $ret = $c->perform_CHECKALLENABLEDDOMAINS(\%lets_data);
if ($ret ne "ok") {
# return to the panel with error message if ($ret ne "ok") {
$c->stash(error => $c->l($ret));
$c->stash( # return to the panel with error message
title => $title, $c->stash(error => $c->l($ret));
modul => $modul, $c->stash(
lets_data => \%lets_data title => $title,
); modul => $modul,
$c->render(template => "letsencrypt"); lets_data => \%lets_data
} else { );
$c->stash( success => $c->l('lets_CHECKONEDOMAIN_panel_action_was_successful')); #A bit bland - edit it in the lex file $c->render(template => "letsencrypt");
} } else {
} $c->stash(success => $c->l('lets_CHECKALLENABLEDDOMAINS_panel_action_was_successful'))
; #A bit bland - edit it in the lex file
# and call any signal-events needed }
#TBD } ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
# Setup shared data and call panel
if ('none' eq 'none') { if ($trt eq 'CHECKONEDOMAIN') {
$lets_data{'trt'} = 'LIST';
} else { #do whatever is required ...
$lets_data{'trt'} = 'none'; $ret = $c->perform_CHECKONEDOMAIN(\%lets_data);
}
$c->do_display($lets_data{'trt'}); if ($ret ne "ok") {
}
} # return to the panel with error message
$c->stash(error => $c->l($ret));
$c->stash(
title => $title,
modul => $modul,
lets_data => \%lets_data
);
$c->render(template => "letsencrypt");
} else {
$c->stash(success => $c->l('lets_CHECKONEDOMAIN_panel_action_was_successful'))
; #A bit bland - edit it in the lex file
}
} ## end if ($trt eq 'CHECKONEDOMAIN')
# and call any signal-events needed
#TBD
# Setup shared data and call panel
if ('none' eq 'none') {
$lets_data{'trt'} = 'LIST';
} else {
$lets_data{'trt'} = 'none';
}
$c->do_display($lets_data{'trt'});
} ## end else [ if ($ret ne "ok") ]
} ## end sub do_update
sub do_display { sub do_display {
# #
# Return after link clicked in table (this is a get) - route is "/<whatever>d" # Return after link clicked in table (this is a get) - route is "/<whatever>d"
# Expects ?trt=PANEL&selected="TableRowName" plus any other required # Expects ?trt=PANEL&selected="TableRowName" plus any other required
# #
# OR it maybe a post from the main panel to add a new record # OR it maybe a post from the main panel to add a new record
# #
#load up all supplied params into prefix_data hash #load up all supplied params into prefix_data hash
#call get-selected-PANEL() - returns hash of all relevent parameters #call get-selected-PANEL() - returns hash of all relevent parameters
#load up returned hash into prefix_data #load up returned hash into prefix_data
#render - to called panel #render - to called panel
my ($c, $trt) = @_;
my ($c,$trt) = @_;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
#The most common ones - you might want to comment out any not used. #The most common ones - you might want to comment out any not used.
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %lets_data = (); my %lets_data = ();
my $title = $c->l('lets_Letsencrypt_certificate'); my $title = $c->l('lets_Letsencrypt_certificate');
my $modul = ""; my $modul = "";
# Accessing all parameters # Accessing all parameters
my %params = $c->req->params->to_hash; my %params = $c->req->params->to_hash;
# Get number of parameters # Get number of parameters
my $num_params = keys %params; my $num_params = keys %params;
#Tag as Post or Get (ie. create new entry or edit existing one #Tag as Post or Get (ie. create new entry or edit existing one
my $is_new_record = ($c->req->method() eq 'POST'); my $is_new_record = ($c->req->method() eq 'POST');
#Params are available in the hash "params" - copy to the prefix_data hash #Params are available in the hash "params" - copy to the prefix_data hash
#while (my ($key, $value) = each %{$c->req->params->to_hash}) { #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
# $lets_data{$key} = $value; # $lets_data{$key} = $value;
#} #}
# the value of trt will tell you which panel has returned
if (!$trt) {
$trt = $c->param('trt') || 'LIST'; #Indicates where to go now
}
# the value of trt will tell you which panel has returned
if (! $trt){
$trt = $c->param('trt') || 'LIST'; #Indicates where to go now
}
# Now add in the params from the selected row from the table # Now add in the params from the selected row from the table
my %selectedrow; my %selectedrow;
if ($trt eq 'LIST'){ if ($trt eq 'LIST') {
#Validate Get selected row (if applicable) LIST
%selectedrow = $c->get_selected_LIST($lets_data{'Selected'},$is_new_record); #Validate Get selected row (if applicable) LIST
} %selectedrow = $c->get_selected_LIST($lets_data{'Selected'}, $is_new_record);
} ## end if ($trt eq 'LIST')
if ($trt eq 'PARAMS'){
#Validate Get selected row (if applicable) PARAMS if ($trt eq 'PARAMS') {
%selectedrow = $c->get_selected_PARAMS($lets_data{'Selected'},$is_new_record);
} #Validate Get selected row (if applicable) PARAMS
%selectedrow = $c->get_selected_PARAMS($lets_data{'Selected'}, $is_new_record);
if ($trt eq 'CHECKALLDOMAINS'){ } ## end if ($trt eq 'PARAMS')
#Validate Get selected row (if applicable) CHECKALLDOMAINS
%selectedrow = $c->get_selected_CHECKALLDOMAINS($lets_data{'Selected'},$is_new_record); if ($trt eq 'CHECKALLDOMAINS') {
}
#Validate Get selected row (if applicable) CHECKALLDOMAINS
if ($trt eq 'CHECKALLENABLEDDOMAINS'){ %selectedrow = $c->get_selected_CHECKALLDOMAINS($lets_data{'Selected'}, $is_new_record);
#Validate Get selected row (if applicable) CHECKALLENABLEDDOMAINS } ## end if ($trt eq 'CHECKALLDOMAINS')
%selectedrow = $c->get_selected_CHECKALLENABLEDDOMAINS($lets_data{'Selected'},$is_new_record);
} if ($trt eq 'CHECKALLENABLEDDOMAINS') {
if ($trt eq 'CHECKONEDOMAIN'){ #Validate Get selected row (if applicable) CHECKALLENABLEDDOMAINS
#Validate Get selected row (if applicable) CHECKONEDOMAIN %selectedrow = $c->get_selected_CHECKALLENABLEDDOMAINS($lets_data{'Selected'}, $is_new_record);
%selectedrow = $c->get_selected_CHECKONEDOMAIN($lets_data{'Selected'},$is_new_record); } ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
}
if ($trt eq 'CHECKONEDOMAIN') {
#Copy in the selected row params to the prefix_data hash to pass to the panel #Validate Get selected row (if applicable) CHECKONEDOMAIN
while (my ($key, $value) = each %selectedrow){ %selectedrow = $c->get_selected_CHECKONEDOMAIN($lets_data{'Selected'}, $is_new_record);
} ## end if ($trt eq 'CHECKONEDOMAIN')
#Copy in the selected row params to the prefix_data hash to pass to the panel
while (my ($key, $value) = each %selectedrow) {
$lets_data{$key} = $value; $lets_data{$key} = $value;
} }
# Where to go now
$lets_data{'trt'} = $trt; # Where to go now
$lets_data{'trt'} = $trt;
# Set up other shared data according to the panel to go to
# Set up other shared data according to the panel to go to
if ($trt eq 'LIST'){ if ($trt eq 'LIST') {
# pickup any other contents needed and load them into hash shared with panel
my %returned_hash; # pickup any other contents needed and load them into hash shared with panel
# subroutine returns a hash directly my %returned_hash;
%returned_hash = $c->get_data_for_panel_LIST();
# Copy each key-value pair from the returned hash to the prefix data hash # subroutine returns a hash directly
while (my ($key, $value) = each %returned_hash) { %returned_hash = $c->get_data_for_panel_LIST();
$lets_data{$key} = $value;
} # Copy each key-value pair from the returned hash to the prefix data hash
} while (my ($key, $value) = each %returned_hash) {
$lets_data{$key} = $value;
if ($trt eq 'PARAMS'){ }
# pickup any other contents needed and load them into hash shared with panel } ## end if ($trt eq 'LIST')
my %returned_hash;
# subroutine returns a hash directly if ($trt eq 'PARAMS') {
%returned_hash = $c->get_data_for_panel_PARAMS();
# Copy each key-value pair from the returned hash to the prefix data hash # pickup any other contents needed and load them into hash shared with panel
while (my ($key, $value) = each %returned_hash) { my %returned_hash;
$lets_data{$key} = $value;
} # subroutine returns a hash directly
} %returned_hash = $c->get_data_for_panel_PARAMS();
if ($trt eq 'CHECKALLDOMAINS'){ # Copy each key-value pair from the returned hash to the prefix data hash
# pickup any other contents needed and load them into hash shared with panel while (my ($key, $value) = each %returned_hash) {
my %returned_hash; $lets_data{$key} = $value;
# subroutine returns a hash directly }
%returned_hash = $c->get_data_for_panel_CHECKALLDOMAINS(); } ## end if ($trt eq 'PARAMS')
# Copy each key-value pair from the returned hash to the prefix data hash
while (my ($key, $value) = each %returned_hash) { if ($trt eq 'CHECKALLDOMAINS') {
$lets_data{$key} = $value;
} # pickup any other contents needed and load them into hash shared with panel
} my %returned_hash;
if ($trt eq 'CHECKALLENABLEDDOMAINS'){ # subroutine returns a hash directly
# pickup any other contents needed and load them into hash shared with panel %returned_hash = $c->get_data_for_panel_CHECKALLDOMAINS();
my %returned_hash;
# subroutine returns a hash directly # Copy each key-value pair from the returned hash to the prefix data hash
%returned_hash = $c->get_data_for_panel_CHECKALLENABLEDDOMAINS(); while (my ($key, $value) = each %returned_hash) {
# Copy each key-value pair from the returned hash to the prefix data hash $lets_data{$key} = $value;
while (my ($key, $value) = each %returned_hash) { }
$lets_data{$key} = $value; } ## end if ($trt eq 'CHECKALLDOMAINS')
}
} if ($trt eq 'CHECKALLENABLEDDOMAINS') {
if ($trt eq 'CHECKONEDOMAIN'){ # pickup any other contents needed and load them into hash shared with panel
# pickup any other contents needed and load them into hash shared with panel my %returned_hash;
my %returned_hash;
# subroutine returns a hash directly # subroutine returns a hash directly
%returned_hash = $c->get_data_for_panel_CHECKONEDOMAIN(); %returned_hash = $c->get_data_for_panel_CHECKALLENABLEDDOMAINS();
# Copy each key-value pair from the returned hash to the prefix data hash
while (my ($key, $value) = each %returned_hash) { # Copy each key-value pair from the returned hash to the prefix data hash
$lets_data{$key} = $value; while (my ($key, $value) = each %returned_hash) {
} $lets_data{$key} = $value;
} }
} ## end if ($trt eq 'CHECKALLENABLEDDOMAINS')
# and table control fields if ($trt eq 'CHECKONEDOMAIN') {
$c->stash(DomainList=>$c->get_DomainList());
# pickup any other contents needed and load them into hash shared with panel
my %returned_hash;
# Data for panel
$c->stash( # subroutine returns a hash directly
title => $title, %returned_hash = $c->get_data_for_panel_CHECKONEDOMAIN();
modul => $modul,
lets_data => \%lets_data # Copy each key-value pair from the returned hash to the prefix data hash
); while (my ($key, $value) = each %returned_hash) {
$c->render(template => "letsencrypt"); $lets_data{$key} = $value;
} }
1; } ## end if ($trt eq 'CHECKONEDOMAIN')
# and table control fields
$c->stash(DomainList => $c->get_DomainList());
# Data for panel
$c->stash(
title => $title,
modul => $modul,
lets_data => \%lets_data
);
$c->render(template => "letsencrypt");
} ## end sub do_display
1;

308
root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
View File

@ -4,13 +4,12 @@ package SrvMngr::Controller::Localnetworks;
# heading : Network # heading : Network
# description : Local networks # description : Local networks
# navigation : 6000 500 # navigation : 6000 500
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session subnet_mask get_reg_mask ip_number); use SrvMngr qw(theme_list init_session subnet_mask get_reg_mask ip_number);
@ -18,246 +17,223 @@ use SrvMngr qw(theme_list init_session subnet_mask get_reg_mask ip_number);
#use Data::Dumper; #use Data::Dumper;
use esmith::util; use esmith::util;
use esmith::HostsDB; use esmith::HostsDB;
my $network_db = esmith::NetworksDB->open() || die("Couldn't open networks db"); my $network_db = esmith::NetworksDB->open() || die("Couldn't open networks db");
my $ret = "OK"; my $ret = "OK";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my %ln_datas = (); my %ln_datas = ();
$ln_datas{return} = ""; $ln_datas{return} = "";
my $title = $c->l('ln_LOCAL NETWORKS'); my $title = $c->l('ln_LOCAL NETWORKS');
my $modul = ''; my $modul = '';
$ln_datas{trt} = 'LIST'; $ln_datas{trt} = 'LIST';
my @localnetworks; my @localnetworks;
if ($network_db) {
@localnetworks = $network_db->get_all_by_prop( type => 'network' );
}
if ($network_db) {
@localnetworks = $network_db->get_all_by_prop(type => 'network');
}
$c->stash( $c->stash(
title => $title, title => $title,
modul => $modul, modul => $modul,
ln_datas => \%ln_datas, ln_datas => \%ln_datas,
localnetworks => \@localnetworks localnetworks => \@localnetworks
); );
$c->render( template => 'localnetworks' ); $c->render(template => 'localnetworks');
} ## end sub main
}
sub do_display { sub do_display {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LIST');
my $trt = ( $c->param('trt') || 'LIST' ); $trt = 'DEL' if ($rt eq 'localnetworksdel');
$trt = 'ADD' if ($rt eq 'localnetworksadd');
$trt = 'DEL' if ( $rt eq 'localnetworksdel' ); $trt = 'ADD1' if ($rt eq 'localnetworksadd1');
$trt = 'ADD' if ( $rt eq 'localnetworksadd' ); $trt = 'DEL1' if ($rt eq 'localnetworksdel1');
$trt = 'ADD1' if ( $rt eq 'localnetworksadd1' );
$trt = 'DEL1' if ( $rt eq 'localnetworksdel1' );
my %ln_datas = (); my %ln_datas = ();
my $title = $c->l('ln_LOCAL NETWORKS'); my $title = $c->l('ln_LOCAL NETWORKS');
my $modul = ''; my $modul = '';
if ($trt eq 'ADD') {
if ( $trt eq 'ADD' ) {
#Add a network - called from the list panel
# Nothing to do here...as just need fields to input data.
} #Add a network - called from the list panel
# Nothing to do here...as just need fields to input data.
} ## end if ($trt eq 'ADD')
if ( $trt eq 'ADD1' ) { if ($trt eq 'ADD1') {
#Add a network - called after new network details filled in
my %ret = add_network($c);
#Return to list page if success
if ((index($ret{ret},"SUCCESS") != -1)) {
$trt = "LIST";
} else {
#Error - return to Add page
$trt = "ADD";
}
$network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-3"); #Refresh the network DB
$c->stash(ret=>\%ret); #stash it away for the template
}
if ( $trt eq 'DEL1' ) { #Add a network - called after new network details filled in
#After Remove clicked on Delete network panel my %ret = add_network($c);
my $network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-1");
#Return to list page if success
if ((index($ret{ret}, "SUCCESS") != -1)) {
$trt = "LIST";
} else {
#Error - return to Add page
$trt = "ADD";
}
$network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-3"); #Refresh the network DB
$c->stash(ret => \%ret); #stash it away for the template
} ## end if ($trt eq 'ADD1')
if ($trt eq 'DEL1') {
#After Remove clicked on Delete network panel
my $network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-1");
my $localnetwork = $c->param("localnetwork"); my $localnetwork = $c->param("localnetwork");
my $delete_hosts = $c->param("deletehost")||"1"; #default to deleting them. my $delete_hosts = $c->param("deletehost") || "1"; #default to deleting them.
my $rec = $network_db->get($localnetwork)||die("Failed to find network on db:$localnetwork"); my $rec = $network_db->get($localnetwork) || die("Failed to find network on db:$localnetwork");
if ( $rec and $rec->prop('type') eq 'localnetwork' ) {
if ($rec and $rec->prop('type') eq 'localnetwork') {
$ln_datas{localnetwork} = $localnetwork; $ln_datas{localnetwork} = $localnetwork;
} }
my %ret = remove_network($localnetwork,$delete_hosts); my %ret = remove_network($localnetwork, $delete_hosts);
$network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-2"); #Refresh the network DB
$network_db = esmith::NetworksDB->open() || die("Failed to open Networkdb-2"); #Refresh the network DB
my @localnetworks; my @localnetworks;
if ($network_db) {
@localnetworks = $network_db->get_all_by_prop( type => 'network' );
}
# Load up ln_datas with values need by template
$ln_datas{subnet} = $rec->prop('Mask');
$ln_datas{router} = $rec->prop('Router');
$c->stash( ln_datas => \%ln_datas, localnetworks => \@localnetworks ,ret =>\%ret);
}
if ( $trt eq 'DEL' ) { if ($network_db) {
#Initial delete panel requiring confirmation @localnetworks = $network_db->get_all_by_prop(type => 'network');
my $localnetwork = $c->param("localnetwork") || ''; }
$c->stash(localnetwork=>$localnetwork);
# Load up ln_datas with values need by template
$ln_datas{subnet} = $rec->prop('Mask');
$ln_datas{router} = $rec->prop('Router');
$c->stash(ln_datas => \%ln_datas, localnetworks => \@localnetworks, ret => \%ret);
} ## end if ($trt eq 'DEL1')
if ($trt eq 'DEL') {
#Initial delete panel requiring confirmation
my $localnetwork = $c->param("localnetwork") || '';
$c->stash(localnetwork => $localnetwork);
my $rec = $network_db->get($localnetwork) || die("Failed to get local network in db::$localnetwork"); my $rec = $network_db->get($localnetwork) || die("Failed to get local network in db::$localnetwork");
my $subnet = $rec->prop('Mask'); my $subnet = $rec->prop('Mask');
$ln_datas{subnet} = $subnet; $ln_datas{subnet} = $subnet;
$ln_datas{router} = $rec->prop('Router'); $ln_datas{router} = $rec->prop('Router');
my $numhosts = hosts_on_network($localnetwork,$subnet); my $numhosts = hosts_on_network($localnetwork, $subnet);
$ln_datas{localnetwork} = $localnetwork; $ln_datas{localnetwork} = $localnetwork;
$ln_datas{deletehosts} = $numhosts>0?1:0; $ln_datas{deletehosts} = $numhosts > 0 ? 1 : 0;
} } ## end if ($trt eq 'DEL')
if ( $trt eq 'LIST' ) { if ($trt eq 'LIST') {
#List all the networks
#List all the networks
my @localnetworks; my @localnetworks;
if ($network_db) { if ($network_db) {
@localnetworks = $network_db->get_all_by_prop( type => 'network' ); @localnetworks = $network_db->get_all_by_prop(type => 'network');
} }
$c->stash( localnetworks => \@localnetworks ); $c->stash(localnetworks => \@localnetworks);
## $c->redirect_to('/localnetworks'); ## $c->redirect_to('/localnetworks');
} } ## end if ($trt eq 'LIST')
$ln_datas{'trt'} = $trt; $ln_datas{'trt'} = $trt;
$c->stash( title => $title, modul => $modul, ln_datas => \%ln_datas ); $c->stash(title => $title, modul => $modul, ln_datas => \%ln_datas);
$c->render( template => 'localnetworks' ); $c->render(template => 'localnetworks');
} ## end sub do_display
}
sub remove_network { sub remove_network {
my $network = shift; my $network = shift;
my $network_db = esmith::NetworksDB->open(); my $network_db = esmith::NetworksDB->open();
my $record = $network_db->get($network); my $record = $network_db->get($network);
my $delete_hosts = shift; my $delete_hosts = shift;
if ( my $record = $network_db->get($network) ) { if (my $record = $network_db->get($network)) {
my $subnet = $record->prop('Mask'); my $subnet = $record->prop('Mask');
my $router = $record->prop('Router'); my $router = $record->prop('Router');
$record->set_prop( type => 'network-deleted' ); $record->set_prop(type => 'network-deleted');
# Untaint $network before use in system() # Untaint $network before use in system()
$network =~ /(.+)/; $network =~ /(.+)/;
$network = $1; $network = $1;
if ( system( "/sbin/e-smith/signal-event", "network-delete", $network ) == 0 ) {
if (system("/sbin/e-smith/signal-event", "network-delete", $network) == 0) {
if ($delete_hosts) { if ($delete_hosts) {
my @hosts_to_delete = hosts_on_network( $network, $subnet ); my @hosts_to_delete = hosts_on_network($network, $subnet);
foreach my $host (@hosts_to_delete) { foreach my $host (@hosts_to_delete) {
$host->delete; $host->delete;
} }
} } ## end if ($delete_hosts)
$record->delete; $record->delete;
return (ret=>'ln_SUCCESS_REMOVED_NETWORK',vars=>"$network,$subnet,$router"); return (ret => 'ln_SUCCESS_REMOVED_NETWORK', vars => "$network,$subnet,$router");
} } else {
else { return (ret => "ln_ERROR_DELETING_NETWORK");
return (ret=>"ln_ERROR_DELETING_NETWORK");
} }
} else {
return (ret => "ln_NO_SUCH_NETWORK");
} }
else { } ## end sub remove_network
return (ret=>"ln_NO_SUCH_NETWORK");
}
}
sub hosts_on_network { sub hosts_on_network {
my $network = shift; my $network = shift;
my $netmask = shift; my $netmask = shift;
die if not $network and $netmask; die if not $network and $netmask;
my $cidr = "$network/$netmask";
my $cidr = "$network/$netmask"; my $hosts = esmith::HostsDB->open() || die("Couldn't open hosts db");
my $hosts = esmith::HostsDB->open() || die("Couldn't open hosts db"); my @localhosts = grep { $_->prop('HostType') eq 'Local' } $hosts->hosts;
my @localhosts = grep { $_->prop('HostType') eq 'Local' } $hosts->hosts;
my @hosts_on_network = (); my @hosts_on_network = ();
foreach my $host (@localhosts) { foreach my $host (@localhosts) {
my $ip = $host->prop('InternalIP') || ""; my $ip = $host->prop('InternalIP') || "";
if ($ip) { if ($ip) {
if ( Net::IPv4Addr::ipv4_in_network( $cidr, $ip ) ) { if (Net::IPv4Addr::ipv4_in_network($cidr, $ip)) {
push @hosts_on_network, $host; push @hosts_on_network, $host;
} }
} } ## end if ($ip)
} } ## end foreach my $host (@localhosts)
return @hosts_on_network if wantarray; return @hosts_on_network if wantarray;
return scalar @hosts_on_network; return scalar @hosts_on_network;
} } ## end sub hosts_on_network
sub add_network sub add_network {
{
my ($fm) = @_; my ($fm) = @_;
my $networkAddress = $fm->param('networkAddress'); my $networkAddress = $fm->param('networkAddress');
my $networkMask = $fm->param('networkMask'); my $networkMask = $fm->param('networkMask');
my $networkRouter = $fm->param('networkRouter'); my $networkRouter = $fm->param('networkRouter');
#Validate Ips and subnet mask #Validate Ips and subnet mask
my $res = ip_number($fm, $networkAddress); my $res = ip_number($fm, $networkAddress);
return (ret=>'ln_INVALID_IP_ADDRESS', vars=>"Network Address $res") unless $res eq 'OK'; return (ret => 'ln_INVALID_IP_ADDRESS', vars => "Network Address $res") unless $res eq 'OK';
$res = subnet_mask($networkMask);
$res = subnet_mask( $networkMask ); return (ret => 'ln_INVALID_SUBNET_MASK', vars => "$networkMask") unless $res eq 'OK';
return (ret=>'ln_INVALID_SUBNET_MASK', vars=>"$networkMask" ) unless $res eq 'OK';
$res = ip_number($fm, $networkRouter); $res = ip_number($fm, $networkRouter);
return (ret=>'ln_INVALID_IP_ADDRESS' , vars=>"Routeur Address $res") unless $res eq 'OK'; return (ret => 'ln_INVALID_IP_ADDRESS', vars => "Routeur Address $res") unless $res eq 'OK';
# we transform bit mask to regular mask # we transform bit mask to regular mask
$networkMask = get_reg_mask( $networkAddress, $networkMask ); $networkMask = get_reg_mask($networkAddress, $networkMask);
my $network_db = esmith::NetworksDB->open() my $network_db = esmith::NetworksDB->open()
|| esmith::NetworksDB->create(); || esmith::NetworksDB->create();
my $config_db = esmith::ConfigDB->open(); my $config_db = esmith::ConfigDB->open();
my $localIP = $config_db->get('LocalIP'); my $localIP = $config_db->get('LocalIP');
my $localNetmask = $config_db->get('LocalNetmask'); my $localNetmask = $config_db->get('LocalNetmask');
my ($localNetwork, $localBroadcast)
my ( $localNetwork, $localBroadcast ) = = esmith::util::computeNetworkAndBroadcast($localIP->value(), $localNetmask->value());
esmith::util::computeNetworkAndBroadcast( $localIP->value(), my ($routerNetwork, $routerBroadcast)
$localNetmask->value() ); = esmith::util::computeNetworkAndBroadcast($networkRouter, $localNetmask->value());
my ( $routerNetwork, $routerBroadcast ) =
esmith::util::computeNetworkAndBroadcast( $networkRouter,
$localNetmask->value() );
# Note to self or future developers: # Note to self or future developers:
# the following tests should probably be validation routines # the following tests should probably be validation routines
# in the form itself, but it just seemed too fiddly to do that # in the form itself, but it just seemed too fiddly to do that
# at the moment. -- Skud 2002-04-11 # at the moment. -- Skud 2002-04-11
# I agree --bjr 2020-04-18 # I agree --bjr 2020-04-18
if ($routerNetwork ne $localNetwork) {
return (ret => 'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK');
if ( $routerNetwork ne $localNetwork ) }
{ my ($network, $broadcast) = esmith::util::computeNetworkAndBroadcast($networkAddress, $networkMask);
return (ret=>'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK');
if ($network eq $localNetwork) {
return (ret => 'ln_NETWORK_ALREADY_LOCAL');
} }
my ( $network, $broadcast ) = if ($network_db->get($network)) {
esmith::util::computeNetworkAndBroadcast( $networkAddress, $networkMask ); return (ret => 'ln_NETWORK_ALREADY_ADDED');
if ( $network eq $localNetwork )
{
return (ret=>'ln_NETWORK_ALREADY_LOCAL');
} }
if ( $network_db->get($network) )
{
return (ret=>'ln_NETWORK_ALREADY_ADDED');
}
$network_db->new_record( $network_db->new_record(
$network, $network,
{ { Mask => $networkMask,
Mask => $networkMask,
Router => $networkRouter, Router => $networkRouter,
type => 'network', type => 'network',
} }
@ -266,26 +242,26 @@ sub add_network
# Untaint $network before use in system() # Untaint $network before use in system()
$network =~ /(.+)/; $network =~ /(.+)/;
$network = $1; $network = $1;
system( "/sbin/e-smith/signal-event", "network-create", $network ) == 0 system("/sbin/e-smith/signal-event", "network-create", $network) == 0
or ( return (ret=>'ln_ERROR_CREATING_NETWORK' )); or (return (ret => 'ln_ERROR_CREATING_NETWORK'));
my ($totalHosts, $firstAddr, $lastAddr) = esmith::util::computeHostRange($network, $networkMask);
my ( $totalHosts, $firstAddr, $lastAddr ) =
esmith::util::computeHostRange( $network, $networkMask );
my $msg; my $msg;
if ( $totalHosts == 1 )
if ($totalHosts == 1) {
return (ret => 'ln_SUCCESS_SINGLE_ADDRESS', vars => "$network,$networkMask,$networkRouter");
} elsif (($totalHosts == 256)
|| ($totalHosts == 65536)
|| ($totalHosts == 16777216))
{ {
return (ret=>'ln_SUCCESS_SINGLE_ADDRESS',vars=>"$network,$networkMask,$networkRouter"); return (
} ret => 'ln_SUCCESS_NETWORK_RANGE',
elsif (( $totalHosts == 256 ) vars => "$network,$networkMask,$networkRouter,$totalHosts,$firstAddr,$lastAddr"
|| ( $totalHosts == 65536 ) );
|| ( $totalHosts == 16777216 ) ) } else {
{ my $simpleMask = esmith::util::computeLocalNetworkPrefix($network, $networkMask);
return ( ret=>'ln_SUCCESS_NETWORK_RANGE',vars=>"$network,$networkMask,$networkRouter,$totalHosts,$firstAddr,$lastAddr"); return (
} ret => 'ln_SUCCESS_NONSTANDARD_RANGE',
else vars => "$network,$networkMask,$networkRouter,$totalHosts,$firstAddr,$lastAddr,$simpleMask"
{ my $simpleMask = esmith::util::computeLocalNetworkPrefix( $network, $networkMask ); );
return ( ret => 'ln_SUCCESS_NONSTANDARD_RANGE', } ## end else [ if ($totalHosts == 1) ]
vars=>"$network,$networkMask,$networkRouter,$totalHosts,$firstAddr,$lastAddr,$simpleMask"); } ## end sub add_network
}
}

353
root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm
View File

@ -8,266 +8,215 @@ package SrvMngr::Controller::Login;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# for information # for information
# $r->get('/login')->to('login#main')->name('login'); # $r->get('/login')->to('login#main')->name('login');
# $r->post('/login')->to('login#login')->name('signin'); # $r->post('/login')->to('login#login')->name('signin');
# $r->get('/login2')->to('login#pwdrescue')->name('pwdresc'); # $r->get('/login2')->to('login#pwdrescue')->name('pwdresc');
# $r->get('/loginc')->to('login#confpwd')->name('resetpwdconf'); # $r->get('/loginc')->to('login#confpwd')->name('resetpwdconf');
# for information # for information
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use esmith::AccountsDB; use esmith::AccountsDB;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr::Model::Main; use SrvMngr::Model::Main;
use SrvMngr qw( theme_list init_session ); use SrvMngr qw( theme_list init_session );
my $MAX_LOGIN_ATTEMPTS = 3;
my $MAX_LOGIN_ATTEMPTS = 3; my $DURATION_BLOCKED = 30 * 60; # access blocked for 30 min
my $DURATION_BLOCKED = 30 * 60; # access blocked for 30 min
my $TIMEOUT_FAILED_LOGIN = 1; my $TIMEOUT_FAILED_LOGIN = 1;
my $RESET_DURATION = 2 * 60 * 60; # 2 hours for resetting my $RESET_DURATION = 2 * 60 * 60; # 2 hours for resetting
our $adb = esmith::AccountsDB->open() or die "Couldn't open DB Accounts\n"; our $adb = esmith::AccountsDB->open() or die "Couldn't open DB Accounts\n";
my $allowed_user_re = qr/^\w{5,10}$/; my $allowed_user_re = qr/^\w{5,10}$/;
my %Login_Attempts; my %Login_Attempts;
sub main { sub main {
my $c = shift;
my $c = shift; $c->stash(trt => 'NORM');
$c->stash( trt => 'NORM' ); $c->render('login');
$c->render('login'); } ## end sub main
}
sub login { sub login {
my $c = shift;
my $c = shift; my $trt = $c->param('Trt');
my $trt = $c->param('Trt');
# password reset request # password reset request
if ( $trt eq 'RESET' ) { if ($trt eq 'RESET') {
my $res = $c->mail_rescue(); my $res = $c->mail_rescue();
if ( $res ne 'OK' ) {
$c->stash( error => $res, trt => $trt ); if ($res ne 'OK') {
return $c->render('login'); $c->stash(error => $res, trt => $trt);
} return $c->render('login');
$c->flash( success => $c->l('use_RESET_REGISTERED') ); }
record_login_attempt($c, 'RESET'); $c->flash(success => $c->l('use_RESET_REGISTERED'));
return $c->redirect_to( $c->home_page ); record_login_attempt($c, 'RESET');
} return $c->redirect_to($c->home_page);
} ## end if ($trt eq 'RESET')
# normal loggin # normal loggin
my $name = $c->param('Username'); my $name = $c->param('Username');
my $pass = $c->param('Password'); my $pass = $c->param('Password');
my $from = $c->param('From'); my $from = $c->param('From');
if ( is_denied($c) ) { if (is_denied($c)) {
$c->stash( error => $c->l('use_TOO_MANY_LOGIN'), trt => 'NORM' ); $c->stash(error => $c->l('use_TOO_MANY_LOGIN'), trt => 'NORM');
return $c->render('login'); return $c->render('login');
}
# untaint
unless ( ($name =~ /^([a-z][\-\_\.a-z0-9]*)$/) && ($pass =~ /^([ -~]+)$/) ) {
record_login_attempt($c, 'FAILED');
$c->stash( error => $c->l('use_INVALID_DATA'), trt => 'NORM' );
return $c->render('login');
}
my $alias = SrvMngr::Model::Main->check_adminalias( $c );
if ( $alias ) {
if ( $name eq $alias ) {
$name = 'admin';
} elsif ( $name eq 'admin' ) {
record_login_attempt($c, 'FAILED');
$c->stash( error => $c->l('use_SORRY'), trt => 'NORM' );
return $c->render('login');
} }
}
if (SrvMngr::Model::Main->check_credentials($name, $pass)) { # untaint
$c->session(logged_in => 1); # set the logged_in flag unless (($name =~ /^([a-z][\-\_\.a-z0-9]*)$/) && ($pass =~ /^([ -~]+)$/)) {
$c->session(username => $name); # keep a copy of the username record_login_attempt($c, 'FAILED');
# if ( $name eq 'admin' || $adb->is_user_in_group($name, 'AdmiN') ) # for futur use $c->stash(error => $c->l('use_INVALID_DATA'), trt => 'NORM');
if ( $name eq 'admin' ) { return $c->render('login');
$c->session(is_admin => 1); }
my $alias = SrvMngr::Model::Main->check_adminalias($c);
if ($alias) {
if ($name eq $alias) {
$name = 'admin';
} elsif ($name eq 'admin') {
record_login_attempt($c, 'FAILED');
$c->stash(error => $c->l('use_SORRY'), trt => 'NORM');
return $c->render('login');
}
} ## end if ($alias)
if (SrvMngr::Model::Main->check_credentials($name, $pass)) {
$c->session(logged_in => 1); # set the logged_in flag
$c->session(username => $name); # keep a copy of the username
# if ( $name eq 'admin' || $adb->is_user_in_group($name, 'AdmiN') ) # for futur use
if ($name eq 'admin') {
$c->session(is_admin => 1);
} else {
$c->session(is_admin => 0);
}
$c->session(expiration => 600); # expire this session in 10 minutes
$c->flash(success => $c->l('use_WELCOME'));
record_login_attempt($c, 'SUCCESS');
} else { } else {
$c->session(is_admin => 0); record_login_attempt($c, 'FAILED');
} sleep $TIMEOUT_FAILED_LOGIN;
$c->session(expiration => 600); # expire this session in 10 minutes $c->stash(error => $c->l('use_SORRY'), trt => 'NORM');
return $c->render('login');
$c->flash( success => $c->l('use_WELCOME') ); } ## end else [ if (SrvMngr::Model::Main...)]
record_login_attempt($c, 'SUCCESS'); $from = $c->home_page if ($from eq 'login');
} else { $c->redirect_to($from);
record_login_attempt($c, 'FAILED'); } ## end sub login
sleep $TIMEOUT_FAILED_LOGIN;
$c->stash( error => $c->l('use_SORRY'), trt => 'NORM' );
return $c->render('login');
}
$from = $c->home_page if ( $from eq 'login' );
$c->redirect_to( $from );
}
sub pwdrescue { sub pwdrescue {
my $c = shift;
my $c = shift; $c->stash(trt => 'RESET');
$c->render('login');
$c->stash( trt => 'RESET' ); } ## end sub pwdrescue
$c->render('login');
}
sub mail_rescue { sub mail_rescue {
my $c = shift;
my $name = $c->param('Username');
my $from = $c->param('From');
my $res;
$res .= $c->l('use_TOO_MANY_LOGIN') if (is_denied($c));
my $c = shift; # untaint
my $name = $c->param('Username'); if (!$res && $name !~ /^([a-z][\-\_\.a-z0-9]*)$/) {
my $from = $c->param('From'); record_login_attempt($c, 'FAILED');
$res .= $c->l('use_ERR_NAME');
my $res;
$res .= $c->l('use_TOO_MANY_LOGIN') if ( is_denied($c) );
# untaint
if ( ! $res && $name !~ /^([a-z][\-\_\.a-z0-9]*)$/ ) {
record_login_attempt($c, 'FAILED');
$res .= $c->l('use_ERR_NAME');
}
if ( ! $res && $name eq 'admin' ) {
$res .= $c->l('use_NOT_THAT_OPER');
}
# user exists ?
if ( ! $res ) {
my $acct = $adb->get($name);
if ( ! $acct || $acct->prop('type') ne "user" || $acct->prop('PasswordSet') ne 'yes' ) {
$res .= $c->l('use_NOT_THAT_OPER');
}
} }
if (!$res && $name eq 'admin') {
$res .= $c->l('use_NOT_THAT_OPER');
}
# user exists ?
if (!$res) {
my $acct = $adb->get($name);
if (!$acct || $acct->prop('type') ne "user" || $acct->prop('PasswordSet') ne 'yes') {
$res .= $c->l('use_NOT_THAT_OPER');
}
} ## end if (!$res)
return $res if $res; return $res if $res;
# send email # send email
my $email = $name .'@'. $c->session->{DomainName}; my $email = $name . '@' . $c->session->{DomainName};
my $until = time() + $RESET_DURATION; my $until = time() + $RESET_DURATION;
$c->pwdrst->{$name} = {
email => $email,
date => $until,
confirmed => 0,
};
my $jwt = $c->jwt->claims({ username => $name })->encode;
my $url = $c->url_for('loginc')->to_abs->query(jwt => $jwt);
$c->pwdrst->{$name} = { # $c->email( $email, $c->l('use_CONFIRM_RESET'), $c->render_to_string(inline => $c->l('use_GO_TO_URL', $url) ) );
email => $email, # directly (without minion)
date => $until, $c->send_email($email, $c->l('use_CONFIRM_RESET'), $c->render_to_string(inline => $c->l('use_GO_TO_URL', $url)));
confirmed => 0, return 'OK';
}; } ## end sub mail_rescue
my $jwt = $c->jwt->claims({username => $name})->encode;
my $url = $c->url_for('loginc')->to_abs->query(jwt => $jwt);
# $c->email( $email, $c->l('use_CONFIRM_RESET'), $c->render_to_string(inline => $c->l('use_GO_TO_URL', $url) ) );
# directly (without minion)
$c->send_email( $email, $c->l('use_CONFIRM_RESET'), $c->render_to_string(inline => $c->l('use_GO_TO_URL', $url) ) );
return 'OK';
}
sub logout { sub logout {
my $c = shift;
my $c = shift; $c->app->log->info($c->log_req);
$c->app->log->info($c->log_req); $c->session(expires => 1);
$c->flash(success => $c->l('use_BYE'));
$c->session( expires => 1 ); $c->flash(error => 'Byegood');
$c->flash( success => $c->l('use_BYE') ); $c->redirect_to($c->home_page);
$c->flash( error => 'Byegood' ); } ## end sub logout
$c->redirect_to( $c->home_page );
}
sub confpwd { sub confpwd {
my $c = shift;
my $c = shift; my $jwt = $c->param('jwt');
my $name = $c->jwt->decode($jwt)->{username};
my $jwt = $c->param('jwt');
my $name = $c->jwt->decode($jwt)->{username};
# request already treated or outdated # request already treated or outdated
if ( $c->pwdrst->{$name}{confirmed} != 0 or $c->pwdrst->{$name}{date} < time() ) { if ($c->pwdrst->{$name}{confirmed} != 0 or $c->pwdrst->{$name}{date} < time()) {
$c->flash( error => $c->l('use_INVALID_REQUEST')); $c->flash(error => $c->l('use_INVALID_REQUEST'));
return $c->redirect_to( $c->home_page ); return $c->redirect_to($c->home_page);
} }
# reset password for this account # reset password for this account
$c->pwdrst->{$name}{confirmed} = 1; $c->pwdrst->{$name}{confirmed} = 1;
$c->flash(success => $c->l('use_OK_FOR_RESET'));
$c->flash( success => $c->l('use_OK_FOR_RESET') );
# call userpassword with encoded name # call userpassword with encoded name
my $url = $c->url_for('userpasswordr')->to_abs->query(jwt => $jwt); my $url = $c->url_for('userpasswordr')->to_abs->query(jwt => $jwt);
# warn "confpwd: " . $url . "\n"; # warn "confpwd: " . $url . "\n";
return $c->redirect_to($url);
return $c->redirect_to( $url ); } ## end sub confpwd
}
sub record_login_attempt { sub record_login_attempt {
my ($c, $result) = @_;
my $user = $c->param('Username');
my $ip_address = $c->tx->remote_address;
my ($c, $result) = @_; if ($result eq 'RESET') {
$c->app->log->info(join "\t", "Password reset requested for : $user at ", $ip_address);
my $user = $c->param('Username'); } elsif ($result eq 'SUCCESS') {
my $ip_address = $c->tx->remote_address; $c->app->log->info(join "\t", "Login succeeded: $user", $ip_address);
$Login_Attempts{$ip_address}->{tries} = 0; # reset the number of login attempts
if ($result eq 'RESET') { } else {
$c->app->log->info(join "\t", "Login FAILED: $user", $ip_address);
$c->app->log->info(join "\t", "Password reset requested for : $user at ", $ip_address); $Login_Attempts{$ip_address}->{tries}++;
} elsif ($result eq 'SUCCESS') {
$c->app->log->info(join "\t", "Login succeeded: $user", $ip_address);
$Login_Attempts{$ip_address}->{tries} = 0; # reset the number of login attempts
} else {
$c->app->log->info(join "\t", "Login FAILED: $user", $ip_address);
$Login_Attempts{$ip_address}->{tries}++;
if ( $Login_Attempts{$ip_address}->{tries} > $MAX_LOGIN_ATTEMPTS ) {
$Login_Attempts{$ip_address}->{denied_until} = time() + $DURATION_BLOCKED;
}
}
}
if ($Login_Attempts{$ip_address}->{tries} > $MAX_LOGIN_ATTEMPTS) {
$Login_Attempts{$ip_address}->{denied_until} = time() + $DURATION_BLOCKED;
}
} ## end else [ if ($result eq 'RESET')]
} ## end sub record_login_attempt
sub is_denied { sub is_denied {
my ($c) = @_; my ($c) = @_;
my $ip_address = $c->tx->remote_address;
my $ip_address = $c->tx->remote_address; return
unless exists $Login_Attempts{$ip_address}
return unless exists $Login_Attempts{$ip_address}
&& exists $Login_Attempts{$ip_address}->{denied_until}; && exists $Login_Attempts{$ip_address}->{denied_until};
return 'Denied'
if $Login_Attempts{$ip_address}->{denied_until} > time();
return 'Denied' # TIMEOUT has expired, reset attempts
if $Login_Attempts{$ip_address}->{denied_until} > time(); delete $Login_Attempts{$ip_address}->{denied_until};
$Login_Attempts{$ip_address}->{tries} = 0;
# TIMEOUT has expired, reset attempts return;
delete $Login_Attempts{$ip_address}->{denied_until}; } ## end sub is_denied
$Login_Attempts{$ip_address}->{tries} = 0;
return;
}
1; 1;

21
root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm
View File

@ -8,27 +8,18 @@ package SrvMngr::Controller::Logout;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw( theme_list init_session ); use SrvMngr qw( theme_list init_session );
sub logout { sub logout {
my $c = shift;
my $c = shift; $c->app->log->info($c->log_req);
$c->app->log->info($c->log_req); $c->session(expires => 1);
$c->flash(success => 'Goodbye');
$c->session( expires => 1 ); $c->redirect_to($c->home_page);
$c->flash( success => 'Goodbye' ); } ## end sub logout
$c->redirect_to( $c->home_page );
}
1; 1;

12
root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm
View File

@ -10,25 +10,17 @@ package SrvMngr::Controller::Manual;
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('manual_FORM_TITLE'); my $title = $c->l('manual_FORM_TITLE');
my $modul = $c->render_to_string(inline => $c->l('manual_DESCRIPTION')); my $modul = $c->render_to_string(inline => $c->l('manual_DESCRIPTION'));
$c->stash(title => $title, modul => $modul);
$c->stash( title => $title, modul => $modul);
$c->render(template => 'manual'); $c->render(template => 'manual');
} } ## end sub main
1; 1;

54
root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm
View File

@ -1,71 +1,57 @@
package SrvMngr::Controller::Modules; package SrvMngr::Controller::Modules;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
sub bugreport { sub bugreport {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $modul = $c->render_to_string(
my $modul = $c->render_to_string( inline => "<p># my (\$lang, \$releaseVersion, inline => "<p># my (\$lang, \$releaseVersion,
<br># \$c->stash\(\'lang\', \'releaseVer\' <br># \$c->stash\(\'lang\', \'releaseVer\'
# \'navigation\'</p>"); # \'navigation\'</p>"
);
$c->stash( modul => $modul ); $c->stash(modul => $modul);
} ## end sub bugreport
};
sub support { sub support {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $modul = $c->stash('modul'); my $modul = $c->stash('modul');
$modul .= 'Mail result is 1 + 8.'; $modul .= 'Mail result is 1 + 8.';
$c->stash(modul => $modul, PwdSet => '0', Unsafe => '0');
$c->stash( modul => $modul, PwdSet => '0', Unsafe => '0' );
#$c->render('modules/support'); #$c->render('modules/support');
}; } ## end sub support
sub modsearch { sub modsearch {
my $c = shift; my $c = shift;
my $module = $c->param('module'); my $module = $c->param('module');
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $redirect_url = SrvMngr->get_mod_url($module); my $redirect_url = SrvMngr->get_mod_url($module);
if($redirect_url ne "-1"){
#$c->render(text => "mod_search: $module to $redirect_url"); if ($redirect_url ne "-1") {
#$c->render(text => "mod_search: $module to $redirect_url");
return $c->redirect_to($redirect_url); return $c->redirect_to($redirect_url);
#return $c->redirect_to( url_for($redirect_url) ); #return $c->redirect_to( url_for($redirect_url) );
} } ## end if ($redirect_url ne "-1")
#$c->render(text => "mod_search: $module to 'welcome'"); #$c->render(text => "mod_search: $module to 'welcome'");
return $c->redirect_to( $c->home_page ); return $c->redirect_to($c->home_page);
} ## end sub modsearch
};
sub whatever { sub whatever {
my $c = shift; my $c = shift;
my $whatever = $c->param('whatever'); my $whatever = $c->param('whatever');
$c->app->log->info($c->log_req . ' ' . $whatever); $c->app->log->info($c->log_req . ' ' . $whatever);
$c->render(text => "whatever: /$whatever did not match.", status => 404); $c->render(text => "whatever: /$whatever did not match.", status => 404);
}; } ## end sub whatever
1; 1;

469
root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
View File

@ -10,248 +10,246 @@ package SrvMngr::Controller::Portforwarding;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use Regexp::Common qw /net/;
#use Regexp::Common qw /net/;
#use Data::Dumper; #use Data::Dumper;
use esmith::util; use esmith::util;
use esmith::HostsDB; use esmith::HostsDB;
our $db = esmith::ConfigDB->open our $db = esmith::ConfigDB->open
|| die "Can't open configuration database: $!\n"; || die "Can't open configuration database: $!\n";
our $tcp_db = esmith::ConfigDB->open('portforward_tcp') our $tcp_db = esmith::ConfigDB->open('portforward_tcp')
|| die "Can't open portforward_tcp database: $!\n"; || die "Can't open portforward_tcp database: $!\n";
our $udp_db = esmith::ConfigDB->open('portforward_udp') our $udp_db = esmith::ConfigDB->open('portforward_udp')
|| die "Can't open portforward_udp database: $!\n"; || die "Can't open portforward_udp database: $!\n";
my %ret = (); my %ret = ();
use constant FALSE => 0; use constant FALSE => 0;
use constant TRUE => 1; use constant TRUE => 1;
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my %pf_datas = (); my %pf_datas = ();
$pf_datas{return} = ""; $pf_datas{return} = "";
my $title = $c->l('pf_FORM_TITLE'); my $title = $c->l('pf_FORM_TITLE');
my $modul = ''; my $modul = '';
$pf_datas{trt} = 'LIST'; $pf_datas{trt} = 'LIST';
my @tcpforwards = $tcp_db->get_all; my @tcpforwards = $tcp_db->get_all;
my @udpforwards = $udp_db->get_all; my @udpforwards = $udp_db->get_all;
my $empty = 1 if not @tcpforwards and not @udpforwards; my $empty = 1 if not @tcpforwards and not @udpforwards;
$c->stash(
$c->stash( title => $title,
title => $title, modul => $modul,
modul => $modul, pf_datas => \%pf_datas,
pf_datas => \%pf_datas, tcpforwards => \@tcpforwards,
tcpforwards =>\@tcpforwards, udpforwards => \@udpforwards,
udpforwards =>\@udpforwards, empty => $empty
empty => $empty
); );
$c->render( template => 'portforwarding' ); $c->render(template => 'portforwarding');
} } ## end sub main
sub do_display { sub do_display {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LIST');
my $trt = ( $c->param('trt') || 'LIST' ); $trt = 'DEL' if ($rt eq 'portforwardingdel');
$trt = 'ADD' if ($rt eq 'portforwardingadd');
$trt = 'ADD1' if ($rt eq 'portforwardingadd1');
$trt = 'DEL' if ( $rt eq 'portforwardingdel' ); $trt = 'DEL1' if ($rt eq 'portforwardingdel1');
$trt = 'ADD' if ( $rt eq 'portforwardingadd' );
$trt = 'ADD1' if ( $rt eq 'portforwardingadd1' );
$trt = 'DEL1' if ( $rt eq 'portforwardingdel1' );
my %pf_datas = (); my %pf_datas = ();
my $title = $c->l('pf_FORM_TITLE'); my $title = $c->l('pf_FORM_TITLE');
my $modul = ''; my $modul = '';
if ($trt eq 'ADD') {
if ( $trt eq 'ADD' ) {
# Add a portforward- called from the list panel
# Nothing to do here...as just need template to display fields to input data.
} # Add a portforward- called from the list panel
# Nothing to do here...as just need template to display fields to input data.
} ## end if ($trt eq 'ADD')
if ( $trt eq 'ADD1' ) { if ($trt eq 'ADD1') {
#Add a port forward - called after new pf details filled in
my %ret = add_portforward($c);
#Return to list page if success
if ((index($ret{ret},"SUCCESS") != -1)) {
$trt = "LIST";
} else {
#Error - return to Add page
$trt = "ADD";
}
$c->stash(ret=>\%ret);
}
if ( $trt eq 'DEL1' ) { #Add a port forward - called after new pf details filled in
##After Remove clicked on Delete network panel my %ret = add_portforward($c);
my $sport = $c->param("sport") || '';
my $proto = $c->param("proto") || ''; #Return to list page if success
#work out which protocol if ((index($ret{ret}, "SUCCESS") != -1)) {
$trt = "LIST";
} else {
#Error - return to Add page
$trt = "ADD";
}
$c->stash(ret => \%ret);
} ## end if ($trt eq 'ADD1')
if ($trt eq 'DEL1') {
##After Remove clicked on Delete network panel
my $sport = $c->param("sport") || '';
my $proto = $c->param("proto") || '';
#work out which protocol
my $fdb; my $fdb;
if ($proto eq 'TCP') { if ($proto eq 'TCP') {
$fdb = $tcp_db; $fdb = $tcp_db;
} } else {
else {
$fdb = $udp_db; $fdb = $udp_db;
} }
#check that the sport is in the db
my $entry = $fdb->get($sport) || die("Unable to find sport and proto $sport $proto"); #check that the sport is in the db
my $entry = $fdb->get($sport) || die("Unable to find sport and proto $sport $proto");
$entry->delete; $entry->delete;
system( "/sbin/e-smith/signal-event", "portforwarding-update") == 0 system("/sbin/e-smith/signal-event", "portforwarding-update") == 0
or ( die($c->l('pf_ERR_NONZERO_RETURN_EVENT'))); or (die($c->l('pf_ERR_NONZERO_RETURN_EVENT')));
$trt = "LIST"; $trt = "LIST";
my %ret = (ret=>"pf_SUCCESS"); my %ret = (ret => "pf_SUCCESS");
$c->stash(ret=>\%ret); $c->stash(ret => \%ret);
} } ## end if ($trt eq 'DEL1')
if ( $trt eq 'DEL' ) { if ($trt eq 'DEL') {
##Initial delete panel requiring confirmation ##Initial delete panel requiring confirmation
my $sport = $c->param("sport") || ''; my $sport = $c->param("sport") || '';
my $proto = $c->param("proto") || ''; my $proto = $c->param("proto") || '';
$c->stash(sport=>$sport); $c->stash(sport => $sport);
#work out which protocol
#work out which protocol
my $fdb; my $fdb;
if ($proto eq 'TCP') { if ($proto eq 'TCP') {
$fdb = $tcp_db; $fdb = $tcp_db;
} } else {
else {
$fdb = $udp_db; $fdb = $udp_db;
} }
#pull out details and pass to template
my $entry = $fdb->get($sport) || die("Unable to find sport and proto $sport $proto"); #pull out details and pass to template
my $entry = $fdb->get($sport) || die("Unable to find sport and proto $sport $proto");
$pf_datas{proto} = $proto; $pf_datas{proto} = $proto;
$pf_datas{sport} = $sport; $pf_datas{sport} = $sport;
$pf_datas{dhost} = $entry->prop('DestHost'); $pf_datas{dhost} = $entry->prop('DestHost');
$pf_datas{dport} = $entry->prop('DestPort') || ''; $pf_datas{dport} = $entry->prop('DestPort') || '';
$pf_datas{cmmnt} = $entry->prop('Comment') || ''; $pf_datas{cmmnt} = $entry->prop('Comment') || '';
$pf_datas{allow} = $entry->prop('AllowHosts') || ''; $pf_datas{allow} = $entry->prop('AllowHosts') || '';
} } ## end if ($trt eq 'DEL')
if ( $trt eq 'LIST' ) { if ($trt eq 'LIST') {
#List all the port forwards
my @tcpforwards = $tcp_db->get_all;
my @udpforwards = $udp_db->get_all;
my $empty = 1 if not @tcpforwards and not @udpforwards;
$c->stash( #List all the port forwards
tcpforwards =>\@tcpforwards, my @tcpforwards = $tcp_db->get_all;
udpforwards =>\@udpforwards, my @udpforwards = $udp_db->get_all;
empty => $empty my $empty = 1 if not @tcpforwards and not @udpforwards;
); $c->stash(
tcpforwards => \@tcpforwards,
udpforwards => \@udpforwards,
empty => $empty
);
#my %forwards = (TCP=>@tcpforwards,UDP=>@udpforwards); #my %forwards = (TCP=>@tcpforwards,UDP=>@udpforwards);
#$c->stash(portforwarding => %forwards); #$c->stash(portforwarding => %forwards);
} } ## end if ($trt eq 'LIST')
$pf_datas{'trt'} = $trt;
$pf_datas{'trt'} = $trt; $c->stash(title => $title, modul => $modul, pf_datas => \%pf_datas);
$c->stash( title => $title, modul => $modul, pf_datas => \%pf_datas ); $c->render(template => 'portforwarding');
$c->render( template => 'portforwarding' ); } ## end sub do_display
}
sub add_portforward { sub add_portforward {
my $c = shift; my $c = shift;
my $sport = $c->param("sport") || ''; my $sport = $c->param("sport") || '';
my $proto = $c->param("proto") || ''; my $proto = $c->param("proto") || '';
#work out which protocol
my $fdb;
if ($proto eq 'TCP') {
$tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
$fdb = $tcp_db;
}
else {
$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
$fdb = $udp_db;
}
#Get the other values
my $dport = $c->param("dport");
my $dhost = get_destination_host($c);
my $cmmnt = $c->param("cmmnt") || "";
my $allow = $c->param("allow") || "";
my $deny = (($c->param("allow")) ? "0.0.0.0/0" : "");
$proto =~ s/^\s+|\s+$//g;
$sport =~ s/^\s+|\s+$//g;
$dport =~ s/^\s+|\s+$//g;
$dhost =~ s/^\s+|\s+$//g;
#Validate the values
%ret=validate_source_port($c) ; unless (index($ret{ret},"SUCCESS")!= -1) {return %ret;}
%ret=validate_allowed_hosts($c) ; if (index($ret{ret},"SUCCESS")== -1) {return %ret;}
%ret=validate_destination_port($c) ; if (index($ret{ret},"SUCCESS")== -1) {return %ret;}
%ret=validate_destination_host($c) ; if (index($ret{ret},"SUCCESS")== -1) {return %ret;}
# and then write it to the DB and tell the exec about it.
my $entry = $fdb->get($sport) || $fdb->new_record($sport, { type => 'forward' });
$entry->set_prop('DestHost', $dhost);
$entry->set_prop('DestPort', $dport) if $dport;
$entry->set_prop('Comment', $cmmnt);
$entry->set_prop('AllowHosts', $allow);
$entry->set_prop('DenyHosts', $deny);
system( "/sbin/e-smith/signal-event", "portforwarding-update") == 0
or ( return (ret=>'pf_ERR_NONZERO_RETURN_EVENT' ));
my %ret = (ret=>"pf_SUCCESS");
return %ret;
}
sub get_destination_host #work out which protocol
{ my $fdb;
my $q = shift;
my $dhost = $q->param("dhost"); if ($proto eq 'TCP') {
my $localip = $db->get_prop('InternalInterface', 'IPAddress'); $tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
$fdb = $tcp_db;
} else {
$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
$fdb = $udp_db;
}
#Get the other values
my $dport = $c->param("dport");
my $dhost = get_destination_host($c);
my $cmmnt = $c->param("cmmnt") || "";
my $allow = $c->param("allow") || "";
my $deny = (($c->param("allow")) ? "0.0.0.0/0" : "");
$proto =~ s/^\s+|\s+$//g;
$sport =~ s/^\s+|\s+$//g;
$dport =~ s/^\s+|\s+$//g;
$dhost =~ s/^\s+|\s+$//g;
#Validate the values
%ret = validate_source_port($c);
unless (index($ret{ret}, "SUCCESS") != -1) { return %ret; }
%ret = validate_allowed_hosts($c);
if (index($ret{ret}, "SUCCESS") == -1) { return %ret; }
%ret = validate_destination_port($c);
if (index($ret{ret}, "SUCCESS") == -1) { return %ret; }
%ret = validate_destination_host($c);
if (index($ret{ret}, "SUCCESS") == -1) { return %ret; }
# and then write it to the DB and tell the exec about it.
my $entry = $fdb->get($sport) || $fdb->new_record($sport, { type => 'forward' });
$entry->set_prop('DestHost', $dhost);
$entry->set_prop('DestPort', $dport) if $dport;
$entry->set_prop('Comment', $cmmnt);
$entry->set_prop('AllowHosts', $allow);
$entry->set_prop('DenyHosts', $deny);
system("/sbin/e-smith/signal-event", "portforwarding-update") == 0
or (return (ret => 'pf_ERR_NONZERO_RETURN_EVENT'));
my %ret = (ret => "pf_SUCCESS");
return %ret;
} ## end sub add_portforward
sub get_destination_host {
my $q = shift;
my $dhost = $q->param("dhost");
my $localip = $db->get_prop('InternalInterface', 'IPAddress');
my $external_ip = $db->get_prop('ExternalInterface', 'IPAddress') || $localip; my $external_ip = $db->get_prop('ExternalInterface', 'IPAddress') || $localip;
if ($dhost =~ /^(127.0.0.1|$localip|$external_ip)$/i) if ($dhost =~ /^(127.0.0.1|$localip|$external_ip)$/i) {
{
# localhost token gets expanded at runtime to current external IP # localhost token gets expanded at runtime to current external IP
$dhost = 'localhost'; $dhost = 'localhost';
} } ## end if ($dhost =~ /^(127.0.0.1|$localip|$external_ip)$/i)
return $dhost; return $dhost;
} } ## end sub get_destination_host
sub validate_source_port { sub validate_source_port {
my $q = shift; my $q = shift;
my $sport = $q->param('sport'); my $sport = $q->param('sport');
$sport =~ s/^\s+|\s+$//g; $sport =~ s/^\s+|\s+$//g;
# If this is a port range, split it up and validate it individually. # If this is a port range, split it up and validate it individually.
my @ports = (); my @ports = ();
if ($sport =~ /-/)
{ if ($sport =~ /-/) {
@ports = split /-/, $sport; @ports = split /-/, $sport;
if (@ports > 2)
{ if (@ports > 2) {
#$self->debug_msg("found more than 2 ports: @ports"); #$self->debug_msg("found more than 2 ports: @ports");
return (ret=>'pf_ERR_BADPORT'); return (ret => 'pf_ERR_BADPORT');
} } ## end if (@ports > 2)
} } else {
else
{
push @ports, $sport; push @ports, $sport;
} }
#$self->debug_msg("the ports array is: @ports"); #$self->debug_msg("the ports array is: @ports");
foreach my $port (@ports) foreach my $port (@ports) {
{
#$self->debug_msg("looping on port $port"); #$self->debug_msg("looping on port $port");
if (! isValidPort($port)) if (!isValidPort($port)) {
{
#$self->debug_msg("returning: " . $self->localise('ERR_BADPORT')); #$self->debug_msg("returning: " . $self->localise('ERR_BADPORT'));
return (ret=>'pf_ERR_BADPORT'); return (ret => 'pf_ERR_BADPORT');
} }
} } ## end foreach my $port (@ports)
# Now, lets screen any duplicates.
# Now, lets screen any duplicates.
my $protocol = $q->param('protocol'); my $protocol = $q->param('protocol');
my @forwards = (); my @forwards = ();
@ -261,152 +259,135 @@ sub validate_source_port {
} elsif ($protocol eq 'UDP') { } elsif ($protocol eq 'UDP') {
@forwards = map { $_->key } $udp_db->get_all; @forwards = map { $_->key } $udp_db->get_all;
} }
foreach my $psport (@forwards)
{
if (detect_collision($sport, $psport))
{
return (ret=>'pf_ERR_PORT_COLLISION');
}
}
return (ret=>"pf_SUCCESS");
}
sub detect_collision foreach my $psport (@forwards) {
{ if (detect_collision($sport, $psport)) {
return (ret => 'pf_ERR_PORT_COLLISION');
}
} ## end foreach my $psport (@forwards)
return (ret => "pf_SUCCESS");
} ## end sub validate_source_port
sub detect_collision {
my $port_a = shift; my $port_a = shift;
my $port_b = shift; my $port_b = shift;
# If they're both single ports, see if they're the same. # If they're both single ports, see if they're the same.
if (($port_a !~ /-/) && ($port_b !~ /-/)) if (($port_a !~ /-/) && ($port_b !~ /-/)) {
{
return $port_a eq $port_b; return $port_a eq $port_b;
} }
# If port_a is not a range but port_b is, is a in b? # If port_a is not a range but port_b is, is a in b?
elsif ($port_a !~ /-/) elsif ($port_a !~ /-/) {
{
my ($b1, $b2) = split /-/, $port_b; my ($b1, $b2) = split /-/, $port_b;
return (($port_a >= $b1) && ($port_a <= $b2)); return (($port_a >= $b1) && ($port_a <= $b2));
} } elsif ($port_b !~ /-/) {
elsif ($port_b !~ /-/)
{
my ($a1, $a2) = split /-/, $port_a; my ($a1, $a2) = split /-/, $port_a;
return (($port_b >= $a1) && ($port_b <= $a2)); return (($port_b >= $a1) && ($port_b <= $a2));
} } else {
else
{
# They're both ranges. Do they overlap? # They're both ranges. Do they overlap?
my ($a1, $a2) = split /-/, $port_a; my ($a1, $a2) = split /-/, $port_a;
my ($b1, $b2) = split /-/, $port_b; my ($b1, $b2) = split /-/, $port_b;
# They can overlap in two ways. Either a1 is in b, or b1 is in a. # They can overlap in two ways. Either a1 is in b, or b1 is in a.
if (($a1 >= $b1) && ($a1 <= $b2)) if (($a1 >= $b1) && ($a1 <= $b2)) {
{
return TRUE; return TRUE;
} } elsif (($b1 >= $a1) && ($b1 <= $a2)) {
elsif (($b1 >= $a1) && ($b1 <= $a2))
{
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} } ## end else [ if (($port_a !~ /-/) &&...)]
} } ## end sub detect_collision
sub validate_destination_port { sub validate_destination_port {
my $c = shift; my $c = shift;
my $dport = $c->param('dport'); my $dport = $c->param('dport');
$dport =~ s/^\s+|\s+$//g; $dport =~ s/^\s+|\s+$//g;
# If the dport is empty, that's ok.
return (ret=>'pf_SUCCESS') if not $dport; # If the dport is empty, that's ok.
return (ret => 'pf_SUCCESS') if not $dport;
# If this is a port range, split it up and validate it individually. # If this is a port range, split it up and validate it individually.
my @ports = (); my @ports = ();
if ($dport =~ /-/)
{ if ($dport =~ /-/) {
@ports = split /-/, $dport; @ports = split /-/, $dport;
if (@ports > 2)
{ if (@ports > 2) {
#$self->debug_msg("found more than 2 ports: @ports"); #$self->debug_msg("found more than 2 ports: @ports");
return (ret=>'pf_ERR_BADPORT'); return (ret => 'pf_ERR_BADPORT');
} } ## end if (@ports > 2)
} } else {
else
{
push @ports, $dport; push @ports, $dport;
} }
#$self->debug_msg("the ports array is: @ports"); #$self->debug_msg("the ports array is: @ports");
foreach my $port (@ports) {
foreach my $port (@ports)
{
#$self->debug_msg("looping on port $port"); #$self->debug_msg("looping on port $port");
if (! isValidPort($port)) if (!isValidPort($port)) {
{
#$self->debug_msg("returning: " . $self->localise('ERR_BADPORT'));
return (ret=>'pf_ERR_BADPORT');
}
}
return (ret=>'pf_SUCCESS');
}
#$self->debug_msg("returning: " . $self->localise('ERR_BADPORT'));
return (ret => 'pf_ERR_BADPORT');
}
} ## end foreach my $port (@ports)
return (ret => 'pf_SUCCESS');
} ## end sub validate_destination_port
sub isValidPort() { sub isValidPort() {
my $port = shift; my $port = shift;
return FALSE unless defined $port; return FALSE unless defined $port;
if (($port =~ /^\d+$/) && if ( ($port =~ /^\d+$/)
($port > 0) && && ($port > 0)
($port < 65536)) && ($port < 65536))
{ {
return TRUE; return TRUE;
} } else {
else {
return FALSE; return FALSE;
} }
} } ## end sub isValidPort
sub validate_destination_host { sub validate_destination_host {
my $c = shift; my $c = shift;
my $dhost = $c->param('dhost'); my $dhost = $c->param('dhost');
$dhost =~ s/^\s+|\s+$//g; $dhost =~ s/^\s+|\s+$//g;
my $localip = $db->get_prop('InternalInterface', 'IPAddress'); my $localip = $db->get_prop('InternalInterface', 'IPAddress');
my $external_ip = $db->get_prop('ExternalInterface', 'IPAddress') || $localip; my $external_ip = $db->get_prop('ExternalInterface', 'IPAddress') || $localip;
if ($dhost =~ /^(localhost|127.0.0.1|$localip|$external_ip)$/i) if ($dhost =~ /^(localhost|127.0.0.1|$localip|$external_ip)$/i) {
{
# localhost token gets expanded at runtime to current external IP
$c->param(-name=>'dhost', -value=>'localhost');
return (ret=>'pf_SUCCESS');
}
# localhost token gets expanded at runtime to current external IP
$c->param(-name => 'dhost', -value => 'localhost');
return (ret => 'pf_SUCCESS');
} ## end if ($dhost =~ /^(localhost|127.0.0.1|$localip|$external_ip)$/i)
my $systemmode = $db->get_value('SystemMode'); my $systemmode = $db->get_value('SystemMode');
if ($systemmode eq 'serveronly') { if ($systemmode eq 'serveronly') {
return (ret=>'pf_IN_SERVERONLY'); return (ret => 'pf_IN_SERVERONLY');
} }
if (isValidIP($dhost)) { if (isValidIP($dhost)) {
return (ret=>'pf_SUCCESS'); return (ret => 'pf_SUCCESS');
} else {
return (ret => 'pf_ERR_BADIP');
} }
else { } ## end sub validate_destination_host
return (ret=>'pf_ERR_BADIP');
}
}
sub validate_allowed_hosts { sub validate_allowed_hosts {
my $c = shift; my $c = shift;
my $ahost = $c->param('allow'); my $ahost = $c->param('allow');
$ahost =~ s/^\s+|\s+$//g; $ahost =~ s/^\s+|\s+$//g;
my %valid_ahost_list = (ret => "pf_SUCCESS");
my %valid_ahost_list = (ret=>"pf_SUCCESS");
foreach (split(/[\s,]+/, $ahost)) { foreach (split(/[\s,]+/, $ahost)) {
my $valid_ipnet = 0; my $valid_ipnet = 0;
$valid_ipnet = 1 if ($_ =~ m/^\d+\.\d+\.\d+\.\d+$/); $valid_ipnet = 1 if ($_ =~ m/^\d+\.\d+\.\d+\.\d+$/);
$valid_ipnet = 1 if ($_ =~ m/^\d+\.\d+\.\d+\.\d+\/\d+$/); $valid_ipnet = 1 if ($_ =~ m/^\d+\.\d+\.\d+\.\d+\/\d+$/);
%valid_ahost_list = (ret=>"pf_ERR_BADAHOST") if ($valid_ipnet != 1); %valid_ahost_list = (ret => "pf_ERR_BADAHOST") if ($valid_ipnet != 1);
} } ## end foreach (split(/[\s,]+/, $ahost...))
return %valid_ahost_list; return %valid_ahost_list;
} } ## end sub validate_allowed_hosts
1; 1;

362
root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm
View File

@ -11,236 +11,198 @@ package SrvMngr::Controller::Printers;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
use esmith::FormMagick::Panel::printers; use esmith::FormMagick::Panel::printers;
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db"; our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %prt_datas = (); my %prt_datas = ();
my $title = $c->l('prt_FORM_TITLE'); my $title = $c->l('prt_FORM_TITLE');
$prt_datas{'trt'} = 'LIST'; $prt_datas{'trt'} = 'LIST';
my @printerDrivers; my @printerDrivers;
if ($adb)
{ if ($adb) {
@printerDrivers = $adb->printers(); @printerDrivers = $adb->printers();
} }
$c->stash(title => $title, prt_datas => \%prt_datas, printerDrivers => \@printerDrivers);
$c->stash( title => $title, prt_datas => \%prt_datas, printerDrivers => \@printerDrivers );
$c->render(template => 'printers'); $c->render(template => 'printers');
} ## end sub main
};
sub do_display { sub do_display {
my $c = shift;
my $c = shift; my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LIST');
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LIST');
my $printer = $c->param('printer') || ''; my $printer = $c->param('printer') || '';
#$trt = 'DEL' if ( $printer ); #$trt = 'DEL' if ( $printer );
#$trt = 'ADD' if ( $rt eq 'printeradd' ); #$trt = 'ADD' if ( $rt eq 'printeradd' );
my %prt_datas = (); my %prt_datas = ();
my $title = $c->l('prt_FORM_TITLE'); my $title = $c->l('prt_FORM_TITLE');
$prt_datas{'trt'} = $trt; $prt_datas{'trt'} = $trt;
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
# nothing # nothing
}
if ($trt eq 'DEL') {
my $rec = $adb->get($printer);
if ($rec and $rec->prop('type') eq 'printer') {
$prt_datas{printer} = $printer;
$prt_datas{description} = $rec->prop('Description') || '';
} }
} ## end if ($trt eq 'DEL')
if ( $trt eq 'DEL' ) { if ($trt eq 'LIST') {
my @printerDrivers;
my $rec = $adb->get($printer);
if ($rec and $rec->prop('type') eq 'printer') {
$prt_datas{printer} = $printer;
$prt_datas{description} = $rec->prop('Description') || '';
}
if ($adb) {
@printerDrivers = $adb->printers();
} }
$c->stash(printerDrivers => \@printerDrivers);
if ( $trt eq 'LIST' ) { } ## end if ($trt eq 'LIST')
my @printerDrivers; $c->stash(title => $title, prt_datas => \%prt_datas);
if ($adb) $c->render(template => 'printers');
{ } ## end sub do_display
@printerDrivers = $adb->printers();
}
$c->stash( printerDrivers => \@printerDrivers );
}
$c->stash( title => $title, prt_datas => \%prt_datas );
$c->render( template => 'printers' );
};
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LIST');
my $trt = ($c->param('trt') || 'LIST');
my %prt_datas = (); my %prt_datas = ();
my $title = $c->l('prt_FORM_TITLE'); my $title = $c->l('prt_FORM_TITLE');
$prt_datas{'trt'} = $trt; $prt_datas{'trt'} = $trt;
my ($res, $result) = ''; my ($res, $result) = '';
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
my $name = ($c->param('Name') || '');
my $name = ($c->param('Name') || '');
my $description = ($c->param('Description') || ''); my $description = ($c->param('Description') || '');
my $location = ($c->param('Location') || ''); my $location = ($c->param('Location') || '');
# controls # controls
$res = $c->validate_printer( $name, $description, $location ); $res = $c->validate_printer($name, $description, $location);
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
if ( $location eq 'remote' and ! $result) { if ($location eq 'remote' and !$result) {
$prt_datas{'trt'} = 'NET'; $prt_datas{'trt'} = 'NET';
$prt_datas{'name'} = $name; $prt_datas{'name'} = $name;
$prt_datas{'description'} = $description; $prt_datas{'description'} = $description;
$prt_datas{'location'} = $location; $prt_datas{'location'} = $location;
$c->stash( title => $title, prt_datas => \%prt_datas ); $c->stash(title => $title, prt_datas => \%prt_datas);
return $c->render( template => 'printers' ); return $c->render(template => 'printers');
} } ## end if ($location eq 'remote'...)
$res = '';
$res = '';
if ( ! $result ) {
$res = $c->new_printer( $name, $description, $location );
#$remoteName, $address );
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$result = $c->l('prt_CREATED_SUCCESSFULLY') . ' ' . $name;
}
}
}
if ( $trt eq 'NET' ) { if (!$result) {
$res = $c->new_printer($name, $description, $location);
my $name = ($c->param('Name') || ''); #$remoteName, $address );
$result .= $res unless $res eq 'OK';
if (!$result) {
$result = $c->l('prt_CREATED_SUCCESSFULLY') . ' ' . $name;
}
} ## end if (!$result)
} ## end if ($trt eq 'ADD')
if ($trt eq 'NET') {
my $name = ($c->param('Name') || '');
my $description = ($c->param('Description') || ''); my $description = ($c->param('Description') || '');
my $location = ($c->param('Location') || ''); my $location = ($c->param('Location') || '');
my $remoteName = ($c->param ('RemoteName') || ''); my $remoteName = ($c->param('RemoteName') || '');
my $address = ($c->param ('Address') || ''); my $address = ($c->param('Address') || '');
$prt_datas{'name'} = $name;
$prt_datas{'description'} = $description;
$prt_datas{'location'} = $location;
$prt_datas{'name'} = $name; # controls
$prt_datas{'description'} = $description; $res = $c->validate_network($location, $remoteName, $address);
$prt_datas{'location'} = $location; $result .= $res unless $res eq 'OK';
$res = '';
# controls if (!$result) {
$res = $c->validate_network( $location, $remoteName, $address); $res = $c->new_printer($name, $description, $location, $remoteName, $address);
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
$res = ''; if (!$result) {
if ( ! $result ) { $result = $c->l('prt_CREATED_SUCCESSFULLY') . ' ' . $name;
$res = $c->new_printer( $name, $description, $location, $remoteName, $address ); }
$result .= $res unless $res eq 'OK'; } ## end if (!$result)
if ( ! $result ) { } ## end if ($trt eq 'NET')
$result = $c->l('prt_CREATED_SUCCESSFULLY') . ' ' . $name;
}
}
}
if ( $trt eq 'DEL' ) { if ($trt eq 'DEL') {
my $printer = ($c->param('printer') || '');
my $printer = ($c->param ('printer') || '');
if ($printer =~ /^([a-z][a-z0-9]*)$/) { if ($printer =~ /^([a-z][a-z0-9]*)$/) {
$printer = $1; $printer = $1;
} else { } else {
$result .= $c->l('prt_ERR_INTERNAL_FAILURE') . ':' . $printer; $result .= $c->l('prt_ERR_INTERNAL_FAILURE') . ':' . $printer;
} }
my $rec = $adb->get($printer);
$result .= $c->l('prt_ERR_INTERNAL_FAILURE') . ':' . $printer unless ($rec);
$res = '';
my $rec = $adb->get($printer); if (!$result) {
$result .= $c->l('prt_ERR_INTERNAL_FAILURE') . ':' . $printer unless ($rec); $res = $c->del_printer($printer);
$result .= $res unless $res eq 'OK';
$res = ''; if (!$result) {
if ( ! $result ) { $result = $c->l('prt_DELETED_SUCCESSFULLY') . ' ' . $printer;
$res = $c->del_printer( $printer ); }
$result .= $res unless $res eq 'OK'; } ## end if (!$result)
if ( ! $result ) { } ## end if ($trt eq 'DEL')
$result = $c->l('prt_DELETED_SUCCESSFULLY') . ' ' . $printer;
}
}
}
# common parts # common parts
if ($res ne 'OK') { if ($res ne 'OK') {
$c->stash( error => $result ); $c->stash(error => $result);
$c->stash( title => $title, prt_datas => \%prt_datas ); $c->stash(title => $title, prt_datas => \%prt_datas);
return $c->render('printers'); return $c->render('printers');
} }
my $message = "'Printers' updates ($trt) DONE"; my $message = "'Printers' updates ($trt) DONE";
$c->app->log->info($message); $c->app->log->info($message);
$c->flash( success => $result ); $c->flash(success => $result);
#$c->flash( error => 'No changes applied !!' ); # for testing purpose #$c->flash( error => 'No changes applied !!' ); # for testing purpose
$c->redirect_to('/printers'); $c->redirect_to('/printers');
} ## end sub do_update
};
sub del_printer { sub del_printer {
my ($c, $printer) = @_;
my ( $c, $printer ) = @_;
# Update the db account (1) # Update the db account (1)
my $rec = $adb->get($printer); my $rec = $adb->get($printer);
$rec->set_prop('type', 'printer-deleted'); $rec->set_prop('type', 'printer-deleted');
system ("/sbin/e-smith/signal-event printer-delete $printer") == 0 system("/sbin/e-smith/signal-event printer-delete $printer") == 0
or return $c->error('ERR_DELETING'); or return $c->error('ERR_DELETING');
$rec->delete(); $rec->delete();
return 'OK'; return 'OK';
} ## end sub del_printer
}
sub validate_printer { sub validate_printer {
my ($c, $name, $description, $location, $remoteName, $address) = @_;
my ($c, $name, $description, $location, $remoteName, $address ) = @_;
#------------------------------------------------------------ #------------------------------------------------------------
# Validate parameters and untaint them # Validate parameters and untaint them
#------------------------------------------------------------ #------------------------------------------------------------
if ($name =~ /^([a-z][a-z0-9]*)$/) {
if ($name =~ /^([a-z][a-z0-9]*)$/) {
$name = $1; $name = $1;
} else { } else {
return $c->l('prt_ERR_UNEXPECTED_NAME') . ': ' . $name; return $c->l('prt_ERR_UNEXPECTED_NAME') . ': ' . $name;
} }
if ($description =~ /^([\'\w\s]+)$/) { if ($description =~ /^([\'\w\s]+)$/) {
$description = $1; $description = $1;
} else { } else {
return $c->l('prt_ERR_UNEXPECTED_DESC') . ': ' . $description; return $c->l('prt_ERR_UNEXPECTED_DESC') . ': ' . $description;
} }
if ($location =~ /^(lp[0-9]+|remote|usb\/lp[0-9]+)$/){ if ($location =~ /^(lp[0-9]+|remote|usb\/lp[0-9]+)$/) {
$location = $1; $location = $1;
} else { } else {
$location = "lp0"; $location = "lp0";
@ -249,26 +211,22 @@ sub validate_printer {
#------------------------------------------------------------ #------------------------------------------------------------
# Looks good. Find out if this printer has been taken # Looks good. Find out if this printer has been taken
#------------------------------------------------------------ #------------------------------------------------------------
my $rec = $adb->get($name); my $rec = $adb->get($name);
my $type; my $type;
if ($rec and ($type = $rec->prop('type'))) { if ($rec and ($type = $rec->prop('type'))) {
return $c->l('prt_ERR_EXISTS') . ' : ' . $name; return $c->l('prt_ERR_EXISTS') . ' : ' . $name;
} }
return 'OK'; return 'OK';
} } ## end sub validate_printer
sub validate_network { sub validate_network {
my ($c, $location, $remoteName, $address) = @_;
my ($c, $location, $remoteName, $address ) = @_;
if ($location eq 'remote') { if ($location eq 'remote') {
my $msg = hostname_or_ip2($c, $address);
return $msg unless $msg eq 'OK';
my $msg = hostname_or_ip2 ( $c, $address );
return $msg unless $msg eq 'OK';
if ($address =~ /^([a-zA-Z0-9\.\-]+)$/) { if ($address =~ /^([a-zA-Z0-9\.\-]+)$/) {
$address = $1; $address = $1;
} else { } else {
@ -280,82 +238,63 @@ sub validate_network {
} else { } else {
return $c->l('prt_ERR_INVALID_REMOTE_NAME') . ' : ' . $remoteName; return $c->l('prt_ERR_INVALID_REMOTE_NAME') . ' : ' . $remoteName;
} }
} } ## end if ($location eq 'remote')
return 'OK'; return 'OK';
} } ## end sub validate_network
sub new_printer { sub new_printer {
my ($c, $name, $description, $location, $remoteName, $address) = @_;
my ($c, $name, $description, $location, $remoteName, $address ) = @_;
#------------------------------------------------------------ #------------------------------------------------------------
# Printer name is available! Update printers database and # Printer name is available! Update printers database and
# signal the create-printer event. # signal the create-printer event.
#------------------------------------------------------------ #------------------------------------------------------------
my $result = ''; my $result = '';
my $rec = $adb->new_record(
my $rec = $adb->new_record($name, $name,
{type=>'printer', { type => 'printer',
Description => $description, Description => $description,
Address => $address, Address => $address,
RemoteName => $remoteName, RemoteName => $remoteName,
Location => $location}); Location => $location
}
system ("/sbin/e-smith/signal-event printer-create $name") == 0 );
or return $c->error('ERR_CREATING'); system("/sbin/e-smith/signal-event printer-create $name") == 0
or return $c->error('ERR_CREATING');
return 'OK', return 'OK',;
} } ## end sub new_printer
sub hostname_or_ip2 { sub hostname_or_ip2 {
my ($fm, $data) = @_; my ($fm, $data) = @_;
if ($data =~ /^[\d\.]+$/) { if ($data =~ /^[\d\.]+$/) {
if (ip_number2($fm, $data) eq "OK") if (ip_number2($fm, $data) eq "OK") {
{
return "OK"; return "OK";
} } else {
else
{
return $fm->l('prt_MUST_BE_VALID_HOSTNAME_OR_IP'); return $fm->l('prt_MUST_BE_VALID_HOSTNAME_OR_IP');
} }
} } elsif ($data =~ /^([a-zA-Z0-9\.\-]+)$/) {
elsif ($data =~ /^([a-zA-Z0-9\.\-]+)$/ )
{
return "OK"; return "OK";
} } else {
else
{
return $fm->l('prt_MUST_BE_VALID_HOSTNAME_OR_IP'); return $fm->l('prt_MUST_BE_VALID_HOSTNAME_OR_IP');
} }
} } ## end sub hostname_or_ip2
sub ip_number2 { sub ip_number2 {
# from CGI::FormMagick::Validator::ip_number($fm, $data) # from CGI::FormMagick::Validator::ip_number($fm, $data)
my ($fm, $data) = @_; my ($fm, $data) = @_;
return undef unless defined $data; return undef unless defined $data;
return 'FM_IP_NUMBER1' unless $data =~ /^[\d.]+$/; return 'FM_IP_NUMBER1' unless $data =~ /^[\d.]+$/;
my @octets = split /\./, $data; my @octets = split /\./, $data;
my $dots = ($data =~ tr/.//); my $dots = ($data =~ tr/.//);
return 'FM_IP_NUMBER2' unless (scalar @octets == 4 and $dots == 3); return 'FM_IP_NUMBER2' unless (scalar @octets == 4 and $dots == 3);
foreach my $octet (@octets) { foreach my $octet (@octets) {
return $fm->l("FM_IP_NUMBER3", {octet => $octet}) if $octet > 255; return $fm->l("FM_IP_NUMBER3", { octet => $octet }) if $octet > 255;
} }
return 'OK'; return 'OK';
} } ## end sub ip_number2
=head2 publicAccess_list =head2 publicAccess_list
@ -365,15 +304,14 @@ access drop down list.
=cut =cut
sub printerLocation_list { sub printerLocation_list {
my $c = shift; my $c = shift;
return [[ $c->l('prt_LOCAL_PRINTER_0') => 'lp0'], return [
[ $c->l('prt_LOCAL_PRINTER_1') => 'lp1'], [ $c->l('prt_LOCAL_PRINTER_0') => 'lp0' ],
[ $c->l('prt_LOCAL_PRINTER_2') => 'lp2'], [ $c->l('prt_LOCAL_PRINTER_1') => 'lp1' ],
[ $c->l('prt_NET_PRINTER') => 'remote' ], [ $c->l('prt_LOCAL_PRINTER_2') => 'lp2' ],
[ $c->l('prt_FIRST_USB_PRINTER') => 'usb/lp0'], [ $c->l('prt_NET_PRINTER') => 'remote' ],
[ $c->l('prt_SECOND_USB_PRINTER') => 'usb/lp1']]; [ $c->l('prt_FIRST_USB_PRINTER') => 'usb/lp0' ],
} [ $c->l('prt_SECOND_USB_PRINTER') => 'usb/lp1' ]
];
} ## end sub printerLocation_list
1 1

41
root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm
View File

@ -11,65 +11,50 @@ package SrvMngr::Controller::Proxy;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
our $db = esmith::ConfigDB->open || die "Couldn't open config db"; our $db = esmith::ConfigDB->open || die "Couldn't open config db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %prx_datas = (); my %prx_datas = ();
my $title = $c->l('prx_TITLE'); my $title = $c->l('prx_TITLE');
my $modul = $c->render_to_string(inline => $c->l('prx_FIRST_PAGE_DESCRIPTION')); my $modul = $c->render_to_string(inline => $c->l('prx_FIRST_PAGE_DESCRIPTION'));
$prx_datas{'http_proxy_status'} = ($db->get_prop('squid', 'status')) || 'disabled';
$prx_datas{'http_proxy_status'} = ($db->get_prop('squid','status')) || 'disabled';
#if (system('/bin/rpm -q e-smith-email > /dev/null') == 0) #if (system('/bin/rpm -q e-smith-email > /dev/null') == 0)
#{ #{
$prx_datas{'smtp_proxy_status'} = $db->get_prop('qpsmtpd','Proxy') || undef; $prx_datas{'smtp_proxy_status'} = $db->get_prop('qpsmtpd', 'Proxy') || undef;
#} #}
#(system('/bin/rpm -q e-smith-email > /dev/null') == 0) ? #(system('/bin/rpm -q e-smith-email > /dev/null') == 0) ?
$c->stash(title => $title, modul => $modul, prx_datas => \%prx_datas);
$c->stash( title => $title, modul => $modul, prx_datas => \%prx_datas );
$c->render(template => 'proxy'); $c->render(template => 'proxy');
}; } ## end sub main
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $http_proxy_status = $c->param('http_proxy_status') || 'disabled'; my $http_proxy_status = $c->param('http_proxy_status') || 'disabled';
my $smtp_proxy_status = $c->param('smtp_proxy_status') || ''; my $smtp_proxy_status = $c->param('smtp_proxy_status') || '';
my $result = "";
my $result = "";
my $squid = $db->get('squid') or $result = $c->l('prx_ERR_NO_SQUID_REC'); my $squid = $db->get('squid') or $result = $c->l('prx_ERR_NO_SQUID_REC');
# smtpd is allowed to not exist, as the relevant packages may not be # smtpd is allowed to not exist, as the relevant packages may not be
# installed. # installed.
my $smtpd = $db->get('qpsmtpd') || undef; my $smtpd = $db->get('qpsmtpd') || undef;
$squid->set_prop('status', $http_proxy_status); $squid->set_prop('status', $http_proxy_status);
$smtpd->set_prop('Proxy', $smtp_proxy_status) if $smtpd; $smtpd->set_prop('Proxy', $smtp_proxy_status) if $smtpd;
# #
# Update the system # Update the system
# #
system("/sbin/e-smith/signal-event proxy-update") == 0 system("/sbin/e-smith/signal-event proxy-update") == 0
or $result = $c->l('prx_ERR_PROXY_UPDATE_FAILED'); or $result = $c->l('prx_ERR_PROXY_UPDATE_FAILED');
my $title = $c->l('prx_TITLE'); my $title = $c->l('prx_TITLE');
if ($result eq '') { $result = $c->l('prx_SUCCESS'); }
if ( $result eq '' ) { $result = $c->l('prx_SUCCESS'); } $c->stash(title => $title, modul => $result);
$c->stash( title => $title, modul => $result );
$c->render(template => 'module'); $c->render(template => 'module');
}; } ## end sub do_update
1;
1;

372
root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm
View File

@ -11,288 +11,252 @@ package SrvMngr::Controller::Pseudonyms;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use Data::Dumper; #use Data::Dumper;
#use esmith::FormMagick::Panel::pseudonyms; #use esmith::FormMagick::Panel::pseudonyms;
use esmith::AccountsDB; use esmith::AccountsDB;
#use URI::Escape; #use URI::Escape;
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"; our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %pse_datas = (); my %pse_datas = ();
my $title = $c->l('pse_FORM_TITLE'); my $title = $c->l('pse_FORM_TITLE');
my $notif = ''; my $notif = '';
$pse_datas{trt} = 'LST'; $pse_datas{trt} = 'LST';
my @pseudonyms; my @pseudonyms;
if ($adb)
{ if ($adb) {
@pseudonyms = $adb->pseudonyms(); @pseudonyms = $adb->pseudonyms();
} }
$c->stash(title => $title, notif => $notif, pse_datas => \%pse_datas, pseudonyms => \@pseudonyms);
$c->stash( title => $title, notif => $notif, pse_datas => \%pse_datas, pseudonyms => \@pseudonyms );
$c->render(template => 'pseudonyms'); $c->render(template => 'pseudonyms');
} ## end sub main
};
sub do_display { sub do_display {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LST');
my $trt = ($c->param('trt') || 'LST');
my $pseudonym = $c->param('pseudonym') || ''; my $pseudonym = $c->param('pseudonym') || '';
my $title = $c->l('pse_FORM_TITLE');
my $title = $c->l('pse_FORM_TITLE');
my %pse_datas = (); my %pse_datas = ();
$pse_datas{'trt'} = $trt; $pse_datas{'trt'} = $trt;
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
#nothing
}
if ( $trt eq 'UPD' ) { #nothing
}
my $rec = $adb->get($pseudonym);
if ($rec and $rec->prop('type') eq 'pseudonym') {
$pse_datas{pseudonym} = $pseudonym; if ($trt eq 'UPD') {
$pse_datas{account} = $rec->prop('Account') || ''; my $rec = $adb->get($pseudonym);
$pse_datas{internal} = is_pseudonym_internal($pseudonym);
}
}
if ( $trt eq 'DEL' ) { if ($rec and $rec->prop('type') eq 'pseudonym') {
$pse_datas{pseudonym} = $pseudonym;
$pse_datas{account} = $rec->prop('Account') || '';
$pse_datas{internal} = is_pseudonym_internal($pseudonym);
} ## end if ($rec and $rec->prop...)
} ## end if ($trt eq 'UPD')
my $rec = $adb->get($pseudonym); if ($trt eq 'DEL') {
if ($rec and $rec->prop('type') eq 'pseudonym') { my $rec = $adb->get($pseudonym);
$pse_datas{pseudonym} = $pseudonym; if ($rec and $rec->prop('type') eq 'pseudonym') {
$pse_datas{account} = $rec->prop('Account') || ''; $pse_datas{pseudonym} = $pseudonym;
$pse_datas{internal} = is_pseudonym_internal($pseudonym); $pse_datas{account} = $rec->prop('Account') || '';
$pse_datas{internal} = is_pseudonym_internal($pseudonym);
} ## end if ($rec and $rec->prop...)
} ## end if ($trt eq 'DEL')
} if ($trt eq 'LST') {
my @pseudonyms;
if ($adb) {
@pseudonyms = $adb->pseudonyms();
} }
$c->stash(pseudonyms => \@pseudonyms);
if ( $trt eq 'LST' ) { } ## end if ($trt eq 'LST')
my @pseudonyms; $c->stash(title => $title, pse_datas => \%pse_datas);
if ($adb) { $c->render(template => 'pseudonyms');
@pseudonyms = $adb->pseudonyms(); } ## end sub do_display
}
$c->stash( pseudonyms => \@pseudonyms );
}
$c->stash( title => $title, pse_datas => \%pse_datas );
$c->render( template => 'pseudonyms' );
};
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LST');
my $trt = ($c->param('trt') || 'LST'); my $title = $c->l('pse_FORM_TITLE');
my $title = $c->l('pse_FORM_TITLE');
my %pse_datas = (); my %pse_datas = ();
$pse_datas{'trt'} = $trt; $pse_datas{'trt'} = $trt;
my ($res, $result) = ''; my ($res, $result) = '';
#my $pseudonym = uri_unescape($c->param('Pseudonym')); #my $pseudonym = uri_unescape($c->param('Pseudonym'));
my $pseudonym = $c->param('Pseudonym'); my $pseudonym = $c->param('Pseudonym');
$pse_datas{'pseudonym'} = $pseudonym; $pse_datas{'pseudonym'} = $pseudonym;
if ( $trt eq 'ADD' ) { if ($trt eq 'ADD') {
my $account = $c->param('Account'); my $account = $c->param('Account');
# controls # controls
$res = $c->validate_new_pseudonym_name( $pseudonym, $account ); $res = $c->validate_new_pseudonym_name($pseudonym, $account);
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
#$result .= ' blocked'; #$result .= ' blocked';
$res = '';
$res = '';
if ( ! $result ) {
$adb->new_record( $pseudonym, { type => 'pseudonym',
Account => $account} )
or $result .= "Error occurred while creating pseudonym in database.";
# Untaint $pseudonym before use in system()
($pseudonym) = ($pseudonym =~ /(.+)/);
system( "/sbin/e-smith/signal-event", "pseudonym-create", "$pseudonym",)
== 0 or $result .= 'pse_CREATE_ERROR.';
}
if ( ! $result ) {
$res = 'OK';
$result = $c->l('pse_CREATE_SUCCEEDED') . ' ' . $pseudonym;
}
}
if ( $trt eq 'UPD' ) { if (!$result) {
$adb->new_record(
$pseudonym,
{ type => 'pseudonym',
Account => $account
}
) or $result .= "Error occurred while creating pseudonym in database.";
my $account = $c->param('Account'); # Untaint $pseudonym before use in system()
my $internal = $c->param ('Internal') || 'NO'; ($pseudonym) = ($pseudonym =~ /(.+)/);
my $removable = $adb->get($pseudonym)->prop('Removable') || 'yes'; system("/sbin/e-smith/signal-event", "pseudonym-create", "$pseudonym",) == 0
or $result .= 'pse_CREATE_ERROR.';
} ## end if (!$result)
my %props = ('Account' => $account); if (!$result) {
$res = 'OK';
$result = $c->l('pse_CREATE_SUCCEEDED') . ' ' . $pseudonym;
}
} ## end if ($trt eq 'ADD')
if ($removable eq 'yes') { if ($trt eq 'UPD') {
if ($internal eq "YES") { $props{'Visible'} = 'internal'; } my $account = $c->param('Account');
else { $adb->get($pseudonym)->delete_prop('Visible'); } my $internal = $c->param('Internal') || 'NO';
} my $removable = $adb->get($pseudonym)->prop('Removable') || 'yes';
my %props = ('Account' => $account);
# controls if ($removable eq 'yes') {
#$res = ''; if ($internal eq "YES") { $props{'Visible'} = 'internal'; }
#$res = validate_description( $c, $account ); else { $adb->get($pseudonym)->delete_prop('Visible'); }
#$result .= $res unless $res eq 'OK'; }
#$result .= 'blocked'; # controls
#$res = '';
#$res = validate_description( $c, $account );
#$result .= $res unless $res eq 'OK';
#$result .= 'blocked';
$res = '';
$res = ''; if (!$result) {
if ( ! $result ) { $adb->get($pseudonym)->merge_props(%props)
$adb->get($pseudonym)->merge_props(%props) or $result .= "Error occurred while modifying pseudonym in database.";
or $result .= "Error occurred while modifying pseudonym in database.";
# Untaint $pseudonym before use in system()
($pseudonym) = ($pseudonym =~ /(.+)/);
system( "/sbin/e-smith/signal-event", "pseudonym-modify", "$pseudonym",)
== 0 or $result .= "Error occurred while modifying pseudonym.";
}
if ( ! $result ) {
$res = 'OK';
$result = $c->l('pse_MODIFY_SUCCEEDED') . ' ' . $pseudonym;
}
}
if ( $trt eq 'DEL' ) { # Untaint $pseudonym before use in system()
($pseudonym) = ($pseudonym =~ /(.+)/);
system("/sbin/e-smith/signal-event", "pseudonym-modify", "$pseudonym",) == 0
or $result .= "Error occurred while modifying pseudonym.";
} ## end if (!$result)
# controls if (!$result) {
$res = ''; $res = 'OK';
$res = validate_is_pseudonym($c, $pseudonym); $result = $c->l('pse_MODIFY_SUCCEEDED') . ' ' . $pseudonym;
$result .= $res unless $res eq 'OK'; }
} ## end if ($trt eq 'UPD')
#$result .= 'blocked';
if ($trt eq 'DEL') {
$res = '';
if ( ! $result ) { # controls
$res = $c->delete_pseudonym( $pseudonym ); $res = '';
$result .= $res unless $res eq 'OK'; $res = validate_is_pseudonym($c, $pseudonym);
if ( ! $result ) { $result .= $res unless $res eq 'OK';
$res = 'OK';
$result = $c->l('pse_REMOVE_SUCCEEDED') . ' ' . $pseudonym; #$result .= 'blocked';
} $res = '';
}
} if (!$result) {
$res = $c->delete_pseudonym($pseudonym);
$result .= $res unless $res eq 'OK';
if (!$result) {
$res = 'OK';
$result = $c->l('pse_REMOVE_SUCCEEDED') . ' ' . $pseudonym;
}
} ## end if (!$result)
} ## end if ($trt eq 'DEL')
# common parts # common parts
if ($res ne 'OK') {
if ( $res ne 'OK' ) { $c->stash(error => $result);
$c->stash( error => $result); $c->stash(title => $title, pse_datas => \%pse_datas);
$c->stash( title => $title, pse_datas => \%pse_datas ); return $c->render('pseudonyms');
return $c->render('pseudonyms');
} }
my $message = "'Pseudonyms' updates $trt DONE"; my $message = "'Pseudonyms' updates $trt DONE";
$c->app->log->info($message); $c->app->log->info($message);
$c->flash( success => $result ); $c->flash(success => $result);
$c->redirect_to('/pseudonyms'); $c->redirect_to('/pseudonyms');
} ## end sub do_update
};
sub delete_pseudonym { sub delete_pseudonym {
my ($c, $pseudonym) = @_; my ($c, $pseudonym) = @_;
my $msg = ''; my $msg = '';
#------------------------------------------------------------ #------------------------------------------------------------
# Make the pseudonym inactive, signal pseudonym-delete event # Make the pseudonym inactive, signal pseudonym-delete event
# and then delete it # and then delete it
#------------------------------------------------------------ #------------------------------------------------------------
my @pseudonyms = $adb->pseudonyms(); my @pseudonyms = $adb->pseudonyms();
foreach my $p_rec (@pseudonyms) { foreach my $p_rec (@pseudonyms) {
if ($p_rec->prop("Account") eq $pseudonym) { if ($p_rec->prop("Account") eq $pseudonym) {
$adb->get($p_rec->key)->set_prop('type','pseudonym-deleted') $adb->get($p_rec->key)->set_prop('type', 'pseudonym-deleted')
or $msg .= "Error occurred while changing pseudonym type."; or $msg .= "Error occurred while changing pseudonym type.";
} }
} } ## end foreach my $p_rec (@pseudonyms)
$adb->get($pseudonym)->set_prop('type', 'pseudonym-deleted')
$adb->get($pseudonym)->set_prop('type','pseudonym-deleted')
or $msg .= "Error occurred while changing pseudonym type."; or $msg .= "Error occurred while changing pseudonym type.";
# Untaint $pseudonym before use in system() # Untaint $pseudonym before use in system()
($pseudonym) = ($pseudonym =~ /(.+)/); ($pseudonym) = ($pseudonym =~ /(.+)/);
system( "/sbin/e-smith/signal-event", "pseudonym-delete", "$pseudonym") == 0 system("/sbin/e-smith/signal-event", "pseudonym-delete", "$pseudonym") == 0
or $msg .= "Error occurred while removing pseudonym."; or $msg .= "Error occurred while removing pseudonym.";
#TODO: is it ->delete or get()->delete #TODO: is it ->delete or get()->delete
foreach my $p_rec (@pseudonyms) { foreach my $p_rec (@pseudonyms) {
if ($p_rec->prop("Account") eq $pseudonym) { if ($p_rec->prop("Account") eq $pseudonym) {
$adb->get($p_rec->key)->delete() $adb->get($p_rec->key)->delete()
or $msg .= "Error occurred while deleting pseudonym from database."; or $msg .= "Error occurred while deleting pseudonym from database.";
} }
} } ## end foreach my $p_rec (@pseudonyms)
$adb->get($pseudonym)->delete() $adb->get($pseudonym)->delete()
or $msg .= "Error occurred while deleting pseudonym from database."; or $msg .= "Error occurred while deleting pseudonym from database.";
return $msg unless $msg;
return $msg unless $msg;
return 'OK'; return 'OK';
} } ## end sub delete_pseudonym
sub existing_accounts_list { sub existing_accounts_list {
my $c = shift; my $c = shift;
my @existingAccounts = ([ 'Administrator' => 'admin' ]);
my @existingAccounts = ( ['Administrator' => 'admin']);
foreach my $a ($adb->get_all) { foreach my $a ($adb->get_all) {
if ($a->prop('type') =~ /(user|group)/) { if ($a->prop('type') =~ /(user|group)/) {
push @existingAccounts, [ $a->key => $a->key ]; push @existingAccounts, [ $a->key => $a->key ];
} }
if ($a->prop('type') eq "pseudonym") { if ($a->prop('type') eq "pseudonym") {
my $target = $adb->get($a->prop('Account')); my $target = $adb->get($a->prop('Account'));
unless ($target) unless ($target) {
{ warn "WARNING: pseudonym (" . $a->key . ") => missing Account(" . $a->prop('Account') . ")\n";
warn "WARNING: pseudonym (" . $a->key . ") => missing Account("
. $a->prop('Account') . ")\n";
next; next;
} }
push @existingAccounts, [ $a->key, $a->key ] push @existingAccounts, [ $a->key, $a->key ]
unless ($target->prop('type') eq "pseudonym"); unless ($target->prop('type') eq "pseudonym");
} } ## end if ($a->prop('type') eq...)
} } ## end foreach my $a ($adb->get_all)
return (\@existingAccounts);
return(\@existingAccounts); } ## end sub existing_accounts_list
}
=head2 get_pseudonym_account =head2 get_pseudonym_account
@ -301,17 +265,17 @@ Returns the current Account property for this pseudonym
=cut =cut
sub get_pseudonym_account { sub get_pseudonym_account {
my $c = shift; my $c = shift;
my $pseudonym = shift; my $pseudonym = shift;
my $a = $adb->get($pseudonym)->prop('Account');
my $a = $adb->get($pseudonym)->prop('Account');
if ($a eq "admin") { if ($a eq "admin") {
$a = "Administrator"; $a = "Administrator";
} elsif ($a eq "shared") { } elsif ($a eq "shared") {
$a = $c->l("EVERYONE"); $a = $c->l("EVERYONE");
} }
return($a); return ($a);
} } ## end sub get_pseudonym_account
=head2 is_pseudonym_not_removable =head2 is_pseudonym_not_removable
@ -320,13 +284,12 @@ Returns 1 if the current Account is not removable, 0 otherwise
=cut =cut
sub is_pseudonym_not_removable { sub is_pseudonym_not_removable {
my $c = shift; my $c = shift;
my $pseudonym = shift; my $pseudonym = shift;
my $removable = $adb->get($pseudonym)->prop('Removable') || 'yes'; my $removable = $adb->get($pseudonym)->prop('Removable') || 'yes';
return 1 if ($removable eq 'yes'); return 1 if ($removable eq 'yes');
return 0; return 0;
} } ## end sub is_pseudonym_not_removable
=head2 is_pseudonym_internal =head2 is_pseudonym_internal
@ -335,13 +298,13 @@ Returns YES if the current Account property Visible is 'internal'
=cut =cut
sub is_pseudonym_internal { sub is_pseudonym_internal {
# my $c = shift;
my $pseudonym = shift;
# my $c = shift;
my $pseudonym = shift;
my $visible = $adb->get($pseudonym)->prop('Visible') || ''; my $visible = $adb->get($pseudonym)->prop('Visible') || '';
return 'YES' if ($visible eq 'internal'); return 'YES' if ($visible eq 'internal');
return 'NO'; return 'NO';
} } ## end sub is_pseudonym_internal
=head2 validate_new_pseudonym_name FM PSEUDONYM =head2 validate_new_pseudonym_name FM PSEUDONYM
@ -355,30 +318,25 @@ Returns "NAME_IN_USE" if this pseudonym is taken.
=cut =cut
sub validate_new_pseudonym_name { sub validate_new_pseudonym_name {
my ($c, $pseudonym, $account) = @_; my ($c, $pseudonym, $account) = @_;
my $acct = $adb->get($pseudonym); my $acct = $adb->get($pseudonym);
if (defined $acct) { if (defined $acct) {
return($c->l('pse_NAME_IN_USE')); return ($c->l('pse_NAME_IN_USE'));
} elsif ($pseudonym =~ /@/) { } elsif ($pseudonym =~ /@/) {
use esmith::DomainsDB; use esmith::DomainsDB;
my $ddb = esmith::DomainsDB->open_ro my $ddb = esmith::DomainsDB->open_ro
or die "Couldn't open DomainsDB\n"; or die "Couldn't open DomainsDB\n";
my ($lhs, $rhs) = split /@/, $pseudonym; my ($lhs, $rhs) = split /@/, $pseudonym;
return ($c->l('pse_PSEUDONYM_INVALID_DOMAIN')) unless ($ddb->get($rhs)); return ($c->l('pse_PSEUDONYM_INVALID_DOMAIN')) unless ($ddb->get($rhs));
return ($c->l('pse_PSEUDONYM_INVALID_SAMEACCT')) if ($lhs eq $account); return ($c->l('pse_PSEUDONYM_INVALID_SAMEACCT')) if ($lhs eq $account);
return ('OK'); # p:' . $pseudonym . ' a:' . $account); return ('OK'); # p:' . $pseudonym . ' a:' . $account);
} elsif ($pseudonym !~ /^([a-z0-9][a-z0-9\.\-_!#\?~\$\^\+&`%\/\*]*)$/) {
} elsif ( $pseudonym !~ /^([a-z0-9][a-z0-9\.\-_!#\?~\$\^\+&`%\/\*]*)$/ ) { return ($c->l('pse_VALID_PSEUDONYM_NAMES'));
return($c->l('pse_VALID_PSEUDONYM_NAMES'));
} else { } else {
return('OK'); return ('OK');
} }
} } ## end sub validate_new_pseudonym_name
=head2 validate_is_pseudonym FM NAME =head2 validate_is_pseudonym FM NAME
@ -388,19 +346,15 @@ returns "NOT_A_PSEUDONYM" if the name in question isn't an existing pseudonym
=cut =cut
sub validate_is_pseudonym { sub validate_is_pseudonym {
my $c = shift; my $c = shift;
my $pseudonym = shift; my $pseudonym = shift;
$pseudonym = $adb->get($pseudonym); $pseudonym = $adb->get($pseudonym);
return($c->l('pse_NOT_A_PSEUDONYM')) unless $pseudonym; return ($c->l('pse_NOT_A_PSEUDONYM')) unless $pseudonym;
my $type = $pseudonym->prop('type'); my $type = $pseudonym->prop('type');
unless (defined $type && ($type eq 'pseudonym') ) {
return($c->l('NOT_A_PSEUDONYM')); unless (defined $type && ($type eq 'pseudonym')) {
return ($c->l('NOT_A_PSEUDONYM'));
} }
return ('OK'); return ('OK');
} } ## end sub validate_is_pseudonym
1; 1;

171
root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm
View File

@ -10,143 +10,106 @@ package SrvMngr::Controller::Qmailanalog;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use esmith::FormMagick qw(gen_locale_date_string); use esmith::FormMagick qw(gen_locale_date_string);
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('qma_FORM_TITLE'); my $title = $c->l('qma_FORM_TITLE');
my $modul = $c->render_to_string(inline => $c->l('qma_INITIAL_DESC')); my $modul = $c->render_to_string(inline => $c->l('qma_INITIAL_DESC'));
$c->stash(title => $title, modul => $modul);
$c->stash( title => $title, modul => $modul );
$c->render(template => 'qmailanalog'); $c->render(template => 'qmailanalog');
}; } ## end sub main
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $result = "";
my $result = "";
my $report_type = $c->param('report_type'); my $report_type = $c->param('report_type');
if ($report_type =~ /^(\S+)$/) if ($report_type =~ /^(\S+)$/) {
{ $report_type = $1;
$report_type = $1; } elsif ($report_type =~ /^\s*$/) {
$report_type = "zoverall";
} else {
$result = $c->l('INVALID_REPORT_TYPE') . $report_type;
$report_type = undef;
} }
elsif ($report_type =~ /^\s*$/)
{
$report_type = "zoverall";
} else {
$result = $c->l('INVALID_REPORT_TYPE') . $report_type;
$report_type = undef;
}
my $title = $c->l('qma_FORM_TITLE'); my $title = $c->l('qma_FORM_TITLE');
$result = $c->render_to_string(inline => generateReport($c, $report_type)) if $report_type; $result = $c->render_to_string(inline => generateReport($c, $report_type)) if $report_type;
$c->stash(title => $title, modul => $result);
$c->stash( title => $title, modul => $result );
$c->render(template => 'module'); $c->render(template => 'module');
}; } ## end sub do_update
sub generateReport { sub generateReport {
my $c = shift;
my $report_type = shift;
my $out = '';
my $c = shift; #------------------------------------------------------------
my $report_type = shift; # Looks good; go ahead and generate the report.
#------------------------------------------------------------
# $| = 1;
my $now_string = $c->gen_locale_date_string();
$out .= sprintf("<h3>%s %s </h3>", $c->l('REPORT_GENERATED'), $now_string);
my $out = ''; if ($report_type =~ /^qmail-q/) {
open(QMAILQUEUEREPORT, "/var/qmail/bin/$report_type |");
#------------------------------------------------------------ $out .= sprintf "<pre>";
# Looks good; go ahead and generate the report.
#------------------------------------------------------------
# $| = 1; while (<QMAILQUEUEREPORT>) {
$out .= sprintf("%s", $_);
}
close QMAILQUEUEREPORT;
$out .= sprintf "</pre>";
$out .= sprintf("<h3>%s</h3>", $c->l('END_OF_REPORT'));
return '';
} ## end if ($report_type =~ /^qmail-q/)
chdir "/var/log/qmail";
open(QMAILANALOG,
"/bin/cat \@* current 2>/dev/null"
. "| /usr/local/bin/tai64nunix"
. "| /usr/local/qmailanalog/bin/matchup 5>/dev/null"
. "| /usr/local/qmailanalog/bin/$report_type |");
$out .= sprintf "<pre>";
my $now_string = $c->gen_locale_date_string(); while (<QMAILANALOG>) {
$out .= sprintf("<h3>%s %s </h3>", $c->l('REPORT_GENERATED'), $now_string);
if ($report_type =~ /^qmail-q/)
{
open(QMAILQUEUEREPORT, "/var/qmail/bin/$report_type |");
$out .= sprintf "<pre>";
while (<QMAILQUEUEREPORT>)
{
$out .= sprintf("%s", $_);
}
close QMAILQUEUEREPORT;
$out .= sprintf "</pre>";
$out .= sprintf("<h3>%s</h3>", $c->l('END_OF_REPORT'));
return '';
}
chdir "/var/log/qmail";
open(QMAILANALOG,
"/bin/cat \@* current 2>/dev/null"
. "| /usr/local/bin/tai64nunix"
. "| /usr/local/qmailanalog/bin/matchup 5>/dev/null"
. "| /usr/local/qmailanalog/bin/$report_type |"
);
$out .= sprintf "<pre>";
while (<QMAILANALOG>)
{
# Cook any special HTML characters
s/\&/\&amp;/g;
s/\"/\&quot;/g;
s/\>/\&gt;/g;
s/\</\&lt;/g;
$out .= sprintf("%s", $_);
}
close QMAILANALOG;
$out .= sprintf "</pre>";
$out .= sprintf("<h3>%s</h3>", $c->l('END_OF_REPORT'));
return $out;
}
# Cook any special HTML characters
s/\&/\&amp;/g;
s/\"/\&quot;/g;
s/\>/\&gt;/g;
s/\</\&lt;/g;
$out .= sprintf("%s", $_);
} ## end while (<QMAILANALOG>)
close QMAILANALOG;
$out .= sprintf "</pre>";
$out .= sprintf("<h3>%s</h3>", $c->l('END_OF_REPORT'));
return $out;
} ## end sub generateReport
sub reportType_list { sub reportType_list {
my $c = shift;
my $c = shift;
my @array = ( my @array = (
# [ $c->l('qma_LIST_OUTGOING') => 'qmail-qread' ],
# [ $c->l('qma_SUMMARIZE_QUEUE') => 'qmail-qstat' ], # [ $c->l('qma_LIST_OUTGOING') => 'qmail-qread' ],
# [ $c->l('qma_SUMMARIZE_QUEUE') => 'qmail-qstat' ],
[ $c->l('qma_SUCCESSFUL_DELIVERY_DELAY') => 'zddist' ], [ $c->l('qma_SUCCESSFUL_DELIVERY_DELAY') => 'zddist' ],
[ $c->l('qma_REASONS_DEFERRAL') => 'zdeferrals' ], [ $c->l('qma_REASONS_DEFERRAL') => 'zdeferrals' ],
[ $c->l('qma_REASONS_FAILURE') => 'zfailures' ], [ $c->l('qma_REASONS_FAILURE') => 'zfailures' ],
[ $c->l('qma_BASIC_STATS') => 'zoverall' ], [ $c->l('qma_BASIC_STATS') => 'zoverall' ],
[ $c->l('qma_RECIP_STATS') => 'zrecipients' ], [ $c->l('qma_RECIP_STATS') => 'zrecipients' ],
[ $c->l('qma_RECIP_HOSTS') => 'zrhosts' ], [ $c->l('qma_RECIP_HOSTS') => 'zrhosts' ],
[ $c->l('qma_RECIP_ORDERED') => 'zrxdelay' ], [ $c->l('qma_RECIP_ORDERED') => 'zrxdelay' ],
[ $c->l('qma_SENDER_STATS') => 'zsenders' ], [ $c->l('qma_SENDER_STATS') => 'zsenders' ],
[ $c->l('qma_SENDMAIL_STYLE') => 'zsendmail' ], [ $c->l('qma_SENDMAIL_STYLE') => 'zsendmail' ],
[ $c->l('qma_REASONS_SUCCESS') => 'zsuccesses' ], [ $c->l('qma_REASONS_SUCCESS') => 'zsuccesses' ],
[ $c->l('qma_SENDER_UIDS') => 'zsuids' ] [ $c->l('qma_SENDER_UIDS') => 'zsuids' ]
); );
my @sorted_array = sort { $a->[0] cmp $b->[0] } @array; my @sorted_array = sort { $a->[0] cmp $b->[0] } @array;
return \@sorted_array; return \@sorted_array;
} } ## end sub reportType_list
1; 1;

178
root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
View File

@ -11,183 +11,149 @@ package SrvMngr::Controller::Quota;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use esmith::FormMagick::Panel::quota; use esmith::FormMagick::Panel::quota;
#use esmith::TestUtils; #use esmith::TestUtils;
use Scalar::Util qw(looks_like_number); use Scalar::Util qw(looks_like_number);
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#our $db = esmith::ConfigDB->open || die "Couldn't open config db"; #our $db = esmith::ConfigDB->open || die "Couldn't open config db";
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db"; our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %quo_datas = (); my %quo_datas = ();
my $title = $c->l('quo_FORM_TITLE'); my $title = $c->l('quo_FORM_TITLE');
$quo_datas{'trt'} = 'LIST'; $quo_datas{'trt'} = 'LIST';
my @userAccounts; my @userAccounts;
if ($adb) { if ($adb) {
@userAccounts = $adb->users(); @userAccounts = $adb->users();
} }
$c->stash(title => $title, quo_datas => \%quo_datas, userAccounts => \@userAccounts);
$c->stash( title => $title, quo_datas => \%quo_datas, userAccounts => \@userAccounts );
$c->render(template => 'quota'); $c->render(template => 'quota');
} ## end sub main
};
sub do_display { sub do_display {
my $c = shift;
my $c = shift; my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LIST');
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'LIST');
my $user = $c->param('user') || ''; my $user = $c->param('user') || '';
$trt = 'UPD' if ($user);
$trt = 'UPD' if ( $user );
my %quo_datas = (); my %quo_datas = ();
my $title = $c->l('quo_FORM_TITLE'); my $title = $c->l('quo_FORM_TITLE');
$quo_datas{'trt'} = $trt; $quo_datas{'trt'} = $trt;
if ( $trt eq 'UPD' ) { if ($trt eq 'UPD') {
my $rec = $adb->get($user);
my $rec = $adb->get($user);
if ($rec and $rec->prop('type') eq 'user') {
$quo_datas{user} = $user;
$quo_datas{userRec} = $rec;
my $max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocks'));
$quo_datas{hardlim} = $max;
$max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocksSoftLim'));
$quo_datas{softlim} = $max;
}
}
$c->stash( title => $title, quo_datas => \%quo_datas );
$c->render( template => 'quota' );
};
if ($rec and $rec->prop('type') eq 'user') {
$quo_datas{user} = $user;
$quo_datas{userRec} = $rec;
my $max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocks'));
$quo_datas{hardlim} = $max;
$max = esmith::FormMagick::Panel::quota->toBestUnit($rec->prop('MaxBlocksSoftLim'));
$quo_datas{softlim} = $max;
} ## end if ($rec and $rec->prop...)
} ## end if ($trt eq 'UPD')
$c->stash(title => $title, quo_datas => \%quo_datas);
$c->render(template => 'quota');
} ## end sub do_display
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('quo_FORM_TITLE');
my $title = $c->l('quo_FORM_TITLE');
my %quo_datas = (); my %quo_datas = ();
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LIST');
my $trt = ($c->param('trt') || 'LIST');
$quo_datas{trt} = $trt; $quo_datas{trt} = $trt;
my $result = ''; my $result = '';
my $res; my $res;
if ( $trt eq 'UPD' ) { if ($trt eq 'UPD') {
$quo_datas{user} = ($c->param('user') || '');
$quo_datas{user} = ($c->param('user') || ''); $quo_datas{softlim} = ($c->param('Soft') || '');
$quo_datas{softlim} = ($c->param('Soft') || '');
$quo_datas{hardlim} = ($c->param('Hard') || ''); $quo_datas{hardlim} = ($c->param('Hard') || '');
# controls # controls
$res = validate_quota( $c, $quo_datas{user}, $quo_datas{softlim}, $quo_datas{hardlim} ); $res = validate_quota($c, $quo_datas{user}, $quo_datas{softlim}, $quo_datas{hardlim});
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
if ( ! $result ) { if (!$result) {
$result = $c->l('quo_SUCCESSFULLY_MODIFIED') . ' ' . $quo_datas{user}; $result = $c->l('quo_SUCCESSFULLY_MODIFIED') . ' ' . $quo_datas{user};
} else { } else {
$quo_datas{userRec} = $adb->get($quo_datas{user}) || undef; $quo_datas{userRec} = $adb->get($quo_datas{user}) || undef;
} }
} } ## end if ($trt eq 'UPD')
# common parts # common parts
if ($res ne 'OK') { if ($res ne 'OK') {
$c->stash( error => $result ); $c->stash(error => $result);
$c->stash( title => $title, quo_datas => \%quo_datas ); $c->stash(title => $title, quo_datas => \%quo_datas);
return $c->render('quota'); return $c->render('quota');
} }
my $message = "'Quota' updates ($trt) DONE"; my $message = "'Quota' updates ($trt) DONE";
$c->app->log->info($message); $c->app->log->info($message);
$c->flash( success => $result ); $c->flash(success => $result);
$c->redirect_to('/quota'); $c->redirect_to('/quota');
} ## end sub do_update
};
sub validate_quota { sub validate_quota {
my ($c, $acct, $softlim, $hardlim ) = @_; my ($c, $acct, $softlim, $hardlim) = @_;
my $msg; my $msg;
my $rec = $adb->get($acct); my $rec = $adb->get($acct);
return $c->l('quo_ERR_NO_SUCH_ACCT') . ' : ' . $acct unless (defined $rec); return $c->l('quo_ERR_NO_SUCH_ACCT') . ' : ' . $acct unless (defined $rec);
my $type = $rec->prop('type'); my $type = $rec->prop('type');
unless ($type eq "user") { unless ($type eq "user") {
$msg = $c->l('quo_ERR_NOT_A_USER_ACCT').$acct.$c->l('quo_ACCOUNT_IS_TYPE').$type; $msg = $c->l('quo_ERR_NOT_A_USER_ACCT') . $acct . $c->l('quo_ACCOUNT_IS_TYPE') . $type;
return $msg; return $msg;
} }
my $uid = getpwnam($acct); my $uid = getpwnam($acct);
return $c->l('COULD_NOT_GET_UID').$acct unless ($uid); return $c->l('COULD_NOT_GET_UID') . $acct unless ($uid);
if (($softlim !~ /^(.+?)\s*([KMGT])?$/ ) || (!looks_like_number ($1))) { if (($softlim !~ /^(.+?)\s*([KMGT])?$/) || (!looks_like_number($1))) {
return $c->l('quo_SOFT_VAL_MUST_BE_NUMBER'); return $c->l('quo_SOFT_VAL_MUST_BE_NUMBER');
} }
my $exponent = 1; # Entries with no suffix are assumed to be in megabytes.
my $exponent = 1; # Entries with no suffix are assumed to be in megabytes.
if (defined ($2)) {
$exponent = index("KMGT",$2);
}
$softlim = ($1 * 1024 ** $exponent);
if (($hardlim !~ /^(.+?)\s*([KMGT])?$/ ) || (!looks_like_number ($1))) { if (defined($2)) {
return $c->l('quo_HARD_VAL_MUST_BE_NUMBER'); $exponent = index("KMGT", $2);
} }
$exponent = 1; # Entries with no suffix are assumed to be in megabytes. $softlim = ($1 * 1024**$exponent);
if (defined ($2))
{ if (($hardlim !~ /^(.+?)\s*([KMGT])?$/) || (!looks_like_number($1))) {
$exponent = index("KMGT",$2); return $c->l('quo_HARD_VAL_MUST_BE_NUMBER');
} }
$hardlim = ($1 * 1024 ** $exponent); $exponent = 1; # Entries with no suffix are assumed to be in megabytes.
if (defined($2)) {
$exponent = index("KMGT", $2);
}
$hardlim = ($1 * 1024**$exponent);
#------------------------------------------------------------ #------------------------------------------------------------
# Make sure that soft limit is less than hard limit. # Make sure that soft limit is less than hard limit.
#------------------------------------------------------------ #------------------------------------------------------------
unless ($hardlim == 0 or $hardlim > $softlim) { unless ($hardlim == 0 or $hardlim > $softlim) {
return $c->l('quo_ERR_HARD_LT_SOFT'); return $c->l('quo_ERR_HARD_LT_SOFT');
} }
#------------------------------------------------------------ #------------------------------------------------------------
# Update accounts database and signal the user-modify event. # Update accounts database and signal the user-modify event.
#------------------------------------------------------------ #------------------------------------------------------------
$rec->set_prop('MaxBlocks', $hardlim);
$rec->set_prop('MaxBlocks', $hardlim);
$rec->set_prop('MaxBlocksSoftLim', $softlim); $rec->set_prop('MaxBlocksSoftLim', $softlim);
# Untaint $acct before using in system(). # Untaint $acct before using in system().
$acct =~ /^(\w[\-\w_\.]*)$/; $acct = $1; $acct =~ /^(\w[\-\w_\.]*)$/;
system ("/sbin/e-smith/signal-event", "user-modify", "$acct") == 0 $acct = $1;
or die ($c->l('quo_ERR_MODIFYING')."\n"); system("/sbin/e-smith/signal-event", "user-modify", "$acct") == 0
or die($c->l('quo_ERR_MODIFYING') . "\n");
return 'OK'; return 'OK';
} } ## end sub validate_quota
1 1

90
root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
View File

@ -1,87 +1,77 @@
package SrvMngr::Controller::Reboot; package SrvMngr::Controller::Reboot;
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# heading : System # heading : System
# description : Reboot or shutdown # description : Reboot or shutdown
# navigation : 4000 700 # navigation : 4000 700
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('rbo_FORM_TITLE'); my $title = $c->l('rbo_FORM_TITLE');
my $modul = ''; my $modul = '';
$c->stash(title => $title, modul => $modul);
$c->stash( title => $title, modul => $modul );
$c->render(template => 'reboot'); $c->render(template => 'reboot');
} ## end sub main
};
sub do_action { sub do_action {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('rbo_FORM_TITLE');
my $title = $c->l('rbo_FORM_TITLE'); my $result = "";
my $result = ""; my $function = $c->param('function');
my $debug = $c->param('debug');
my $function = $c->param ('function');
my $debug = $c->param('debug');
if ($function eq "reboot") { if ($function eq "reboot") {
$result = $c->l('rbo_REBOOT_SUCCEEDED') . '<br>' . $c->l('rbo_DESC_REBOOT'); $result = $c->l('rbo_REBOOT_SUCCEEDED') . '<br>' . $c->l('rbo_DESC_REBOOT');
unless ($debug) { unless ($debug) {
esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "reboot" ); esmith::util::backgroundCommand(1, "/sbin/e-smith/signal-event", "reboot");
# system( "/sbin/e-smith/signal-event", "reboot" ) == 0
# or die ("Error occurred while rebooting.\n"); # system( "/sbin/e-smith/signal-event", "reboot" ) == 0
} # or die ("Error occurred while rebooting.\n");
} ## end unless ($debug)
} elsif ($function eq 'shutdown') { } elsif ($function eq 'shutdown') {
$result = $c->l('rbo_SHUTDOWN_SUCCEEDED') . '<br>' . $c->l('rbo_DESC_SHUTDOWN'); $result = $c->l('rbo_SHUTDOWN_SUCCEEDED') . '<br>' . $c->l('rbo_DESC_SHUTDOWN');
unless ($debug) { unless ($debug) {
esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "halt" ); esmith::util::backgroundCommand(1, "/sbin/e-smith/signal-event", "halt");
# system( "/sbin/e-smith/signal-event", "halt" ) == 0
# or die ("Error occurred while halting.\n"); # system( "/sbin/e-smith/signal-event", "halt" ) == 0
} # or die ("Error occurred while halting.\n");
} ## end unless ($debug)
} elsif ($function eq 'reconfigure') { } elsif ($function eq 'reconfigure') {
$result = $c->l('rbo_RECONFIGURE_SUCCEEDED') . '<br>' . $c->l('rbo_DESC_RECONFIGURE'); $result = $c->l('rbo_RECONFIGURE_SUCCEEDED') . '<br>' . $c->l('rbo_DESC_RECONFIGURE');
unless ($debug) { unless ($debug) {
# esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade",
# "; ", "/sbin/e-smith/signal-event", "reboot" );
system( "/sbin/e-smith/signal-event", "post-upgrade" ) == 0
or die ("Error occurred while running post-upgrade.\n");
system( "/sbin/e-smith/signal-event", "reboot" ) == 0
or die ("Error occurred while rebooting.\n");
}
}
$c->stash( title => $title, modul => $result ); # esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade",
# "; ", "/sbin/e-smith/signal-event", "reboot" );
system("/sbin/e-smith/signal-event", "post-upgrade") == 0
or die("Error occurred while running post-upgrade.\n");
system("/sbin/e-smith/signal-event", "reboot") == 0
or die("Error occurred while rebooting.\n");
} ## end unless ($debug)
} ## end elsif ($function eq 'reconfigure')
$c->stash(title => $title, modul => $result);
$c->render(template => 'module'); $c->render(template => 'module');
} ## end sub do_action
};
sub rebootFunction_list { sub rebootFunction_list {
my $c = shift; my $c = shift;
return [[ $c->l('rbo_REBOOT') => 'reboot' ], return [
[ $c->l('RECONFIGURE') => 'reconfigure' ], [ $c->l('rbo_REBOOT') => 'reboot' ],
[ $c->l('SHUTDOWN') => 'shutdown' ]]; [ $c->l('RECONFIGURE') => 'reconfigure' ],
} [ $c->l('SHUTDOWN') => 'shutdown' ]
];
} ## end sub rebootFunction_list
1; 1;

418
root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
View File

@ -11,12 +11,9 @@ package SrvMngr::Controller::Remoteaccess;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session ip_number subnet_mask get_reg_mask); use SrvMngr qw(theme_list init_session ip_number subnet_mask get_reg_mask);
use esmith::ConfigDB; use esmith::ConfigDB;
use esmith::util; use esmith::util;
use File::Basename; use File::Basename;
@ -25,29 +22,23 @@ use Carp;
use Socket qw( inet_aton ); use Socket qw( inet_aton );
#our @ISA = qw(esmith::FormMagick Exporter); #our @ISA = qw(esmith::FormMagick Exporter);
our @EXPORT = qw( networkAccess_list passwordLogin_list get_ssh_permit_root_login get_ssh_access get_telnet_mode
our @EXPORT = get_ftp_access get_ftp_password_login_access
qw( networkAccess_list passwordLogin_list get_ssh_permit_root_login get_ssh_access get_telnet_mode get_value get_prop get_ssh_password_auth
get_ftp_access get_ftp_password_login_access validate_network_and_mask ip_number_or_blank subnet_mask_or_blank
get_value get_prop get_ssh_password_auth get_ipsecrw_sessions pptp_and_dhcp_range
validate_network_and_mask ip_number_or_blank subnet_mask_or_blank );
get_ipsecrw_sessions pptp_and_dhcp_range
);
# get_pptp_sessions # get_pptp_sessions
our $db = esmith::ConfigDB->open || warn "Couldn't open configuration database"; our $db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my $title = $c->l('rma_FORM_TITLE'); my $title = $c->l('rma_FORM_TITLE');
my $notif = ''; my $notif = '';
my %rma_datas = (); my %rma_datas = ();
$db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
$db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
#$rma_datas{ipsecrwSess} = $c->get_ipsecrw_sessions(); #$rma_datas{ipsecrwSess} = $c->get_ipsecrw_sessions();
#$rma_datas{pptpSessions} = $c->get_pptp_sessions(); #$rma_datas{pptpSessions} = $c->get_pptp_sessions();
@ -59,106 +50,84 @@ sub main {
$rma_datas{ftpPasswordAccess} = $c->get_ftp_password_login_access(); $rma_datas{ftpPasswordAccess} = $c->get_ftp_password_login_access();
#$rma_datas{telnetAccess} = $c->get_telnet_access; #$rma_datas{telnetAccess} = $c->get_telnet_access;
$c->stash(title => $title, notif => $notif, rma_datas => \%rma_datas);
$c->stash( title => $title, notif => $notif, rma_datas => \%rma_datas ); $c->render(template => 'remoteaccess');
$c->render( template => 'remoteaccess' ); } ## end sub main
}
sub do_action { sub do_action {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info($c->log_req);
my $title = $c->l('rma_FORM_TITLE'); my $title = $c->l('rma_FORM_TITLE');
my ( $result, $res, $trt ) = ''; my ($result, $res, $trt) = '';
my %rma_datas = (); my %rma_datas = ();
$db = esmith::ConfigDB->open || warn "Couldn't open configuration database";
$db = esmith::ConfigDB->open || warn "Couldn't open configuration database"; $rma_datas{ipsecrwSess} = ($c->param('IpsecrwSess') || '');
$rma_datas{ipsecrwReset} = ($c->param('IpsecrwReset') || '');
$rma_datas{ipsecrwSess} = ( $c->param('IpsecrwSess') || '' );
$rma_datas{ipsecrwReset} = ( $c->param('IpsecrwReset') || '' );
#$rma_datas{pptpSessions} = ($c->param ('PptpSessions') || '0'); #$rma_datas{pptpSessions} = ($c->param ('PptpSessions') || '0');
$rma_datas{validFromNetwork} = ($c->param('ValidFromNetwork') || '');
$rma_datas{validFromNetwork} = ( $c->param('ValidFromNetwork') || '' ); $rma_datas{validFromMask} = ($c->param('ValidFromMask') || '');
$rma_datas{validFromMask} = ( $c->param('ValidFromMask') || '' );
## my @remove = $q->param('validFromRemove'); ???????? the first one only !! ## my @remove = $q->param('validFromRemove'); ???????? the first one only !!
my @vals = $c->param('Remove_nets'); my @vals = $c->param('Remove_nets');
$rma_datas{remove_nets} = join ',', @vals; $rma_datas{remove_nets} = join ',', @vals;
$rma_datas{sshaccess} = ($c->param('SshAccess') || 'off');
$rma_datas{sshaccess} = ( $c->param('SshAccess') || 'off' ); $rma_datas{sshPermitRootLogin} = ($c->param('SshPermitRootLogin') || 'no');
$rma_datas{sshPermitRootLogin} = $rma_datas{sshPasswordAuthentication} = ($c->param('SshPasswordAuthentication') || 'no');
( $c->param('SshPermitRootLogin') || 'no' ); $rma_datas{sshTCPPort} = ($c->param('SshTCPPort') || '22');
$rma_datas{sshPasswordAuthentication} = $rma_datas{ftpAccess} = ($c->param('FtpAccess') || 'off');
( $c->param('SshPasswordAuthentication') || 'no' ); $rma_datas{ftpPasswordAccess} = ($c->param('FtpPasswordAccess') || 'private');
$rma_datas{sshTCPPort} = ( $c->param('SshTCPPort') || '22' ); $rma_datas{telnetAccess} = ($c->param('TelnetAccess') || 'off');
$rma_datas{ftpAccess} = ( $c->param('FtpAccess') || 'off' );
$rma_datas{ftpPasswordAccess} =
( $c->param('FtpPasswordAccess') || 'private' );
$rma_datas{telnetAccess} = ( $c->param('TelnetAccess') || 'off' );
# validate # validate
my $v = $c->validation; my $v = $c->validation;
return $c->render('remoteaccess') unless $v->has_data; return $c->render('remoteaccess') unless $v->has_data;
#$v->optional('PptpSessions')->num(0, 999)->is_valid; #$v->optional('PptpSessions')->num(0, 999)->is_valid;
if ( $c->param('ValidFromNetwork') ne "" ) { if ($c->param('ValidFromNetwork') ne "") {
$v->optional('ValidFromNetwork')->size( 7, 15 )->is_valid; $v->optional('ValidFromNetwork')->size(7, 15)->is_valid;
} }
if ( $c->param('ValidFromMask') ne "" ) {
$v->optional('ValidFromMask')->size( 7, 15 )->is_valid;
}
$v->required('SshTCPPort')->num( 1, 65535 )->is_valid;
if ($c->param('ValidFromMask') ne "") {
$v->optional('ValidFromMask')->size(7, 15)->is_valid;
}
$v->required('SshTCPPort')->num(1, 65535)->is_valid;
$result .= 'field validation error' if $v->has_error; $result .= 'field validation error' if $v->has_error;
if ( !$result ) { if (!$result) {
# controls # controls
#$res = pptp_and_dhcp_range( $c, $rma_datas{pptpSessions} ); #$res = pptp_and_dhcp_range( $c, $rma_datas{pptpSessions} );
#$result .= $res . ' ' unless $res eq 'OK'; #$result .= $res . ' ' unless $res eq 'OK';
$res = ip_number_or_blank($c, $rma_datas{validFromNetwork});
$res = ip_number_or_blank( $c, $rma_datas{validFromNetwork} );
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
$res = subnet_mask_or_blank($c, $rma_datas{validFromMask});
$res = subnet_mask_or_blank( $c, $rma_datas{validFromMask} );
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
$res = validate_network_and_mask($c, $rma_datas{validFromNetwork}, $rma_datas{validFromMask});
$res = validate_network_and_mask(
$c,
$rma_datas{validFromNetwork},
$rma_datas{validFromMask}
);
$result .= $res . ' ' unless $res eq 'OK'; $result .= $res . ' ' unless $res eq 'OK';
#$result .= ' blocked for testing !' . $rma_datas{remove_nets}; #$result .= ' blocked for testing !' . $rma_datas{remove_nets};
} } ## end if (!$result)
if ( !$result ) { if (!$result) {
$res = change_settings( $c, %rma_datas ); $res = change_settings($c, %rma_datas);
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
} }
if ( $result eq "" ) { if ($result eq "") {
$result = $c->l('rma_SUCCESS'); $result = $c->l('rma_SUCCESS');
$trt = 'SUC'; $trt = 'SUC';
} }
$c->stash( title => $title, notif => $result, rma_datas => \%rma_datas ); $c->stash(title => $title, notif => $result, rma_datas => \%rma_datas);
#return $c->render( template => 'remoteaccess' ); #return $c->render( template => 'remoteaccess' );
if ($trt eq 'SUC') {
if ( $trt eq 'SUC' ) { $c->stash(title => $title, modul => $result);
$c->stash( title => $title,modul => $result); return $c->render(template => 'module');
return $c->render( template => 'module' );
} }
return $c->render(template => 'remoteaccess');
return $c->render( template => 'remoteaccess' );
#$c->redirect_to('/remoteaccess'); #$c->redirect_to('/remoteaccess');
} ## end sub do_action
}
sub networkAccess_list { sub networkAccess_list {
my $c = shift; my $c = shift;
@ -167,40 +136,33 @@ sub networkAccess_list {
[ $c->l('NETWORKS_ALLOW_LOCAL') => 'private' ], [ $c->l('NETWORKS_ALLOW_LOCAL') => 'private' ],
[ $c->l('NETWORKS_ALLOW_PUBLIC') => 'public' ] [ $c->l('NETWORKS_ALLOW_PUBLIC') => 'public' ]
]; ];
} } ## end sub networkAccess_list
sub passwordLogin_list { sub passwordLogin_list {
my $c = shift; my $c = shift;
return [ return [ [ $c->l('rma_PASSWORD_LOGIN_PRIVATE') => 'private' ], [ $c->l('rma_PASSWORD_LOGIN_PUBLIC') => 'public' ] ];
[ $c->l('rma_PASSWORD_LOGIN_PRIVATE') => 'private' ],
[ $c->l('rma_PASSWORD_LOGIN_PUBLIC') => 'public' ]
];
} }
sub get_prop { sub get_prop {
my ($c, $item, $prop) = @_;
my ( $c, $item, $prop ) = @_;
warn "You must specify a record key" unless $item; warn "You must specify a record key" unless $item;
warn "You must specify a property name" unless $prop; warn "You must specify a property name" unless $prop;
my $record = $db->get($item) or warn "Couldn't get record for $item"; my $record = $db->get($item) or warn "Couldn't get record for $item";
return $record ? $record->prop($prop) : undef; return $record ? $record->prop($prop) : undef;
} } ## end sub get_prop
sub get_value { sub get_value {
my $c = shift; my $c = shift;
my $item = shift; my $item = shift;
return ( $db->get($item)->value() ); return ($db->get($item)->value());
} } ## end sub get_value
sub get_ftp_access { sub get_ftp_access {
my $status = get_prop('', 'ftp', 'status') || 'disabled';
my $status = get_prop( '', 'ftp', 'status' ) || 'disabled';
return 'off' unless $status eq 'enabled'; return 'off' unless $status eq 'enabled';
my $access = get_prop('', 'ftp', 'access') || 'private';
my $access = get_prop( '', 'ftp', 'access' ) || 'private'; return ($access eq 'public') ? 'normal' : 'private';
return ( $access eq 'public' ) ? 'normal' : 'private'; } ## end sub get_ftp_access
}
#sub get_pptp_sessions { #sub get_pptp_sessions {
# my $status = get_prop('','pptpd','status'); # my $status = get_prop('','pptpd','status');
@ -208,188 +170,160 @@ sub get_ftp_access {
# return(get_prop('','pptpd','sessions') || 'no'); # return(get_prop('','pptpd','sessions') || 'no');
# return '0'; # return '0';
#} #}
sub get_ssh_permit_root_login { sub get_ssh_permit_root_login {
return ( get_prop( '', 'sshd', 'PermitRootLogin' ) || 'no' ); return (get_prop('', 'sshd', 'PermitRootLogin') || 'no');
} }
sub get_ssh_password_auth { sub get_ssh_password_auth {
return ( get_prop( '', 'sshd', 'PasswordAuthentication' ) || 'yes' ); return (get_prop('', 'sshd', 'PasswordAuthentication') || 'yes');
} }
sub get_ssh_access { sub get_ssh_access {
my $status = get_prop('', 'sshd', 'status');
my $status = get_prop( '', 'sshd', 'status' ); if (defined($status) && ($status eq 'enabled')) {
if ( defined($status) && ( $status eq 'enabled' ) ) { my $access = get_prop('', 'sshd', 'access');
my $access = get_prop( '', 'sshd', 'access' ); $access = ($access eq 'public') ? 'public' : 'private';
$access = ( $access eq 'public' ) ? 'public' : 'private';
return ($access); return ($access);
} } else {
else {
return ('off'); return ('off');
} }
} } ## end sub get_ssh_access
sub get_ssh_port { sub get_ssh_port {
return ( get_prop( '$c', 'sshd', 'TCPPort' ) || '22' ); return (get_prop('$c', 'sshd', 'TCPPort') || '22');
} }
sub get_ftp_password_login_access { sub get_ftp_password_login_access {
my $status = get_prop('', 'ftp', 'status') || 'disabled';
my $status = get_prop( '', 'ftp', 'status' ) || 'disabled';
return 'private' unless $status eq 'enabled'; return 'private' unless $status eq 'enabled';
my $access = get_prop('', 'ftp', 'LoginAccess') || 'private';
my $access = get_prop( '', 'ftp', 'LoginAccess' ) || 'private'; return ($access eq 'public') ? 'public' : 'private';
} ## end sub get_ftp_password_login_access
return ( $access eq 'public' ) ? 'public' : 'private';
}
sub get_telnet_mode { sub get_telnet_mode {
my $telnet = $db->get('telnet'); my $telnet = $db->get('telnet');
return ('off') unless $telnet; return ('off') unless $telnet;
my $status = $telnet->prop('status') || 'disabled'; my $status = $telnet->prop('status') || 'disabled';
return ('off') unless $status eq 'enabled'; return ('off') unless $status eq 'enabled';
my $access = $telnet->prop('access') || 'private'; my $access = $telnet->prop('access') || 'private';
return ( $access eq "public" ) ? "public" : "private"; return ($access eq "public") ? "public" : "private";
} } ## end sub get_telnet_mode
sub get_ipsecrw_sessions { sub get_ipsecrw_sessions {
my $status = $db->get('ipsec')->prop('RoadWarriorStatus'); my $status = $db->get('ipsec')->prop('RoadWarriorStatus');
if ( defined($status) && ( $status eq 'enabled' ) ) {
return ( $db->get('ipsec')->prop('RoadWarriorSessions') || '0' ); if (defined($status) && ($status eq 'enabled')) {
} return ($db->get('ipsec')->prop('RoadWarriorSessions') || '0');
else { } else {
return ('0'); return ('0');
} }
} } ## end sub get_ipsecrw_sessions
sub get_ipsecrw_status { sub get_ipsecrw_status {
return undef unless ($db->get('ipsec'));
return undef unless ( $db->get('ipsec') );
return $db->get('ipsec')->prop('RoadWarriorStatus'); return $db->get('ipsec')->prop('RoadWarriorStatus');
} }
sub pptp_and_dhcp_range { sub pptp_and_dhcp_range {
my $c = shift; my $c = shift;
my $val = shift || 0; my $val = shift || 0;
my $dhcp_status = $db->get_prop( 'dhcpd', 'status' ) || 'disabled'; my $dhcp_status = $db->get_prop('dhcpd', 'status') || 'disabled';
my $dhcp_end = $db->get_prop( 'dhcpd', 'end' ) || ''; my $dhcp_end = $db->get_prop('dhcpd', 'end') || '';
my $dhcp_start = $db->get_prop( 'dhcpd', 'start' ) || ''; my $dhcp_start = $db->get_prop('dhcpd', 'start') || '';
if ( $dhcp_status eq 'enabled' ) { if ($dhcp_status eq 'enabled') {
my $ip_start = unpack 'N', inet_aton($dhcp_start); my $ip_start = unpack 'N', inet_aton($dhcp_start);
my $ip_end = unpack 'N', inet_aton($dhcp_end); my $ip_end = unpack 'N', inet_aton($dhcp_end);
my $ip_count = $ip_end - $ip_start; my $ip_count = $ip_end - $ip_start;
return 'OK' if ( $val < $ip_count ); return 'OK' if ($val < $ip_count);
return $c->l( return $c->l('rma_NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE');
'rma_NUMBER_OF_PPTP_CLIENTS_MUST_BE_LESSER_THAN_NUMBER_OF_IP_IN_DHCP_RANGE' } else {
);
}
else {
return 'OK'; return 'OK';
} }
} } ## end sub pptp_and_dhcp_range
sub _get_valid_from { sub _get_valid_from {
my $c = shift;
my $c = shift;
my $rec = $db->get('httpd-admin'); my $rec = $db->get('httpd-admin');
return undef unless ($rec); return undef unless ($rec);
my @vals = ( split ',', ( $rec->prop('ValidFrom') || '' ) ); my @vals = (split ',', ($rec->prop('ValidFrom') || ''));
return @vals; return @vals;
} } ## end sub _get_valid_from
sub ip_number_or_blank { sub ip_number_or_blank {
my $c = shift; my $c = shift;
my $ip = shift; my $ip = shift;
if ( !defined($ip) || $ip eq "" ) { if (!defined($ip) || $ip eq "") {
return 'OK'; return 'OK';
} }
return ip_number( $c, $ip ); return ip_number($c, $ip);
} } ## end sub ip_number_or_blank
sub subnet_mask_or_blank { sub subnet_mask_or_blank {
my $c = shift; my $c = shift;
my $mask = shift; my $mask = shift;
if ( !defined($mask) || $mask eq "" ) { if (!defined($mask) || $mask eq "") {
return "OK"; return "OK";
} }
chomp $mask; chomp $mask;
return (subnet_mask($mask) ne 'OK')
return ( subnet_mask($mask) ne 'OK' ) ? $c->l('rma_INVALID_SUBNET_MASK') . " (" . $mask . ")"
? $c->l('rma_INVALID_SUBNET_MASK') . " (" . $mask . ")" : 'OK';
: 'OK'; } ## end sub subnet_mask_or_blank
}
sub validate_network_and_mask { sub validate_network_and_mask {
my $c = shift; my $c = shift;
my $net = shift || ""; my $net = shift || "";
my $mask = shift || ""; my $mask = shift || "";
if ( $net xor $mask ) { if ($net xor $mask) {
return $c->l( return $c->l('rma_ERR_INVALID_PARAMS' . " (" . $net . "/" . $mask . ")");
'rma_ERR_INVALID_PARAMS' . " (" . $net . "/" . $mask . ")" );
} }
return 'OK'; return 'OK';
} } ## end sub validate_network_and_mask
sub change_settings { sub change_settings {
my ($c, %rma_datas) = @_;
my ( $c, %rma_datas ) = @_;
#------------------------------------------------------------ #------------------------------------------------------------
# good; go ahead and change the access. # good; go ahead and change the access.
#------------------------------------------------------------ #------------------------------------------------------------
my $rec = $db->get('telnet'); my $rec = $db->get('telnet');
if ($rec) { if ($rec) {
if ( $rma_datas{telnetAccess} eq "off" ) { if ($rma_datas{telnetAccess} eq "off") {
$rec->set_prop( 'status', 'disabled' ); $rec->set_prop('status', 'disabled');
} else {
$rec->set_prop('status', 'enabled');
$rec->set_prop('access', $rma_datas{telnetAccess});
} }
else { } ## end if ($rec)
$rec->set_prop( 'status', 'enabled' ); $rec = $db->get('sshd') || $db->new_record('sshd', { type => 'service' });
$rec->set_prop( 'access', $rma_datas{telnetAccess} ); $rec->set_prop('TCPPort', $rma_datas{sshTCPPort});
} $rec->set_prop('status', ($rma_datas{sshaccess} eq "off" ? 'disabled' : 'enabled'));
} $rec->set_prop('access', $rma_datas{sshaccess});
$rec->set_prop('PermitRootLogin', $rma_datas{sshPermitRootLogin});
$rec = $db->get('sshd') || $db->new_record( 'sshd', { type => 'service' } ); $rec->set_prop('PasswordAuthentication', $rma_datas{sshPasswordAuthentication});
$rec->set_prop( 'TCPPort', $rma_datas{sshTCPPort} );
$rec->set_prop( 'status',
( $rma_datas{sshaccess} eq "off" ? 'disabled' : 'enabled' ) );
$rec->set_prop( 'access', $rma_datas{sshaccess} );
$rec->set_prop( 'PermitRootLogin', $rma_datas{sshPermitRootLogin} );
$rec->set_prop( 'PasswordAuthentication',
$rma_datas{sshPasswordAuthentication} );
$rec = $db->get('ftp'); $rec = $db->get('ftp');
if ($rec) { if ($rec) {
if ( $rma_datas{ftpAccess} eq "off" ) { if ($rma_datas{ftpAccess} eq "off") {
$rec->set_prop( 'status', 'disabled' ); $rec->set_prop('status', 'disabled');
$rec->set_prop( 'access', 'private' ); $rec->set_prop('access', 'private');
$rec->set_prop( 'LoginAccess', 'private' ); $rec->set_prop('LoginAccess', 'private');
} elsif ($rma_datas{ftpAccess} eq "normal") {
$rec->set_prop('status', 'enabled');
$rec->set_prop('access', 'public');
$rec->set_prop('LoginAccess', $rma_datas{ftpPasswordAccess});
} else {
$rec->set_prop('status', 'enabled');
$rec->set_prop('access', 'private');
$rec->set_prop('LoginAccess', $rma_datas{ftpPasswordAccess});
} }
elsif ( $rma_datas{ftpAccess} eq "normal" ) { } ## end if ($rec)
$rec->set_prop( 'status', 'enabled' );
$rec->set_prop( 'access', 'public' );
$rec->set_prop( 'LoginAccess', $rma_datas{ftpPasswordAccess} );
}
else {
$rec->set_prop( 'status', 'enabled' );
$rec->set_prop( 'access', 'private' );
$rec->set_prop( 'LoginAccess', $rma_datas{ftpPasswordAccess} );
}
}
# if ($rma_datas{pptpSessions} == 0) { # if ($rma_datas{pptpSessions} == 0) {
# $db->get('pptpd')->set_prop('status', 'disabled'); # $db->get('pptpd')->set_prop('status', 'disabled');
@ -397,107 +331,85 @@ sub change_settings {
# $db->get('pptpd')->set_prop('status', 'enabled'); # $db->get('pptpd')->set_prop('status', 'enabled');
# $db->get('pptpd')->set_prop('sessions', $rma_datas{pptpSessions}); # $db->get('pptpd')->set_prop('sessions', $rma_datas{pptpSessions});
# } # }
if ($rma_datas{validFromNetwork} && $rma_datas{validFromMask}) {
if ( $rma_datas{validFromNetwork} && $rma_datas{validFromMask} ) { unless (add_new_valid_from($c, $rma_datas{validFromNetwork}, $rma_datas{validFromMask})) {
unless (
add_new_valid_from(
$c,
$rma_datas{validFromNetwork},
$rma_datas{validFromMask}
)
)
{
return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'new net'; return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'new net';
} }
} } ## end if ($rma_datas{validFromNetwork...})
if ( $rma_datas{remove_nets} ) { if ($rma_datas{remove_nets}) {
unless ( remove_valid_from( $c, $rma_datas{remove_nets} ) ) { unless (remove_valid_from($c, $rma_datas{remove_nets})) {
return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'del net'; return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'del net';
} }
} } ## end if ($rma_datas{remove_nets...})
# reset ipsec roadwarrior CA,server,client certificates # reset ipsec roadwarrior CA,server,client certificates
if ( $rma_datas{ipsecrwReset} ) { if ($rma_datas{ipsecrwReset}) {
system( '/sbin/e-smith/roadwarrior', 'reset_certs' ) == 0 system('/sbin/e-smith/roadwarrior', 'reset_certs') == 0
or return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'rst ipsec'; or return $c->l('rma_ERROR_UPDATING_CONFIGURATION') . 'rst ipsec';
} }
if ( $rma_datas{ipsecrwSess} ) { if ($rma_datas{ipsecrwSess}) {
set_ipsecrw_sessions( $c, $rma_datas{ipsecrwSess} ); set_ipsecrw_sessions($c, $rma_datas{ipsecrwSess});
} }
unless ( unless (system("/sbin/e-smith/signal-event", "remoteaccess-update") == 0) {
system( "/sbin/e-smith/signal-event", "remoteaccess-update" ) == 0 )
{
return $c->l('rma_ERROR_UPDATING_CONFIGURATION'); return $c->l('rma_ERROR_UPDATING_CONFIGURATION');
} }
return 'OK'; return 'OK';
} } ## end sub change_settings
sub set_ipsecrw_sessions { sub set_ipsecrw_sessions {
my $c = shift; my $c = shift;
my $sessions = shift; my $sessions = shift;
if ( defined $sessions ) { if (defined $sessions) {
$db->get('ipsec')->set_prop( 'RoadWarriorSessions', $sessions ); $db->get('ipsec')->set_prop('RoadWarriorSessions', $sessions);
if ( int($sessions) > 0 ) {
$db->get('ipsec')->set_prop( 'RoadWarriorStatus', 'enabled' ); if (int($sessions) > 0) {
$db->get('ipsec')->set_prop('RoadWarriorStatus', 'enabled');
} }
} } ## end if (defined $sessions)
return ''; return '';
} } ## end sub set_ipsecrw_sessions
sub add_new_valid_from { sub add_new_valid_from {
my $c = shift; my $c = shift;
my $net = shift; my $net = shift;
my $mask = shift; my $mask = shift;
# we transform bit mask to regular mask # we transform bit mask to regular mask
$mask = get_reg_mask( $net, $mask ); $mask = get_reg_mask($net, $mask);
my $rec = $db->get('httpd-admin'); my $rec = $db->get('httpd-admin');
return $c->error('ERR_NO_RECORD') unless $rec; return $c->error('ERR_NO_RECORD') unless $rec;
my $prop = $rec->prop('ValidFrom') || ''; my $prop = $rec->prop('ValidFrom') || '';
my @vals = split /,/, $prop; my @vals = split /,/, $prop;
return '' if ( grep /^$net\/$mask$/, @vals ); # already have this entry return '' if (grep /^$net\/$mask$/, @vals); # already have this entry
if ( $prop ne '' ) { if ($prop ne '') {
$prop .= ",$net/$mask"; $prop .= ",$net/$mask";
} } else {
else {
$prop = "$net/$mask"; $prop = "$net/$mask";
} }
$rec->set_prop('ValidFrom', $prop);
$rec->set_prop( 'ValidFrom', $prop );
return 1; return 1;
} } ## end sub add_new_valid_from
sub remove_valid_from { sub remove_valid_from {
my $c = shift; my $c = shift;
my $remove_nets = shift; my $remove_nets = shift;
my @remove = split /,/, $remove_nets;
my @remove = split /,/, $remove_nets;
# my @remove = $c->param('Remove_nets'); # my @remove = $c->param('Remove_nets');
my @vals = $c->_get_valid_from(); my @vals = $c->_get_valid_from();
foreach my $entry (@remove) { foreach my $entry (@remove) {
return undef unless $entry; return undef unless $entry;
my ($net, $mask) = split(/\//, $entry);
my ( $net, $mask ) = split( /\//, $entry );
unless (@vals) { unless (@vals) {
print STDERR print STDERR "ERROR: unable to load ValidFrom property from conf db\n";
"ERROR: unable to load ValidFrom property from conf db\n";
return undef; return undef;
} }
@ -506,20 +418,16 @@ sub remove_valid_from {
# added a 32 bit mask, so we don't know for sure if the value in db # added a 32 bit mask, so we don't know for sure if the value in db
# is $net alone or $net/255.255.255.255. we have to check for both # is $net alone or $net/255.255.255.255. we have to check for both
# in this special case... # in this special case...
@vals = ( grep { $entry ne $_ && $net ne $_ } @vals ); @vals = (grep { $entry ne $_ && $net ne $_ } @vals);
} } ## end foreach my $entry (@remove)
my $prop; my $prop;
if (@vals) { if (@vals) {
$prop = join ',', @vals; $prop = join ',', @vals;
} } else {
else {
$prop = ''; $prop = '';
} }
$db->get('httpd-admin')->set_prop('ValidFrom', $prop);
$db->get('httpd-admin')->set_prop( 'ValidFrom', $prop );
return 1; return 1;
} } ## end sub remove_valid_from
1;
1;

40
root/usr/share/smanager/lib/SrvMngr/Controller/Request.pm
View File

@ -1,56 +1,46 @@
package SrvMngr::Controller::Request; package SrvMngr::Controller::Request;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
# retrieve a configuration db record # retrieve a configuration db record
sub getconfig { sub getconfig {
my $c = shift; my $c = shift;
my $key = $c->param('key'); my $key = $c->param('key');
$c->app->log->info($c->log_req . ' ' . $key); $c->app->log->info($c->log_req . ' ' . $key);
if ($key) { if ($key) {
use esmith::ConfigDB qw(open_ro); use esmith::ConfigDB qw(open_ro);
my $cdb = esmith::ConfigDB->open_ro; my $cdb = esmith::ConfigDB->open_ro;
return getdb( $c, $cdb, $key); return getdb($c, $cdb, $key);
} } ## end if ($key)
} } ## end sub getconfig
# retrieve an accounts db record, given its name # retrieve an accounts db record, given its name
sub getaccount { sub getaccount {
my $c = shift; my $c = shift;
my $key = $c->param('key'); my $key = $c->param('key');
$c->app->log->info($c->log_req . ' ' . $key); $c->app->log->info($c->log_req . ' ' . $key);
if ($key) { if ($key) {
use esmith::AccountsDB qw(open_ro); use esmith::AccountsDB qw(open_ro);
my $adb = esmith::AccountsDB->open_ro; my $adb = esmith::AccountsDB->open_ro;
return getdb( $c, $adb, $key); return getdb($c, $adb, $key);
} } ## end if ($key)
} } ## end sub getaccount
sub getdb { sub getdb {
my ($c, $db, $key) = @_; my ($c, $db, $key) = @_;
if ( my $rec = $db->get($key) ) { if (my $rec = $db->get($key)) {
return $c->render(json => { $key => { $rec->props }} ); return $c->render(json => { $key => { $rec->props } });
} }
return undef; return undef;
} } ## end sub getdb
1; 1;

232
root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
View File

@ -7,76 +7,59 @@ package SrvMngr::Controller::Review;
# menu : N # menu : N
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# heading-o : Configuration # heading-o : Configuration
# description-o : Review configuration # description-o : Review configuration
# navigation-o : 6000 6800 # navigation-o : 6000 6800
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use SrvMngr::Review_sub qw(print_page); #use SrvMngr::Review_sub qw(print_page);
#use smeserver::Panel::review; #use smeserver::Panel::review;
use esmith::FormMagick::Panel::review; use esmith::FormMagick::Panel::review;
our $db = esmith::ConfigDB->open_ro || die "Couldn't open config db";
our $db = esmith::ConfigDB->open_ro || die "Couldn't open config db"; our $domains = esmith::DomainsDB->open_ro || die "Couldn't open domains";
our $domains = esmith::DomainsDB->open_ro || die "Couldn't open domains";
our $networks = esmith::NetworksDB->open_ro || die "Couldn't open networks"; our $networks = esmith::NetworksDB->open_ro || die "Couldn't open networks";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('rvw_FORM_TITLE');
my $title = $c->l('rvw_FORM_TITLE'); my $modul = $c->render_to_string(inline => $c->l('rvw_DESCRIPTION'));
my $modul = $c->render_to_string(inline => $c->l('rvw_DESCRIPTION'));
my %rvw_datas = (); my %rvw_datas = ();
$rvw_datas{'servermode'} = (get_value('', 'SystemMode') || '');
$rvw_datas{'servermode'} = (get_value('','SystemMode' )|| ''); $rvw_datas{'localip'} = get_value('$c', 'LocalIP') . '/' . get_value('$c', 'LocalNetmask');
$rvw_datas{'localip'} = get_value('$c','LocalIP' ) $rvw_datas{'publicip'} = esmith::FormMagick::Panel::review->get_public_ip_address($c);
.'/'.get_value('$c','LocalNetmask'); $rvw_datas{'gateway'} = $c->render_to_string(inline => print2_gateway_stanza($c));
$rvw_datas{'publicip'} = $rvw_datas{'serveronly'} = $c->render_to_string(inline => print2_serveronly_stanza($c));
esmith::FormMagick::Panel::review->get_public_ip_address($c);
$rvw_datas{'gateway'} =
$c->render_to_string(inline => print2_gateway_stanza($c));
$rvw_datas{'serveronly'} =
$c->render_to_string(inline => print2_serveronly_stanza($c));
$rvw_datas{'addlocalnetworks'} = get_local_networks($c); $rvw_datas{'addlocalnetworks'} = get_local_networks($c);
$rvw_datas{'dhcpserver'} = $rvw_datas{'dhcpserver'} = $c->render_to_string(inline => print2_dhcp_stanza($c));
$c->render_to_string(inline => print2_dhcp_stanza($c)); $rvw_datas{'dnsserver'} = (get_value('', 'LocalIP') || '');
$rvw_datas{'webserver'} = 'www.' . (get_local_domain());
$rvw_datas{'dnsserver'} = (get_value('','LocalIP' )|| '');
$rvw_datas{'webserver'} = 'www.'.(get_local_domain());
my $port = $db->get_prop("squid", "TransparentPort") || 3128; my $port = $db->get_prop("squid", "TransparentPort") || 3128;
$rvw_datas{'proxyserver'} = 'proxy.'.get_local_domain().":$port"; $rvw_datas{'proxyserver'} = 'proxy.' . get_local_domain() . ":$port";
$rvw_datas{'ftpserver'} = 'ftp.'.get_local_domain(); $rvw_datas{'ftpserver'} = 'ftp.' . get_local_domain();
$rvw_datas{'smtpserver'} = 'mail.'.get_local_domain(); $rvw_datas{'smtpserver'} = 'mail.' . get_local_domain();
$rvw_datas{'domainname'} = (get_value('', 'DomainName') || '');
$rvw_datas{'domainname'} = (get_value('','DomainName' )|| ''); $rvw_datas{'virtualdomains'} = $c->render_to_string(inline => gen2_domains($c));
$rvw_datas{'virtualdomains'} = $rvw_datas{'primarywebsite'} = 'http://www.' . get_value('', 'DomainName');
$c->render_to_string(inline => gen2_domains($c)); $rvw_datas{'servermanager'} = 'https://' . (get_value('', 'SystemName') || 'localhost') . '/server-manager/';
$rvw_datas{'primarywebsite'} = 'http://www.'.get_value('','DomainName'); $rvw_datas{'usermanager'} = 'https://' . (get_value('', 'SystemName') || 'localhost') . '/user-password/';
$rvw_datas{'servermanager'} = 'https://'. (get_value('','SystemName') || 'localhost').'/server-manager/'; $rvw_datas{'emailaddresses'} = $c->render_to_string(inline => gen2_email_addresses($c));
$rvw_datas{'usermanager'} = 'https://'. (get_value('','SystemName') || 'localhost').'/user-password/';
$rvw_datas{'emailaddresses'} =
$c->render_to_string(inline => gen2_email_addresses($c));
#$c->stash( releaseVersion => $c->session->{releaseVersion}, copyRight => $c->session->{copyRight}, #$c->stash( releaseVersion => $c->session->{releaseVersion}, copyRight => $c->session->{copyRight},
#PwdSet => $c->session->{PwdSet}, Unsafe => $c->session->{Unsafe}, #PwdSet => $c->session->{PwdSet}, Unsafe => $c->session->{Unsafe},
$c->stash( title => $title, modul => $modul, rvw_datas => \%rvw_datas, $c->stash(
); title => $title,
modul => $modul,
rvw_datas => \%rvw_datas,
);
$c->render(template => 'review'); $c->render(template => 'review');
} ## end sub main
}
=head2 gen2_email_addresses =head2 gen2_email_addresses
@ -86,20 +69,28 @@ sub main {
=cut =cut
sub gen2_email_addresses { sub gen2_email_addresses {
my $c = shift; my $c = shift;
my $domain = get_value($c, 'DomainName');
my $domain = get_value($c,'DomainName');
my $useraccount = $c->l("rvw_EMAIL_USERACCOUNT"); my $useraccount = $c->l("rvw_EMAIL_USERACCOUNT");
my $firstname = $c->l("rvw_EMAIL_FIRSTNAME"); my $firstname = $c->l("rvw_EMAIL_FIRSTNAME");
my $lastname = $c->l("rvw_EMAIL_LASTNAME"); my $lastname = $c->l("rvw_EMAIL_LASTNAME");
my $out
my $out = "<I>" . $useraccount . "</I>\@" . $domain . "<BR>" = "<I>"
. "<I>" . $firstname . "</I>.<I>" . $lastname . "</I>\@" . $domain . "<BR>" . $useraccount
. "<I>" . $firstname . "</I>_<I>" . $lastname . "</I>\@" . $domain . "<BR>"; . "</I>\@"
. $domain . "<BR>" . "<I>"
return $out; . $firstname
} . "</I>.<I>"
. $lastname
. "</I>\@"
. $domain . "<BR>" . "<I>"
. $firstname
. "</I>_<I>"
. $lastname
. "</I>\@"
. $domain . "<BR>";
return $out;
} ## end sub gen2_email_addresses
=head2 gen2_domains =head2 gen2_domains
@ -109,26 +100,25 @@ sub gen2_email_addresses {
=cut =cut
sub gen2_domains { sub gen2_domains {
my $c = shift; my $c = shift;
my @virtual = $domains->get_all_by_prop(type => 'domain');
my @virtual = $domains->get_all_by_prop( type => 'domain');
my $numvirtual = @virtual; my $numvirtual = @virtual;
if ($numvirtual == 0) { if ($numvirtual == 0) {
$c->localise("NO_VIRTUAL_DOMAINS"); $c->localise("NO_VIRTUAL_DOMAINS");
} } else {
else {
my $out = ""; my $out = "";
my $domain; my $domain;
foreach $domain (sort @virtual) { foreach $domain (sort @virtual) {
if ($out ne "") { if ($out ne "") {
$out .= "<BR>"; $out .= "<BR>";
} }
$out .= $domain->key; $out .= $domain->key;
} } ## end foreach $domain (sort @virtual)
return $out; return $out;
} } ## end else [ if ($numvirtual == 0) ]
} } ## end sub gen2_domains
=head2 get2_local_networks =head2 get2_local_networks
@ -138,33 +128,28 @@ serving. (mojo ver)
=cut =cut
sub get2_local_networks { sub get2_local_networks {
my $c = shift; my $c = shift;
my @nets = $networks->get_all_by_prop('type' => 'network');
my @nets = $networks->get_all_by_prop('type' => 'network');
my $numNetworks = @nets; my $numNetworks = @nets;
if ($numNetworks == 0) { if ($numNetworks == 0) {
return $c->l('rvw_NO_NETWORKS'); return $c->l('rvw_NO_NETWORKS');
} } else {
else {
my $out = ""; my $out = "";
foreach my $network (sort @nets) { foreach my $network (sort @nets) {
if ($out ne "") { if ($out ne "") {
$out .= "<BR>"; $out .= "<BR>";
} }
$out .= $network->key . "/" . get_net_prop($c, $network->key, 'Mask');
$out .= $network->key."/" . get_net_prop($c, $network->key, 'Mask'); if (defined get_net_prop($c, $network->key, 'Router')) {
$out .= " via " . get_net_prop($c, $network->key, 'Router');
if ( defined get_net_prop($c, $network->key, 'Router') ) {
$out .= " via " . get_net_prop ($c, $network->key, 'Router');
} }
} } ## end foreach my $network (sort @nets)
return $out; return $out;
} } ## end else [ if ($numNetworks == 0)]
} ## end sub get2_local_networks
}
=head2 print2_gateway_stanza =head2 print2_gateway_stanza
@ -172,28 +157,28 @@ If this system is a server gateway, show the external ip and gateway ip (mojo ve
=cut =cut
sub print2_gateway_stanza sub print2_gateway_stanza {
{
my $c = shift; my $c = shift;
if (get_value($c,'SystemMode') =~ /servergateway/)
{ if (get_value($c, 'SystemMode') =~ /servergateway/) {
my $ip = get_value($c,'ExternalIP'); my $ip = get_value($c, 'ExternalIP');
my $static = my $static
(get_value($c, 'AccessType') eq 'dedicated') && = (get_value($c, 'AccessType') eq 'dedicated')
(get_value($c, 'ExternalDHCP') eq 'off') && && (get_value($c, 'ExternalDHCP') eq 'off')
(get_prop($c, 'pppoe', 'status') eq 'disabled'); && (get_prop($c, 'pppoe', 'status') eq 'disabled');
if ($static)
{ if ($static) {
$ip .= "/".get_value($c,'ExternalNetmask'); $ip .= "/" . get_value($c, 'ExternalNetmask');
} }
my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK').':'.$ip; my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK') . ':' . $ip;
if ($static)
{ if ($static) {
$out .= $c->l('rvw_GATEWAY').':'.get_value($c,'GatewayIP'); $out .= $c->l('rvw_GATEWAY') . ':' . get_value($c, 'GatewayIP');
} }
return $out return $out;
} } ## end if (get_value($c, 'SystemMode'...))
} } ## end sub print2_gateway_stanza
=head2 print2_serveronly_stanza =head2 print2_serveronly_stanza
If this system is a standalone server with net access, show the external If this system is a standalone server with net access, show the external
@ -202,14 +187,15 @@ gateway IP (mojo ver)
=cut =cut
sub print2_serveronly_stanza { sub print2_serveronly_stanza {
my $c = shift; my $c = shift;
if ( (get_value($c,'SystemMode') eq 'serveronly') &&
get_value($c,'AccessType') && if ( (get_value($c, 'SystemMode') eq 'serveronly')
(get_value($c,'AccessType') ne "off")) { && get_value($c, 'AccessType')
return ( get_value($c,'GatewayIP') ); && (get_value($c, 'AccessType') ne "off"))
} {
return (get_value($c, 'GatewayIP'));
} } ## end if ((get_value($c, 'SystemMode'...)))
} ## end sub print2_serveronly_stanza
=head2 print2_dhcp_stanza =head2 print2_dhcp_stanza
@ -220,16 +206,14 @@ Prints out the current state of dhcp service (mojo ver)
sub print2_dhcp_stanza { sub print2_dhcp_stanza {
my $c = shift; my $c = shift;
my $out = (get_prop($c,'dhcpd','status') || 'disabled' ); my $out = (get_prop($c, 'dhcpd', 'status') || 'disabled');
if (get_prop($c,'dhcpd', 'status') eq 'enabled') { if (get_prop($c, 'dhcpd', 'status') eq 'enabled') {
$out .= '<br>'.$c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE').':'; $out .= '<br>' . $c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE') . ':';
$out .= (get_prop($c,'dhcpd','start') || '' ).'<br>'; $out .= (get_prop($c, 'dhcpd', 'start') || '') . '<br>';
$out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE').':'; $out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE') . ':';
$out .= (get_prop($c,'dhcpd','end') || '' ); $out .= (get_prop($c, 'dhcpd', 'end') || '');
} } ## end if (get_prop($c, 'dhcpd'...))
return $out; return $out;
} } ## end sub print2_dhcp_stanza
1; 1;

26
root/usr/share/smanager/lib/SrvMngr/Controller/Roundcubepanel.pm
View File

@ -10,37 +10,27 @@ package SrvMngr::Controller::Roundcubepanel;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
#use SrvMngr::Model::Main; #use SrvMngr::Model::Main;
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('Roundcube Webmail');
my $title = $c->l('Roundcube Webmail'); my $roundcube_url = $c->param('url');
my $roundcube_url = $c->param('url');
my $roundcube_height = $c->param('height') | 600; my $roundcube_height = $c->param('height') | 600;
$c->stash( title => $title, modul => $roundcube_url, height => $roundcube_height ); $c->stash(title => $title, modul => $roundcube_url, height => $roundcube_height);
$c->render(template => 'roundcube'); $c->render(template => 'roundcube');
} ## end sub main
}
sub getroundcubeurl { sub getroundcubeurl {
my $c = shift; my $c = shift;
my $url = shift; my $url = shift;
return "/smanager/roundcube?url=$url"; return "/smanager/roundcube?url=$url";
} } ## end sub getroundcubeurl
1; 1;

27
root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
View File

@ -11,34 +11,25 @@ package SrvMngr::Controller::Support;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
use esmith::util; use esmith::util;
sub display_licenses { sub display_licenses {
my $lang = shift;
my $lic = '';
my $lang = shift; foreach my $license (esmith::util::getLicenses($lang)) {
$lic .= $license . '<br>';
my $lic = ''; }
foreach my $license (esmith::util::getLicenses($lang)) { return $lic;
} ## end sub display_licenses
$lic .= $license . '<br>';
}
return $lic;
}
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('support_FORM_TITLE'); my $title = $c->l('support_FORM_TITLE');
my $modul = $c->render_to_string(inline => display_licenses($c->session->{lang})); my $modul = $c->render_to_string(inline => display_licenses($c->session->{lang}));
$c->stash(title => $title, modul => $modul);
$c->stash( title => $title, modul => $modul );
$c->render(template => 'module'); $c->render(template => 'module');
}; } ## end sub main
1; 1;

52
root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm
View File

@ -1,51 +1,39 @@
package SrvMngr::Controller::Swttheme; package SrvMngr::Controller::Swttheme;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
#use SrvMngr qw(theme_list init_session); #use SrvMngr qw(theme_list init_session);
our $db = esmith::ConfigDB->open() || die "Couldn't open config db"; our $db = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main { sub main {
my $c = shift;
my $c = shift; my $from = $c->param('From') || '/';
my $from = $c->param('From') || '/';
my $theme = $c->param('Theme'); my $theme = $c->param('Theme');
$c->app->log->info(" swt theme '$from' '$theme' "); $c->app->log->info(" swt theme '$from' '$theme' ");
my $oldTheme = $c->session->{CurrentTheme}; my $oldTheme = $c->session->{CurrentTheme};
if ( $theme ne $oldTheme ) { if ($theme ne $oldTheme) {
# $c->app->renderer->paths([$c->app->home->rel_file('themes/default/templates')]);
# $c->app->static->paths([$c->app->home->rel_file('themes/default/public')]); # $c->app->renderer->paths([$c->app->home->rel_file('themes/default/templates')]);
# if ( $theme ne 'default' ) { # $c->app->static->paths([$c->app->home->rel_file('themes/default/public')]);
# # Put the new theme first # if ( $theme ne 'default' ) {
# my $t_path = $c->app->home->rel_file('themes/'.$theme); # # Put the new theme first
# unshift @{$c->app->renderer->paths}, $t_path.'/templates' if -d $t_path.'/templates'; # my $t_path = $c->app->home->rel_file('themes/'.$theme);
# unshift @{$c->app->static->paths}, $t_path.'/public' if -d $t_path.'/public'; # unshift @{$c->app->renderer->paths}, $t_path.'/templates' if -d $t_path.'/templates';
# } # unshift @{$c->app->static->paths}, $t_path.'/public' if -d $t_path.'/public';
# }
$c->session->{CurrentTheme} = $theme; $c->session->{CurrentTheme} = $theme;
$db->get('smanager')->set_prop('Theme', $theme);
$db->get('smanager')->set_prop('Theme', $theme); system("/sbin/e-smith/signal-event smanager-theme-change") == 0
system ("/sbin/e-smith/signal-event smanager-theme-change") == 0 or warn "$c->l('ERROR_UPDATING')";
or warn "$c->l('ERROR_UPDATING')"; } ## end if ($theme ne $oldTheme)
}
## (not sure) $c->flash( warning => $c->l('swt_LOGIN_AGAIN') ); ## (not sure) $c->flash( warning => $c->l('swt_LOGIN_AGAIN') );
$from = '/initial' if $from eq '/'; $from = '/initial' if $from eq '/';
$from = '/' . $from if ( $from !~ m|^\/| ); $from = '/' . $from if ($from !~ m|^\/|);
$c->redirect_to($from);
$c->redirect_to( $from); } ## end sub main
}
1; 1;

889
root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
View File

File diff suppressed because it is too large Load Diff

271
root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
View File

@ -8,182 +8,165 @@ package SrvMngr::Controller::Userpassword;
# #
# routes : end # routes : end
#---------------------------------------------------------------------- #----------------------------------------------------------------------
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use esmith::util; use esmith::util;
use esmith::ConfigDB; use esmith::ConfigDB;
use esmith::AccountsDB; use esmith::AccountsDB;
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw( theme_list init_session is_normal_password ); use SrvMngr qw( theme_list init_session is_normal_password );
our $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db"; our $cdb = esmith::ConfigDB->open_ro || die "Couldn't open configuration db";
sub main { sub main {
my $c = shift; my $c = shift;
my %pwd_datas = (); my %pwd_datas = ();
if ( $c->is_logged_in ) { if ($c->is_logged_in) {
$pwd_datas{Account} = $c->session->{username}; $pwd_datas{Account} = $c->session->{username};
$pwd_datas{trt} = 'NORM'; $pwd_datas{trt} = 'NORM';
} else { } else {
my $rt = $c->current_route; my $rt = $c->current_route;
my $mess = ''; my $mess = '';
my $jwt = $c->param('jwt') || ''; my $jwt = $c->param('jwt') || '';
my $name = $c->jwt->decode($jwt)->{username} || ''; my $name = $c->jwt->decode($jwt)->{username} || '';
$mess = 'Invalid state' unless ($jwt and $name and $rt eq 'upwdreset');
$mess = 'Invalid state' unless ($jwt and $name and $rt eq 'upwdreset');
# request already treated or outdated # request already treated or outdated
if ( $c->pwdrst->{$name}{confirmed} != 1 or $c->pwdrst->{$name}{date} < time() ) { if ($c->pwdrst->{$name}{confirmed} != 1 or $c->pwdrst->{$name}{date} < time()) {
$mess = $c->l('use_INVALID_REQUEST').' -step 1-'; $mess = $c->l('use_INVALID_REQUEST') . ' -step 1-';
} }
if ($mess) {
$c->stash(error => $mess);
return $c->redirect_to($c->home_page);
}
if ( $mess ) {
$c->stash( error => $mess );
return $c->redirect_to ( $c->home_page );
}
# ok for reset password for this account - step 2 # ok for reset password for this account - step 2
$c->pwdrst->{$name}{confirmed} = 2; $c->pwdrst->{$name}{confirmed} = 2;
$pwd_datas{Account} = $name; $pwd_datas{Account} = $name;
$pwd_datas{trt} = 'RESET'; $pwd_datas{trt} = 'RESET';
$pwd_datas{jwt} = $jwt; $pwd_datas{jwt} = $jwt;
$c->flash( success => $c->l('use_OK_FOR_RESET') ); $c->flash(success => $c->l('use_OK_FOR_RESET'));
} } ## end else [ if ($c->is_logged_in) ]
$c->stash(pwd_datas => \%pwd_datas);
$c->stash( pwd_datas => \%pwd_datas ); $c->render('userpassword');
$c->render( 'userpassword' ); } ## end sub main
}
sub change_password { sub change_password {
my $c = shift; my $c = shift;
my $result; my $result;
my $res; my $res;
my %pwd_datas = (); my %pwd_datas = ();
my $trt = $c->param('Trt');
my $trt = $c->param('Trt'); my $acctName = $c->param('User');
my $acctName = $c->param('User'); my $oldPass = $c->param('Oldpass') || '';
my $oldPass = $c->param('Oldpass') || ''; my $pass = $c->param('Pass');
my $pass = $c->param('Pass');
my $passVerify = $c->param('Passverify'); my $passVerify = $c->param('Passverify');
my $jwt = $c->param('jwt') || '';
my $jwt = $c->param('jwt') || ''; my $rt = $c->current_route;
my $rt = $c->current_route; my $mess = '';
my $mess = ''; my $name = ''; my $name = '';
$name = $c->jwt->decode($jwt)->{username} if $jwt; $name = $c->jwt->decode($jwt)->{username} if $jwt;
if ( $trt eq 'RESET' ) { if ($trt eq 'RESET') {
$mess = 'Invalid state' unless ($jwt and $name and ($rt eq 'upwdreset2')); $mess = 'Invalid state' unless ($jwt and $name and ($rt eq 'upwdreset2'));
# request already treated or outdated
if ( $c->pwdrst->{$name}{confirmed} != 2 or $c->pwdrst->{$name}{date} < time() ) { # request already treated or outdated
$mess = $c->l('use_INVALID_REQUEST').' -step 2-'; if ($c->pwdrst->{$name}{confirmed} != 2 or $c->pwdrst->{$name}{date} < time()) {
} $mess = $c->l('use_INVALID_REQUEST') . ' -step 2-';
if ( ! $name or $c->is_logged_in or $name ne $acctName ) { }
$mess = 'Invalid reset state';
if (!$name or $c->is_logged_in or $name ne $acctName) {
$mess = 'Invalid reset state';
} }
} else { } else {
if ( $name or $jwt or ! $c->is_logged_in ) {
$mess = 'Invalid update state';
}
}
if ( $mess ) { if ($name or $jwt or !$c->is_logged_in) {
$c->stash( error => $mess ); $mess = 'Invalid update state';
return $c->redirect_to ( $c->home_page ); }
} } ## end else [ if ($trt eq 'RESET') ]
if ($mess) {
$c->stash(error => $mess);
return $c->redirect_to($c->home_page);
}
$pwd_datas{Account} = $acctName; $pwd_datas{Account} = $acctName;
$pwd_datas{trt} = $trt; $pwd_datas{trt} = $trt;
# common controls # common controls
if ( $acctName eq 'admin' ) { if ($acctName eq 'admin') {
$result .= "Admin password should not be reset here !"; $result .= "Admin password should not be reset here !";
} else { } else {
unless ( $pass && $passVerify ) {
$result .= $c->l('pwd_FIELDS_REQUIRED') . "<br>";
} else {
$result .= $c->l('pwd_PASSWORD_INVALID_CHARS') . "<br>" unless (($pass) = ($pass =~ /^([ -~]+)$/ ));
$result .= $c->l('pwd_PASSWORD_VERIFY_ERROR') . "<br>" unless ( $pass eq $passVerify );
}
}
if ( $result ne '' ) { unless ($pass && $passVerify) {
$c->stash( error => $result, pwd_datas => \%pwd_datas ); $result .= $c->l('pwd_FIELDS_REQUIRED') . "<br>";
return $c->render( 'userpassword' ); } else {
$result .= $c->l('pwd_PASSWORD_INVALID_CHARS') . "<br>" unless (($pass) = ($pass =~ /^([ -~]+)$/));
$result .= $c->l('pwd_PASSWORD_VERIFY_ERROR') . "<br>" unless ($pass eq $passVerify);
}
} ## end else [ if ($acctName eq 'admin')]
if ($result ne '') {
$c->stash(error => $result, pwd_datas => \%pwd_datas);
return $c->render('userpassword');
} }
# validate new password # validate new password
$res = $c->check_password( $pass ); $res = $c->check_password($pass);
$result .= $res . "<br>" unless ( $res eq 'OK' ); $result .= $res . "<br>" unless ($res eq 'OK');
# controls old password # controls old password
if ( $trt ne 'RESET' ) { if ($trt ne 'RESET') {
unless ( $oldPass ) {
$result .= $c->l('pwd_FIELDS_REQUIRED') . "<br>" unless $trt eq 'RESET'; unless ($oldPass) {
$result .= $c->l('pwd_FIELDS_REQUIRED') . "<br>" unless $trt eq 'RESET';
} else { } else {
$result .= $c->l('pwd_PASSWORD_OLD_INVALID_CHARS') . "<br>" unless (($oldPass) = ($oldPass =~ /^(\S+)$/ )); $result .= $c->l('pwd_PASSWORD_OLD_INVALID_CHARS') . "<br>" unless (($oldPass) = ($oldPass =~ /^(\S+)$/));
} }
if ( $result ne '' ) { if ($result ne '') {
$c->stash( error => $result, pwd_datas => \%pwd_datas ); $c->stash(error => $result, pwd_datas => \%pwd_datas);
return $c->render( 'userpassword' ); return $c->render('userpassword');
} }
# verify old password # verify old password
if ( $trt ne 'RESET') { if ($trt ne 'RESET') {
$result .= $c->l('pwd_ERROR_PASSWORD_CHANGE') . "<br>" $result .= $c->l('pwd_ERROR_PASSWORD_CHANGE') . "<br>"
unless (SrvMngr::Model::Main->check_credentials($acctName, $oldPass)); unless (SrvMngr::Model::Main->check_credentials($acctName, $oldPass));
} }
} } ## end if ($trt ne 'RESET')
# $result .= 'Blocked for test (prevents updates)<br>'; # $result .= 'Blocked for test (prevents updates)<br>';
if (!$result) {
if ( ! $result ) { my $res = $c->reset_password($trt, $acctName, $pass, $oldPass);
my $res = $c->reset_password( $trt, $acctName, $pass, $oldPass );
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
} }
if ( $result ) { if ($result) {
record_password_change_attempt($c, 'FAILED'); record_password_change_attempt($c, 'FAILED');
$c->stash( error => $result, pwd_datas => \%pwd_datas ); $c->stash(error => $result, pwd_datas => \%pwd_datas);
return $c->render( 'userpassword' ); return $c->render('userpassword');
} } ## end if ($result)
$c->pwdrst->{$name}{confirmed} = 9 if $trt eq 'RESET'; $c->pwdrst->{$name}{confirmed} = 9 if $trt eq 'RESET';
record_password_change_attempt($c, 'SUCCESS'); record_password_change_attempt($c, 'SUCCESS');
$result .= $c->l('pwd_PASSWORD_CHANGE_SUCCESS'); $result .= $c->l('pwd_PASSWORD_CHANGE_SUCCESS');
$c->flash( success => $result ); $c->flash(success => $result);
$c->redirect_to( $c->home_page ); $c->redirect_to($c->home_page);
} } ## end sub change_password
sub reset_password { sub reset_password {
my ($c, $trt, $user, $password, $oldpassword) = @_; my ($c, $trt, $user, $password, $oldpassword) = @_;
my $ret; my $ret;
return $c->l('usr_TAINTED_USER') unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/)); return $c->l('usr_TAINTED_USER') unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/));
$user = $1; $user = $1;
my $adb = esmith::AccountsDB->open();
my $adb = esmith::AccountsDB->open();
my $acct = $adb->get($user); my $acct = $adb->get($user);
return $c->l('NO_SUCH_USER', $user) unless ( $acct->prop('type') eq 'user' ); return $c->l('NO_SUCH_USER', $user) unless ($acct->prop('type') eq 'user');
$ret = esmith::util::setUserPasswordRequirePrevious($user, $oldpassword, $password) if $trt ne 'RESET';
$ret = esmith::util::setUserPasswordRequirePrevious( $user, $oldpassword, $password ) if $trt ne 'RESET'; $ret = esmith::util::setUserPassword($user, $password) if $trt eq 'RESET';
$ret = esmith::util::setUserPassword( $user, $password ) if $trt eq 'RESET'; return $c->l('pwd_ERROR_PASSWORD_CHANGE') . ' ' . $trt unless $ret;
return $c->l('pwd_ERROR_PASSWORD_CHANGE') .' '. $trt unless $ret;
$acct->set_prop("PasswordSet", "yes"); $acct->set_prop("PasswordSet", "yes");
undef $adb; undef $adb;
@ -192,66 +175,52 @@ sub reset_password {
return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD"); return $c->l("usr_ERR_OCCURRED_MODIFYING_PASSWORD");
} }
$adb = esmith::AccountsDB->open(); $adb = esmith::AccountsDB->open();
return 'OK'; return 'OK';
} } ## end sub reset_password
sub record_password_change_attempt { sub record_password_change_attempt {
my ($c, $result) = @_;
my $user = $c->param('User');
my $ip_address = $c->tx->remote_address;
my ($c, $result) = @_; if ($result eq 'SUCCESS') {
$c->app->log->info(join "\t", "Password change succeeded: $user", $ip_address);
my $user = $c->param('User'); } else {
my $ip_address = $c->tx->remote_address; $c->app->log->info(join "\t", "Password change FAILED: $user", $ip_address);
}
if ($result eq 'SUCCESS') { } ## end sub record_password_change_attempt
$c->app->log->info(join "\t", "Password change succeeded: $user", $ip_address);
} else {
$c->app->log->info(join "\t", "Password change FAILED: $user", $ip_address);
}
}
sub check_password { sub check_password {
my $c = shift; my $c = shift;
my $password = shift; my $password = shift;
my $strength;
my $strength; my $rec = $cdb->get('passwordstrength');
my $rec = $cdb->get('passwordstrength'); $strength = ($rec ? ($rec->prop('Users') || 'none') : 'none');
$strength = ($rec ? ($rec->prop('Users') || 'none') : 'none'); return validate_password($c, $strength, $password);
} ## end sub check_password
return validate_password( $c, $strength, $password );
}
sub validate_password { sub validate_password {
my ($c, $strength, $pass) = @_; my ($c, $strength, $pass) = @_;
use Crypt::Cracklib; use Crypt::Cracklib;
if ($strength eq "none") { if ($strength eq "none") {
return $c->l("Passwords must be at least 7 characters long") unless ( length( $pass ) > 6 ); return $c->l("Passwords must be at least 7 characters long") unless (length($pass) > 6);
return "OK"; return "OK";
} }
my $reason = is_normal_password($c, $pass, undef); my $reason = is_normal_password($c, $pass, undef);
return $reason unless ($reason eq "OK"); return $reason unless ($reason eq "OK");
return "OK" unless ($strength eq "strong"); return "OK" unless ($strength eq "strong");
if ( -f '/usr/lib64/cracklib_dict.pwd' ) { if (-f '/usr/lib64/cracklib_dict.pwd') {
$reason = fascist_check($pass, '/usr/lib64/cracklib_dict'); $reason = fascist_check($pass, '/usr/lib64/cracklib_dict');
} else { } else {
$reason = fascist_check($pass, '/usr/lib/cracklib_dict'); $reason = fascist_check($pass, '/usr/lib/cracklib_dict');
} }
$reason ||= "Software error: password check failed"; $reason ||= "Software error: password check failed";
return "OK" if ($reason eq "ok"); return "OK" if ($reason eq "ok");
return
return $c->l("Bad Password Choice") . ": " $c->l("Bad Password Choice") . ": "
. $c->l("The password you have chosen is not a good choice, because") . $c->l("The password you have chosen is not a good choice, because") . " "
. " " . $c->($reason) . "."; . $c->($reason) . ".";
} } ## end sub validate_password
1; 1;

282
root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
View File

@ -13,145 +13,121 @@ use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
#use esmith::FormMagick qw(gen_locale_date_string); #use esmith::FormMagick qw(gen_locale_date_string);
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
use esmith::ConfigDB; use esmith::ConfigDB;
use Time::TAI64; use Time::TAI64;
use File::Basename; use File::Basename;
use HTML::Entities; use HTML::Entities;
use esmith::FormMagick qw(gen_locale_date_string); use esmith::FormMagick qw(gen_locale_date_string);
use File::Temp qw(tempfile); use File::Temp qw(tempfile);
use constant TRUE => 1; use constant TRUE => 1;
use constant FALSE => 0; use constant FALSE => 0;
our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
our @logfiles = (); # with array
our @logfiles = (); # with array
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %log_datas = (); my %log_datas = ();
my $title = $c->l('log_FORM_TITLE'); my $title = $c->l('log_FORM_TITLE');
my $notif = ''; my $notif = '';
$log_datas{default_op} = ($cdb->get('viewlogfiles')->prop('DefaultOperation')) || 'view';
$log_datas{default_op} = $c->stash(title => $title, notif => $notif, log_datas => \%log_datas);
($cdb->get('viewlogfiles')->prop('DefaultOperation')) || 'view';
$c->stash( title => $title, notif => $notif, log_datas => \%log_datas);
$c->render(template => 'viewlogfiles'); $c->render(template => 'viewlogfiles');
}; } ## end sub main
sub do_action { sub do_action {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $title = $c->l('log_FORM_TITLE');
my $title = $c->l('log_FORM_TITLE'); my $notif = '';
my $notif = ''; my $result = "";
my $result = "";
my %log_datas = (); my %log_datas = ();
$log_datas{filename} = $c->param('Filename');
$log_datas{filename} = $c->param('Filename'); $log_datas{matchpattern} = $c->param('Matchpattern');
$log_datas{matchpattern} = $c->param('Matchpattern');
$log_datas{highlightpattern} = $c->param('Highlightpattern'); $log_datas{highlightpattern} = $c->param('Highlightpattern');
$log_datas{operation} = $c->param('Operation'); $log_datas{operation} = $c->param('Operation');
if ($log_datas{operation} eq 'download') {
$log_datas{'trt'} = "DOWN"
} else {
$log_datas{'trt'} = "SHOW"
}
if ($log_datas{operation} eq 'download') {
$log_datas{'trt'} = "DOWN";
} else {
$log_datas{'trt'} = "SHOW";
}
if ($log_datas{filename} =~ /^([\S\s]+)$/) { if ($log_datas{filename} =~ /^([\S\s]+)$/) {
$log_datas{filename} = $1; $log_datas{filename} = $1;
} elsif ($log_datas{filename} =~ /^$/) { } elsif ($log_datas{filename} =~ /^$/) {
$log_datas{filename} = "messages"; $log_datas{filename} = "messages";
} else { } else {
$result .= $c->l("log_FILENAME_ERROR", $log_datas{filename} ) $result .= $c->l("log_FILENAME_ERROR", $log_datas{filename}) . " ";
. " ";
}
if ($log_datas{matchpattern} =~ /^(\S+)$/) {
$log_datas{matchpattern} = $1;
} else {
$log_datas{matchpattern} = ".";
}
if ($log_datas{highlightpattern} =~ /^(\S+)$/) {
$log_datas{highlightpattern} = $1;
} else {
$log_datas{highlightpattern} = '';
} }
if ($log_datas{matchpattern} =~ /^(\S+)$/) {
$log_datas{matchpattern} = $1;
} else {
$log_datas{matchpattern} = ".";
}
if ($log_datas{highlightpattern} =~ /^(\S+)$/) {
$log_datas{highlightpattern} = $1;
} else {
$log_datas{highlightpattern} = '';
}
my $fullpath = "/var/log/$log_datas{filename}"; my $fullpath = "/var/log/$log_datas{filename}";
if (-z $fullpath) { if (-z $fullpath) {
$result .= $c->l("log_LOG_FILE_EMPTY", "$log_datas{filename}" ); $result .= $c->l("log_LOG_FILE_EMPTY", "$log_datas{filename}");
} }
if ($log_datas{trt} eq "SHOW") { if ($log_datas{trt} eq "SHOW") {
if ( ! $result ) { if (!$result) {
$result = $c->render_to_string(inline => showlogFile( $c, %log_datas )); $result = $c->render_to_string(inline => showlogFile($c, %log_datas));
} }
if ( $result ) { if ($result) {
$c->stash(title => $title, modul => $result, log_datas => \%log_datas); $c->stash(title => $title, modul => $result, log_datas => \%log_datas);
return $c->render(template => 'viewlogfiles2'); return $c->render(template => 'viewlogfiles2');
} }
} } ## end if ($log_datas{trt} eq...)
if ($log_datas{trt} eq 'DOWN') {
if ( $log_datas{trt} eq 'DOWN' ) { my $modul = 'Log file download';
$notif = download_logFile($c, %log_datas);
my $modul = 'Log file download'; return undef unless defined $notif;
} ## end if ($log_datas{trt} eq...)
$notif = download_logFile( $c, %log_datas ); $c->stash(title => $title, notif => $notif, log_datas => \%log_datas);
return undef unless defined $notif;
}
$c->stash( title => $title, notif => $notif, log_datas => \%log_datas);
$c->render(template => 'viewlogfiles'); $c->render(template => 'viewlogfiles');
} ## end sub do_action
}; sub timestamp2local {
sub timestamp2local
{
$_ = shift; $_ = shift;
if (/^(\@[0-9a-f]{24})(.*)/s)
{ if (/^(\@[0-9a-f]{24})(.*)/s) {
return Time::TAI64::tai64nlocal($1) . $2; return Time::TAI64::tai64nlocal($1) . $2;
} } elsif (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
elsif (/^([0-9]{10}\.[0-9]{3})(.*)/s) return localtime($1) . $2;
{
return localtime($1) . $2;
} }
return $_; return $_;
} } ## end sub timestamp2local
sub findlogFiles { sub findlogFiles {
my $c = shift; my $c = shift;
use File::Find; use File::Find;
sub findlogfiles
{ sub findlogfiles {
my $path = $File::Find::name; my $path = $File::Find::name;
if (-f) if (-f) {
{
# Remove leading /var/log/messages # Remove leading /var/log/messages
$path =~ s:^/var/log/::; $path =~ s:^/var/log/::;
# don't bother to collect files known to be non-text # don't bother to collect files known to be non-text
# or not log files # or not log files
foreach (qw( foreach (
qw(
lastlog lastlog
btmp$ btmp$
wtmp wtmp
@ -161,176 +137,160 @@ sub findlogFiles {
httpd/ssl_scache.pag httpd/ssl_scache.pag
httpd/ssl_scache.dir httpd/ssl_scache.dir
\/config$ \/config$
)) )
)
{ {
return if $path =~ /$_/; return if $path =~ /$_/;
} } ## end foreach (qw( lastlog btmp$ wtmp...))
my ($file_base, $file_path, $file_type) = fileparse($path); my ($file_base, $file_path, $file_type) = fileparse($path);
if ( $file_base =~ /@.*/ ) if ($file_base =~ /@.*/) {
{
#$logfiles{$path} = $file_path . timestamp2local($file_base); #$logfiles{$path} = $file_path . timestamp2local($file_base);
push @logfiles, [ $file_path . timestamp2local($file_base), $path ]; push @logfiles, [ $file_path . timestamp2local($file_base), $path ];
} } else {
else
{
#$logfiles{$path} = $path; #$logfiles{$path} = $path;
push @logfiles, [ $path, $path ]; push @logfiles, [ $path, $path ];
} }
} } ## end if (-f)
} } ## end sub findlogfiles
@logfiles = (); @logfiles = ();
# Now go and find all the files under /var/log # Now go and find all the files under /var/log
find({wanted => \&findlogfiles, no_chdir => 1}, '/var/log'); find({ wanted => \&findlogfiles, no_chdir => 1 }, '/var/log');
my @logf = sort { $a->[0] cmp $b->[0] } @logfiles; my @logf = sort { $a->[0] cmp $b->[0] } @logfiles;
return \@logf; return \@logf;
} } ## end sub findlogFiles
sub showlogFile { sub showlogFile {
my ($c, %log_datas) = @_; my ($c, %log_datas) = @_;
my $fullpath = "/var/log/$log_datas{filename}"; my $fullpath = "/var/log/$log_datas{filename}";
my $out = ''; my $out = '';
$out .= sprintf("$fullpath: \n"); $out .= sprintf("$fullpath: \n");
$out .= sprintf($c->l("log_VIEWING_TIME", $c->gen_locale_date_string()));
$out .= sprintf($c->l("log_VIEWING_TIME", $c->gen_locale_date_string() )); unless ($log_datas{matchpattern} eq '.') {
unless ( $log_datas{matchpattern} eq '.' )
{
#$out .= sprintf("<p>\n"); #$out .= sprintf("<p>\n");
$out .= sprintf($c->l("log_MATCH_HEADER", $log_datas{matchpattern} )); $out .= sprintf($c->l("log_MATCH_HEADER", $log_datas{matchpattern}));
} } ## end unless ($log_datas{matchpattern...})
if ($log_datas{highlightpattern}) {
if ( $log_datas{highlightpattern} )
{
#$out .= sprintf("<p>\n"); #$out .= sprintf("<p>\n");
$out .= sprintf($c->l("log_HIGHLIGHT_HEADER", "$log_datas{highlightpattern}" )); $out .= sprintf($c->l("log_HIGHLIGHT_HEADER", "$log_datas{highlightpattern}"));
} } ## end if ($log_datas{highlightpattern...})
if ($log_datas{filename} =~ /\.gz$/) { if ($log_datas{filename} =~ /\.gz$/) {
my $pid = open(LOGFILE, "-|"); my $pid = open(LOGFILE, "-|");
die "Couldn't fork: $!" unless defined $pid; die "Couldn't fork: $!" unless defined $pid;
unless ($pid) { unless ($pid) {
# Child # Child
exec("/bin/zcat", $fullpath) exec("/bin/zcat", $fullpath)
|| die "Can't exec zcat: $!"; || die "Can't exec zcat: $!";
# NOTREACHED # NOTREACHED
} } ## end unless ($pid)
} else { } else {
open(LOGFILE, "$fullpath"); open(LOGFILE, "$fullpath");
} }
my $somethingMatched = 0; my $somethingMatched = 0;
my $fileEmpty = 1; my $fileEmpty = 1;
$out .= sprintf("<PRE>"); $out .= sprintf("<PRE>");
while(<LOGFILE>)
{ while (<LOGFILE>) {
$fileEmpty = 0; $fileEmpty = 0;
next unless /$log_datas{matchpattern}/; next unless /$log_datas{matchpattern}/;
$somethingMatched = 1; $somethingMatched = 1;
$_ = timestamp2local($_);
$_ = timestamp2local($_); $_ = HTML::Entities::encode_entities($_);
$_ = HTML::Entities::encode_entities($_);
($log_datas{highlightpattern} && /$log_datas{highlightpattern}/) ($log_datas{highlightpattern} && /$log_datas{highlightpattern}/)
? $out .= sprintf( "<b>$_</b>" ) ? $out .= sprintf("<b>$_</b>")
: $out .= sprintf("$_"); : $out .= sprintf("$_");
} } ## end while (<LOGFILE>)
$out .= sprintf("</PRE>"); $out .= sprintf("</PRE>");
if ($fileEmpty) { if ($fileEmpty) {
$out .= sprintf("<p>\n"); $out .= sprintf("<p>\n");
$out .= sprintf($c->l("log_LOG_FILE_EMPTY")); $out .= sprintf($c->l("log_LOG_FILE_EMPTY"));
} else { } else {
unless ($somethingMatched)
{ unless ($somethingMatched) {
$out .= sprintf("<p>\n"); $out .= sprintf("<p>\n");
$out .= sprintf($c->l("log_NO_MATCHING_LINES")); $out .= sprintf($c->l("log_NO_MATCHING_LINES"));
} }
} } ## end else [ if ($fileEmpty) ]
close LOGFILE; close LOGFILE;
return $out; return $out;
} } ## end sub showlogFile
sub download_logFile { sub download_logFile {
my ($c, %log_datas) = @_; my ($c, %log_datas) = @_;
my $fullpath = "/var/log/$log_datas{filename}"; my $fullpath = "/var/log/$log_datas{filename}";
# Save this information for later. # Save this information for later.
$cdb->get('viewlogfiles')->merge_props('DefaultOperation', $log_datas{operation}); $cdb->get('viewlogfiles')->merge_props('DefaultOperation', $log_datas{operation});
# If the client is on windows, we must handle this a little differently. # If the client is on windows, we must handle this a little differently.
my $win32 = FALSE; my $win32 = FALSE;
my $mac = FALSE; my $mac = FALSE;
my $agent = $ENV{HTTP_USER_AGENT} || ""; my $agent = $ENV{HTTP_USER_AGENT} || "";
if ($agent =~ /win32|windows/i) { if ($agent =~ /win32|windows/i) {
$win32 = TRUE; $win32 = TRUE;
} elsif ($agent =~ /mac/i) { } elsif ($agent =~ /mac/i) {
$mac = TRUE; $mac = TRUE;
} }
# Check for errors first. Once we start sending the file it's too late to # Check for errors first. Once we start sending the file it's too late to
# report them. # report them.
my $error = ""; my $error = "";
unless (-f $fullpath) {
unless (-f $fullpath) {
$error = $c->l("log_ERR_NOEXIST_FILE") . $fullpath; $error = $c->l("log_ERR_NOEXIST_FILE") . $fullpath;
} }
local *FILE; local *FILE;
open(FILE, "<$fullpath") open(FILE, "<$fullpath")
or $error = $c->l("log_ERR_NOOPEN_FILE"); or $error = $c->l("log_ERR_NOOPEN_FILE");
# Put other error checking here.
# Put other error checking here.
return $error if $error; return $error if $error;
# Fix the filename, as it might have a directory prefixed to it. # Fix the filename, as it might have a directory prefixed to it.
my $filename = $log_datas{filename}; my $filename = $log_datas{filename};
if ( $filename =~ m#/# ) {
if ($filename =~ m#/#) {
$filename = (split /\//, $filename)[-1]; $filename = (split /\//, $filename)[-1];
} }
# And send the file. # And send the file.
my $nl = "\n"; my $nl = "\n";
if ($win32) { $nl = "\r\n" } if ($win32) { $nl = "\r\n" }
elsif ($mac) { $nl = "\r" } elsif ($mac) { $nl = "\r" }
# Otherwise, send the file. Start with the headers. # Otherwise, send the file. Start with the headers.
# Note: The Content-disposition must be attachment, or IE will view the # Note: The Content-disposition must be attachment, or IE will view the
# file inline like it's told. It ignores the Content-type, but it likes # file inline like it's told. It ignores the Content-type, but it likes
# the Content-disposition (an officially unsupported header) for some # the Content-disposition (an officially unsupported header) for some
# reason. Yay Microsoft. # reason. Yay Microsoft.
my $file2 = new File::Temp(UNLINK => 0);
my $file2 = new File::Temp( UNLINK => 0 );
while (my $line = <FILE>) { while (my $line = <FILE>) {
chomp $line; chomp $line;
my $linew = timestamp2local($line) . $nl; my $linew = timestamp2local($line) . $nl;
print $file2 $linew; print $file2 $linew;
} } ## end while (my $line = <FILE>)
close(FILE); close(FILE);
$c->render_file( $c->render_file(
'filepath' => "$file2", 'filepath' => "$file2",
'filename' => "$filename", 'filename' => "$filename",
'format' => 'x-download', 'format' => 'x-download',
'content_disposition' => 'attachment', 'content_disposition' => 'attachment',
'cleanup' => 1, 'cleanup' => 1,
); );
return undef; return undef;
} } ## end sub download_logFile
1; 1;

87
root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
View File

@ -10,94 +10,71 @@ package SrvMngr::Controller::Workgroup;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session); use SrvMngr qw(theme_list init_session);
use esmith::FormMagick::Panel::workgroup; use esmith::FormMagick::Panel::workgroup;
our $db = esmith::ConfigDB->open || die "Couldn't open config db"; our $db = esmith::ConfigDB->open || die "Couldn't open config db";
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %wkg_datas = (); my %wkg_datas = ();
my $title = $c->l('wkg_FORM_TITLE'); my $title = $c->l('wkg_FORM_TITLE');
my $modul = ''; my $modul = '';
$wkg_datas{'Workgroup'} = ($db->get_prop('smb', 'Workgroup')) || '';
$wkg_datas{'Workgroup'} = ($db->get_prop('smb','Workgroup')) || ''; $wkg_datas{'ServerName'} = ($db->get_prop('smb', 'ServerName')) || '';
$wkg_datas{'ServerName'} = ($db->get_prop('smb','ServerName')) || ''; $wkg_datas{'ServerRole'} = ($db->get_prop('smb', 'ServerRole')) || '';
$wkg_datas{'ServerRole'} = ($db->get_prop('smb','ServerRole')) || ''; $wkg_datas{'RoamingProfiles'} = ($db->get_prop('smb', 'RoamingProfiles')) || '';
$wkg_datas{'RoamingProfiles'} = ($db->get_prop('smb','RoamingProfiles')) || ''; $c->stash(title => $title, modul => $modul, wkg_datas => \%wkg_datas);
$c->stash( title => $title, modul => $modul, wkg_datas => \%wkg_datas );
$c->render(template => 'workgroup'); $c->render(template => 'workgroup');
}; } ## end sub main
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $result = "";
my $result = ""; my $workgroup = ($c->param('Workgroup') || 'no');
my $servername = ($c->param('ServerName') || 'WS');
my $workgroup = ($c->param('Workgroup') || 'no');
my $servername = ($c->param('ServerName') || 'WS');
my $roamingprofiles = ($c->param('RoamingProfiles') || 'no'); my $roamingprofiles = ($c->param('RoamingProfiles') || 'no');
my $serverrole = ($c->param('ServerRole') || 'WS'); my $serverrole = ($c->param('ServerRole') || 'WS');
# controls # controls
my $res = validate2_workgroup($c, $workgroup, $servername); my $res = validate2_workgroup($c, $workgroup, $servername);
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
$res = validate2_servername($c, $servername); $res = validate2_servername($c, $servername);
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
if ($result eq '') { if ($result eq '') {
$db->get('smb')->set_prop('Workgroup', $workgroup); $db->get('smb')->set_prop('Workgroup', $workgroup);
$db->get('smb')->set_prop('ServerRole', $serverrole); $db->get('smb')->set_prop('ServerRole', $serverrole);
$db->get('smb')->set_prop('ServerName', $servername); $db->get('smb')->set_prop('ServerName', $servername);
$db->get('smb')->set_prop('RoamingProfiles', $roamingprofiles); $db->get('smb')->set_prop('RoamingProfiles', $roamingprofiles);
} } ## end if ($result eq '')
system("/sbin/e-smith/signal-event", "workgroup-update") == 0
system( "/sbin/e-smith/signal-event", "workgroup-update" ) == 0 or $result = $c->l('ERROR_UPDATING') . " system";
or $result = $c->l('ERROR_UPDATING') . " system";
my $title = $c->l('wkg_FORM_TITLE'); my $title = $c->l('wkg_FORM_TITLE');
if ($result eq '') { $result = $c->l('wkg_SUCCESS'); }
if ( $result eq '' ) { $result = $c->l('wkg_SUCCESS'); } $c->stash(title => $title, modul => $result);
$c->stash( title => $title, modul => $result );
$c->render(template => 'module'); $c->render(template => 'module');
} ## end sub do_update
};
sub validate2_servername { sub validate2_servername {
my $c = shift; my $c = shift;
my $servername = shift; my $servername = shift;
return ('OK') if ($servername =~ /^([a-zA-Z][\-\w]*)$/);
return ('OK') if ( $servername =~ /^([a-zA-Z][\-\w]*)$/ );
return $c->l('INVALID_SERVERNAME'); return $c->l('INVALID_SERVERNAME');
} } ## end sub validate2_servername
sub validate2_workgroup { sub validate2_workgroup {
my $c = shift; my $c = shift;
my $workgroup = lc(shift); my $workgroup = lc(shift);
my $servername = lc(shift); my $servername = lc(shift);
# my $workgroup = $c->l(shift);
# my $servername = $c->l(shift);
return $c->l('INVALID_WORKGROUP') unless ( $workgroup =~ /^([a-zA-Z0-9][\-\w\.]*)$/ );
return $c->l('INVALID_WORKGROUP_MATCHES_SERVERNAME') if ( $servername eq $workgroup);
return ('OK');
}
# my $workgroup = $c->l(shift);
# my $servername = $c->l(shift);
return $c->l('INVALID_WORKGROUP') unless ($workgroup =~ /^([a-zA-Z0-9][\-\w\.]*)$/);
return $c->l('INVALID_WORKGROUP_MATCHES_SERVERNAME') if ($servername eq $workgroup);
return ('OK');
} ## end sub validate2_workgroup
1; 1;

549
root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm
View File

@ -10,270 +10,238 @@ package SrvMngr::Controller::Yum;
use strict; use strict;
use warnings; use warnings;
use Mojo::Base 'Mojolicious::Controller'; use Mojo::Base 'Mojolicious::Controller';
use Locale::gettext; use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session ip_number_or_blank); use SrvMngr qw(theme_list init_session ip_number_or_blank);
use esmith::ConfigDB; use esmith::ConfigDB;
use esmith::util; use esmith::util;
use File::Basename; use File::Basename;
our $cdb = esmith::ConfigDB->open || die "Couldn't open config db"; our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
my $dnf_status_file = '/var/cache/dnf/dnf.status';
my $dnf_status_file = '/var/cache/dnf/dnf.status';
#use File::stat; #use File::stat;
our %dbs; our %dbs;
for ( qw(available installed updates) ) for (qw(available installed updates)) {
{ $dbs{$_} = esmith::ConfigDB->open_ro("dnf_$_")
$dbs{$_} = esmith::ConfigDB->open_ro("dnf_$_") or or die "Couldn't open dnf_$_ DB\n";
die "Couldn't open dnf_$_ DB\n";
} }
for ( qw(repositories) ) for (qw(repositories)) {
{ $dbs{$_} = esmith::ConfigDB->open("yum_$_")
$dbs{$_} = esmith::ConfigDB->open("yum_$_") or or die "Couldn't open yum_$_ DB\n";
die "Couldn't open yum_$_ DB\n";
} }
sub main { sub main {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my %yum_datas = (); my %yum_datas = ();
my $title = $c->l('yum_FORM_TITLE'); my $title = $c->l('yum_FORM_TITLE');
my $dest = 'yum'; my $dest = 'yum';
my $notif = ''; my $notif = '';
$yum_datas{'trt'} = 'STAT'; $yum_datas{'trt'} = 'STAT';
if ($c->is_dnf_running()) {
if ( $c->is_dnf_running()) { $yum_datas{'trt'} = 'LOGF';
$yum_datas{'trt'} = 'LOGF'; $dest = 'yumlogfile';
$dest = 'yumlogfile';
} elsif ($cdb->get_prop('dnf', 'LogFile')) { } elsif ($cdb->get_prop('dnf', 'LogFile')) {
$yum_datas{'trt'} = 'PSTU'; $yum_datas{'trt'} = 'PSTU';
$yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes'); $yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes');
$dest = 'yumpostupg'; $dest = 'yumpostupg';
} else { } else {
# normal other trt
# normal other trt
} }
$c->stash(title => $title, notif => $notif, yum_datas => \%yum_datas);
$c->stash( title => $title, notif => $notif, yum_datas => \%yum_datas ); return $c->render(template => $dest);
return $c->render( template => $dest ); } ## end sub main
}
sub do_display { sub do_display {
my $c = shift;
my $c = shift; my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'STAT');
my $rt = $c->current_route;
my $trt = ($c->param('trt') || 'STAT');
my %yum_datas = (); my %yum_datas = ();
my $title = $c->l('yum_FORM_TITLE'); my $title = $c->l('yum_FORM_TITLE');
my ($notif, $dest) = ''; my ($notif, $dest) = '';
$yum_datas{'trt'} = $trt; $yum_datas{'trt'} = $trt;
# force $trt if current logfile # force $trt if current logfile
if ( $c->is_dnf_running() ) { if ($c->is_dnf_running()) {
$trt = 'LOGF'; $trt = 'LOGF';
} elsif ($cdb->get_prop('dnf', 'LogFile')) { } elsif ($cdb->get_prop('dnf', 'LogFile')) {
$trt = 'PSTU'; $trt = 'PSTU';
} }
if ( $trt eq 'UPDT' ) { if ($trt eq 'UPDT') {
$dest = 'yumupdate'; $dest = 'yumupdate';
}
if ($trt eq 'INST') {
$dest = 'yuminstall';
}
if ($trt eq 'REMO') {
$dest = 'yumremove';
}
if ($trt eq 'CONF') {
$dest = 'yumconfig';
}
if ($trt eq 'LOGF') {
if ($c->is_dnf_running()) {
$dest = 'yumlogfile';
} }
} ## end if ($trt eq 'LOGF')
if ( $trt eq 'INST' ) { if ($trt eq 'PSTU') {
$dest = 'yuminstall'; if ($cdb->get_prop('dnf', 'LogFile')) {
$dest = 'yumpostupg';
$yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes');
} }
} ## end if ($trt eq 'PSTU')
if ( $trt eq 'REMO' ) { if (!$dest) { $dest = 'yum'; }
$dest = 'yumremove'; $c->stash(title => $title, notif => $notif, yum_datas => \%yum_datas);
} return $c->render(template => $dest);
} ## end sub do_display
if ( $trt eq 'CONF' ) {
$dest = 'yumconfig';
}
if ( $trt eq 'LOGF' ) {
if ($c->is_dnf_running()) {
$dest = 'yumlogfile';
}
}
if ( $trt eq 'PSTU') {
if ($cdb->get_prop('dnf', 'LogFile')) {
$dest = 'yumpostupg';
$yum_datas{'reconf'} = $cdb->get_value('UnsavedChanges', 'yes');
}
}
if ( ! $dest ) { $dest = 'yum'; }
$c->stash( title => $title, notif => $notif, yum_datas => \%yum_datas );
return $c->render( template => $dest );
};
sub do_update { sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $rt = $c->current_route; my $trt = $c->param('trt');
my $trt = $c->param('trt');
my %yum_datas = (); my %yum_datas = ();
$yum_datas{trt} = $trt; $yum_datas{trt} = $trt;
my $title = $c->l('yum_FORM_TITLE'); my $title = $c->l('yum_FORM_TITLE');
my ($dest, $res, $result) = ''; my ($dest, $res, $result) = '';
if ( $trt eq 'UPDT' ) { if ($trt eq 'UPDT') {
$dest = 'yumupdate';
$dest = 'yumupdate'; if (!$result) {
$res = $c->do_yum('update');
$result .= $res unless $res eq 'OK';
if ( ! $result ) { if (!$result) {
$res = $c->do_yum('update'); $yum_datas{trt} = 'SUC';
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$yum_datas{trt} = 'SUC';
#$result = $c->l('yum_SUCCESS');
}
}
}
if ( $trt eq 'INST' ) { #$result = $c->l('yum_SUCCESS');
} ## end if (!$result)
} ## end if (!$result)
} ## end if ($trt eq 'UPDT')
$dest = 'yuminstall'; if ($trt eq 'INST') {
$dest = 'yuminstall';
if ( ! $result ) { if (!$result) {
$res = $c->do_yum('install'); $res = $c->do_yum('install');
$result .= $res unless $res eq 'OK'; $result .= $res unless $res eq 'OK';
if ( ! $result ) {
$yum_datas{trt} = 'SUC';
#$result = $c->l('yum_SUCCESS');
}
}
}
if ( $trt eq 'REMO' ) { if (!$result) {
$yum_datas{trt} = 'SUC';
$dest = 'yumremove'; #$result = $c->l('yum_SUCCESS');
} ## end if (!$result)
} ## end if (!$result)
} ## end if ($trt eq 'INST')
if ( ! $result ) { if ($trt eq 'REMO') {
$res = $c->do_yum('remove'); $dest = 'yumremove';
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$yum_datas{trt} = 'SUC';
#$result = $c->l('yum_SUCCESS');
}
}
}
if ( $trt eq 'CONF' ) { if (!$result) {
$res = $c->do_yum('remove');
$result .= $res unless $res eq 'OK';
$dest = 'yumconfig'; if (!$result) {
$yum_datas{trt} = 'SUC';
if ( ! $result ) { #$result = $c->l('yum_SUCCESS');
$res = $c->change_settings(); } ## end if (!$result)
$result .= $res unless $res eq 'OK'; } ## end if (!$result)
if ( ! $result ) { } ## end if ($trt eq 'REMO')
$yum_datas{trt} = 'SUC';
$result = $c->l('yum_SUCCESS');
}
}
}
if ($trt eq 'CONF') {
$dest = 'yumconfig';
if ( $trt eq 'PSTU') { if (!$result) {
$res = $c->change_settings();
$result .= $res unless $res eq 'OK';
my $reconf = $c->param('reconf') || 'yes'; if (!$result) {
$dest = 'yumpostupg'; $yum_datas{trt} = 'SUC';
$result = $c->l('yum_SUCCESS');
}
} ## end if (!$result)
} ## end if ($trt eq 'CONF')
# effective reconfigure and reboot required if ($trt eq 'PSTU') {
if ( $reconf eq 'yes' ) { my $reconf = $c->param('reconf') || 'yes';
$res = $c->post_upgrade_reboot(); $dest = 'yumpostupg';
$result .= $res unless $res eq 'OK';
if ( ! $result ) {
$yum_datas{trt} = 'SUC';
$result = $c->l('yum_SYSTEM_BEING_RECONFIGURED');
}
} else {
$yum_datas{trt} = 'SUC';
$result = $c->l('yum_UPDATE_SUCCESS');
}
}
# effective reconfigure and reboot required
if ($reconf eq 'yes') {
$res = $c->post_upgrade_reboot();
$result .= $res unless $res eq 'OK';
if ( $trt eq 'LOGF' ) { if (!$result) {
$yum_datas{trt} = 'SUC';
$dest = 'yumlogfile'; $result = $c->l('yum_SYSTEM_BEING_RECONFIGURED');
if ( ! $c->is_dnf_running()) { }
$yum_datas{trt} = 'SUC'; } else {
$result = $c->l('yum_SUCCESS'); $yum_datas{trt} = 'SUC';
$result = $c->l('yum_UPDATE_SUCCESS');
} }
} } ## end if ($trt eq 'PSTU')
if ($trt eq 'LOGF') {
$dest = 'yumlogfile';
if (!$c->is_dnf_running()) {
$yum_datas{trt} = 'SUC';
$result = $c->l('yum_SUCCESS');
}
} ## end if ($trt eq 'LOGF')
# do_yum ended (no message) --> forced to LOGFile # do_yum ended (no message) --> forced to LOGFile
if ( ! $result ) { if (!$result) {
$dest = 'yumlogfile'; $dest = 'yumlogfile';
$yum_datas{trt} = 'LOGF'; $yum_datas{trt} = 'LOGF';
} }
$c->stash(title => $title, notif => $result, yum_datas => \%yum_datas);
$c->stash( title => $title, notif => $result, yum_datas => \%yum_datas );
if ($yum_datas{trt} ne 'SUC') { if ($yum_datas{trt} ne 'SUC') {
return $c->render(template => $dest); return $c->render(template => $dest);
} }
my $message = "'Yum' $trt update DONE"; my $message = "'Yum' $trt update DONE";
$c->app->log->info($message); $c->app->log->info($message);
$c->flash(success => $result) if $result; $c->flash(success => $result) if $result;
$c->redirect_to("/yum"); $c->redirect_to("/yum");
} ## end sub do_update
};
sub get_dnf_status { sub get_dnf_status {
#interrogate status file created and maintained by smeserver.py plugin for dnf. #interrogate status file created and maintained by smeserver.py plugin for dnf.
my ($c) = @_; my ($c) = @_;
my $file_name = $dnf_status_file; my $file_name = $dnf_status_file;
my $content = "resolved"; my $content = "resolved";
if ( -e "$file_name") {
open my $fh, '<', $file_name or die "Can't open file: $!"; if (-e "$file_name") {
$content = <$fh>; open my $fh, '<', $file_name or die "Can't open file: $!";
close $fh; $content = <$fh>;
} close $fh;
} ## end if (-e "$file_name")
return $content; return $content;
} } ## end sub get_dnf_status
sub is_dnf_running { sub is_dnf_running {
my ($c) = @_; my ($c) = @_;
my $dnf_status = $c->get_dnf_status(); my $dnf_status = $c->get_dnf_status();
return $dnf_status ne "resolved" && $dnf_status ne "config" && $dnf_status ne "sack"; return $dnf_status ne "resolved" && $dnf_status ne "config" && $dnf_status ne "sack";
} } ## end sub is_dnf_running
sub is_empty { sub is_empty {
my ($c, $yumdb) = @_; my ($c, $yumdb) = @_;
my $groups = $dbs{$yumdb}->get_all_by_prop(type => 'group') || 'none';
my $groups = $dbs{$yumdb}->get_all_by_prop(type => 'group') || 'none';
my $packages = $dbs{$yumdb}->get_all_by_prop(type => 'package') || 'none'; my $packages = $dbs{$yumdb}->get_all_by_prop(type => 'package') || 'none';
#Show no updates if both = none #Show no updates if both = none
@ -281,283 +249,194 @@ sub is_empty {
#else return here #else return here
return; return;
} } ## end sub is_empty
sub non_empty { sub non_empty {
my ($c, $yumdb, $type) = @_; my ($c, $yumdb, $type) = @_;
$type ||= 'both'; $type ||= 'both';
return 0 unless (exists $dbs{$yumdb}); return 0 unless (exists $dbs{$yumdb});
my $groups = scalar $dbs{$yumdb}->get_all_by_prop(type => 'group');
my $groups = scalar $dbs{$yumdb}->get_all_by_prop(type => 'group');
return $groups if ($type eq 'group'); return $groups if ($type eq 'group');
my $packages = scalar $dbs{$yumdb}->get_all_by_prop(type => 'package'); my $packages = scalar $dbs{$yumdb}->get_all_by_prop(type => 'package');
if ($type eq 'package')
{ if ($type eq 'package') {
return $c->package_functions_enabled ? $packages : 0; return $c->package_functions_enabled ? $packages : 0;
} }
return ($c->package_functions_enabled or $yumdb eq 'updates') ? ($groups || $packages) : $groups;
return ($c->package_functions_enabled or $yumdb eq 'updates') ? } ## end sub non_empty
($groups || $packages) : $groups;
}
sub package_functions_enabled { sub package_functions_enabled {
my ($c) = @_; my ($c) = @_;
return ($cdb->get_prop("dnf", "PackageFunctions") eq "enabled"); return ($cdb->get_prop("dnf", "PackageFunctions") eq "enabled");
} }
sub get_status { sub get_status {
my ($c, $prop, $localise) = @_; my ($c, $prop, $localise) = @_;
my $status = $cdb->get_prop("dnf", $prop) || 'disabled'; my $status = $cdb->get_prop("dnf", $prop) || 'disabled';
return $status unless $localise; return $status unless $localise;
return $c->l($status eq 'enabled' ? 'ENABLED' : 'DISABLED'); return $c->l($status eq 'enabled' ? 'ENABLED' : 'DISABLED');
} } ## end sub get_status
sub get_options { sub get_options {
my ($c, $yumdb, $type) = @_; my ($c, $yumdb, $type) = @_;
my %options; my %options;
for ($dbs{$yumdb}->get_all_by_prop(type => $type)) for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
{ $options{ $_->key } = $_->key . " " . $_->prop("Version") . " - " . $_->prop("Repo");
$options{$_->key} = $_->key . " " . $_->prop("Version") . " - " .
$_->prop("Repo");
} }
return \%options; return \%options;
} } ## end sub get_options
sub get_options2 { sub get_options2 {
my ($c, $yumdb, $type) = @_; my ($c, $yumdb, $type) = @_;
my @options; my @options;
for ($dbs{$yumdb}->get_all_by_prop(type => $type)) for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
{ push @options, [ $_->key . " " . $_->prop("Version") . " - " . $_->prop("Repo") => $_->key ];
push @options, [ $_->key . " " . $_->prop("Version") . " - " .
$_->prop("Repo") => $_->key ];
} }
return \@options; return \@options;
} } ## end sub get_options2
sub get_names { sub get_names {
return [ keys %{ get_options(@_) } ];
return [ keys %{get_options(@_)} ];
} }
sub get_names2 { sub get_names2 {
my ($c, $yumdb, $type) = @_; my ($c, $yumdb, $type) = @_;
my @selected; my @selected;
for ($dbs{$yumdb}->get_all_by_prop(type => $type)) { for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
push @selected, $_->key; push @selected, $_->key;
} }
return \@selected; return \@selected;
# return [ values @{get_options2(@_)} ];
}
# return [ values @{get_options2(@_)} ];
} ## end sub get_names2
sub get_repository_options2 { sub get_repository_options2 {
my $c = shift; my $c = shift;
my @options; my @options;
foreach my $repos ( foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
$dbs{repositories}->get_all_by_prop(type => "repository") ) next unless ($repos->prop('Visible') eq 'yes'
{ or $repos->prop('status') eq 'enabled');
next unless ($repos->prop('Visible') eq 'yes'
or $repos->prop('status') eq 'enabled');
push @options, [ $repos->prop('Name') => $repos->key ]; push @options, [ $repos->prop('Name') => $repos->key ];
} } ## end foreach my $repos ($dbs{repositories...})
my @opts = sort { $a->[0] cmp $b->[0] } @options; my @opts = sort { $a->[0] cmp $b->[0] } @options;
return \@opts; return \@opts;
} } ## end sub get_repository_options2
sub get_repository_current_options {
sub get_repository_current_options
{
my $c = shift; my $c = shift;
my @selected; my @selected;
foreach my $repos ( foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
$dbs{repositories}->get_all_by_prop( type => "repository" ) ) next unless ($repos->prop('Visible') eq 'yes'
{ or $repos->prop('status') eq 'enabled');
next unless ($repos->prop('Visible') eq 'yes'
or $repos->prop('status') eq 'enabled');
push @selected, $repos->key if ($repos->prop('status') eq 'enabled'); push @selected, $repos->key if ($repos->prop('status') eq 'enabled');
} } ## end foreach my $repos ($dbs{repositories...})
return \@selected; return \@selected;
} } ## end sub get_repository_current_options
sub get_avail2 { sub get_avail2 {
my ($c, $yumdb, $type) = @_; my ($c, $yumdb, $type) = @_;
return $c->get_options2("available", "package"); return $c->get_options2("available", "package");
} }
sub get_check_freq_opt { sub get_check_freq_opt {
my ($c) = @_; my ($c) = @_;
return [
return [[ $c->l('DISABLED') => 'disabled'], [ $c->l('DISABLED') => 'disabled' ],
[ $c->l('yum_1DAILY') => 'daily'], [ $c->l('yum_1DAILY') => 'daily' ],
[ $c->l('yum_2WEEKLY') => 'weekly'], [ $c->l('yum_2WEEKLY') => 'weekly' ],
[ $c->l('yum_3MONTHLY') => 'monthly']]; [ $c->l('yum_3MONTHLY') => 'monthly' ]
} ];
} ## end sub get_check_freq_opt
sub print_skip_header { sub print_skip_header {
my ($c) = shift; my ($c) = shift;
return "<INPUT TYPE=\"hidden\" NAME=\"skip_header\" VALUE=\"1\">\n"; return "<INPUT TYPE=\"hidden\" NAME=\"skip_header\" VALUE=\"1\">\n";
} }
sub change_settings { sub change_settings {
my ($c) = @_; my ($c) = @_;
for my $param ( qw( for my $param (
PackageFunctions qw(
) ) PackageFunctions
)
)
{ {
$cdb->set_prop("dnf", $param, $c->param("yum_$param")); $cdb->set_prop("dnf", $param, $c->param("yum_$param"));
} } ## end for my $param (qw( PackageFunctions...))
my $check4updates = $c->param("yum_check4updates"); my $check4updates = $c->param("yum_check4updates");
my $status = 'disabled'; my $status = 'disabled';
if ($check4updates ne 'disabled') { $status = 'enabled'; } if ($check4updates ne 'disabled') { $status = 'enabled'; }
$cdb->set_prop("dnf", 'check4updates', $check4updates); $cdb->set_prop("dnf", 'check4updates', $check4updates);
my $deltarpm = $c->param("yum_DeltaRpmProcess"); my $deltarpm = $c->param("yum_DeltaRpmProcess");
$cdb->set_prop("dnf", 'DeltaRpmProcess', $deltarpm); $cdb->set_prop("dnf", 'DeltaRpmProcess', $deltarpm);
my $downloadonly = $c->param("yum_DownloadOnly"); my $downloadonly = $c->param("yum_DownloadOnly");
if ($downloadonly ne 'disabled') { $status = 'enabled'; } if ($downloadonly ne 'disabled') { $status = 'enabled'; }
$cdb->set_prop("dnf", 'DownloadOnly', $downloadonly); $cdb->set_prop("dnf", 'DownloadOnly', $downloadonly);
my $AutoInstallUpdates = $c->param("yum_AutoInstallUpdates"); my $AutoInstallUpdates = $c->param("yum_AutoInstallUpdates");
if ($AutoInstallUpdates ne 'disabled') { $status = 'enabled'; } if ($AutoInstallUpdates ne 'disabled') { $status = 'enabled'; }
$cdb->set_prop("dnf", 'AutoInstallUpdates', $AutoInstallUpdates); $cdb->set_prop("dnf", 'AutoInstallUpdates', $AutoInstallUpdates);
$cdb->set_prop("dnf", 'status', $status); $cdb->set_prop("dnf", 'status', $status);
my %selected = map { $_ => 1 } @{ $c->every_param('SelectedRepositories') };
my %selected = map {$_ => 1} @{$c->every_param('SelectedRepositories')};
foreach my $repos (
$dbs{repositories}->get_all_by_prop(type => "repository") )
{
$repos->set_prop("status",
exists $selected{$repos->key} ? 'enabled' : 'disabled');
foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
$repos->set_prop("status", exists $selected{ $repos->key } ? 'enabled' : 'disabled');
} }
$dbs{repositories}->reload; $dbs{repositories}->reload;
unless ( system( "/sbin/e-smith/signal-event", "dnf-modify" ) == 0 ) unless (system("/sbin/e-smith/signal-event", "dnf-modify") == 0) {
{ return $c->l('yum_ERROR_UPDATING_CONFIGURATION');
return $c->l('yum_ERROR_UPDATING_CONFIGURATION');
} }
return 'OK'; return 'OK';
} } ## end sub change_settings
sub do_yum { sub do_yum {
my ($c, $function) = @_; my ($c, $function) = @_;
for ( qw(SelectedGroups SelectedPackages) ) for (qw(SelectedGroups SelectedPackages)) {
{ $cdb->set_prop("dnf", $_, join(',', (@{ $c->every_param($_) })));
$cdb->set_prop("dnf", $_, join(',', (@{$c->every_param($_)} )));
} }
esmith::util::backgroundCommand(0, "/sbin/e-smith/signal-event", "dnf-$function");
esmith::util::backgroundCommand(0, for (qw(available installed updates)) {
"/sbin/e-smith/signal-event", "dnf-$function"); $dbs{$_}->reload;
for ( qw(available installed updates) ) {
$dbs{$_}->reload;
} }
return 'OK'; return 'OK';
} } ## end sub do_yum
sub get_yum_status_page { sub get_yum_status_page {
my ($c) = @_; my ($c) = @_;
my $yum_status; my $yum_status;
open(YUM_STATUS, "</var/run/yum.status"); open(YUM_STATUS, "</var/run/yum.status");
$yum_status = <YUM_STATUS>; $yum_status = <YUM_STATUS>;
close(YUM_STATUS); close(YUM_STATUS);
return $yum_status; return $yum_status;
} } ## end sub get_yum_status_page
sub format_yum_log { sub format_yum_log {
my $c = shift; my $c = shift;
$cdb->reload; $cdb->reload;
my $filepage = $cdb->get_prop('dnf', 'LogFile'); my $filepage = $cdb->get_prop('dnf', 'LogFile');
return '' unless $filepage and ( -e "$filepage" ); return '' unless $filepage and (-e "$filepage");
my $out = sprintf "<PRE>"; my $out = sprintf "<PRE>";
open (FILE, "$filepage"); open(FILE, "$filepage");
while (<FILE>) { while (<FILE>) {
$out .= sprintf("%s", $_); $out .= sprintf("%s", $_);
} }
close FILE; close FILE;
$out .= sprintf "</PRE>"; $out .= sprintf "</PRE>";
undef $filepage; undef $filepage;
return $out; return $out;
} } ## end sub format_yum_log
sub post_upgrade_reboot { sub post_upgrade_reboot {
my $c = shift; my $c = shift;
$cdb->get_prop_and_delete('dnf', 'LogFile'); $cdb->get_prop_and_delete('dnf', 'LogFile');
$cdb->reload; $cdb->reload;
@ -565,17 +444,13 @@ sub post_upgrade_reboot {
exec "/sbin/e-smith/signal-event post-upgrade; /sbin/e-smith/signal-event reboot"; exec "/sbin/e-smith/signal-event post-upgrade; /sbin/e-smith/signal-event reboot";
die "Exec failed"; die "Exec failed";
} }
return 'OK';
return 'OK' } ## end sub post_upgrade_reboot
}
sub show_yum_log { sub show_yum_log {
my $c = shift; my $c = shift;
my $out = $c->format_yum_log(); my $out = $c->format_yum_log();
my $yum_log = $cdb->get_prop_and_delete('dnf', 'LogFile'); my $yum_log = $cdb->get_prop_and_delete('dnf', 'LogFile');
return $out; return $out;
} } ## end sub show_yum_log
1; 1;

5
smeserver-manager.spec
View File

@ -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 38 %define release 39
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -115,6 +115,9 @@ true
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Tue Jan 14 2025 Brian Read <brianr@koozali.org> 11.0.0-39.sme
- Apply perltidy to all Controller files, add .perltidy to directory and .gitignore for .tdy files (just incase) [SME: 12485]
* Sat Jan 11 2025 Brian Read <brianr@koozali.org> 11.0.0-38.sme * Sat Jan 11 2025 Brian Read <brianr@koozali.org> 11.0.0-38.sme
- Fix password reset for admin in user panel [SME: 12655] - Fix password reset for admin in user panel [SME: 12655]