* [PATCH 2/4] unbound-dhcp-leases-bridge: Fix typo
2024-10-21 16:38 [PATCH 1/4] unbound-dhcp-leases-bridge: Don't export expired leases to Unbound Michael Tremer
@ 2024-10-21 16:38 ` Michael Tremer
2024-10-21 16:44 ` Bernhard Bitsch
2024-10-21 16:38 ` [PATCH 3/4] unbound-dhcp-leases-bridge: Don't overwrite static leases Michael Tremer
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Michael Tremer @ 2024-10-21 16:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/unbound/unbound-dhcp-leases-bridge | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
index bc944a073..2cbdaa004 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -279,9 +279,9 @@ class UnboundDHCPLeasesBridge(object):
self.unbound.update_dhcp_leases([l for l in self.leases if not l.has_expired()])
def _add_lease(self, lease):
- # Skip leases without an FQDN
+ # Skip leases without a FQDN
if not lease.fqdn:
- log.debug("Skipping lease without an FQDN: %s" % lease)
+ log.debug("Skipping lease without a FQDN: %s" % lease)
return
# Skip any leases that also are a static host
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/4] unbound-dhcp-leases-bridge: Fix typo
2024-10-21 16:38 ` [PATCH 2/4] unbound-dhcp-leases-bridge: Fix typo Michael Tremer
@ 2024-10-21 16:44 ` Bernhard Bitsch
0 siblings, 0 replies; 7+ messages in thread
From: Bernhard Bitsch @ 2024-10-21 16:44 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Am 21.10.2024 um 18:38 schrieb Michael Tremer:
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> config/unbound/unbound-dhcp-leases-bridge | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
> index bc944a073..2cbdaa004 100644
> --- a/config/unbound/unbound-dhcp-leases-bridge
> +++ b/config/unbound/unbound-dhcp-leases-bridge
> @@ -279,9 +279,9 @@ class UnboundDHCPLeasesBridge(object):
> self.unbound.update_dhcp_leases([l for l in self.leases if not l.has_expired()])
>
> def _add_lease(self, lease):
> - # Skip leases without an FQDN
> + # Skip leases without a FQDN
> if not lease.fqdn:
> - log.debug("Skipping lease without an FQDN: %s" % lease)
> + log.debug("Skipping lease without a FQDN: %s" % lease)
> return
>
> # Skip any leases that also are a static host
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/4] unbound-dhcp-leases-bridge: Don't overwrite static leases
2024-10-21 16:38 [PATCH 1/4] unbound-dhcp-leases-bridge: Don't export expired leases to Unbound Michael Tremer
2024-10-21 16:38 ` [PATCH 2/4] unbound-dhcp-leases-bridge: Fix typo Michael Tremer
@ 2024-10-21 16:38 ` Michael Tremer
2024-10-21 16:47 ` Bernhard Bitsch
2024-10-21 16:38 ` [PATCH 4/4] unbound-dhcp-leases-bridge: Fix expiry check on leases Michael Tremer
2024-10-21 16:42 ` [PATCH 1/4] unbound-dhcp-leases-bridge: Don't export expired leases to Unbound Bernhard Bitsch
3 siblings, 1 reply; 7+ messages in thread
From: Michael Tremer @ 2024-10-21 16:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1745 bytes --]
When we import all static leases, their remark will be used as hostname
(because WTF?) and might be overwritten if the device is not sending any
or even the same hostname.
This patch avoids that static leases will be modified.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/unbound/unbound-dhcp-leases-bridge | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
index 2cbdaa004..66ea28054 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -216,6 +216,11 @@ class UnboundDHCPLeasesBridge(object):
# Find the old lease
old_lease = self._find_lease(address)
+ # Don't update fixed leases as they might clear the hostname
+ if old_lease and old_lease.fixed:
+ log.debug("Won't update fixed lease %s" % old_lease)
+ return
+
# Create a new lease
lease = Lease(address, {
"client-hostname" : name,
@@ -581,19 +586,20 @@ class FixLeases(object):
"client-hostname" : hostname,
"starts" : now.strftime("%w %Y/%m/%d %H:%M:%S"),
"ends" : "never",
- })
+ }, fixed=True)
leases.append(l)
return leases
class Lease(object):
- def __init__(self, ipaddr, properties):
+ def __init__(self, ipaddr, properties, fixed=False):
if not isinstance(ipaddr, ipaddress.IPv4Address):
ipaddr = ipaddress.IPv4Address(ipaddr)
self.ipaddr = ipaddr
self._properties = properties
+ self.fixed = fixed
def __repr__(self):
return "<%s for %s (%s)>" % (self.__class__.__name__, self.ipaddr, self.hostname)
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 3/4] unbound-dhcp-leases-bridge: Don't overwrite static leases
2024-10-21 16:38 ` [PATCH 3/4] unbound-dhcp-leases-bridge: Don't overwrite static leases Michael Tremer
@ 2024-10-21 16:47 ` Bernhard Bitsch
0 siblings, 0 replies; 7+ messages in thread
From: Bernhard Bitsch @ 2024-10-21 16:47 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1960 bytes --]
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Am 21.10.2024 um 18:38 schrieb Michael Tremer:
> When we import all static leases, their remark will be used as hostname
> (because WTF?) and might be overwritten if the device is not sending any
> or even the same hostname.
>
> This patch avoids that static leases will be modified.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> config/unbound/unbound-dhcp-leases-bridge | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
> index 2cbdaa004..66ea28054 100644
> --- a/config/unbound/unbound-dhcp-leases-bridge
> +++ b/config/unbound/unbound-dhcp-leases-bridge
> @@ -216,6 +216,11 @@ class UnboundDHCPLeasesBridge(object):
> # Find the old lease
> old_lease = self._find_lease(address)
>
> + # Don't update fixed leases as they might clear the hostname
> + if old_lease and old_lease.fixed:
> + log.debug("Won't update fixed lease %s" % old_lease)
> + return
> +
> # Create a new lease
> lease = Lease(address, {
> "client-hostname" : name,
> @@ -581,19 +586,20 @@ class FixLeases(object):
> "client-hostname" : hostname,
> "starts" : now.strftime("%w %Y/%m/%d %H:%M:%S"),
> "ends" : "never",
> - })
> + }, fixed=True)
> leases.append(l)
>
> return leases
>
>
> class Lease(object):
> - def __init__(self, ipaddr, properties):
> + def __init__(self, ipaddr, properties, fixed=False):
> if not isinstance(ipaddr, ipaddress.IPv4Address):
> ipaddr = ipaddress.IPv4Address(ipaddr)
>
> self.ipaddr = ipaddr
> self._properties = properties
> + self.fixed = fixed
>
> def __repr__(self):
> return "<%s for %s (%s)>" % (self.__class__.__name__, self.ipaddr, self.hostname)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/4] unbound-dhcp-leases-bridge: Fix expiry check on leases
2024-10-21 16:38 [PATCH 1/4] unbound-dhcp-leases-bridge: Don't export expired leases to Unbound Michael Tremer
2024-10-21 16:38 ` [PATCH 2/4] unbound-dhcp-leases-bridge: Fix typo Michael Tremer
2024-10-21 16:38 ` [PATCH 3/4] unbound-dhcp-leases-bridge: Don't overwrite static leases Michael Tremer
@ 2024-10-21 16:38 ` Michael Tremer
2024-10-21 16:42 ` [PATCH 1/4] unbound-dhcp-leases-bridge: Don't export expired leases to Unbound Bernhard Bitsch
3 siblings, 0 replies; 7+ messages in thread
From: Michael Tremer @ 2024-10-21 16:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 733 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/unbound/unbound-dhcp-leases-bridge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
index 66ea28054..4a6f9587f 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -717,7 +717,7 @@ class Lease(object):
if not self.time_ends:
return self.time_starts > datetime.datetime.utcnow()
- return self.time_starts > datetime.datetime.utcnow() > self.time_ends
+ return not self.time_starts < datetime.datetime.utcnow() < self.time_ends
@property
def rrset(self):
--
2.39.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/4] unbound-dhcp-leases-bridge: Don't export expired leases to Unbound
2024-10-21 16:38 [PATCH 1/4] unbound-dhcp-leases-bridge: Don't export expired leases to Unbound Michael Tremer
` (2 preceding siblings ...)
2024-10-21 16:38 ` [PATCH 4/4] unbound-dhcp-leases-bridge: Fix expiry check on leases Michael Tremer
@ 2024-10-21 16:42 ` Bernhard Bitsch
3 siblings, 0 replies; 7+ messages in thread
From: Bernhard Bitsch @ 2024-10-21 16:42 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 877 bytes --]
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Am 21.10.2024 um 18:38 schrieb Michael Tremer:
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> config/unbound/unbound-dhcp-leases-bridge | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
> index 986fae2d2..bc944a073 100644
> --- a/config/unbound/unbound-dhcp-leases-bridge
> +++ b/config/unbound/unbound-dhcp-leases-bridge
> @@ -276,7 +276,7 @@ class UnboundDHCPLeasesBridge(object):
> if lease.has_expired():
> log.debug(" Expired")
>
> - self.unbound.update_dhcp_leases(self.leases)
> + self.unbound.update_dhcp_leases([l for l in self.leases if not l.has_expired()])
>
> def _add_lease(self, lease):
> # Skip leases without an FQDN
^ permalink raw reply [flat|nested] 7+ messages in thread