From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 23E561FF16E for ; Mon, 9 Dec 2024 12:32:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E0ADE230; Mon, 9 Dec 2024 12:32:57 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Mon, 9 Dec 2024 12:31:56 +0100 In-Reply-To: <20241209113158.7343-1-lou.lecrivain@wdz.de> References: <20241209113158.7343-1-lou.lecrivain@wdz.de> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Lou Lecrivain via pve-devel Precedence: list Cc: Lou Lecrivain X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] SPAM: [PATCH pve-network v2 2/4] dhcp: always generate dhcp-range for dnsmasq Content-Type: multipart/mixed; boundary="===============8582251401874962918==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============8582251401874962918== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D5656C1813 for ; Mon, 9 Dec 2024 12:32:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2577C5 for ; Mon, 9 Dec 2024 12:32:26 +0100 (CET) Received: from smtp.smtpout.orange.fr (smtp-81.smtpout.orange.fr [80.12.242.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 9 Dec 2024 12:32:26 +0100 (CET) Received: from localhost ([176.139.8.107]) by smtp.orange.fr with ESMTPA id KbzvtphzahaaAKbzwtWffA; Mon, 09 Dec 2024 12:32:20 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr; s=t20230301; t=1733743940; bh=Y/atDSO5VGSGBicoJ2qbpyybP7utgLtl28w1Bz8Gnv4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=qt8H0xZb00aXGKDyiWW+Ogg/Tdo6/r3Bw/pvtg7LEsi0xo1dkdSisWyD7pp43JKAs 5XATMcpHpbe1GnyUHJ7lt548BiXtM1XhyHPvG4PmlryBQvEbKNJxdIvr4/DXOrY+UG sfCxA31QS9aTrXI4bcHXQvvVSsJmkNsfk0imxkgURg1LbHeyvFCASLbgn+FBQlmhuC M32qFQ7AjzxyJJ//RzluNvrIofwcZSPcu7LQosY4f10A21iEbZ/BikA7echzNz1zVp KlXNvBWfNdNT/LEE2hMWEbEr9OvThFMk4G4vrKF0hxv9SAI0h3raYnHzU0G5K2HMpg poh+sbDsHVoyQ== X-ME-Helo: localhost X-ME-Auth: bG91LmxlY3JpdmFpbkBvcmFuZ2UuZnI= X-ME-Date: Mon, 09 Dec 2024 12:32:20 +0100 X-ME-IP: 176.139.8.107 From: Lou Lecrivain To: pve-devel@lists.proxmox.com subject: SPAM: [PATCH pve-network v2 2/4] dhcp: always generate dhcp-range for dnsmasq Date: Mon, 9 Dec 2024 12:31:56 +0100 Message-Id: <20241209113158.7343-3-lou.lecrivain@wdz.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241209113158.7343-1-lou.lecrivain@wdz.de> References: <20241209113158.7343-1-lou.lecrivain@wdz.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 4 AWL -0.103 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain DMARC_REJECT 0.1 DMARC reject policy FREEMAIL_FORGED_FROMDOMAIN 0.001 2nd level domains in From and EnvelopeFrom freemail headers are different FREEMAIL_FROM 0.001 Sender email is commonly abused enduser mail provider HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_REJECT 6 DKIM has Failed or SPF has failed on the message and the domain has a DMARC reject policy RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust RCVD_IN_MSPIKE_H3 -0.01 Good reputation (+3) RCVD_IN_MSPIKE_WL -0.01 Mailspike good senders SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record (configure_range is now noop) Signed-off-by: lou lecrivain --- src/PVE/Network/SDN/Dhcp.pm | 3 ++- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 23 ++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm index d48de34..3ee18e0 100644 --- a/src/PVE/Network/SDN/Dhcp.pm +++ b/src/PVE/Network/SDN/Dhcp.pm @@ -98,11 +98,12 @@ sub regenerate_config { my $subnet_config = $subnets->{$subnet_id}; my $dhcp_ranges = PVE::Network::SDN::Subnets::get_dhcp_ranges($subnet_config); + next if !$dhcp_ranges; my ($zone, $subnet_network, $subnet_mask) = split(/-/, $subnet_id); next if $zone ne $zoneid; - next if !$dhcp_ranges; eval { $dhcp_plugin->configure_subnet($config, $zoneid, $vnetid, $subnet_config) }; + warn "Could not configure subnet $subnet_id: $@\n" if $@; foreach my $dhcp_range (@$dhcp_ranges) { diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index ae52d31..263d24f 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -129,6 +129,15 @@ sub configure_subnet { my $tag = $subnet_config->{id}; + my ($zone, $network, $mask) = split(/-/, $tag); + + if (Net::IP::ip_is_ipv4($network)) { + $mask = (2 ** $mask - 1) << (32 - $mask); + $mask = join( '.', unpack( "C4", pack( "N", $mask ) ) ); + } + + push @{$config}, "dhcp-range=set:$tag,$network,static,$mask,infinite"; + my $option_string; if (ip_is_ipv6($subnet_config->{network})) { $option_string = 'option6'; @@ -139,22 +148,10 @@ sub configure_subnet { push @{$config}, "dhcp-option=tag:$tag,$option_string:dns-server,$subnet_config->{'dhcp-dns-server'}" if $subnet_config->{'dhcp-dns-server'}; - } sub configure_range { - my ($class, $config, $dhcpid, $vnetid, $subnet_config, $range_config) = @_; - - my $tag = $subnet_config->{id}; - - my ($zone, $network, $mask) = split(/-/, $tag); - - if (Net::IP::ip_is_ipv4($network)) { - $mask = (2 ** $mask - 1) << (32 - $mask); - $mask = join( '.', unpack( "C4", pack( "N", $mask ) ) ); - } - - push @{$config}, "dhcp-range=set:$tag,$network,static,$mask,infinite"; + # noop, everything is done within configure_subnet } sub configure_vnet { -- 2.39.5 --===============8582251401874962918== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============8582251401874962918==--