From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] api: improve error messages for restricted endpoints
Date: Wed, 30 Dec 2020 12:21:13 +0100 [thread overview]
Message-ID: <20201230112114.424764-1-f.gruenbichler@proxmox.com> (raw)
the old variant attempted to parse a tokenid as userid and returned the
cryptic parsing error to the client, which is rather confusing.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Notes:
not sure whether this is already enough repetition to have a helper somewhere?
I expect the number of such API endpoints to remain rather small.. the
change_password one could even be lifted with small changes..
src/api2/access.rs | 14 +++++++++-----
src/api2/node.rs | 22 ++++++++++++++++++----
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/api2/access.rs b/src/api2/access.rs
index 2f7fb6ec..22d6ebd2 100644
--- a/src/api2/access.rs
+++ b/src/api2/access.rs
@@ -206,14 +206,18 @@ fn change_password(
password: String,
rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
-
- let current_user: Userid = rpcenv
+ let current_auth: Authid = rpcenv
.get_auth_id()
- .ok_or_else(|| format_err!("unknown user"))?
+ .ok_or_else(|| format_err!("no authid available"))?
.parse()?;
- let current_auth = Authid::from(current_user.clone());
- let mut allowed = userid == current_user;
+ if current_auth.is_token() {
+ bail!("API tokens cannot access this API endpoint");
+ }
+
+ let current_user = current_auth.user();
+
+ let mut allowed = userid == *current_user;
if current_user == "root@pam" { allowed = true; }
diff --git a/src/api2/node.rs b/src/api2/node.rs
index dcde83df..b1a25e0e 100644
--- a/src/api2/node.rs
+++ b/src/api2/node.rs
@@ -92,11 +92,16 @@ async fn termproxy(
rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
// intentionally user only for now
- let userid: Userid = rpcenv
+ let auth_id: Authid = rpcenv
.get_auth_id()
- .ok_or_else(|| format_err!("unknown user"))?
+ .ok_or_else(|| format_err!("no authid available"))?
.parse()?;
- let auth_id = Authid::from(userid.clone());
+
+ if auth_id.is_token() {
+ bail!("API tokens cannot access this API endpoint");
+ }
+
+ let userid = auth_id.user();
if userid.realm() != "pam" {
bail!("only pam users can use the console");
@@ -267,7 +272,16 @@ fn upgrade_to_websocket(
) -> ApiResponseFuture {
async move {
// intentionally user only for now
- let userid: Userid = rpcenv.get_auth_id().unwrap().parse()?;
+ let auth_id: Authid = rpcenv
+ .get_auth_id()
+ .ok_or_else(|| format_err!("no authid available"))?
+ .parse()?;
+
+ if auth_id.is_token() {
+ bail!("API tokens cannot access this API endpoint");
+ }
+
+ let userid = auth_id.user();
let ticket = tools::required_string_param(¶m, "vncticket")?;
let port: u16 = tools::required_integer_param(¶m, "port")? as u16;
--
2.20.1
next reply other threads:[~2020-12-30 11:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 11:21 Fabian Grünbichler [this message]
2020-12-30 11:21 ` [pbs-devel] [PATCH proxmox-backup 2/2] api: allow tokens to list users Fabian Grünbichler
2020-12-31 7:29 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] api: improve error messages for restricted endpoints Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201230112114.424764-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox