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 A7BAF1FF164 for ; Fri, 6 Dec 2024 11:21:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 282432159; Fri, 6 Dec 2024 11:21:38 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Fri, 6 Dec 2024 11:21:11 +0100 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 , Jacob Green 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] ipam: fix #5496 Content-Type: multipart/mixed; boundary="===============7272211320133965714==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============7272211320133965714== 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 E87C8C0F2B for ; Fri, 6 Dec 2024 11:21:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D22BF212E for ; Fri, 6 Dec 2024 11:21:36 +0100 (CET) Received: from smtp.smtpout.orange.fr (smtp-18.smtpout.orange.fr [80.12.242.18]) (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 ; Fri, 6 Dec 2024 11:21:36 +0100 (CET) Received: from localhost ([176.139.8.107]) by smtp.orange.fr with ESMTPA id JVSitfhNYaI1lJVSjto6oM; Fri, 06 Dec 2024 11:21:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr; s=t20230301; t=1733480489; bh=F4OXnMeOskZTAuUJM/c8hJ2PKB0SSddvLr+1Znw44Kg=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=cE1lDneaRPqCVX5znnqgE2DSSL5S6hnB4Xx5cjAyX2k1XljbnAODmjU8y9WQfGV50 oV14LdPmWYRxZxOh/3Zi5xlKYNNHkxRIIQJOR+MAnts+pWIV+lkxMg8KUJOekIuRyk jOZ0r0lk7xqYE3apsmJGDMlLUcizX9VHftjqMUY5U5okvS0YQBPX7HQNNZxbSOewDJ 7wL9Fdu61/iZpXeUqfm8sZWd6OnMO++2GlEsJ3vlhT+TIXBieqVLscjEC6iDlQVUfh IUIW7odg2xAkK0l1BAmjgIsTxiBzeEQn1gppPZyBy29nytXv5FxtsPC/n4bf+CP5Jp QmwzGLKA1cvOQ== X-ME-Helo: localhost X-ME-Auth: bG91LmxlY3JpdmFpbkBvcmFuZ2UuZnI= X-ME-Date: Fri, 06 Dec 2024 11:21:29 +0100 X-ME-IP: 176.139.8.107 From: Lou Lecrivain To: pve-devel@lists.proxmox.com Cc: Lou Lecrivain , Jacob Green , Stefan Hanreich subject: SPAM: [PATCH pve-network v2] ipam: fix #5496 Date: Fri, 6 Dec 2024 11:21:11 +0100 Message-Id: <20241206102111.4964-1-lou.lecrivain@wdz.de> X-Mailer: git-send-email 2.39.5 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_H3 0.001 Good reputation (+3) 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 functions were returning undef despite API calls being successfull, due to eval blocks return values not being taken into account. Co-authored-by: Jacob Green Signed-off-by: Lou Lecrivain Tested-by: Stefan Hanreich --- src/PVE/Network/SDN/Ipams/NetboxPlugin.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm index d923269..124c355 100644 --- a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm @@ -151,7 +151,7 @@ sub add_next_freeip { my $params = { dns_name => $hostname, description => $description }; - eval { + my $ip = eval { my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/prefixes/$internalid/available-ips/", $headers, $params); my ($ip, undef) = split(/\//, $result->{address}); return $ip; @@ -160,6 +160,8 @@ sub add_next_freeip { if ($@) { die "can't find free ip in subnet $cidr: $@" if !$noerr; } + + return $ip; } sub add_range_next_freeip { @@ -174,7 +176,7 @@ sub add_range_next_freeip { my $params = { dns_name => $data->{hostname}, description => $description }; - eval { + my $ip = eval { my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/ip-ranges/$internalid/available-ips/", $headers, $params); my ($ip, undef) = split(/\//, $result->{address}); print "found ip free $ip in range $range->{'start-address'}-$range->{'end-address'}\n" if $ip; @@ -184,6 +186,8 @@ sub add_range_next_freeip { if ($@) { die "can't find free ip in range $range->{'start-address'}-$range->{'end-address'}: $@" if !$noerr; } + + return $ip; } sub del_ip { -- 2.39.5 --===============7272211320133965714== 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 --===============7272211320133965714==--