From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] ui: tape/Restore: let the user choose an owner
Date: Fri, 12 Mar 2021 11:28:41 +0100 [thread overview]
Message-ID: <20210312102841.11712-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210312102841.11712-1-d.csapak@proxmox.com>
so that the tape backup can be restored as any user, given
the current logged in user has the correct permission.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/tape/restore.rs | 24 +++++++++++++++++++++++-
src/bin/proxmox-tape.rs | 5 +++++
www/tape/window/TapeRestore.js | 10 ++++++++++
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
index 504bc296..85b14f21 100644
--- a/src/api2/tape/restore.rs
+++ b/src/api2/tape/restore.rs
@@ -40,6 +40,7 @@ use crate::{
cached_user_info::CachedUserInfo,
acl::{
PRIV_DATASTORE_BACKUP,
+ PRIV_DATASTORE_MODIFY,
PRIV_TAPE_READ,
},
},
@@ -105,6 +106,10 @@ pub const ROUTER: Router = Router::new()
type: Userid,
optional: true,
},
+ owner: {
+ type: Authid,
+ optional: true,
+ },
},
},
returns: {
@@ -123,6 +128,7 @@ pub fn restore(
drive: String,
media_set: String,
notify_user: Option<Userid>,
+ owner: Option<Authid>,
rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
@@ -134,6 +140,18 @@ pub fn restore(
bail!("no permissions on /datastore/{}", store);
}
+ if let Some(ref owner) = owner {
+ let correct_owner = owner == &auth_id
+ || (owner.is_token()
+ && !auth_id.is_token()
+ && owner.user() == auth_id.user());
+
+ // same permission as changing ownership after syncing
+ if !correct_owner && privs & PRIV_DATASTORE_MODIFY == 0 {
+ bail!("no permission to restore as '{}'", owner);
+ }
+ }
+
let privs = user_info.lookup_privs(&auth_id, &["tape", "drive", &drive]);
if (privs & PRIV_TAPE_READ) == 0 {
bail!("no permissions on /tape/drive/{}", drive);
@@ -222,6 +240,7 @@ pub fn restore(
&datastore,
&auth_id,
¬ify_user,
+ &owner,
)?;
}
@@ -252,6 +271,7 @@ pub fn request_and_restore_media(
datastore: &DataStore,
authid: &Authid,
notify_user: &Option<Userid>,
+ owner: &Option<Authid>,
) -> Result<(), Error> {
let media_set_uuid = match media_id.media_set_label {
@@ -284,7 +304,9 @@ pub fn request_and_restore_media(
}
}
- restore_media(worker, &mut drive, &info, Some((datastore, authid)), false)
+ let restore_owner = owner.as_ref().unwrap_or(authid);
+
+ restore_media(worker, &mut drive, &info, Some((datastore, restore_owner)), false)
}
/// Restore complete media content and catalog
diff --git a/src/bin/proxmox-tape.rs b/src/bin/proxmox-tape.rs
index ad39ec82..69dd7a8d 100644
--- a/src/bin/proxmox-tape.rs
+++ b/src/bin/proxmox-tape.rs
@@ -27,6 +27,7 @@ use proxmox_backup::{
api2::{
self,
types::{
+ Authid,
DATASTORE_SCHEMA,
DRIVE_NAME_SCHEMA,
MEDIA_LABEL_SCHEMA,
@@ -868,6 +869,10 @@ async fn backup(mut param: Value) -> Result<(), Error> {
type: Userid,
optional: true,
},
+ owner: {
+ type: Authid,
+ optional: true,
+ },
"output-format": {
schema: OUTPUT_FORMAT,
optional: true,
diff --git a/www/tape/window/TapeRestore.js b/www/tape/window/TapeRestore.js
index abf3cf68..6b356bda 100644
--- a/www/tape/window/TapeRestore.js
+++ b/www/tape/window/TapeRestore.js
@@ -51,5 +51,15 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
skipEmptyText: true,
renderer: Ext.String.htmlEncode,
},
+ {
+ xtype: 'pbsUserSelector',
+ name: 'owner',
+ fieldLabel: gettext('Owner'),
+ emptyText: gettext('Current User'),
+ value: null,
+ allowBlank: true,
+ skipEmptyText: true,
+ renderer: Ext.String.htmlEncode,
+ },
],
});
--
2.20.1
next prev parent reply other threads:[~2021-03-12 10:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 10:28 [pbs-devel] [PATCH proxmox-backup 1/2] proxmox-tape: add missing notify-user to 'proxmox-tape restore' Dominik Csapak
2021-03-12 10:28 ` Dominik Csapak [this message]
2021-03-16 7:55 ` [pbs-devel] applied: " 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=20210312102841.11712-2-d.csapak@proxmox.com \
--to=d.csapak@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal