\n \n";
+ print "
\n";
+ return undef;
}
sub read_pem{
- my ($fm,$pem) = @_;
- my $q = $fm->{cgi};
- my $dir = '';
- my $ret;
- if (($pem eq 'cacert.pem') || ($pem eq 'cert.pem') || ($pem eq 'dh.pem')){
- $dir = $pubdir;
- }
- elsif (($pem eq 'key.pem') || ($pem eq 'takey.pem')){
- $dir = $privdir;
- }
-
- if (! open (PEM, "<$dir/$pem")){
- $fm->error('ERROR_OPEN_PEM','FIRST');
- # Tell the user something bad has happened
- return;
+ my ($fm,$pem) = @_;
+ my $q = $fm->{cgi};
+ my $dir = '';
+ my $ret;
+ if (($pem eq 'cacert.pem') || ($pem eq 'cert.pem') || ($pem eq 'dh.pem')){
+ $dir = $pubdir;
+ }
+ elsif (($pem eq 'key.pem') || ($pem eq 'takey.pem')){
+ $dir = $privdir;
}
- while (){
- $ret .= $_;
- }
+ if (! open (PEM, "<$dir/$pem")){
+ $fm->error('ERROR_OPEN_PEM','FIRST');
+ # Tell the user something bad has happened
+ return;
+ }
+ while (){
+ $ret .= $_;
+ }
+ close PEM;
- close PEM;
-
- return $ret;
+ return $ret;
}
sub write_pem{
- my ($fm) = @_;
- my $q = $fm->{cgi};
+ my ($fm) = @_;
+ my $q = $fm->{cgi};
- my $ca = $q->param('ca_pem');
- my $crt = $q->param('crt_pem');
- my $key = $q->param('key_pem');
- my $dh = $q->param('dhpar_pem');
- my $ta = $q->param('ta_pem');
-
- $config_db->set_prop('openvpn-bridge', 'CrlUrl', $q->param('crl_url'));
-
- if (! open (CA, ">$pubdir/cacert.pem")){
- $fm->error('ERROR_OPEN_CA','FIRST');
- # Tell the user something bad has happened
+ my $ca = $q->param('ca_pem');
+ my $crt = $q->param('crt_pem');
+ my $key = $q->param('key_pem');
+ my $dh = $q->param('dhpar_pem');
+ my $ta = $q->param('ta_pem');
+
+ $config_db->set_prop('openvpn-bridge', 'CrlUrl', $q->param('crl_url'));
+
+ if (! open (CA, ">$pubdir/cacert.pem")){
+ $fm->error('ERROR_OPEN_CA','FIRST');
+ # Tell the user something bad has happened
return;
- }
- print CA $ca;
- close CA;
-
- if (! open (CRT, ">$pubdir/cert.pem")){
- $fm->error('ERROR_OPEN_CRT','FIRST');
- # Tell the user something bad has happened
+ }
+ print CA $ca;
+ close CA;
+
+ if (! open (CRT, ">$pubdir/cert.pem")){
+ $fm->error('ERROR_OPEN_CRT','FIRST');
+ # Tell the user something bad has happened
return;
- }
- print CRT $crt;
- close CRT;
-
- if (! open (KEY, ">$privdir/key.pem")){
- $fm->error('ERROR_OPEN_KEY','FIRST');
- # Tell the user something bad has happened
+ }
+ print CRT $crt;
+ close CRT;
+
+ if (! open (KEY, ">$privdir/key.pem")){
+ $fm->error('ERROR_OPEN_KEY','FIRST');
+ # Tell the user something bad has happened
return;
- }
- print KEY $key;
- close KEY;
-
- if (! open (DH, ">$pubdir/dh.pem")){
- $fm->error('ERROR_OPEN_DH','FIRST');
- # Tell the user something bad has happened
+ }
+ print KEY $key;
+ close KEY;
+
+ if (! open (DH, ">$pubdir/dh.pem")){
+ $fm->error('ERROR_OPEN_DH','FIRST');
+ # Tell the user something bad has happened
return;
- }
- print DH $dh;
- close DH;
-
- if (! open (TA, ">$privdir/takey.pem")){
- $fm->error('ERROR_OPEN_TA','FIRST');
- # Tell the user something bad has happened
+ }
+ print DH $dh;
+ close DH;
+
+ if (! open (TA, ">$privdir/takey.pem")){
+ $fm->error('ERROR_OPEN_TA','FIRST');
+ # Tell the user something bad has happened
return;
- }
- print TA $ta;
- close TA;
-
- # Restrict permissions on sensitive data
- esmith::util::chownFile("root", "root","$privdir");
- esmith::util::chownFile("root", "root","$pubdir");
- chmod 0700, "$privdir";
- chmod 0755, "$pubdir";
-
- unless(system("/sbin/e-smith/signal-event openvpn-bridge-update") == 0){
- $fm->error('ERROR_OCCURED','RULES_PAGE');
- return undef;
- }
- $fm->success('SUCCESS','FIRST');
- return undef;
+ }
+ print TA $ta;
+ close TA;
+
+ # Restrict permissions on sensitive data
+ esmith::util::chownFile("root", "root","$privdir");
+ esmith::util::chownFile("root", "root","$pubdir");
+ chmod 0700, "$privdir";
+ chmod 0755, "$pubdir";
+
+ unless(system("/sbin/e-smith/signal-event openvpn-bridge-update") == 0){
+ $fm->error('ERROR_OCCURED','RULES_PAGE');
+ return undef;
+ }
+ $fm->success('SUCCESS','FIRST');
+ return undef;
}
# Validations
sub is_ip{
- my ($fm,$ip) = @_;
- return CGI::FormMagick::Validator::ip_number($fm, $ip);
+ my ($fm,$ip) = @_;
+ return CGI::FormMagick::Validator::ip_number($fm, $ip);
}
sub ip_is_in_local_net {
my ($fm,$ip) = @_;
-
+
unless(is_ip($fm, $ip) eq 'OK'){
- return $fm->localise('NOT_A_VALID_IP',{ip => $ip});
+ return $fm->localise('NOT_A_VALID_IP',{ip => $ip});
}
-
+
my $local_ip = $config_db->get('LocalIP')->value();
my $local_netmask = $config_db->get('LocalNetmask')->value;
my ($local_network, $local_broadcast) =
- esmith::util::computeNetworkAndBroadcast( $local_ip, $local_netmask );
-
+ esmith::util::computeNetworkAndBroadcast( $local_ip, $local_netmask );
+
my ($ip_network,$ip_broadcast) =
- esmith::util::computeNetworkAndBroadcast($ip, $local_netmask);
-
- if ($ip_network ne $local_network){
+ esmith::util::computeNetworkAndBroadcast($ip, $local_netmask);
- return $fm->localise('NOT_IN_LOCAL_NET',{ip => $ip});
+ if ($ip_network ne $local_network){
+ return $fm->localise('NOT_IN_LOCAL_NET',{ip => $ip});
}
return "OK";
}
sub ip_is_in_local_net_or_blank {
- my ($fm,$ip) = @_;
-
- if ($ip eq ''){
- return 'OK';
- }
- return ip_is_in_local_net ($fm,$ip);
+ my ($fm,$ip) = @_;
+
+ if ($ip eq ''){
+ return 'OK';
+ }
+ return ip_is_in_local_net ($fm,$ip);
}
sub end_is_after_start{
- my ($fm,$end) = @_;
- my $start = $fm->{cgi}->param('start_pool');
- my $start_ip = new Net::IP($start);
- my $end_ip = new Net::IP($end);
- unless ($end_ip->bincomp('gt',$start_ip)){
- return $fm->localise('START_AFTER_END');
- }
- return 'OK';
+ my ($fm,$end) = @_;
+ my $start = $fm->{cgi}->param('start_pool');
+ my $start_ip = new Net::IP($start);
+ my $end_ip = new Net::IP($end);
+ unless ($end_ip->bincomp('gt',$start_ip)){
+ return $fm->localise('START_AFTER_END');
+ }
+ return 'OK';
}
sub not_in_dhcp_range
@@ -754,19 +741,18 @@
&&
esmith::util::IPquadToAddr($address)
<= esmith::util::IPquadToAddr($end)){
- return $fm->localise("ADDR_IN_DHCP_RANGE",{ip => $address});
- }
- else{
+ return $fm->localise("ADDR_IN_DHCP_RANGE",{ip => $address});
+ }
+ else{
return "OK";
- }
+ }
}
sub validate_common_name
{
my ($fm, $common_name) = @_;
- unless ($common_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]*)$/)
- {
+ unless ($common_name =~ /^([a-zA-Z0-9][\_\.\-a-zA-Z0-9]*)$/){
return $fm->localise('INVALID_CHARS',{string => $common_name});
}
return "OK";
@@ -777,10 +763,9 @@
my ($fm, $url) = @_;
unless ($url =~ /^(http:\/\/)|(https:\/\/)/){
- return $fm->localise('NOT_A_VALID_URL',{string => $url});
- }
+ return $fm->localise('NOT_A_VALID_URL',{string => $url});
+ }
return "OK";
-
}
|