X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAccessControl.pm;h=2b7974dd6245fd44d92a9d3902c0f9cfe07c4bea;hp=b06ca3b2dfe7bfa87db6998d27df58852dd87845;hb=dd2cfee072b8ebe8280595b250dafdb2786297af;hpb=7070c1aee526ad755c7afeb632e28f2f29e27d2b diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index b06ca3b..2b7974d 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -150,20 +150,21 @@ sub assemble_ticket { sub verify_ticket { my ($ticket, $noerr) = @_; - if ($ticket && $ticket =~ m/^(\S+)::([^:\s]+)$/) { + 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:(([A-Za-z0-9\.\-_]+)(\@([A-Za-z0-9\.\-_]+))?):([A-Z0-9]{8})$/) { + if ($plain =~ m/^PVE:(\S+):([A-Z0-9]{8})$/) { my $username = $1; - my $timestamp = $5; + my $timestamp = $2; my $ttime = hex($timestamp); my $age = time() - $ttime; - if (($age > -300) && ($age < $ticket_lifetime)) { + if (verify_username($username, 1) && + ($age > -300) && ($age < $ticket_lifetime)) { return wantarray ? ($username, $age) : $username; } } @@ -175,6 +176,56 @@ sub verify_ticket { return undef; } +# VNC tickets +# - they do not contain the username in plain text +# - they are restricted to a specific resource path (example: '/vms/100') +sub assemble_vnc_ticket { + my ($username, $path) = @_; + + 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), ''); + + return $ticket; +} + +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; + } + } + } + } + + die "permission denied - invalid vnc ticket\n" if !$noerr; + + return undef; +} + + sub authenticate_user_shadow { my ($userid, $password) = @_; @@ -323,18 +374,30 @@ sub authenticate_user_domain { } } -sub check_user_enabled { +sub check_user_exist { my ($usercfg, $username, $noerr) = @_; $username = verify_username($username, $noerr); return undef if !$username; - return 1 if $usercfg && $usercfg->{users}->{$username} && - $usercfg->{users}->{$username}->{enable}; + return $usercfg->{users}->{$username} if $usercfg && $usercfg->{users}->{$username}; + + die "no such user ('$username')\n" if !$noerr; + + return undef; +} + +sub check_user_enabled { + my ($usercfg, $username, $noerr) = @_; + + my $data = check_user_exist($usercfg, $username, $noerr); + return undef if !$data; + + return 1 if $data->{enable}; return 1 if $username eq 'root@pam'; # root is always enabled - die "no such user ('$username')\n" if !$noerr; + die "user '$username' is disabled\n" if !$noerr; return undef; } @@ -401,14 +464,14 @@ sub encrypt_pw { sub store_pam_password { my ($userid, $password) = @_; - my $cmd = ['/usr/sbin/usermod']; + my $cmd = ['usermod']; my $epw = encrypt_pw($password); push @$cmd, '-p', $epw; push @$cmd, $userid; - run_command($cmd); + run_command($cmd, errmsg => 'change password failed'); } sub domain_set_password { @@ -452,8 +515,8 @@ sub delete_user_acl { delete ($usercfg->{acl}->{$acl}->{users}->{$username}) if $usercfg->{acl}->{$acl}->{users}->{$username}; } - } + sub delete_group_acl { my ($group, $usercfg) = @_; @@ -463,7 +526,18 @@ sub delete_group_acl { 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'; + } } # we automatically create some predefined roles by splitting privs @@ -475,25 +549,33 @@ my $privgroups = { VM => { root => [], admin => [ - 'VM.Modify', + '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.Migrate', - 'Permissions.Modify', + 'VM.Monitor', ], user => [ + 'VM.Config.CDROM', # change CDROM media 'VM.Console', + 'VM.Backup', 'VM.PowerMgmt', ], audit => [ - 'VM.Audit' + 'VM.Audit', ], }, Sys => { root => [ 'Sys.PowerMgmt', - 'Sys.Modify', # edit/change node settings + 'Sys.Modify', # edit/change node settings ], admin => [ + 'Permissions.Modify', 'Sys.Console', 'Sys.Syslog', ], @@ -503,11 +585,11 @@ my $privgroups = { ], }, Datastore => { - root => [ + root => [], + admin => [ 'Datastore.Allocate', - 'Permissions.Modify', + 'Datastore.AllocateTemplate', ], - admin => [], user => [ 'Datastore.AllocateSpace', ], @@ -515,6 +597,26 @@ my $privgroups = { 'Datastore.Audit', ], }, + User => { + root => [ + 'Realm.Allocate', + ], + admin => [ + 'User.Modify', + 'Group.Allocate', # edit/change group settings + 'Realm.AllocateUser', + ], + user => [], + audit => [], + }, + Pool => { + root => [], + admin => [ + 'Pool.Allocate', # create/delete pools + ], + user => [], + audit => [], + }, }; my $valid_privs = {}; @@ -562,7 +664,7 @@ my $valid_attributes = { ldap => { server1 => '[\w\d]+(.[\w\d]+)*', server2 => '[\w\d]+(.[\w\d]+)*', - base_dn => '\w+=[\w\s]+(,\s*\w+=[\w\s]+)*', + base_dn => '\w+=[^,]+(,\s*\w+=[^,]+)*', user_attr => '\S{2,}', secure => '', port => '\d+', @@ -589,12 +691,14 @@ sub add_role_privs { sub normalize_path { my $path = shift; - $path =~ s|/+|/|; + $path =~ s|/+|/|g; $path =~ s|/$||; $path = '/' if !$path; + $path = "/$path" if $path !~ m|^/|; + return undef if $path !~ m|^[[:alnum:]\-\_\/]+$|; return $path; @@ -602,6 +706,7 @@ sub normalize_path { my $realm_regex = qr/[A-Za-z][A-Za-z0-9\.\-_]+/; +PVE::JSONSchema::register_format('pve-realm', \&pve_verify_realm); sub pve_verify_realm { my ($realm, $noerr) = @_; @@ -645,7 +750,7 @@ PVE::JSONSchema::register_standard_option('userid', { PVE::JSONSchema::register_standard_option('realm', { description => "Authentication domain ID", - type => 'string', format => 'pve-configid', + type => 'string', format => 'pve-realm', maxLength => 32, }); @@ -677,6 +782,20 @@ sub verify_rolename { return $rolename; } +PVE::JSONSchema::register_format('pve-poolid', \&verify_groupname); +sub verify_poolname { + my ($poolname, $noerr) = @_; + + if ($poolname !~ m/^[A-Za-z0-9\.\-_]+$/) { + + die "pool name '$poolname' contains invalid characters\n" if !$noerr; + + return undef; + } + + return $poolname; +} + PVE::JSONSchema::register_format('pve-priv', \&verify_privname); sub verify_privname { my ($priv, $noerr) = @_; @@ -821,7 +940,7 @@ sub parse_user_config { } foreach my $ug (split_list($uglist)) { - if ($ug =~ m/^@(\w+)$/) { + if ($ug =~ m/^@(\S+)$/) { my $group = $1; if ($cfg->{groups}->{$group}) { # group exists $cfg->{acl}->{$path}->{groups}->{$group}->{$role} = $propagate; @@ -842,6 +961,44 @@ sub parse_user_config { } else { warn "user config - ignore invalid path in acl '$pathtxt'\n"; } + } elsif ($et eq 'pool') { + my ($pool, $comment, $vmlist, $storelist) = @data; + + if (!verify_poolname($pool, 1)) { + warn "user config - ignore pool '$pool' - invalid characters in pool name\n"; + next; + } + + # make sure to add the pool (even if there are no members) + $cfg->{pools}->{$pool} = { vms => {}, storage => {} } if !$cfg->{pools}->{$pool}; + + $cfg->{pools}->{$pool}->{comment} = PVE::Tools::decode_text($comment) if $comment; + + foreach my $vmid (split_list($vmlist)) { + if ($vmid !~ m/^\d+$/) { + warn "user config - ignore invalid vmid '$vmid' in pool '$pool'\n"; + next; + } + $vmid = int($vmid); + + if ($cfg->{vms}->{$vmid}) { + warn "user config - ignore duplicate vmid '$vmid' in pool '$pool'\n"; + next; + } + + $cfg->{pools}->{$pool}->{vms}->{$vmid} = 1; + + # record vmid ==> pool relation + $cfg->{vms}->{$vmid} = $pool; + } + + foreach my $storeid (split_list($storelist)) { + if ($storeid !~ m/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i) { + warn "user config - ignore invalid storage '$storeid' in pool '$pool'\n"; + next; + } + $cfg->{pools}->{$pool}->{storage}->{$storeid} = 1; + } } else { warn "user config - ignore config line: $line\n"; } @@ -1064,6 +1221,16 @@ sub write_user_config { $data .= "\n"; + foreach my $pool (keys %{$cfg->{pools}}) { + 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}) : ''; + $data .= "pool:$pool:$comment:$vmlist:$storelist:\n"; + } + + $data .= "\n"; + foreach my $role (keys %{$cfg->{roles}}) { next if $special_roles->{$role}; @@ -1132,6 +1299,9 @@ sub write_user_config { sub roles { my ($cfg, $user, $path) = @_; + # 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 my $perm = {}; @@ -1180,18 +1350,14 @@ sub roles { $perm = $new; # overwrite previous settings next; } - - #die "what herea?"; } - my $res = {}; - if (!defined ($perm->{NoAccess})) { - $res = $perm; - } + return ('NoAccess') if defined ($perm->{NoAccess}); + #return () if defined ($perm->{NoAccess}); #print "permission $user $path = " . Dumper ($perm); - my @ra = keys %$res; + my @ra = keys %$perm; #print "roles $user $path = " . join (',', @ra) . "\n";