X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAccessControl.pm;h=b45abda9cfa52d466313b56766a31216411347ad;hp=4ba612cbfdf0829df3a5f1a1ac588a83f068aa7f;hb=5654af83fa4f8ffc4e44176eea6229716eae2036;hpb=86cd805b635299fd810ff80a79cac8a37f7e6a63 diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index 4ba612c..b45abda 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -6,11 +6,12 @@ use Encode; use Crypt::OpenSSL::Random; use Crypt::OpenSSL::RSA; use Net::SSLeay; +use Net::IP; use MIME::Base64; use Digest::SHA; -use Digest::HMAC_SHA1; -use URI::Escape; -use LWP::UserAgent; + +use PVE::OTP; +use PVE::Ticket; use PVE::Tools qw(run_command lock_file file_get_contents split_list safe_print); use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file cfs_lock_file); use PVE::JSONSchema; @@ -21,8 +22,6 @@ use PVE::Auth::LDAP; use PVE::Auth::PVE; use PVE::Auth::PAM; -use Data::Dumper; # fixme: remove - # load and initialize all plugins PVE::Auth::AD->register(); @@ -42,8 +41,8 @@ my $ticket_lifetime = 3600*2; # 2 hours Crypt::OpenSSL::RSA->import_random_seed(); -cfs_register_file('user.cfg', - \&parse_user_config, +cfs_register_file('user.cfg', + \&parse_user_config, \&write_user_config); @@ -65,11 +64,11 @@ sub lock_user_config { } my $pve_auth_pub_key; -sub get_pubkey { +sub get_pubkey { return $pve_auth_pub_key if $pve_auth_pub_key; - my $input = PVE::Tools::file_get_contents($authpubkeyfn); + my $input = PVE::Tools::file_get_contents($authpubkeyfn); $pve_auth_pub_key = Crypt::OpenSSL::RSA->new_public_key($input); @@ -79,7 +78,7 @@ sub get_pubkey { my $csrf_prevention_secret; my $get_csrfr_secret = sub { if (!$csrf_prevention_secret) { - my $input = PVE::Tools::file_get_contents($pve_www_key_fn); + my $input = PVE::Tools::file_get_contents($pve_www_key_fn); $csrf_prevention_secret = Digest::SHA::sha1_base64($input); } return $csrf_prevention_secret; @@ -88,30 +87,18 @@ my $get_csrfr_secret = sub { sub assemble_csrf_prevention_token { my ($username) = @_; - my $timestamp = sprintf("%08X", time()); - - my $digest = Digest::SHA::sha1_base64("$timestamp:$username", &$get_csrfr_secret()); + my $secret = &$get_csrfr_secret(); - return "$timestamp:$digest"; + return PVE::Ticket::assemble_csrf_prevention_token ($secret, $username); } sub verify_csrf_prevention_token { my ($username, $token, $noerr) = @_; - if ($token =~ m/^([A-Z0-9]{8}):(\S+)$/) { - my $sig = $2; - my $timestamp = $1; - my $ttime = hex($timestamp); + my $secret = &$get_csrfr_secret(); - my $digest = Digest::SHA::sha1_base64("$timestamp:$username", &$get_csrfr_secret()); - - my $age = time() - $ttime; - return if ($digest eq $sig) && ($age > -300) && ($age < $ticket_lifetime); - } - - die "Permission denied - invalid csrf token\n" if !$noerr; - - return undef; + return PVE::Ticket::verify_csrf_prevention_token( + $secret, $username, $token, -300, $ticket_lifetime, $noerr); } my $pve_auth_priv_key; @@ -119,7 +106,7 @@ sub get_privkey { return $pve_auth_priv_key if $pve_auth_priv_key; - my $input = PVE::Tools::file_get_contents($authprivkeyfn); + my $input = PVE::Tools::file_get_contents($authprivkeyfn); $pve_auth_priv_key = Crypt::OpenSSL::RSA->new_private_key($input); @@ -131,42 +118,22 @@ sub assemble_ticket { my $rsa_priv = get_privkey(); - my $timestamp = sprintf("%08X", time()); - - my $plain = "PVE:$username:$timestamp"; - - my $ticket = $plain . "::" . encode_base64($rsa_priv->sign($plain), ''); - - return $ticket; + return PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', $username); } sub verify_ticket { my ($ticket, $noerr) = @_; - if ($ticket && $ticket =~ m/^(PVE:\S+)::([^:\s]+)$/) { - my $plain = $1; - my $sig = $2; + my $rsa_pub = get_pubkey(); - my $rsa_pub = get_pubkey(); - if ($rsa_pub->verify($plain, decode_base64($sig))) { - if ($plain =~ m/^PVE:(\S+):([A-Z0-9]{8})$/) { - my $username = $1; - my $timestamp = $2; - my $ttime = hex($timestamp); + my ($username, $age) = PVE::Ticket::verify_rsa_ticket( + $rsa_pub, 'PVE', $ticket, undef, -300, $ticket_lifetime, $noerr); - my $age = time() - $ttime; + return undef if $noerr && !defined($username); - if (PVE::Auth::Plugin::verify_username($username, 1) && - ($age > -300) && ($age < $ticket_lifetime)) { - return wantarray ? ($username, $age) : $username; - } - } - } - } - - die "permission denied - invalid ticket\n" if !$noerr; + return undef if !PVE::Auth::Plugin::verify_username($username, $noerr); - return undef; + return wantarray ? ($username, $age) : $username; } # VNC tickets @@ -177,108 +144,41 @@ sub assemble_vnc_ticket { my $rsa_priv = get_privkey(); - my $timestamp = sprintf("%08X", time()); - - my $plain = "PVEVNC:$timestamp"; - $path = normalize_path($path); - my $full = "$plain:$username:$path"; - - my $ticket = $plain . "::" . encode_base64($rsa_priv->sign($full), ''); + my $secret_data = "$username:$path"; - return $ticket; + return PVE::Ticket::assemble_rsa_ticket( + $rsa_priv, 'PVEVNC', undef, $secret_data); } sub verify_vnc_ticket { my ($ticket, $username, $path, $noerr) = @_; - if ($ticket && $ticket =~ m/^(PVEVNC:\S+)::([^:\s]+)$/) { - my $plain = $1; - my $sig = $2; - my $full = "$plain:$username:$path"; - - my $rsa_pub = get_pubkey(); - # Note: sign only match if $username and $path is correct - if ($rsa_pub->verify($full, decode_base64($sig))) { - if ($plain =~ m/^PVEVNC:([A-Z0-9]{8})$/) { - my $ttime = hex($1); - - my $age = time() - $ttime; - - if (($age > -20) && ($age < 40)) { - return 1; - } - } - } - } + my $rsa_pub = get_pubkey(); - die "permission denied - invalid vnc ticket\n" if !$noerr; + my $secret_data = "$username:$path"; - return undef; + return PVE::Ticket::verify_rsa_ticket( + $rsa_pub, 'PVEVNC', $ticket, $secret_data, -20, 40, $noerr); } sub assemble_spice_ticket { my ($username, $vmid, $node) = @_; - my $rsa_priv = get_privkey(); - - my $timestamp = sprintf("%08x", time()); - - my $randomstr = "PVESPICE:$timestamp:$vmid:$node:" . rand(10); - - # this should be uses as one-time password - # max length is 60 chars (spice limit) - # we pass this to qemu set_pasword and limit lifetime there - # keep this secret - my $ticket = Digest::SHA::sha1_hex($rsa_priv->sign($randomstr)); - - # Note: spice proxy connects with HTTP, so $proxyticket is exposed to public - # we use a signature/timestamp to make sure nobody can fake such ticket - # an attacker can use this $proxyticket, but he will fail because $ticket is - # private. - # The proxy need to be able to extract/verify the ticket - # Note: data needs to be lower case only, because virt-viewer needs that - # Note: RSA signature are too long (>=256 charaters) and makes problems with remote-viewer - my $secret = &$get_csrfr_secret(); - my $plain = "pvespiceproxy:$timestamp:$vmid:" . lc($node); - - # produces 40 characters - my $sig = unpack("H*", Digest::SHA::sha1($plain, &$get_csrfr_secret())); - - #my $sig = unpack("H*", $rsa_priv->sign($plain)); # this produce too long strings (512) - my $proxyticket = $plain . "::" . $sig; - - return ($ticket, $proxyticket); + return PVE::Ticket::assemble_spice_ticket( + $secret, $username, $vmid, $node); } + sub verify_spice_connect_url { my ($connect_str) = @_; - # Note: we pass the spice ticket as 'host', so the - # spice viewer connects with "$ticket:$port" - - return undef if !$connect_str; - - if ($connect_str =~m/^pvespiceproxy:([a-z0-9]{8}):(\d+):(\S+)::([a-z0-9]{40}):(\d+)$/) { - my ($timestamp, $vmid, $node, $hexsig, $port) = ($1, $2, $3, $4, $5, $6); - my $ttime = hex($timestamp); - my $age = time() - $ttime; - - # use very limited lifetime - is this enough? - return undef if !(($age > -20) && ($age < 40)); - - my $plain = "pvespiceproxy:$timestamp:$vmid:$node"; - my $sig = unpack("H*", Digest::SHA::sha1($plain, &$get_csrfr_secret())); - - if ($sig eq $hexsig) { - return ($vmid, $node, $port); - } - } + my $secret = &$get_csrfr_secret(); - return undef; + return PVE::Ticket::verify_spice_connect_url($secret, $connect_str); } sub read_x509_subject_spice { @@ -286,12 +186,19 @@ sub read_x509_subject_spice { # read x509 subject my $bio = Net::SSLeay::BIO_new_file($filename, 'r'); + die "Could not open $filename using OpenSSL\n" + if !$bio; + my $x509 = Net::SSLeay::PEM_read_bio_X509($bio); Net::SSLeay::BIO_free($bio); + + die "Could not parse X509 certificate in $filename\n" + if !$x509; + my $nameobj = Net::SSLeay::X509_get_subject_name($x509); my $subject = Net::SSLeay::X509_NAME_oneline($nameobj); Net::SSLeay::X509_free($x509); - + # remote-viewer wants comma as seperator (not '/') $subject =~ s!^/!!; $subject =~ s!/(\w+=)!,$1!g; @@ -317,13 +224,14 @@ sub remote_viewer_config { my $cacert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192); $cacert =~ s/\n/\\n/g; + $proxy = "[$proxy]" if Net::IP::ip_is_ipv6($proxy); my $config = { 'secure-attention' => "Ctrl+Alt+Ins", 'toggle-fullscreen' => "Shift+F11", 'release-cursor' => "Ctrl+Alt+R", type => 'spice', title => $title, - host => $proxyticket, # this break tls hostname verification, so we need to use 'host-subject' + host => $proxyticket, # this breaks tls hostname verification, so we need to use 'host-subject' proxy => "http://$proxy:3128", 'tls-port' => $port, 'host-subject' => $subject, @@ -340,11 +248,11 @@ sub check_user_exist { $username = PVE::Auth::Plugin::verify_username($username, $noerr); return undef if !$username; - + return $usercfg->{users}->{$username} if $usercfg && $usercfg->{users}->{$username}; die "no such user ('$username')\n" if !$noerr; - + return undef; } @@ -356,10 +264,8 @@ sub check_user_enabled { return 1 if $data->{enable}; - return 1 if $username eq 'root@pam'; # root is always enabled - die "user '$username' is disabled\n" if !$noerr; - + return undef; } @@ -368,29 +274,30 @@ sub verify_one_time_pw { my $type = $tfa_cfg->{type}; - die "missing one time password for Factor-two authentication '$type'\n" if !$otp; + die "missing one time password for two-factor authentication '$type'\n" if !$otp; # fixme: proxy support? my $proxy; if ($type eq 'yubico') { my $keys = $usercfg->{users}->{$username}->{keys}; - yubico_verify_otp($otp, $keys, $tfa_cfg->{url}, $tfa_cfg->{id}, $tfa_cfg->{key}, $proxy); + PVE::OTP::yubico_verify_otp($otp, $keys, $tfa_cfg->{url}, + $tfa_cfg->{id}, $tfa_cfg->{key}, $proxy); } elsif ($type eq 'oath') { my $keys = $usercfg->{users}->{$username}->{keys}; - oath_verify_otp($otp, $keys, $tfa_cfg->{step}, $tfa_cfg->{digits}); + PVE::OTP::oath_verify_otp($otp, $keys, $tfa_cfg->{step}, $tfa_cfg->{digits}); } else { die "unknown tfa type '$type'\n"; } } # password should be utf8 encoded -# Note: some pluging delay/sleep if auth fails +# Note: some plugins delay/sleep if auth fails sub authenticate_user { my ($username, $password, $otp) = @_; die "no username specified\n" if !$username; - + my ($ruid, $realm); ($username, $ruid, $realm) = PVE::Auth::Plugin::verify_username($username); @@ -427,102 +334,95 @@ sub domain_set_password { my $domain_cfg = cfs_read_file('domains.cfg'); my $cfg = $domain_cfg->{ids}->{$realm}; - die "auth domain '$realm' does not exists\n" if !$cfg; + die "auth domain '$realm' does not exist\n" if !$cfg; my $plugin = PVE::Auth::Plugin->lookup($cfg->{type}); $plugin->store_password($cfg, $realm, $username, $password); } sub add_user_group { - my ($username, $usercfg, $group) = @_; + $usercfg->{users}->{$username}->{groups}->{$group} = 1; $usercfg->{groups}->{$group}->{users}->{$username} = 1; } sub delete_user_group { - my ($username, $usercfg) = @_; - + foreach my $group (keys %{$usercfg->{groups}}) { - delete ($usercfg->{groups}->{$group}->{users}->{$username}) + delete ($usercfg->{groups}->{$group}->{users}->{$username}) if $usercfg->{groups}->{$group}->{users}->{$username}; } } sub delete_user_acl { - my ($username, $usercfg) = @_; foreach my $acl (keys %{$usercfg->{acl}}) { - delete ($usercfg->{acl}->{$acl}->{users}->{$username}) + delete ($usercfg->{acl}->{$acl}->{users}->{$username}) if $usercfg->{acl}->{$acl}->{users}->{$username}; } } sub delete_group_acl { - my ($group, $usercfg) = @_; foreach my $acl (keys %{$usercfg->{acl}}) { - delete ($usercfg->{acl}->{$acl}->{groups}->{$group}) + delete ($usercfg->{acl}->{$acl}->{groups}->{$group}) if $usercfg->{acl}->{$acl}->{groups}->{$group}; } } sub delete_pool_acl { - my ($pool, $usercfg) = @_; my $path = "/pool/$pool"; - foreach my $aclpath (keys %{$usercfg->{acl}}) { - delete ($usercfg->{acl}->{$aclpath}) - if $usercfg->{acl}->{$aclpath} eq 'path'; - } + delete ($usercfg->{acl}->{$path}) } # we automatically create some predefined roles by splitting privs # into 3 groups (per category) # root: only root is allowed to do that # admin: an administrator can to that -# user: a normak user/customer can to that +# user: a normal user/customer can to that my $privgroups = { VM => { root => [], - admin => [ - 'VM.Config.Disk', - 'VM.Config.CPU', - 'VM.Config.Memory', - 'VM.Config.Network', + admin => [ + 'VM.Config.Disk', + 'VM.Config.CPU', + 'VM.Config.Memory', + 'VM.Config.Network', 'VM.Config.HWType', - 'VM.Config.Options', # covers all other things - 'VM.Allocate', - 'VM.Clone', + 'VM.Config.Options', # covers all other things + 'VM.Allocate', + 'VM.Clone', 'VM.Migrate', - 'VM.Monitor', - 'VM.Snapshot', + 'VM.Monitor', + 'VM.Snapshot', ], user => [ 'VM.Config.CDROM', # change CDROM media - 'VM.Console', + 'VM.Console', 'VM.Backup', 'VM.PowerMgmt', ], - audit => [ + audit => [ 'VM.Audit', ], }, Sys => { root => [ - 'Sys.PowerMgmt', + 'Sys.PowerMgmt', 'Sys.Modify', # edit/change node settings ], admin => [ 'Permissions.Modify', - 'Sys.Console', + 'Sys.Console', 'Sys.Syslog', ], user => [], @@ -550,7 +450,7 @@ my $privgroups = { admin => [ 'User.Modify', 'Group.Allocate', # edit/change group settings - 'Realm.AllocateUser', + 'Realm.AllocateUser', ], user => [], audit => [], @@ -568,15 +468,15 @@ my $privgroups = { my $valid_privs = {}; my $special_roles = { - 'NoAccess' => {}, # no priviledges - 'Administrator' => $valid_privs, # all priviledges + 'NoAccess' => {}, # no privileges + 'Administrator' => $valid_privs, # all privileges }; sub create_roles { foreach my $cat (keys %$privgroups) { my $cd = $privgroups->{$cat}; - foreach my $p (@{$cd->{root}}, @{$cd->{admin}}, + foreach my $p (@{$cd->{root}}, @{$cd->{admin}}, @{$cd->{user}}, @{$cd->{audit}}) { $valid_privs->{$p} = 1; } @@ -600,6 +500,11 @@ sub create_roles { create_roles(); +sub role_is_special { + my ($role) = @_; + return exists $special_roles->{$role}; +} + sub add_role_privs { my ($role, $usercfg, $privs) = @_; @@ -611,9 +516,9 @@ sub add_role_privs { if (defined ($valid_privs->{$priv})) { $usercfg->{roles}->{$role}->{$priv} = 1; } else { - die "invalid priviledge '$priv'\n"; - } - } + die "invalid privilege '$priv'\n"; + } + } } sub normalize_path { @@ -630,7 +535,7 @@ sub normalize_path { return undef if $path !~ m|^[[:alnum:]\.\-\_\/]+$|; return $path; -} +} PVE::JSONSchema::register_format('pve-groupid', \&verify_groupname); @@ -643,7 +548,7 @@ sub verify_groupname { return undef; } - + return $groupname; } @@ -657,7 +562,7 @@ sub verify_rolename { return undef; } - + return $rolename; } @@ -671,7 +576,7 @@ sub verify_poolname { return undef; } - + return $poolname; } @@ -680,11 +585,11 @@ sub verify_privname { my ($priv, $noerr) = @_; if (!$valid_privs->{$priv}) { - die "invalid priviledge '$priv'\n" if !$noerr; + die "invalid privilege '$priv'\n" if !$noerr; return undef; } - + return $priv; } @@ -695,10 +600,10 @@ sub userconfig_force_defaults { $cfg->{roles}->{$r} = $special_roles->{$r}; } - # fixme: remove 'root' group (not required)? - - # add root user - $cfg->{users}->{'root@pam'}->{enable} = 1; + # add root user if not exists + if (!$cfg->{users}->{'root@pam'}) { + $cfg->{users}->{'root@pam'}->{enable} = 1; + } } sub parse_user_config { @@ -708,15 +613,13 @@ sub parse_user_config { userconfig_force_defaults($cfg); - while ($raw && $raw =~ s/^(.*?)(\n|$)//) { + $raw = '' if !defined($raw); + while ($raw =~ /^\s*(.+?)\s*$/gm) { my $line = $1; - - next if $line =~ m/^\s*$/; # skip empty lines - my @data; foreach my $d (split (/:/, $line)) { - $d =~ s/^\s+//; + $d =~ s/^\s+//; $d =~ s/\s+$//; push @data, $d } @@ -757,7 +660,7 @@ sub parse_user_config { $cfg->{users}->{$user}->{comment} = PVE::Tools::decode_text($comment) if $comment; $cfg->{users}->{$user}->{expire} = $expire; # keys: allowed yubico key ids or oath secrets (base32 encoded) - $cfg->{users}->{$user}->{keys} = $keys if $keys; + $cfg->{users}->{$user}->{keys} = $keys if $keys; #$cfg->{users}->{$user}->{groups}->{$group} = 1; #$cfg->{groups}->{$group}->{$user} = 1; @@ -782,7 +685,7 @@ sub parse_user_config { next; } - if ($cfg->{users}->{$user}) { # user exists + if ($cfg->{users}->{$user}) { # user exists $cfg->{users}->{$user}->{groups}->{$group} = 1; $cfg->{groups}->{$group}->{users}->{$user} = 1; } else { @@ -792,7 +695,7 @@ sub parse_user_config { } elsif ($et eq 'role') { my ($role, $privlist) = @data; - + if (!verify_rolename($role, 1)) { warn "user config - ignore role '$role' - invalid characters in role name\n"; next; @@ -806,15 +709,15 @@ sub parse_user_config { $cfg->{roles}->{$role}->{$priv} = 1; } else { warn "user config - ignore invalid priviledge '$priv'\n"; - } + } } - + } elsif ($et eq 'acl') { my ($propagate, $pathtxt, $uglist, $rolelist) = @data; if (my $path = normalize_path($pathtxt)) { foreach my $role (split_list($rolelist)) { - + if (!verify_rolename($role, 1)) { warn "user config - ignore invalid role name '$role' in acl\n"; next; @@ -823,13 +726,13 @@ sub parse_user_config { foreach my $ug (split_list($uglist)) { if ($ug =~ m/^@(\S+)$/) { my $group = $1; - if ($cfg->{groups}->{$group}) { # group exists + if ($cfg->{groups}->{$group}) { # group exists $cfg->{acl}->{$path}->{groups}->{$group}->{$role} = $propagate; } else { warn "user config - ignore invalid acl group '$group'\n"; } } elsif (PVE::Auth::Plugin::verify_username($ug, 1)) { - if ($cfg->{users}->{$ug}) { # user exists + if ($cfg->{users}->{$ug}) { # user exists $cfg->{acl}->{$path}->{users}->{$ug}->{$role} = $propagate; } else { warn "user config - ignore invalid acl member '$ug'\n"; @@ -868,7 +771,7 @@ sub parse_user_config { } $cfg->{pools}->{$pool}->{vms}->{$vmid} = 1; - + # record vmid ==> pool relation $cfg->{vms}->{$vmid} = $pool; } @@ -912,7 +815,7 @@ sub write_user_config { foreach my $group (keys %{$cfg->{groups}}) { my $d = $cfg->{groups}->{$group}; my $list = join (',', keys %{$d->{users}}); - my $comment = $d->{comment} ? PVE::Tools::encode_text($d->{comment}) : ''; + my $comment = $d->{comment} ? PVE::Tools::encode_text($d->{comment}) : ''; $data .= "group:$group:$list:$comment:\n"; } @@ -922,7 +825,7 @@ sub write_user_config { my $d = $cfg->{pools}->{$pool}; my $vmlist = join (',', keys %{$d->{vms}}); my $storelist = join (',', keys %{$d->{storage}}); - my $comment = $d->{comment} ? PVE::Tools::encode_text($d->{comment}) : ''; + my $comment = $d->{comment} ? PVE::Tools::encode_text($d->{comment}) : ''; $data .= "pool:$pool:$comment:$vmlist:$storelist:\n"; } @@ -961,8 +864,8 @@ sub write_user_config { } foreach my $user (keys %{$d->{users}}) { - # no need to save, because root is always 'Administartor' - next if $user eq 'root@pam'; + # no need to save, because root is always 'Administrator' + next if $user eq 'root@pam'; my $l0 = ''; my $l1 = ''; @@ -996,7 +899,7 @@ sub write_user_config { sub roles { my ($cfg, $user, $path) = @_; - # NOTE: we do not consider pools here. + # NOTE: we do not consider pools here. # You need to use $rpcenv->roles() instead if you want that. return 'Administrator' if $user eq 'root@pam'; # root can do anything @@ -1051,7 +954,7 @@ sub roles { return ('NoAccess') if defined ($perm->{NoAccess}); #return () if defined ($perm->{NoAccess}); - + #print "permission $user $path = " . Dumper ($perm); my @ra = keys %$perm; @@ -1060,7 +963,7 @@ sub roles { return @ra; } - + sub permission { my ($cfg, $user, $path) = @_; @@ -1068,7 +971,7 @@ sub permission { return {} if !$user; my @ra = roles($cfg, $user, $path); - + my $privs = {}; foreach my $role (@ra) { @@ -1098,6 +1001,51 @@ sub check_permissions { return 1; } +sub remove_vm_access { + my ($vmid) = @_; + my $delVMaccessFn = sub { + my $usercfg = cfs_read_file("user.cfg"); + my $modified; + + if (my $acl = $usercfg->{acl}->{"/vms/$vmid"}) { + delete $usercfg->{acl}->{"/vms/$vmid"}; + $modified = 1; + } + if (my $pool = $usercfg->{vms}->{$vmid}) { + if (my $data = $usercfg->{pools}->{$pool}) { + delete $data->{vms}->{$vmid}; + delete $usercfg->{vms}->{$vmid}; + $modified = 1; + } + } + cfs_write_file("user.cfg", $usercfg) if $modified; + }; + + lock_user_config($delVMaccessFn, "access permissions cleanup for VM $vmid failed"); +} + +sub remove_storage_access { + my ($storeid) = @_; + + my $deleteStorageAccessFn = sub { + my $usercfg = cfs_read_file("user.cfg"); + my $modified; + + if (my $storage = $usercfg->{acl}->{"/storage/$storeid"}) { + delete $usercfg->{acl}->{"/storage/$storeid"}; + $modified = 1; + } + foreach my $pool (keys %{$usercfg->{pools}}) { + delete $usercfg->{pools}->{$pool}->{storage}->{$storeid}; + $modified = 1; + } + cfs_write_file("user.cfg", $usercfg) if $modified; + }; + + lock_user_config($deleteStorageAccessFn, + "access permissions cleanup for storage $storeid failed"); +} + sub add_vm_to_pool { my ($vmid, $pool) = @_; @@ -1115,7 +1063,7 @@ sub add_vm_to_pool { sub remove_vm_from_pool { my ($vmid) = @_; - + my $delVMfromPoolFn = sub { my $usercfg = cfs_read_file("user.cfg"); if (my $pool = $usercfg->{vms}->{$vmid}) { @@ -1130,133 +1078,27 @@ sub remove_vm_from_pool { lock_user_config($delVMfromPoolFn, "pool cleanup for VM $vmid failed"); } -# experimental code for yubico OTP verification +# bash completion helpers -sub yubico_compute_param_sig { - my ($param, $api_key) = @_; - - my $paramstr = ''; - foreach my $key (sort keys %$param) { - $paramstr .= '&' if $paramstr; - $paramstr .= "$key=$param->{$key}"; - } +sub complete_username { - my $sig = uri_escape(encode_base64(Digest::HMAC_SHA1::hmac_sha1($paramstr, decode_base64($api_key || '')), '')); + my $user_cfg = cfs_read_file('user.cfg'); - return ($paramstr, $sig); + return [ keys %{$user_cfg->{users}} ]; } -sub yubico_verify_otp { - my ($otp, $keys, $url, $api_id, $api_key, $proxy) = @_; +sub complete_group { - die "yubico: missing password\n" if !defined($otp); - die "yubico: missing API ID\n" if !defined($api_id); - die "yubico: missing API KEY\n" if !defined($api_key); - die "yubico: no associated yubico keys\n" if $keys =~ m/^\s+$/; + my $user_cfg = cfs_read_file('user.cfg'); - die "yubico: wrong OTP lenght\n" if (length($otp) < 32) || (length($otp) > 48); - - # we always use http, because https cert verification always make problem, and - # some proxies does not work with https. - - $url = 'http://api2.yubico.com/wsapi/2.0/verify' if !defined($url); - - my $params = { - nonce => Digest::HMAC_SHA1::hmac_sha1_hex(time(), rand()), - id => $api_id, - otp => uri_escape($otp), - timestamp => 1, - }; - - my ($paramstr, $sig) = yubico_compute_param_sig($params, $api_key); - - $paramstr .= "&h=$sig" if $api_key; - - my $req = HTTP::Request->new('GET' => "$url?$paramstr"); - - my $ua = LWP::UserAgent->new(protocols_allowed => ['http'], timeout => 30); - - if ($proxy) { - $ua->proxy(['http'], $proxy); - } else { - $ua->env_proxy; - } - - my $response = $ua->request($req); - my $code = $response->code; - - if ($code != 200) { - my $msg = $response->message || 'unknown'; - die "Invalid response from server: $code $msg\n"; - } - - my $raw = $response->decoded_content; - - my $result = {}; - foreach my $kvpair (split(/\n/, $raw)) { - chomp $kvpair; - if($kvpair =~ /^\S+=/) { - my ($k, $v) = split(/=/, $kvpair, 2); - $v =~ s/\s//g; - $result->{$k} = $v; - } - } - - my $rsig = $result->{h}; - delete $result->{h}; - - if ($api_key) { - my ($datastr, $vsig) = yubico_compute_param_sig($result, $api_key); - $vsig = uri_unescape($vsig); - die "yubico: result signature verification failed\n" if $rsig ne $vsig; - } - - die "yubico auth failed: $result->{status}\n" if $result->{status} ne 'OK'; - - my $publicid = $result->{publicid} = substr(lc($result->{otp}), 0, 12); - - my $found; - foreach my $k (PVE::Tools::split_list($keys)) { - if ($k eq $publicid) { - $found = 1; - last; - } - } - - die "yubico auth failed: key does not belong to user\n" if !$found; - - return $result; + return [ keys %{$user_cfg->{groups}} ]; } -sub oath_verify_otp { - my ($otp, $keys, $step, $digits) = @_; +sub complete_realm { - die "oath: missing password\n" if !defined($otp); - die "oath: no associated oath keys\n" if $keys =~ m/^\s+$/; - - $step = 30 if !$step; - $digits = 6 if !$digits; - - my $found; - - my $parser = sub { - my $line = shift; - - if ($line =~ m/^\d{6}$/) { - print "GOT:$line\n"; - $found = 1 if $otp eq $line; - } - }; - - foreach my $k (PVE::Tools::split_list($keys)) { - # Note: we generate 3 values to allow small time drift - my $now = localtime(time() - $step); - my $cmd = ['oathtool', '--totp', '--digits', $digits, '-N', $now, '-s', $step, '-w', '2', '-b', $k]; - eval { run_command($cmd, outfunc => $parser, errfunc => sub {}); }; - last if $found; - } + my $domain_cfg = cfs_read_file('domains.cfg'); - die "oath auth failed\n" if !$found; + return [ keys %{$domain_cfg->{ids}} ]; } 1;