From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CA5841FF15C for ; Wed, 27 Nov 2024 17:27:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A09781B3D8; Wed, 27 Nov 2024 17:27:29 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Wed, 27 Nov 2024 17:18:01 +0100 In-Reply-To: <20241127161803.8866-1-lou.lecrivain@wdz.de> References: <20241127161803.8866-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 14/16] ipam: nautobot: hacky ip range support Content-Type: multipart/mixed; boundary="===============5958903872050072615==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============5958903872050072615== 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 4443FCAF5E for ; Wed, 27 Nov 2024 17:27:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE5C51B363 for ; Wed, 27 Nov 2024 17:27:27 +0100 (CET) Received: from smtp.smtpout.orange.fr (smtp-27.smtpout.orange.fr [80.12.242.27]) (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 ; Wed, 27 Nov 2024 17:27:26 +0100 (CET) Received: from localhost ([176.139.8.107]) by smtp.orange.fr with ESMTPA id GKkKtdtTfxZq3GKkKtKF1T; Wed, 27 Nov 2024 17:18:33 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orange.fr; s=t20230301; t=1732724313; bh=KyePrtu0Pl8+dAHgH2GiqSUDBXZzocxO26WYuArpMDo=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=bubrdMqo16eF5zTV1RB1nYrudPgbRZHaxecWJYHwAiQh8JzjAF3mWCc6cXzCWpy6r W4lx14Q8ubIhOmYcOgJvBwyl7zFYnD+NUpwt5ejvV4PVxNTznJv7AYInmqZLkAs620 De4249uUfV2VyXhedre6782Fj8GiOF98/sN2JSqR9K5Wm5vDdNVBb1vxDVkXOrhD3b 5N6S2kL4CgHwDL49MpKImPjSa2mpXRCVsHs7Vz6Z9yzLfREl4hb5eiQR2YH+cxlDQG ZaLGnbHLidgz35ONBEnai/es2cFZ8bBmQYqS3ECLQD4TxS3MmDFo6LG/96lf7OoMa1 srMz83CJIplwA== X-ME-Helo: localhost X-ME-Auth: bG91LmxlY3JpdmFpbkBvcmFuZ2UuZnI= X-ME-Date: Wed, 27 Nov 2024 17:18:33 +0100 X-ME-IP: 176.139.8.107 From: Lou Lecrivain To: pve-devel@lists.proxmox.com subject: SPAM: [PATCH pve-network 14/16] ipam: nautobot: hacky ip range support Date: Wed, 27 Nov 2024 17:18:01 +0100 Message-Id: <20241127161803.8866-15-lou.lecrivain@wdz.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241127161803.8866-1-lou.lecrivain@wdz.de> References: <20241127161803.8866-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 since nautobot lacks support for IP ranges, this feature could be dropped / marked unsupported Signed-off-by: lou lecrivain --- src/PVE/Network/SDN/Ipams/NautobotPlugin.pm | 26 ++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm index bf9d34a..95e749c 100644 --- a/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm +++ b/src/PVE/Network/SDN/Ipams/NautobotPlugin.pm @@ -104,15 +104,22 @@ sub add_range_next_freeip { my $headers = default_headers($plugin_config); my $cidr = $subnet->{cidr}; - my $range_offset = NetAddr::IP->new($range->{'start-address'}) - NetAddr::IP->new($cidr); + my $minimal_size = NetAddr::IP->new($range->{'start-address'}) - NetAddr::IP->new($cidr); my $internalid = PVE::Network::SDN::Ipams::NetboxPlugin::get_prefix_id($url, $cidr, $headers); - my $params = { offset => $range_offset }; eval { - my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/prefixes/$internalid/available-ips/", $headers, $params); - my ($ip, undef) = split(/\//, @{$result}[0]->{address}); - print "found free ip $ip in range $range->{'start-address'}-$range->{'end-address'}\n" if $ip; - return $ip + my $result = PVE::Network::SDN::api_request("GET", "$url/ipam/prefixes/$internalid/available-ips/?limit=$minimal_size", $headers); + # v important for NetAddr::IP comparison! + my @ips = map((split(/\//,$_->{address}))[0], @{$result}); + # get 1st result + my $ip = (get_ips_within_range($range->{'start-address'}, $range->{'end-address'}, @ips))[0]; + + if ($ip) { + print "found free ip $ip in range $range->{'start-address'}-$range->{'end-address'}\n" + } else { die "prefix out of space in range"; } + + $class->add_ip($plugin_config, undef, $subnet, $ip, $data->{hostname}, $data->{mac}, undef, 0, 0); + return $ip; }; if ($@) { @@ -199,6 +206,13 @@ sub on_update_hook { } # helpers +sub get_ips_within_range { + my ($start_address, $end_address, @list) = @_; + $start_address = NetAddr::IP->new($start_address); + $end_address = NetAddr::IP->new($end_address); + return grep($start_address <= NetAddr::IP->new($_) <= $end_address, @list); +} + sub get_namespace_id { my ($url, $namespace, $headers) = @_; -- 2.39.5 --===============5958903872050072615== 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 --===============5958903872050072615==--