From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id D2D941FF16B
for <inbox@lore.proxmox.com>; Thu, 28 Nov 2024 18:10:36 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 925FBB69D;
Thu, 28 Nov 2024 18:10:28 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Thu, 28 Nov 2024 18:09:42 +0100
In-Reply-To: <20241128170942.4717-1-lou.lecrivain@wdz.de>
References: <20241128170942.4717-1-lou.lecrivain@wdz.de>
MIME-Version: 1.0
Message-ID: <mailman.835.1732813827.391.pve-devel@lists.proxmox.com>
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Post: <mailto:pve-devel@lists.proxmox.com>
From: Lou Lecrivain via pve-devel <pve-devel@lists.proxmox.com>
Precedence: list
Cc: Lou Lecrivain <lou.lecrivain@wdz.de>
X-Mailman-Version: 2.1.29
X-BeenThere: pve-devel@lists.proxmox.com
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
Subject: [pve-devel] SPAM: [PATCH pve-network 2/2] dhcp: generate dhcp-range
for dnsmasq even when no dhcp_ranges exist
Content-Type: multipart/mixed; boundary="===============3168293086506907565=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
--===============3168293086506907565==
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <lou.lecrivain@orange.fr>
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 F2DE4CB473
for <pve-devel@lists.proxmox.com>; Thu, 28 Nov 2024 18:10:26 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D7A4DB4F7
for <pve-devel@lists.proxmox.com>; Thu, 28 Nov 2024 18:09:56 +0100 (CET)
Received: from smtp.smtpout.orange.fr (smtp-24.smtpout.orange.fr [80.12.242.24])
(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 <pve-devel@lists.proxmox.com>; Thu, 28 Nov 2024 18:09:55 +0100 (CET)
Received: from localhost ([176.139.8.107])
by smtp.orange.fr with ESMTPA
id Gi1Ut6rPfM7KXGi1VtJuwg; Thu, 28 Nov 2024 18:09:49 +0100
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr;
s=t20230301; t=1732813789;
bh=2/a4UdVFhu4wViV41tTnZWU7bf53lowRp4DMDhOe3Aw=;
h=From:To:Subject:Date:Message-Id:MIME-Version;
b=baU/T3l0PumVe1gPCMJ8yosWpAtlmwYwWdUWPf7cW6lZ7z4fsC7iGzKkX7NZiPi0c
dZB7HM8u0dNb5J54pAzAtLJsxya5oMvu6zhCW5hrAWgfJwk+feKtgYeAW56wqPoEWW
nTzo3DJqaiAAB+nyMVfkp3DwOY/bX5vaZwyfeb5Pnvhaqnq1XblvF4SpW7tTZKWwmF
xO5L6eacoYLCOOZ/06Vu0xApLLx23vdANvghT0S2s6WQ2CpaWZ6lju9oHejx1Lm70l
5b1JrqpyGBb4MEnHCi7uAzsBNnbYs9Fy9vbgORkikzB0E0TLMUA1zBxq08uJi1krsJ
1kbRDRCkmG0hg==
X-ME-Helo: localhost
X-ME-Auth: bG91LmxlY3JpdmFpbkBvcmFuZ2UuZnI=
X-ME-Date: Thu, 28 Nov 2024 18:09:49 +0100
X-ME-IP: 176.139.8.107
From: Lou Lecrivain <lou.lecrivain@wdz.de>
To: pve-devel@lists.proxmox.com
subject: SPAM: [PATCH pve-network 2/2] dhcp: generate dhcp-range for dnsmasq even when no dhcp_ranges exist
Date: Thu, 28 Nov 2024 18:09:42 +0100
Message-Id: <20241128170942.4717-3-lou.lecrivain@wdz.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20241128170942.4717-1-lou.lecrivain@wdz.de>
References: <20241128170942.4717-1-lou.lecrivain@wdz.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 4
AWL 0.000 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.001 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_H4 0.001 Very Good reputation (+4)
RCVD_IN_MSPIKE_WL 0.001 Mailspike good senders
SPF_HELO_PASS -0.001 SPF: HELO matches SPF record
SPF_PASS -0.001 SPF: sender matches SPF record
Signed-off-by: lou lecrivain <lou.lecrivain@wdz.de>
---
src/PVE/Network/SDN/Dhcp.pm | 6 ++++--
src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 5 ++++-
src/PVE/Network/SDN/Dhcp/Plugin.pm | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm
index d48de34..6c4ad10 100644
--- a/src/PVE/Network/SDN/Dhcp.pm
+++ b/src/PVE/Network/SDN/Dhcp.pm
@@ -98,11 +98,13 @@ 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 $with_ranges = (scalar $dhcp_ranges->@* > 0);
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) };
+ eval { $dhcp_plugin->configure_subnet($config, $zoneid, $vnetid, $subnet_config, $with_ranges) };
+
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..0271e19 100644
--- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
+++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
@@ -122,7 +122,7 @@ sub add_ip_mapping {
}
sub configure_subnet {
- my ($class, $config, $dhcpid, $vnetid, $subnet_config) = @_;
+ my ($class, $config, $dhcpid, $vnetid, $subnet_config, $with_ranges) = @_;
die "No gateway defined for subnet $subnet_config->{id}"
if !$subnet_config->{gateway};
@@ -140,6 +140,9 @@ sub configure_subnet {
push @{$config}, "dhcp-option=tag:$tag,$option_string:dns-server,$subnet_config->{'dhcp-dns-server'}"
if $subnet_config->{'dhcp-dns-server'};
+ if (!$with_ranges) {
+ $class->configure_range($config, $dhcpid, $vnetid, $subnet_config, undef);
+ }
}
sub configure_range {
diff --git a/src/PVE/Network/SDN/Dhcp/Plugin.pm b/src/PVE/Network/SDN/Dhcp/Plugin.pm
index 1757915..3ad4b7f 100644
--- a/src/PVE/Network/SDN/Dhcp/Plugin.pm
+++ b/src/PVE/Network/SDN/Dhcp/Plugin.pm
@@ -33,7 +33,7 @@ sub configure_range {
}
sub configure_subnet {
- my ($class, $config, $dhcpid, $vnetid, $subnet_config) = @_;
+ my ($class, $config, $dhcpid, $vnetid, $subnet_config, $with_ranges) = @_;
die 'implement in sub class';
}
--
2.39.5
--===============3168293086506907565==
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
--===============3168293086506907565==--