X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAccessControl.pm;h=bdadfd2ae58397ddc876c540730d20ed00dc41e6;hp=db311213f170a3eea679ee3f4627e285e85e3f4d;hb=0fea3f1677d5830a349cb7407b5a62a2e2ebe0f7;hpb=3e5bfdf60f255a432956ba0f77d6f840708d9619 diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index db31121..bdadfd2 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -9,12 +9,12 @@ 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; +use PVE::JSONSchema qw(register_standard_option get_standard_option); use PVE::Auth::Plugin; use PVE::Auth::AD; @@ -22,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(); @@ -47,7 +45,6 @@ cfs_register_file('user.cfg', \&parse_user_config, \&write_user_config); - sub verify_username { PVE::Auth::Plugin::verify_username(@_); } @@ -89,30 +86,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 $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; + my $secret = &$get_csrfr_secret(); - return undef; + return PVE::Ticket::verify_csrf_prevention_token( + $secret, $username, $token, -300, $ticket_lifetime, $noerr); } my $pve_auth_priv_key; @@ -132,42 +117,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(); - 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 $rsa_pub = get_pubkey(); - my $age = time() - $ttime; + my ($username, $age) = PVE::Ticket::verify_rsa_ticket( + $rsa_pub, 'PVE', $ticket, undef, -300, $ticket_lifetime, $noerr); - if (PVE::Auth::Plugin::verify_username($username, 1) && - ($age > -300) && ($age < $ticket_lifetime)) { - return wantarray ? ($username, $age) : $username; - } - } - } - } + return undef if $noerr && !defined($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 @@ -178,108 +143,40 @@ 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 { @@ -287,8 +184,15 @@ 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); @@ -325,7 +229,7 @@ sub remote_viewer_config { '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, @@ -368,24 +272,25 @@ 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) = @_; @@ -427,7 +332,7 @@ 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); } @@ -481,7 +386,7 @@ sub delete_pool_acl { # 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 => [], @@ -497,6 +402,7 @@ my $privgroups = { 'VM.Migrate', 'VM.Monitor', 'VM.Snapshot', + 'VM.Snapshot.Rollback', ], user => [ 'VM.Config.CDROM', # change CDROM media @@ -561,8 +467,8 @@ 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 { @@ -593,6 +499,22 @@ sub create_roles { create_roles(); +sub create_priv_properties { + my $properties = {}; + foreach my $priv (keys %$valid_privs) { + $properties->{$priv} = { + type => 'boolean', + optional => 1, + }; + } + return $properties; +} + +sub role_is_special { + my ($role) = @_; + return (exists $special_roles->{$role}) ? 1 : 0; +} + sub add_role_privs { my ($role, $usercfg, $privs) = @_; @@ -604,7 +526,7 @@ 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"; } } } @@ -625,7 +547,6 @@ sub normalize_path { return $path; } - PVE::JSONSchema::register_format('pve-groupid', \&verify_groupname); sub verify_groupname { my ($groupname, $noerr) = @_; @@ -654,7 +575,7 @@ sub verify_rolename { return $rolename; } -PVE::JSONSchema::register_format('pve-poolid', \&verify_groupname); +PVE::JSONSchema::register_format('pve-poolid', \&verify_poolname); sub verify_poolname { my ($poolname, $noerr) = @_; @@ -673,7 +594,7 @@ 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; } @@ -952,7 +873,7 @@ sub write_user_config { } foreach my $user (keys %{$d->{users}}) { - # no need to save, because root is always 'Administartor' + # no need to save, because root is always 'Administrator' next if $user eq 'root@pam'; my $l0 = ''; @@ -1166,136 +1087,12 @@ sub remove_vm_from_pool { lock_user_config($delVMfromPoolFn, "pool cleanup for VM $vmid failed"); } -# experimental code for yubico OTP verification - -sub yubico_compute_param_sig { - my ($param, $api_key) = @_; - - my $paramstr = ''; - foreach my $key (sort keys %$param) { - $paramstr .= '&' if $paramstr; - $paramstr .= "$key=$param->{$key}"; - } - - my $sig = uri_escape(encode_base64(Digest::HMAC_SHA1::hmac_sha1($paramstr, decode_base64($api_key || '')), '')); - - return ($paramstr, $sig); -} - -sub yubico_verify_otp { - my ($otp, $keys, $url, $api_id, $api_key, $proxy) = @_; - - 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+$/; - - 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; -} - -sub oath_verify_otp { - my ($otp, $keys, $step, $digits) = @_; - - 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}$/) { - $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; - } - - die "oath auth failed\n" if !$found; -} - # bash completion helpers +register_standard_option('userid-completed', + get_standard_option('userid', { completion => \&complete_username}), +); + sub complete_username { my $user_cfg = cfs_read_file('user.cfg');