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 85CF8646F3 for ; Fri, 30 Oct 2020 13:10:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 70A4F13306 for ; Fri, 30 Oct 2020 13:10:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 47F99132F8 for ; Fri, 30 Oct 2020 13:10:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 126CF45E4A for ; Fri, 30 Oct 2020 13:10:43 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 30 Oct 2020 13:10:38 +0100 Message-Id: <20201030121038.2699389-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [rest.rs] Subject: [pbs-devel] [PATCH proxmox-backup] api tokens: add authorization method X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Oct 2020 12:10:44 -0000 and properly decode secret (which is a no-op with the current scheme). Signed-off-by: Fabian Grünbichler --- note: this breaks older clients obviously, but given the short time it's been out, and the lack of documentation I think this is okay.. src/client/http_client.rs | 4 ++-- src/server/rest.rs | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/client/http_client.rs b/src/client/http_client.rs index 3b7597fe..99558dba 100644 --- a/src/client/http_client.rs +++ b/src/client/http_client.rs @@ -493,7 +493,7 @@ impl HttpClient { let auth = self.login().await?; if auth.auth_id.is_token() { - let enc_api_token = format!("{}:{}", auth.auth_id, percent_encode(auth.ticket.as_bytes(), DEFAULT_ENCODE_SET)); + let enc_api_token = format!("PBSAPIToken {}:{}", auth.auth_id, percent_encode(auth.ticket.as_bytes(), DEFAULT_ENCODE_SET)); req.headers_mut().insert("Authorization", HeaderValue::from_str(&enc_api_token).unwrap()); } else { let enc_ticket = format!("PBSAuthCookie={}", percent_encode(auth.ticket.as_bytes(), DEFAULT_ENCODE_SET)); @@ -602,7 +602,7 @@ impl HttpClient { let auth = self.login().await?; if auth.auth_id.is_token() { - let enc_api_token = format!("{}:{}", auth.auth_id, percent_encode(auth.ticket.as_bytes(), DEFAULT_ENCODE_SET)); + let enc_api_token = format!("PBSAPIToken {}:{}", auth.auth_id, percent_encode(auth.ticket.as_bytes(), DEFAULT_ENCODE_SET)); req.headers_mut().insert("Authorization", HeaderValue::from_str(&enc_api_token).unwrap()); } else { let enc_ticket = format!("PBSAuthCookie={}", percent_encode(auth.ticket.as_bytes(), DEFAULT_ENCODE_SET)); diff --git a/src/server/rest.rs b/src/server/rest.rs index 365e3570..85ad3746 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -17,6 +17,7 @@ use lazy_static::lazy_static; use serde_json::{json, Value}; use tokio::fs::File; use tokio::time::Instant; +use percent_encoding::percent_decode_str; use url::form_urlencoded; use regex::Regex; @@ -568,7 +569,9 @@ fn extract_auth_data(headers: &http::HeaderMap) -> Option { } match headers.get("AUTHORIZATION").map(|v| v.to_str()) { - Some(Ok(v)) => Some(AuthData::ApiToken(v.to_owned())), + Some(Ok(v)) if v.starts_with("PBSAPIToken ") => { + Some(AuthData::ApiToken(v["PBSAPIToken ".len()..].to_owned())) + }, _ => None, } } @@ -609,6 +612,10 @@ fn check_auth( let tokensecret = parts.next() .ok_or_else(|| format_err!("failed to split API token header"))?; + let tokensecret = percent_decode_str(tokensecret) + .decode_utf8() + .map_err(|_| format_err!("failed to decode API token header"))?; + crate::config::token_shadow::verify_secret(&tokenid, &tokensecret)?; Ok(tokenid) -- 2.20.1