From patchwork Tue Mar 22 03:47:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Heading X-Patchwork-Id: 5378 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KMyCy2tVHz3xlr for ; Tue, 22 Mar 2022 03:49:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KMyBT5GC5z5R7; Tue, 22 Mar 2022 03:48:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KMyBT2fPFz2ysd; Tue, 22 Mar 2022 03:48:17 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KMyBR4Dwtz2x9p for ; Tue, 22 Mar 2022 03:48:15 +0000 (UTC) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4KMyBR2Vk3z1TN for ; Tue, 22 Mar 2022 03:48:15 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id C13D13200F81; Mon, 21 Mar 2022 23:48:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 21 Mar 2022 23:48:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajrh.net; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=mesmtp; bh=BUOKFysE9wR37aLBoPADIYhVVTJ HxNWXc2qEs3HQi3Y=; b=iASI/KQILTzdl3+350LKsjABtpZsZCqWRpEcG053qfd YqYpQKNf1lfmyMWgyn2VY0SCnU6zMqP8ZggpWKYp8kQ7pUCPjhdBqkb67V+l4EFq b4ZkxK6lbEtbxOP7DQ60+Q+ErxNxTW1PPHrtgeKDTChfMhg7Nt8Qpsg5Kg8mvV3c = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=BUOKFy sE9wR37aLBoPADIYhVVTJHxNWXc2qEs3HQi3Y=; b=W0CfZAaxCLmK1Is5fn6pMf GwcNaHwtdlHNJz9u1C8R+abXqR1Q3vjkR+BrvTsy9c35c3LhqLEWGdSoVbhOSH38 hkRF2g8Bqv9P4Gr98CkFfmv05rXYmsHjjXxDinWszK8qZhvhlb4lqBh1qYK3Cqz+ fdVUwQ7PWWNF2YQPcEWhdoosNnoOIMAsJoV6va9UJ54Hnr5axJysDK1nX8lPBUYn U+hiH2ctQsfsRi9ouiiJtaN8lJyFCD/p70ZBNxSmUm1Itcj/JvBejr18cjkgoXGH 4/rQUuWNfpo43pNaF8EYX5+iVYW1L+VsUDO//GNuBoU0+vQ15S1aYAzNzdtEB3KA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudeggedgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehnthhhohhnhicujfgvrgguihhnghcuoegrjhhrhhesrghj rhhhrdhnvghtqeenucggtffrrghtthgvrhhnpefhhedvuddtgffhffduheelleehheegge duuefftdelkeevgffhuefggfduhefgteenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpegrjhhrhhesrghjrhhhrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 21 Mar 2022 23:48:13 -0400 (EDT) From: Anthony Heading To: development@lists.ipfire.org Subject: [PATCH 2/3] unbound-dhcp-leases-bridge : read settings less enthusiastically Date: Mon, 21 Mar 2022 23:47:55 -0400 Message-Id: <20220322034756.36327-2-ajrh@ajrh.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220322034756.36327-1-ajrh@ajrh.net> References: <20220322034756.36327-1-ajrh@ajrh.net> MIME-Version: 1.0 ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1647920895; a=rsa-sha256; cv=none; b=q/8QIXubuq0vFH+3C4BJ6r7EGCCiYCqcLubs3W1QyaBz42wpicOzrfkRA/1GFH0FNx1XbG SqkKyBXeXALkfa8kdcQunYxynzW4PJ7oC3t/ykzP63+fxZQF/ALIq40g4CtWZ5sqGiIMfP iJsjYpDqwOXhVm+fh78ZVsNG7bYHtI3YllvCGoUBF214DWZp3BCpVGhxUmuUcQB4ij7MLY C0dma0DJ5FLC8i5L0j0bm4QW6slTgTtiBmDavVoor6hHSGHCj6mxj/wZWW8RnMjjHi0Ji7 2M42IOpjslaSiz2mrdyTI981dtmp0UZBg2fdH6GN7UiLWFnwwnXtqluVVRfI1Q== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=ajrh.net header.s=mesmtp header.b="iASI/KQI"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=W0CfZAax; dmarc=none; spf=pass (mail01.ipfire.org: domain of ajrh@ajrh.net designates 64.147.123.25 as permitted sender) smtp.mailfrom=ajrh@ajrh.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1647920895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BUOKFysE9wR37aLBoPADIYhVVTJHxNWXc2qEs3HQi3Y=; b=aWJXd3J0nyMW+V7ThCZ/rs1i6y30HXyBxiCo3vSPwKj0Iy13wCVbr617LWLLxBdBfymZVg L6pR+5S03u9qH1MLilcDjQNP0iCKfV8Ml89YXrF0aMVF8DPBHMewc7hxW7u/tFoFDwcsCE zOs6Xb+1b0uk1rA1tILkE/AveehLf1jSGv5NnAMs9oes/Rd3GFiEwibzt0cwEqO3ZCl+0q Ws4tqO/0YboeEPu6pFxIOosYGz+V03RE6SOmlk+HHZMVCaZh5oM1K0WbXVe/61EVkWLa2L 28TVmdesMJM+RjqYEon82UJJtk6XxosY0JpU2kcn0KuihryXy3lQeeEkukhz5g== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=ajrh.net header.s=mesmtp header.b="iASI/KQI"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=W0CfZAax; dmarc=none; spf=pass (mail01.ipfire.org: domain of ajrh@ajrh.net designates 64.147.123.25 as permitted sender) smtp.mailfrom=ajrh@ajrh.net X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-4.11 / 11.00]; BAYES_HAM(-3.00)[99.98%]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM(-1.00)[-0.999]; R_MISSING_CHARSET(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.25:c]; R_DKIM_ALLOW(-0.20)[ajrh.net:s=mesmtp,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.25:from]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; IP_REPUTATION_HAM(-0.01)[asn: 29838(0.00), country: US(-0.01), ip: 64.147.123.25(0.00)]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[ajrh.net]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US]; RWL_MAILSPIKE_EXCELLENT(0.00)[64.147.123.25:from]; RCPT_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[ajrh.net:+,messagingengine.com:+]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 4KMyBR2Vk3z1TN X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The script is rereading the ethernet and dhcp settings files for every lease in every update. Since dhcpd does not have a reload mechanism and is just restarted for settings changes, and so this bridge is restarted too, it seems fine just to read these at startup. --- unbound-dhcp-leases-bridge | 69 ++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git unbound-dhcp-leases-bridge unbound-dhcp-leases-bridge index 6e22066..814cf0c 100644 --- unbound-dhcp-leases-bridge +++ unbound-dhcp-leases-bridge @@ -329,6 +329,42 @@ class FixLeases(object): return leases +def read_settings(filename): + settings = {} + + with open(filename) as f: + for line in f.readlines(): + # Remove line-breaks + line = line.rstrip() + + k, v = line.split("=", 1) + settings[k] = v + + return settings + +def load_subnets(): + # Load ethernet settings + ethernet_settings = read_settings("/var/ipfire/ethernet/settings") + + # Load DHCP settings + dhcp_settings = read_settings("/var/ipfire/dhcp/settings") + + subnets = {} + for zone in ("GREEN", "BLUE"): + if not dhcp_settings.get("ENABLE_%s" % zone) == "on": + continue + + netaddr = ethernet_settings.get("%s_NETADDRESS" % zone) + submask = ethernet_settings.get("%s_NETMASK" % zone) + + subnet = ipaddress.ip_network("%s/%s" % (netaddr, submask)) + domain = dhcp_settings.get("DOMAIN_NAME_%s" % zone) + + subnets[subnet] = domain + + return subnets + +subnets = load_subnets() class Lease(object): def __init__(self, ipaddr, properties): @@ -396,25 +432,6 @@ class Lease(object): @property def domain(self): - # Load ethernet settings - ethernet_settings = self.read_settings("/var/ipfire/ethernet/settings") - - # Load DHCP settings - dhcp_settings = self.read_settings("/var/ipfire/dhcp/settings") - - subnets = {} - for zone in ("GREEN", "BLUE"): - if not dhcp_settings.get("ENABLE_%s" % zone) == "on": - continue - - netaddr = ethernet_settings.get("%s_NETADDRESS" % zone) - submask = ethernet_settings.get("%s_NETMASK" % zone) - - subnet = ipaddress.ip_network("%s/%s" % (netaddr, submask)) - domain = dhcp_settings.get("DOMAIN_NAME_%s" % zone) - - subnets[subnet] = domain - address = ipaddress.ip_address(self.ipaddr) for subnet in subnets: @@ -424,20 +441,6 @@ class Lease(object): # Fall back to localdomain if no match could be found return "localdomain" - @staticmethod - def read_settings(filename): - settings = {} - - with open(filename) as f: - for line in f.readlines(): - # Remove line-breaks - line = line.rstrip() - - k, v = line.split("=", 1) - settings[k] = v - - return settings - @property def fqdn(self): if self.hostname: