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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 85F7090F20 for ; Wed, 3 Apr 2024 10:09:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 69F2013646 for ; Wed, 3 Apr 2024 10:08:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 3 Apr 2024 10:08:47 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9B209415E7 for ; Wed, 3 Apr 2024 10:08:47 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 3 Apr 2024 10:08:25 +0200 Message-Id: <20240403080825.61181-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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. [gotify.rs] Subject: [pve-devel] [PATCH proxmox] notify: fix #5274: also set 'X-Gotify-Key' header for authentication 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: Wed, 03 Apr 2024 08:09:20 -0000 Versions of Gotify < 2.2.0 only supported the 'X-Gotify-Key' header for passing the API token. This comment sets this header in addition to the regular 'Authorization' header in order to be compatible with older Gotify servers. Signed-off-by: Lukas Wagner --- proxmox-notify/src/endpoints/gotify.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/proxmox-notify/src/endpoints/gotify.rs b/proxmox-notify/src/endpoints/gotify.rs index 90ae959..20c83bf 100644 --- a/proxmox-notify/src/endpoints/gotify.rs +++ b/proxmox-notify/src/endpoints/gotify.rs @@ -124,10 +124,13 @@ impl Endpoint for GotifyEndpoint { let body = serde_json::to_vec(&body) .map_err(|err| Error::NotifyFailed(self.name().to_string(), err.into()))?; - let extra_headers = HashMap::from([( - "Authorization".into(), - format!("Bearer {}", self.private_config.token), - )]); + let extra_headers = HashMap::from([ + ( + "Authorization".into(), + format!("Bearer {}", self.private_config.token), + ), + ("X-Gotify-Key".into(), self.private_config.token.clone()), + ]); let proxy_config = context() .http_proxy_config() -- 2.39.2