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 998e880b61b4c201a9483a0beafc6d139a29f0db (commit) via 5eeea642371892e0ecdd6064746a1f6c38bd32a5 (commit) via 3a52755b973a21ac15b033f4b39a3ff4c82b0be4 (commit) via b32a8aefa2dea0146df34bf6e4e785afec1600b4 (commit) via 58c2333bdc4494c34197432791f6d67d974f3588 (commit) from f824cd285b72ca1e2837614607b15e93bf6d5819 (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 998e880b61b4c201a9483a0beafc6d139a29f0db Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 10 20:11:57 2016 +0100
unbound: Skip invalid hostnames
If there are any invalid hostnames in the DHCP leases table, we just skip them and do not create and RRs for them.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5eeea642371892e0ecdd6064746a1f6c38bd32a5 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Oct 9 14:56:52 2016 +0200
guardian 2.0: fixes for rootfile
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3a52755b973a21ac15b033f4b39a3ff4c82b0be4 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 10 12:05:01 2016 +0100
core106: Ship changed pakfire.cgi
This was actually changed over a year ago, but was never shipped in an update.
Commit 212fd689a30a7b2f627149ead8d45823dc8a68af
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b32a8aefa2dea0146df34bf6e4e785afec1600b4 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 10 12:04:24 2016 +0100
core106: Ship updated iptables.cgi file
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 58c2333bdc4494c34197432791f6d67d974f3588 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Oct 8 15:20:38 2016 +0200
iptables.cgi: cosmetics - wider columns
Hi,
Since the first three columns of 'iptables.cgi' gave a nearly unreadable output with large numbers, so I made 'pkts', 'bytes' and 'target'-columns a bit wider.
BEFORE - it was something like this:
Chain INPUT (policy DROP 0 packets, 0 bytes) pkts bytestarget proc opt in out source destination 32M38G BADTCP tcp -- * * 0.0.0.0/0 0.0.0.0/0 32M38G CUSTOMINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G P2PBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G GUARDIAN all -- * * 0.0.0.0/0 0.0.0.0/0 00 OVPNBLOCK all -- tun+ * 0.0.0.0/0 0.0.0.0/0 32M38G IPTVINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G ICMPINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G LOOPBACK all -- * * 0.0.0.0/0 0.0.0.0/0 21M21G CONNTRACK all -- * * 0.0.0.0/0 0.0.0.0/0 393873484KDHCPGREENINPUTall -- green0 * 0.0.0.0/0 0.0.0.0/0 645153642KGEOIPBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 386592304KIPSECINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 386592304KGUIINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 368332209KWIRELESSINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 ctstate NEW 368332209KOVPNINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 368332209KTOR_INPUT all -- * * 0.0.0.0/0 0.0.0.0/0 368332209KINPUTFW all -- * * 0.0.0.0/0 0.0.0.0/0 309641833KREDINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 309641833KPOLICYIN all -- * * 0.0.0.0/0 0.0.0.0/0
AFTER - somehow better readable - I think: ;-)
Chain INPUT (policy DROP 0 packets, 0 bytes) pkts bytes target proc opt in out source destination 32M 38G BADTCP tcp -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G CUSTOMINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G P2PBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G GUARDIAN all -- * * 0.0.0.0/0 0.0.0.0/0 0 0 OVPNBLOCK all -- tun+ * 0.0.0.0/0 0.0.0.0/0 32M 38G IPTVINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G ICMPINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G LOOPBACK all -- * * 0.0.0.0/0 0.0.0.0/0 21M 21G CONNTRACK all -- * * 0.0.0.0/0 0.0.0.0/0 39387 3484K DHCPGREENINPUT all -- green0 * 0.0.0.0/0 0.0.0.0/0 64515 3642K GEOIPBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 38659 2304K IPSECINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 38659 2304K GUIINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 36833 2209K WIRELESSINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 ctstate NEW 36833 2209K OVPNINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 36833 2209K TOR_INPUT all -- * * 0.0.0.0/0 0.0.0.0/0 36833 2209K INPUTFW all -- * * 0.0.0.0/0 0.0.0.0/0 30964 1833K REDINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 30964 1833K POLICYIN all -- * * 0.0.0.0/0 0.0.0.0/0
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/106/filelists/files | 2 ++ config/rootfiles/packages/guardian | 9 +++++++++ config/unbound/unbound-dhcp-leases-bridge | 18 ++++++++++++++---- html/cgi-bin/iptables.cgi | 12 ++++++------ 4 files changed, 31 insertions(+), 10 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 5133da9..3b5af01 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -17,7 +17,9 @@ srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/hosts.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/iptables.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/services.cgi usr/sbin/setup diff --git a/config/rootfiles/packages/guardian b/config/rootfiles/packages/guardian index 9eb3fed..3838af5 100644 --- a/config/rootfiles/packages/guardian +++ b/config/rootfiles/packages/guardian @@ -16,6 +16,15 @@ usr/lib/perl5/site_perl/5.12.3/Guardian/Logger.pm usr/lib/perl5/site_perl/5.12.3/Guardian/Parser.pm usr/lib/perl5/site_perl/5.12.3/Guardian/Socket.pm usr/sbin/guardian +var/ipfire/addon-lang/guardian.de.pl +var/ipfire/addon-lang/guardian.en.pl +var/ipfire/addon-lang/guardian.es.pl +var/ipfire/addon-lang/guardian.fr.pl +var/ipfire/addon-lang/guardian.it.pl +var/ipfire/addon-lang/guardian.nl.pl +var/ipfire/addon-lang/guardian.pl.pl +var/ipfire/addon-lang/guardian.ru.pl +var/ipfire/addon-lang/guardian.tr.pl var/ipfire/backup/addons/includes/guardian var/ipfire/guardian var/ipfire/menu.d/EX-guardian.menu diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index c62d233..862b581 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -227,11 +227,16 @@ class Lease(object): def hostname(self): hostname = self._properties.get("client-hostname")
+ if hostname is None: + return + # Remove any "" - if hostname: - hostname = hostname.replace(""", "") + hostname = hostname.replace(""", "")
- return hostname + # Only return valid hostnames + m = re.match(r"^[A-Z0-9-]{1,63}$", hostname, re.I) + if m: + return hostname
@property def domain(self): @@ -279,7 +284,8 @@ class Lease(object):
@property def fqdn(self): - return "%s.%s" % (self.hostname, self.domain) + if self.hostname: + return "%s.%s" % (self.hostname, self.domain)
@staticmethod def _parse_time(s): @@ -310,6 +316,10 @@ class Lease(object):
@property def rrset(self): + # If the lease does not have a valid FQDN, we cannot create any RRs + if self.fqdn is None: + return [] + return [ # Forward record (self.fqdn, "%s" % LOCAL_TTL, "IN A", self.ipaddr), diff --git a/html/cgi-bin/iptables.cgi b/html/cgi-bin/iptables.cgi index d456375..30fce27 100644 --- a/html/cgi-bin/iptables.cgi +++ b/html/cgi-bin/iptables.cgi @@ -150,8 +150,8 @@ END print "</tr>\n";
print "<tr>\n"; - print " <td width='0'></td>\n <td width='35'></td>\n <td width='35'></td>\n"; - print " <td width='130'></td>\n <td width='30'></td>\n"; + print " <td width='0'></td>\n <td width='60'></td>\n <td width='60'></td>\n"; + print " <td width='150'></td>\n <td width='30'></td>\n"; print " <td width='30'></td>\n <td width='40'></td>\n"; print " <td width='40'></td>\n <td width='95'></td>\n"; print " <td width='95'></td>\n <td width='260'></td>\n"; @@ -272,8 +272,8 @@ END print "</tr>\n";
print "<tr>\n"; - print " <td width='0'></td>\n <td width='35'></td>\n <td width='35'></td>\n"; - print " <td width='130'></td>\n <td width='30'></td>\n"; + print " <td width='0'></td>\n <td width='60'></td>\n <td width='60'></td>\n"; + print " <td width='150'></td>\n <td width='30'></td>\n"; print " <td width='30'></td>\n <td width='40'></td>\n"; print " <td width='40'></td>\n <td width='95'></td>\n"; print " <td width='95'></td>\n <td width='260'></td>\n"; @@ -399,8 +399,8 @@ END print "</tr>\n";
print "<tr>\n"; - print " <td width='0'></td>\n <td width='35'></td>\n <td width='35'></td>\n"; - print " <td width='130'></td>\n <td width='30'></td>\n"; + print " <td width='0'></td>\n <td width='60'></td>\n <td width='60'></td>\n"; + print " <td width='150'></td>\n <td width='30'></td>\n"; print " <td width='30'></td>\n <td width='40'></td>\n"; print " <td width='40'></td>\n <td width='95'></td>\n"; print " <td width='95'></td>\n <td width='260'></td>\n";
hooks/post-receive -- IPFire 2.x development tree