* Re: [pve-devel] [PATCH access-control 1/2] tfa: when modifying others, verify the current user's password
@ 2021-12-06 14:13 Wolfgang Bumiller
0 siblings, 0 replies; 3+ messages in thread
From: Wolfgang Bumiller @ 2021-12-06 14:13 UTC (permalink / raw)
To: Fabian Grünbichler, Proxmox VE development discussion
> On 12/06/2021 3:06 PM Fabian Grünbichler <f.gruenbichler@proxmox.com> wrote:
>
>
> doesn't work for me
>
> On December 6, 2021 2:36 pm, Wolfgang Bumiller wrote:
> > this was wrong as it asked for the password of the
> > to-be-edited user instead, which makes no sense
> >
> > Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> > ---
> > src/PVE/API2/TFA.pm | 10 ++++++----
> > 1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/src/PVE/API2/TFA.pm b/src/PVE/API2/TFA.pm
> > index be696e1..343374e 100644
> > --- a/src/PVE/API2/TFA.pm
> > +++ b/src/PVE/API2/TFA.pm
> > @@ -101,7 +101,7 @@ my $TFA_UPDATE_INFO_SCHEMA = {
> > my sub root_permission_check : prototype($$$$) {
> > my ($rpcenv, $authuser, $userid, $password) = @_;
> >
> > - ($userid, my $ruid, my $realm) = PVE::AccessControl::verify_username($userid);
> > + ($userid, undef, my $realm) = PVE::AccessControl::verify_username($userid);
> > $rpcenv->check_user_exist($userid);
> >
> > raise_perm_exc() if $userid eq 'root@pam' && $authuser ne 'root@pam';
> > @@ -111,11 +111,13 @@ my sub root_permission_check : prototype($$$$) {
> > raise_param_exc({ 'password' => 'password is required to modify TFA data' })
> > if !defined($password);
> >
> > + ($authuser, my $ruid, my $auth_realm) = PVE::AccessControl::verify_username($authuser);
> > +
> > my $domain_cfg = cfs_read_file('domains.cfg');
> > - my $cfg = $domain_cfg->{ids}->{$realm};
> > - die "auth domain '$realm' does not exist\n" if !$cfg;
> > + my $cfg = $domain_cfg->{ids}->{$auth_realm};
> > + die "auth domain '$auth_realm' does not exist\n" if !$cfg;
> > my $plugin = PVE::Auth::Plugin->lookup($cfg->{type});
> > - $plugin->authenticate_user($cfg, $realm, $ruid, $password);
> > + $plugin->authenticate_user($cfg, $auth_realm, $authuser, $password);
>
> this should likely still be $ruid? (which is actually just the username
> without realm, which is what authenticate_user expects. so maybe
> $username might also be a more readable variable name - ruid reads to me
> like euid and friends)
yes actually, bad copy from directly modifying /usr/share/... >.>
^ permalink raw reply [flat|nested] 3+ messages in thread* [pve-devel] [PATCH access-control 1/2] tfa: when modifying others, verify the current user's password
@ 2021-12-06 13:36 Wolfgang Bumiller
2021-12-06 14:06 ` Fabian Grünbichler
0 siblings, 1 reply; 3+ messages in thread
From: Wolfgang Bumiller @ 2021-12-06 13:36 UTC (permalink / raw)
To: pve-devel
this was wrong as it asked for the password of the
to-be-edited user instead, which makes no sense
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
src/PVE/API2/TFA.pm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/PVE/API2/TFA.pm b/src/PVE/API2/TFA.pm
index be696e1..343374e 100644
--- a/src/PVE/API2/TFA.pm
+++ b/src/PVE/API2/TFA.pm
@@ -101,7 +101,7 @@ my $TFA_UPDATE_INFO_SCHEMA = {
my sub root_permission_check : prototype($$$$) {
my ($rpcenv, $authuser, $userid, $password) = @_;
- ($userid, my $ruid, my $realm) = PVE::AccessControl::verify_username($userid);
+ ($userid, undef, my $realm) = PVE::AccessControl::verify_username($userid);
$rpcenv->check_user_exist($userid);
raise_perm_exc() if $userid eq 'root@pam' && $authuser ne 'root@pam';
@@ -111,11 +111,13 @@ my sub root_permission_check : prototype($$$$) {
raise_param_exc({ 'password' => 'password is required to modify TFA data' })
if !defined($password);
+ ($authuser, my $ruid, my $auth_realm) = PVE::AccessControl::verify_username($authuser);
+
my $domain_cfg = cfs_read_file('domains.cfg');
- my $cfg = $domain_cfg->{ids}->{$realm};
- die "auth domain '$realm' does not exist\n" if !$cfg;
+ my $cfg = $domain_cfg->{ids}->{$auth_realm};
+ die "auth domain '$auth_realm' does not exist\n" if !$cfg;
my $plugin = PVE::Auth::Plugin->lookup($cfg->{type});
- $plugin->authenticate_user($cfg, $realm, $ruid, $password);
+ $plugin->authenticate_user($cfg, $auth_realm, $authuser, $password);
}
return wantarray ? ($userid, $realm) : $userid;
--
2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [pve-devel] [PATCH access-control 1/2] tfa: when modifying others, verify the current user's password
2021-12-06 13:36 Wolfgang Bumiller
@ 2021-12-06 14:06 ` Fabian Grünbichler
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Grünbichler @ 2021-12-06 14:06 UTC (permalink / raw)
To: Proxmox VE development discussion; +Cc: w.bumiller
doesn't work for me
On December 6, 2021 2:36 pm, Wolfgang Bumiller wrote:
> this was wrong as it asked for the password of the
> to-be-edited user instead, which makes no sense
>
> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> ---
> src/PVE/API2/TFA.pm | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/src/PVE/API2/TFA.pm b/src/PVE/API2/TFA.pm
> index be696e1..343374e 100644
> --- a/src/PVE/API2/TFA.pm
> +++ b/src/PVE/API2/TFA.pm
> @@ -101,7 +101,7 @@ my $TFA_UPDATE_INFO_SCHEMA = {
> my sub root_permission_check : prototype($$$$) {
> my ($rpcenv, $authuser, $userid, $password) = @_;
>
> - ($userid, my $ruid, my $realm) = PVE::AccessControl::verify_username($userid);
> + ($userid, undef, my $realm) = PVE::AccessControl::verify_username($userid);
> $rpcenv->check_user_exist($userid);
>
> raise_perm_exc() if $userid eq 'root@pam' && $authuser ne 'root@pam';
> @@ -111,11 +111,13 @@ my sub root_permission_check : prototype($$$$) {
> raise_param_exc({ 'password' => 'password is required to modify TFA data' })
> if !defined($password);
>
> + ($authuser, my $ruid, my $auth_realm) = PVE::AccessControl::verify_username($authuser);
> +
> my $domain_cfg = cfs_read_file('domains.cfg');
> - my $cfg = $domain_cfg->{ids}->{$realm};
> - die "auth domain '$realm' does not exist\n" if !$cfg;
> + my $cfg = $domain_cfg->{ids}->{$auth_realm};
> + die "auth domain '$auth_realm' does not exist\n" if !$cfg;
> my $plugin = PVE::Auth::Plugin->lookup($cfg->{type});
> - $plugin->authenticate_user($cfg, $realm, $ruid, $password);
> + $plugin->authenticate_user($cfg, $auth_realm, $authuser, $password);
this should likely still be $ruid? (which is actually just the username
without realm, which is what authenticate_user expects. so maybe
$username might also be a more readable variable name - ruid reads to me
like euid and friends)
> }
>
> return wantarray ? ($userid, $realm) : $userid;
> --
> 2.30.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-06 14:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-06 14:13 [pve-devel] [PATCH access-control 1/2] tfa: when modifying others, verify the current user's password Wolfgang Bumiller
-- strict thread matches above, loose matches on Subject: below --
2021-12-06 13:36 Wolfgang Bumiller
2021-12-06 14:06 ` Fabian Grünbichler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox