From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 0357566040 for ; Tue, 5 Jan 2021 10:36:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 43F2D25781 for ; Tue, 5 Jan 2021 10:35:47 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id B7167254D7 for ; Tue, 5 Jan 2021 10:35:37 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 803F4168B9F; Tue, 5 Jan 2021 10:35:37 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 5 Jan 2021 10:35:31 +0100 Message-Id: <20210105093536.1727641-11-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210105093536.1727641-1-aderumier@odiso.com> References: <20210105093536.1727641-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.138 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.287 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [powerdnsplugin.pm, plugin.pm] Subject: [pve-devel] [PATCH pve-network 10/15] dns: add noerr param X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2021 09:36:20 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Dns/Plugin.pm | 10 +++++----- PVE/Network/SDN/Dns/PowerdnsPlugin.pm | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/PVE/Network/SDN/Dns/Plugin.pm b/PVE/Network/SDN/Dns/Plugin.pm index 199c170..07d0be1 100644 --- a/PVE/Network/SDN/Dns/Plugin.pm +++ b/PVE/Network/SDN/Dns/Plugin.pm @@ -67,31 +67,31 @@ sub parse_section_header { sub add_a_record { - my ($class, $plugin_config, $zone, $hostname, $ip) = @_; + my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_; die "please implement inside plugin"; } sub add_ptr_record { - my ($class, $plugin_config, $zone, $hostname, $ip) = @_; + my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_; die "please implement inside plugin"; } sub del_ptr_record { - my ($class, $plugin_config, $zone, $ip) = @_; + my ($class, $plugin_config, $zone, $ip, $noerr) = @_; die "please implement inside plugin"; } sub del_a_record { - my ($class, $plugin_config, $zone, $hostname, $ip) = @_; + my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_; die "please implement inside plugin"; } sub verify_zone { - my ($class, $plugin_config, $zone) = @_; + my ($class, $plugin_config, $zone, $noerr) = @_; die "please implement inside plugin"; } diff --git a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm b/PVE/Network/SDN/Dns/PowerdnsPlugin.pm index d93fb06..339ac28 100644 --- a/PVE/Network/SDN/Dns/PowerdnsPlugin.pm +++ b/PVE/Network/SDN/Dns/PowerdnsPlugin.pm @@ -42,7 +42,7 @@ sub options { # Plugin implementation sub add_a_record { - my ($class, $plugin_config, $zone, $hostname, $ip) = @_; + my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_; my $url = $plugin_config->{url}; my $key = $plugin_config->{key}; @@ -88,12 +88,12 @@ sub add_a_record { }; if ($@) { - die "error add $fqdn to zone $zone: $@"; + die "error add $fqdn to zone $zone: $@" if !$noerr; } } sub add_ptr_record { - my ($class, $plugin_config, $zone, $hostname, $ip) = @_; + my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_; my $url = $plugin_config->{url}; my $key = $plugin_config->{key}; @@ -125,12 +125,12 @@ sub add_ptr_record { }; if ($@) { - die "error add $reverseip to zone $zone: $@"; + die "error add $reverseip to zone $zone: $@" if !$noerr; } } sub del_a_record { - my ($class, $plugin_config, $zone, $hostname, $ip) = @_; + my ($class, $plugin_config, $zone, $hostname, $ip, $noerr) = @_; my $url = $plugin_config->{url}; my $key = $plugin_config->{key}; @@ -151,7 +151,7 @@ sub del_a_record { push @$final_records, $record; } return if !$foundrecord; - + my $rrset = {}; if (scalar (@{$final_records}) > 0) { @@ -177,12 +177,12 @@ sub del_a_record { }; if ($@) { - die "error delete $fqdn from zone $zone: $@"; + die "error delete $fqdn from zone $zone: $@" if !$noerr; } } sub del_ptr_record { - my ($class, $plugin_config, $zone, $ip) = @_; + my ($class, $plugin_config, $zone, $ip, $noerr) = @_; my $url = $plugin_config->{url}; my $key = $plugin_config->{key}; @@ -204,12 +204,12 @@ sub del_ptr_record { }; if ($@) { - die "error delete $reverseip from zone $zone: $@"; + die "error delete $reverseip from zone $zone: $@" if !$noerr; } } sub verify_zone { - my ($class, $plugin_config, $zone) = @_; + my ($class, $plugin_config, $zone, $noerr) = @_; #verify that api is working @@ -222,7 +222,7 @@ sub verify_zone { }; if ($@) { - die "can't read zone $zone: $@"; + die "can't read zone $zone: $@" if !$noerr; } } -- 2.20.1