From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup v2 3/8] api2/tape/restore: factor out check_datastore_privs
Date: Thu, 6 May 2021 08:01:51 +0200 [thread overview]
Message-ID: <10153350-a667-e363-09c3-3988827f1e93@proxmox.com> (raw)
In-Reply-To: <20210505100918.506-4-d.csapak@proxmox.com>
applied
On 5/5/21 12:09 PM, Dominik Csapak wrote:
> so that we can reuse it
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/api2/tape/restore.rs | 39 +++++++++++++++++++++++++--------------
> 1 file changed, 25 insertions(+), 14 deletions(-)
>
> diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
> index 1dd6ba11..b7bf6670 100644
> --- a/src/api2/tape/restore.rs
> +++ b/src/api2/tape/restore.rs
> @@ -157,6 +157,30 @@ impl DataStoreMap {
> }
> }
>
> +fn check_datastore_privs(
> + user_info: &CachedUserInfo,
> + store: &str,
> + auth_id: &Authid,
> + owner: &Option<Authid>,
> +) -> Result<(), Error> {
> + let privs = user_info.lookup_privs(&auth_id, &["datastore", &store]);
> + if (privs & PRIV_DATASTORE_BACKUP) == 0 {
> + 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);
> + }
> + }
> +
> + Ok(())
> +}
> +
> pub const ROUTER: Router = Router::new().post(&API_METHOD_RESTORE);
>
> #[api(
> @@ -212,20 +236,7 @@ pub fn restore(
> }
>
> for store in used_datastores.iter() {
> - let privs = user_info.lookup_privs(&auth_id, &["datastore", &store]);
> - if (privs & PRIV_DATASTORE_BACKUP) == 0 {
> - 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);
> - }
> - }
> + check_datastore_privs(&user_info, &store, &auth_id, &owner)?;
> }
>
> let privs = user_info.lookup_privs(&auth_id, &["tape", "drive", &drive]);
next prev parent reply other threads:[~2021-05-06 6:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 10:09 [pbs-devel] [PATCH proxmox-backup v2 0/8] tape: single snapshot restore Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 1/8] tape/drive: add 'move_to_file' to TapeDriver trait Dominik Csapak
2021-05-06 5:56 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 2/8] tape/media_catalog: add helpers to look for snapshot/chunk files Dominik Csapak
2021-05-06 5:59 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 3/8] api2/tape/restore: factor out check_datastore_privs Dominik Csapak
2021-05-06 6:01 ` Dietmar Maurer [this message]
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 4/8] api2/tape/restore: remove unnecessary params from (try_)restore_snapshot_archive Dominik Csapak
2021-05-06 6:02 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 5/8] api2/tape/restore: return backup manifest in try_restore_snapshot_archive Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 6/8] api2/tape/restore: add 'restore-single' api path Dominik Csapak
2021-05-05 10:53 ` Thomas Lamprecht
2021-05-05 12:48 ` Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 7/8] bin/proxmox-tape: add restore-single command to proxmox-tape Dominik Csapak
2021-05-05 11:04 ` Thomas Lamprecht
2021-05-05 12:50 ` Dominik Csapak
2021-05-05 10:09 ` [pbs-devel] [PATCH proxmox-backup v2 8/8] ui: tape: add single snapshot restore Dominik Csapak
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=10153350-a667-e363-09c3-3988827f1e93@proxmox.com \
--to=dietmar@proxmox.com \
--cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox