From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH 3/4] unbound-dhcp-leases-bridge: Don't overwrite static leases
Date: Mon, 21 Oct 2024 18:47:06 +0200
Message-ID: <976c0588-d12a-46bc-8a6e-b56de292489b@ipfire.org>
In-Reply-To: <20241021163849.1265183-3-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8817415364923945240=="
List-Id: <development.lists.ipfire.org>

--===============8817415364923945240==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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.
>=20
> This patch avoids that static leases will be modified.
>=20
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   config/unbound/unbound-dhcp-leases-bridge | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>=20
> diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unb=
ound-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 =3D self._find_lease(address)
>  =20
> +			# 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 =3D 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=3DTrue)
>   				leases.append(l)
>  =20
>   		return leases
>  =20
>  =20
>   class Lease(object):
> -	def __init__(self, ipaddr, properties):
> +	def __init__(self, ipaddr, properties, fixed=3DFalse):
>   		if not isinstance(ipaddr, ipaddress.IPv4Address):
>   			ipaddr =3D ipaddress.IPv4Address(ipaddr)
>  =20
>   		self.ipaddr =3D ipaddr
>   		self._properties =3D properties
> +		self.fixed =3D fixed
>  =20
>   	def __repr__(self):
>   		return "<%s for %s (%s)>" % (self.__class__.__name__, self.ipaddr, self=
.hostname)


--===============8817415364923945240==--