IPFire-SCM November 2012

ipfire-scm@lists.ipfire.org

1 participants
100 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 82c809c7529a9cd7c9cdd6c96d5671d4e261a546
by git＠ipfire.org 29 Nov '12

29 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 82c809c7529a9cd7c9cdd6c96d5671d4e261a546 (commit) from 1075e0b5f0c08695a839462c5609e919d24b8a5c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 82c809c7529a9cd7c9cdd6c96d5671d4e261a546 Author: Alexander Marx <amarx(a)ipfire.org> Date: Thu Nov 29 21:31:32 2012 +0100 OpenVPN ccd: fixed typos in ccd-files ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index f7895a3..2b0c4ba 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3320,6 +3320,7 @@ if ($cgiparams{'TYPE'} eq 'host') { goto VPNCONF_ERROR; } my ($ip1,$cidr1) = split (/\//, $val); + $ip1 = &General::getnetworkip($ip1,&General::iporsubtocidr($cidr1)); my ($ip2,$cidr2) = split (/\//, $ccdroutehash{$key}[$oldiroute]); if (&General::IpInSubnet ($ip1,$ip2,$cidr2)){ $errormessage=$errormessage.$Lang::tr{'ccd err irouteexist'}; @@ -3980,11 +3981,11 @@ if ($cgiparams{'TYPE'} eq 'net') { unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}"; } open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!"; - print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n"; + print CCDRWCONF "# OpenVPN clientconfig from ccd extension by Copymaster#\n\n"; if($cgiparams{'CHECK1'} eq 'dynamic'){ print CCDRWCONF "#This client uses the dynamic pool\n"; }else{ - print CCDRWCONF "#Ip address client and Server\n"; + print CCDRWCONF "#Ip address client and server\n"; print CCDRWCONF "ifconfig-push $ccdip ".&General::getlastip($ccdip,1)."\n"; } if ($confighash{$key}[34] eq 'on'){ @@ -3993,7 +3994,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); if ($cgiparams{'IR'} ne ''){ - print CCDRWCONF "\n#Client routes these Networks (behind Client)\n"; + print CCDRWCONF "\n#Client routes these networks (behind Client)\n"; foreach my $key (keys %ccdroutehash){ if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}){ foreach my $i ( 1 .. $#{$ccdroutehash{$key}}){ @@ -4005,7 +4006,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } if ($cgiparams{'IFROUTE'} eq $Lang::tr{'ccd none'} ){$cgiparams{'IFROUTE'}='';} if ($cgiparams{'IFROUTE'} ne ''){ - print CCDRWCONF "\n#Client gets routes to these Networks (behind IPFIRE)\n"; + print CCDRWCONF "\n#Client gets routes to these networks (behind IPFire)\n"; foreach my $key (keys %ccdroute2hash){ if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ foreach my $i ( 1 .. $#{$ccdroute2hash{$key}}){ @@ -4027,7 +4028,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } if(($cgiparams{'CCD_DNS1'} eq '') && ($cgiparams{'CCD_DNS1'} ne '')){ $cgiparams{'CCD_DNS1'} = $cgiparams{'CCD_DNS2'};$cgiparams{'CCD_DNS2'}='';} if($cgiparams{'CCD_DNS1'} ne ''){ - print CCDRWCONF "\n#Client gets these Nameservers\n"; + print CCDRWCONF "\n#Client gets these nameservers\n"; print CCDRWCONF "push \"dhcp-option DNS $cgiparams{'CCD_DNS1'}\" \n"; } if($cgiparams{'CCD_DNS2'} ne ''){ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. ed62983f6240c89ad9f3f85cc7d8b136ea51ba8f
by git＠ipfire.org 29 Nov '12

29 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via ed62983f6240c89ad9f3f85cc7d8b136ea51ba8f (commit) from 3b772d874a34a87798b1ae02ac0eeed3e3d5f60a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ed62983f6240c89ad9f3f85cc7d8b136ea51ba8f Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Thu Nov 29 16:45:59 2012 +0100 compat-wireless: update to 3.6.8-1-snp. ----------------------------------------------------------------------- Summary of changes: lfs/compat-wireless | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 6c6b791..8a3fd56 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -26,7 +26,7 @@ include Config VERSUFIX=ipfire$(KCFG) -VER = 3.6.6-1-snp +VER = 3.6.8-1-snp ifeq "$(KCFG)" "-xen" KVER = 2.6.32.60 @@ -47,8 +47,7 @@ objects = $(DL_FILE) asix-4.4.0.tar.xz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz -$(DL_FILE)_MD5 = e20f1b5a50095cf3483fd171ea9d3f92 - +$(DL_FILE)_MD5 = 4120bc9841d6a1b5b92af34103f16a06 asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1075e0b5f0c08695a839462c5609e919d24b8a5c
by git＠ipfire.org 29 Nov '12

29 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 1075e0b5f0c08695a839462c5609e919d24b8a5c (commit) from 79d29f0082a0f97313c4cf8ec2696281785069bb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1075e0b5f0c08695a839462c5609e919d24b8a5c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 29 11:01:34 2012 +0100 core 65: Don't replace crontab. Just update the necessary bits because users may probably have added their own configurations. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/65/filelists/files | 1 - config/rootfiles/core/65/update.sh | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index 91272a4..6c88a31 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -7,4 +7,3 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi usr/sbin/ovpn-ccd-convert var/ipfire/general-functions.pl var/ipfire/langs -var/spool/cron/root.orig diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh index fca7211..88f5b36 100644 --- a/config/rootfiles/core/65/update.sh +++ b/config/rootfiles/core/65/update.sh @@ -49,7 +49,9 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Convert OpenVPN RW connections. /usr/sbin/ovpn-ccd-convert -# Re-read crontab. +# Update crontab. +sed -i /var/spool/cron/root.orig \ + -e 's@^.*fcron.weekly.*$@\&nice(10),bootrun 47 2 \* \* 1\ttest -x /usr/local/bin/run-parts \&\& /usr/local/bin/run-parts /etc/fcron.weekly@' fcrontab -z &>/dev/null # Reload apache configuration. hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79d29f0082a0f97313c4cf8ec2696281785069bb
by git＠ipfire.org 28 Nov '12

28 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 79d29f0082a0f97313c4cf8ec2696281785069bb (commit) via 4cdf8b927a0e75e7046c315788bba4c3fcbc7df6 (commit) from 7eb378428b21cc2dcaeee2d585da6be8950aca8a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 79d29f0082a0f97313c4cf8ec2696281785069bb Merge: 7eb3784 4cdf8b9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 28 22:59:33 2012 +0100 Merge remote-tracking branch 'stevee/next' into next commit 4cdf8b927a0e75e7046c315788bba4c3fcbc7df6 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Nov 28 22:03:44 2012 +0100 ovpnmain.cgi: Some cosmetic changes on the Net-to-Net section. * Fix colspan of column. * Check of mtu-disc and fragment or mssfix, before mtu will be performend. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index cd13a14..f7895a3 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3533,13 +3533,6 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } - if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '1500')) { - $errormessage = $Lang::tr{'ovpn mtu-disc and mtu not 1500'}; - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; - } - if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') { if (($cgiparams{'FRAGMENT'} ne '') || ($cgiparams{'MSSFIX'} eq 'on')) { $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; @@ -3549,6 +3542,13 @@ if ($cgiparams{'TYPE'} eq 'net') { } } + if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '1500')) { + $errormessage = $Lang::tr{'ovpn mtu-disc and mtu not 1500'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } + if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -4243,7 +4243,7 @@ if ($cgiparams{'TYPE'} eq 'net') { <tr> <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td> - <td colspan='2'> + <td colspan='3'> <input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'} <input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'} <input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7eb378428b21cc2dcaeee2d585da6be8950aca8a
by git＠ipfire.org 28 Nov '12

28 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 7eb378428b21cc2dcaeee2d585da6be8950aca8a (commit) via f4819f1f76c38963382b5f9bb052a8fc366432d5 (commit) via f7fc17c38a0338a0c09e03ee34edb7823d398483 (commit) from bd54ff030eee920be813de64e8b4ffec8d57315b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7eb378428b21cc2dcaeee2d585da6be8950aca8a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 28 22:13:17 2012 +0100 core 65: Ship vpnmain.cgi. commit f4819f1f76c38963382b5f9bb052a8fc366432d5 Merge: bd54ff0 f7fc17c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 28 22:12:50 2012 +0100 Merge remote-tracking branch 'amarx/ipsec' into next commit f7fc17c38a0338a0c09e03ee34edb7823d398483 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Nov 26 13:19:07 2012 +0100 IPSEC: added checkroutine for used OpenVPN subnets/Hosts ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/65/filelists/files | 1 + html/cgi-bin/vpnmain.cgi | 8 ++++++++ 2 files changed, 9 insertions(+) mode change 100644 => 100755 html/cgi-bin/vpnmain.cgi Difference in files: diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index 297f276..91272a4 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -3,6 +3,7 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi usr/sbin/ovpn-ccd-convert var/ipfire/general-functions.pl var/ipfire/langs diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi old mode 100644 new mode 100755 index 0fb7c93..24aeb6d --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1415,6 +1415,14 @@ END goto VPNCONF_ERROR; } + + if ($cgiparams{'TYPE'} eq 'net'){ + $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'}); + if ($errormessage ne ''){ + goto VPNCONF_ERROR; + } + + } if ($cgiparams{'AUTH'} eq 'psk') { if (! length($cgiparams{'PSK'}) ) { $errormessage = $Lang::tr{'pre-shared key is too short'}; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bd54ff030eee920be813de64e8b4ffec8d57315b
by git＠ipfire.org 28 Nov '12

28 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via bd54ff030eee920be813de64e8b4ffec8d57315b (commit) via e2429e8d3452e39128a8c8f2806b97314f9c9470 (commit) via ac87f37110a5cfb41ed65c1b2b83cd3d340ce125 (commit) via df9b48b753cb84e8bd5a338c593202e9aaf1d07f (commit) from 1e0419c8da24544cbadf03f7eadb320cec41e675 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bd54ff030eee920be813de64e8b4ffec8d57315b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 28 20:25:28 2012 +0100 Update translations. commit e2429e8d3452e39128a8c8f2806b97314f9c9470 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Nov 26 13:13:16 2012 +0100 OpenVPN ccd: created subnet checkfunction in general_functions, because ipsec needs this too! This should prevent ipsec Hosts/Nets to have same ip addresses than openvpn Hosts/Nets commit ac87f37110a5cfb41ed65c1b2b83cd3d340ce125 Author: Alexander Marx <amarx(a)ipfire.org> Date: Tue Nov 27 14:48:33 2012 +0100 OpenVPN ccd: fixed counter in static networks. Only 63 hosts are possible in /24 subnet Now IP-Range begins with ".2" commit df9b48b753cb84e8bd5a338c593202e9aaf1d07f Author: Alexander Marx <amarx(a)ipfire.org> Date: Tue Nov 27 12:40:36 2012 +0100 OpenVPN ccd: added alphanumeric sort of static networks and under ROUTING, NONE is selected if no route is specified ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 79 +++++++++++++++++++++++++++++++++++++ doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_missings | 4 ++ html/cgi-bin/ovpnmain.cgi | 60 ++++++++++++++-------------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 9 files changed, 118 insertions(+), 31 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 6055567..c14f990 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -399,6 +399,85 @@ sub validipandmask return 0; } +sub checksubnets +{ + + my %ccdconfhash=(); + my @ccdconf=(); + my $ccdname=$_[0]; + my $ccdnet=$_[1]; + my $errormessage; + my ($ip,$cidr)=split(/\//,$ccdnet); + $cidr=&iporsubtocidr($cidr); + + + #get OVPN-Subnet (dynamic range) + my %ovpnconf=(); + &readhash("${General::swroot}/ovpn/settings", \%ovpnconf); + my ($ovpnip,$ovpncidr)= split (/\//,$ovpnconf{'DOVPN_SUBNET'}); + $ovpncidr=&iporsubtocidr($ovpncidr); + + #check if we try to use same network as ovpn server + if ("$ip/$cidr" eq "$ovpnip/$ovpncidr") { + $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>"; + return $errormessage; + } + + #check if we use a network-name/subnet that already exists + &readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + @ccdconf=split(/\//,$ccdconfhash{$key}[1]); + if ($ccdname eq $ccdconfhash{$key}[0]) + { + $errormessage=$errormessage.$Lang::tr{'ccd err nameexist'}."<br>"; + return $errormessage; + } + my ($newip,$newsub) = split(/\//,$ccdnet); + if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1]))) + { + $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>"; + return $errormessage; + } + + } + #check if we use a name which is already used by ovpn + + + + + + #check if we use a ipsec right network which is already defined + my %ipsecconf=(); + &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf); + foreach my $key (keys %ipsecconf){ + if ($ipsecconf{$key}[11] ne ''){ + #$errormessage="DRIN!"; + #return $errormessage; + + my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); + $ipsecsub=&iporsubtodec($ipsecsub); + + if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ + $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[2]"; + return $errormessage; + } + } + } + + + #check if we use one of ipfire's networks (green,orange,blue) + my %ownnet=(); + &readhash("${General::swroot}/ethernet/settings", \%ownnet); + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'RED_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} + + + +} + + sub validport { $_ = $_[0]; diff --git a/doc/language_issues.es b/doc/language_issues.es index 3cd95a8..eca067d 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -514,6 +514,7 @@ WARNING: untranslated string: ccd err inuse WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 406c422..91beb6f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -513,6 +513,7 @@ WARNING: untranslated string: ccd err inuse WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 3cd95a8..eca067d 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -514,6 +514,7 @@ WARNING: untranslated string: ccd err inuse WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a6efe4d..e36449a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -505,6 +505,7 @@ WARNING: untranslated string: ccd err inuse WARNING: untranslated string: ccd err invalidname WARNING: untranslated string: ccd err invalidnet WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet WARNING: untranslated string: ccd err isovpnnet WARNING: untranslated string: ccd err issubnet WARNING: untranslated string: ccd err name diff --git a/doc/language_missings b/doc/language_missings index 9b7400e..83fbf90 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -26,6 +26,7 @@ < ccd err invalidnet < ccd err iroute < ccd err irouteexist +< ccd err isipsecnet < ccd err isovpnnet < ccd err issubnet < ccd err name @@ -147,6 +148,7 @@ < ccd err invalidnet < ccd err iroute < ccd err irouteexist +< ccd err isipsecnet < ccd err isovpnnet < ccd err issubnet < ccd err name @@ -259,6 +261,7 @@ < ccd err invalidnet < ccd err iroute < ccd err irouteexist +< ccd err isipsecnet < ccd err isovpnnet < ccd err issubnet < ccd err name @@ -348,6 +351,7 @@ < ccd err invalidnet < ccd err iroute < ccd err irouteexist +< ccd err isipsecnet < ccd err isovpnnet < ccd err issubnet < ccd err name diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 3c090b0..cd13a14 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -64,6 +64,10 @@ my $warnmessage = ''; my $errormessage = ''; my %settings=(); my $routes_push_file = ''; +my $confighost="${General::swroot}/fwhosts/customhosts"; +my $configgrp="${General::swroot}/fwhosts/customgroups"; +my $customnet="${General::swroot}/fwhosts/customnetworks"; +my $name; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); $cgiparams{'ENABLED'} = 'off'; $cgiparams{'ENABLED_BLUE'} = 'off'; @@ -493,7 +497,6 @@ sub addccdnet my @ccdconf=(); my $ccdname=$_[0]; my $ccdnet=$_[1]; - my $ovpnsubnet=$_[2]; my $subcidr; my @ip2=(); my $checkup; @@ -528,29 +531,8 @@ sub addccdnet return; } + $errormessage=&General::checksubnets($ccdname,$ccdnet); - #check if we try to use same network as ovpn server - if (&General::iporsubtocidr($ccdnet) eq &General::iporsubtocidr($ovpnsubnet)) { - $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>"; - } - - #check if we use a name/subnet that already exists - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - foreach my $key (keys %ccdconfhash) { - @ccdconf=split(/\//,$ccdconfhash{$key}[1]); - if ($ccdname eq $ccdconfhash{$key}[0]) {$errormessage=$errormessage.$Lang::tr{'ccd err nameexist'}."<br>";} - my ($newip,$newsub) = split(/\//,$ccdnet); - if (&General::IpInSubnet($newip,$ccdconf[0],&General::iporsubtodec($ccdconf[1]))) {$errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>";} - - } - #check if we use one of ipfire's networks (green,orange,blue) - my %ownnet=(); - &General::readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err green'};} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err orange'};} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err blue'};} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'RED_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err red'};} - if (!$errormessage) { my %ccdconfhash=(); @@ -631,7 +613,7 @@ sub getccdadresses my %ccdhash=(); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2; - for (my $i=0;$i<=$count-1;$i++) { + for (my $i=1;$i<=$count;$i++) { my $tmpip=$iprange[$i-1]; my $stepper=$i*4; $iprange[$i]= &General::getnextip($tmpip,4); @@ -2584,7 +2566,7 @@ END } if ($cgiparams{'ACTION'} eq $Lang::tr{'ccd add'}) { - &addccdnet($cgiparams{'ccdname'},$cgiparams{'ccdsubnet'},$cgiparams{'DOVPN_SUBNET'}); + &addccdnet($cgiparams{'ccdname'},$cgiparams{'ccdsubnet'}); } if ($errormessage) { &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); @@ -2651,7 +2633,7 @@ END &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); my @ccdconf=(); my $count=0; - foreach my $key (keys %ccdconfhash) { + foreach my $key (sort { uc($ccdconfhash{$a}[0]) cmp uc($ccdconfhash{$b}[0]) } keys %ccdconfhash) { @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); $count++; my $ccdhosts = &hostsinnet($ccdconf[0]); @@ -3295,7 +3277,7 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'COMPLZO'} = $confighash{$cgiparams{'KEY'}}[30]; $cgiparams{'MTU'} = $confighash{$cgiparams{'KEY'}}[31]; $cgiparams{'CHECK1'} = $confighash{$cgiparams{'KEY'}}[32]; - my $name=$cgiparams{'CHECK1'} ; + $name=$cgiparams{'CHECK1'} ; $cgiparams{$name} = $confighash{$cgiparams{'KEY'}}[33]; $cgiparams{'RG'} = $confighash{$cgiparams{'KEY'}}[34]; $cgiparams{'CCD_DNS1'} = $confighash{$cgiparams{'KEY'}}[35]; @@ -3979,7 +3961,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[30] = $cgiparams{'COMPLZO'}; $confighash{$key}[31] = $cgiparams{'MTU'}; $confighash{$key}[32] = $cgiparams{'CHECK1'}; - my $name=$cgiparams{'CHECK1'}; + $name=$cgiparams{'CHECK1'}; $confighash{$key}[33] = $cgiparams{$name}; $confighash{$key}[34] = $cgiparams{'RG'}; $confighash{$key}[35] = $cgiparams{'CCD_DNS1'}; @@ -3994,7 +3976,9 @@ if ($cgiparams{'TYPE'} eq 'net') { my ($ccdip,$ccdsub)=split "/",$cgiparams{$name}; my ($a,$b,$c,$d) = split (/\./,$ccdip); - if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}";} + if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){ + unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}"; + } open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!"; print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n"; if($cgiparams{'CHECK1'} eq 'dynamic'){ @@ -4300,7 +4284,7 @@ if ($cgiparams{'TYPE'} eq 'host') { if (! -z "${General::swroot}/ovpn/ccd.conf"){ print"<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td width='1%'></td><td width='30%' class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td width='15%' class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' align='center' width='18%'><b>$Lang::tr{'ccd clientip'}</td></tr>"; - foreach my $key (keys %ccdconfhash) { + foreach my $key (sort { uc($ccdconfhash{$a}[0]) cmp uc($ccdconfhash{$b}[0]) } keys %ccdconfhash) { $count++; @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); if ($count % 2){print"<tr bgcolor='$color{'color22'}'>";}else{print"<tr bgcolor='$color{'color20'}'>";} @@ -4466,6 +4450,7 @@ END my $helpblue=0; my $helporange=0; my $other=0; + my $none=0; my @temp=(); our @current = (); @@ -4473,7 +4458,20 @@ END @current = <FILE>; close (FILE); &General::readhasharray ("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - print"<option>$Lang::tr{'ccd none'}</option>"; + #check for "none" + foreach my $key (keys %ccdroute2hash) { + if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ + if ($ccdroute2hash{$key}[1] eq ''){ + $none=1; + last; + } + } + } + if ($none ne '1'){ + print"<option>$Lang::tr{'ccd none'}</option>"; + }else{ + print"<option selected>$Lang::tr{'ccd none'}</option>"; + } #check if static routes are defined for client foreach my $line (@current) { chomp($line); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f7ab1ea..05e1d85 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -469,6 +469,7 @@ 'ccd err invalidnet' => 'Ungültige IP-Addresse. Format: 192.168.0.0/24 oder 192.168.0.0/255.255.255.0.', 'ccd err iroute' => 'Netzadresse für Route ungültig.', 'ccd err irouteexist' => 'Diese Route wird bereits verwendet.', +'ccd err isipsecnet' => 'Diese Subnetzadresse wird bereits für ein IPsec-Netzwerk verwendet.', 'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!', 'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.', 'ccd err name' => 'Es muss ein Name angegeben werden.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5080559..f0fa2c2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -488,6 +488,7 @@ 'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.', 'ccd err iroute' => 'Network address for route is invalid.', 'ccd err irouteexist' => 'This route is already in use.', +'ccd err isipsecnet' => 'The given subnet address already used by an IPsec network.', 'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.', 'ccd err issubnet' => 'Subnet address already in use.', 'ccd err name' => 'Please choose a name.', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 3b772d874a34a87798b1ae02ac0eeed3e3d5f60a
by git＠ipfire.org 28 Nov '12

28 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via 3b772d874a34a87798b1ae02ac0eeed3e3d5f60a (commit) via bb71011054a715f8781a6b1945af1fe16df3c0db (commit) from ef3bc862489a5dfddd0d242a7eb7a0e545996e04 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3b772d874a34a87798b1ae02ac0eeed3e3d5f60a Merge: bb71011 ef3bc86 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Nov 28 16:34:45 2012 +0100 Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen commit bb71011054a715f8781a6b1945af1fe16df3c0db Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Wed Nov 28 16:32:43 2012 +0100 pycurl: remove dependency to curl because curl is no addon. ----------------------------------------------------------------------- Summary of changes: lfs/pycurl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/pycurl b/lfs/pycurl index 2bc3c44..cf8bd71 100644 --- a/lfs/pycurl +++ b/lfs/pycurl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pycurl -PAK_VER = 1 +PAK_VER = 2 -DEPS = "curl" +DEPS = "" CFLAGS += -DHAVE_CURL_OPENSSL hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. ef3bc862489a5dfddd0d242a7eb7a0e545996e04
by git＠ipfire.org 28 Nov '12

28 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via ef3bc862489a5dfddd0d242a7eb7a0e545996e04 (commit) from 95c26b24859ac1537c5df79cbfaf3ae732be301d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ef3bc862489a5dfddd0d242a7eb7a0e545996e04 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 28 08:49:09 2012 +0100 toolchain: bump version. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/make.sh b/make.sh index 7cf5945..94e45ed 100755 --- a/make.sh +++ b/make.sh @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=5 +TOOLCHAINVER=6 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1e0419c8da24544cbadf03f7eadb320cec41e675
by git＠ipfire.org 26 Nov '12

26 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 1e0419c8da24544cbadf03f7eadb320cec41e675 (commit) via 35c343da7a91824cb48b069a57594e533a2003b7 (commit) via d22cf0887658f2e0de04c24ec33f9afaa0e9f4ab (commit) from 1d8c30387e0637ac0f471e9c09d196e1d74a5de7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1e0419c8da24544cbadf03f7eadb320cec41e675 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 22:27:43 2012 +0100 Add daq library to core update 65. commit 35c343da7a91824cb48b069a57594e533a2003b7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 8 23:30:06 2012 +0100 daq: fix rootfile (part2). commit d22cf0887658f2e0de04c24ec33f9afaa0e9f4ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 8 19:16:33 2012 +0100 daq: fix rootfile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/daq | 10 ++++------ config/rootfiles/core/{64 => 65}/filelists/daq | 0 2 files changed, 4 insertions(+), 6 deletions(-) copy config/rootfiles/core/{64 => 65}/filelists/daq (100%) Difference in files: diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index e68cee4..b23fd19 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -20,8 +20,8 @@ usr/lib/daq #usr/lib/libdaq.a #usr/lib/libdaq.la #usr/lib/libdaq.so -#usr/lib/libdaq.so.1 -#usr/lib/libdaq.so.1.0.0 +usr/lib/libdaq.so.1 +usr/lib/libdaq.so.1.0.0 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a @@ -29,7 +29,5 @@ usr/lib/daq #usr/lib/libsfbpf.a #usr/lib/libsfbpf.la #usr/lib/libsfbpf.so -#usr/lib/libsfbpf.so.0 -#usr/lib/libsfbpf.so.0.0.1 -#usr/lib/libdaq.so.0 -#usr/lib/libdaq.so.0.0.1 +usr/lib/libsfbpf.so.0 +usr/lib/libsfbpf.so.0.0.1 diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/core/65/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/65/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 95c26b24859ac1537c5df79cbfaf3ae732be301d
by git＠ipfire.org 26 Nov '12

26 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via 95c26b24859ac1537c5df79cbfaf3ae732be301d (commit) from 6bd5e3144c62df819fbb9d790d0348a64065d179 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 95c26b24859ac1537c5df79cbfaf3ae732be301d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 17:40:14 2012 +0100 misc-progs: Fix some more uninitialized variables. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/rebuildhosts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/misc-progs/rebuildhosts.c b/src/misc-progs/rebuildhosts.c index 0840887..e831858 100644 --- a/src/misc-progs/rebuildhosts.c +++ b/src/misc-progs/rebuildhosts.c @@ -41,11 +41,11 @@ void exithandler(void) int main(int argc, char *argv[]) { int fdpid; - char hostname[STRING_SIZE]; + char hostname[STRING_SIZE] = ""; char domainname[STRING_SIZE] = ""; char gateway[STRING_SIZE] = ""; char buffer[STRING_SIZE]; - char address[STRING_SIZE]; + char address[STRING_SIZE] = ""; char *active, *ip, *host, *domain; int pid; hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM November 2012