X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAccessControl.pm;h=f0c37c7651a6eda6d51ced1bda18022d9ff63068;hp=5ba3d3930fc24146402ac69e24851efb1b7f16d1;hb=854f1dceb6f1bb733518a8a77df670768d9f5392;hpb=0c1563637a036cda7297d7741c8b2c717ed65890 diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index 5ba3d39..f0c37c7 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -6,22 +6,31 @@ use Crypt::OpenSSL::Random; use Crypt::OpenSSL::RSA; use MIME::Base64; use Digest::SHA; -use Authen::PAM qw(:constants); -use Net::LDAP; 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 Encode; + +use PVE::Auth::Plugin; +use PVE::Auth::AD; +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(); +PVE::Auth::LDAP->register(); +PVE::Auth::PVE->register(); +PVE::Auth::PAM->register(); +PVE::Auth::Plugin->init(); + # $authdir must be writable by root only! my $confdir = "/etc/pve"; my $authdir = "$confdir/priv"; my $authprivkeyfn = "$authdir/authkey.key"; my $authpubkeyfn = "$confdir/authkey.pub"; -my $shadowconfigfile = "priv/shadow.cfg"; -my $domainconfigfile = "domains.cfg"; my $pve_www_key_fn = "$confdir/pve-www.key"; my $ticket_lifetime = 3600*2; # 2 hours @@ -32,41 +41,20 @@ cfs_register_file('user.cfg', \&parse_user_config, \&write_user_config); -cfs_register_file($shadowconfigfile, - \&parse_shadow_passwd, - \&write_shadow_config); - -cfs_register_file($domainconfigfile, - \&parse_domains, - \&write_domains); - - -sub lock_user_config { - my ($code, $errmsg) = @_; - cfs_lock_file("user.cfg", undef, $code); - my $err = $@; - if ($err) { - $errmsg ? die "$errmsg: $err" : die $err; - } +sub verify_username { + PVE::Auth::Plugin::verify_username(@_); } -sub lock_domain_config { - my ($code, $errmsg) = @_; - - cfs_lock_file($domainconfigfile, undef, $code); - my $err = $@; - if ($err) { - $errmsg ? die "$errmsg: $err" : die $err; - } +sub pve_verify_realm { + PVE::Auth::Plugin::pve_verify_realm(@_); } -sub lock_shadow_config { +sub lock_user_config { my ($code, $errmsg) = @_; - cfs_lock_file($shadowconfigfile, undef, $code); - my $err = $@; - if ($err) { + cfs_lock_file("user.cfg", undef, $code); + if (my $err = $@) { $errmsg ? die "$errmsg: $err" : die $err; } } @@ -150,20 +138,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 (PVE::Auth::Plugin::verify_username($username, 1) && + ($age > -300) && ($age < $ticket_lifetime)) { return wantarray ? ($username, $age) : $username; } } @@ -175,166 +164,144 @@ sub verify_ticket { return undef; } -sub authenticate_user_shadow { - my ($userid, $password) = @_; +# 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) = @_; - die "no password\n" if !$password; - - my $shadow_cfg = cfs_read_file($shadowconfigfile); - - if ($shadow_cfg->{users}->{$userid}) { - my $encpw = crypt($password, $shadow_cfg->{users}->{$userid}->{shadow}); - die "invalid credentials\n" if ($encpw ne $shadow_cfg->{users}->{$userid}->{shadow}); - } else { - die "no password set\n"; - } -} + my $rsa_priv = get_privkey(); -sub authenticate_user_pam { - my ($userid, $password) = @_; + my $timestamp = sprintf("%08X", time()); - # user (www-data) need to be able to read /etc/passwd /etc/shadow + my $plain = "PVEVNC:$timestamp"; - die "no password\n" if !$password; + $path = normalize_path($path); - my $pamh = new Authen::PAM ('common-auth', $userid, sub { - my @res; - while(@_) { - my $msg_type = shift; - my $msg = shift; - push @res, (0, $password); - } - push @res, 0; - return @res; - }); + my $full = "$plain:$username:$path"; - if (!ref ($pamh)) { - my $err = $pamh->pam_strerror($pamh); - die "error during PAM init: $err"; - } + my $ticket = $plain . "::" . encode_base64($rsa_priv->sign($full), ''); - my $res; + return $ticket; +} - if (($res = $pamh->pam_authenticate(0)) != PAM_SUCCESS) { - my $err = $pamh->pam_strerror($res); - die "$err\n"; - } +sub verify_vnc_ticket { + my ($ticket, $username, $path, $noerr) = @_; - if (($res = $pamh->pam_acct_mgmt (0)) != PAM_SUCCESS) { - my $err = $pamh->pam_strerror($res); - die "$err\n"; - } + if ($ticket && $ticket =~ m/^(PVEVNC:\S+)::([^:\s]+)$/) { + my $plain = $1; + my $sig = $2; + my $full = "$plain:$username:$path"; - $pamh = 0; # call destructor -} + 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); -sub authenticate_user_ad { + my $age = time() - $ttime; - my ($entry, $server, $userid, $password) = @_; + if (($age > -20) && ($age < 40)) { + return 1; + } + } + } + } - my $default_port = $entry->{secure} ? 636: 389; - my $port = $entry->{port} ? $entry->{port} : $default_port; - my $scheme = $entry->{secure} ? 'ldaps' : 'ldap'; - my $conn_string = "$scheme://${server}:$port"; - - my $ldap = Net::LDAP->new($server) || die "$@\n"; + die "permission denied - invalid vnc ticket\n" if !$noerr; - $userid = "$userid\@$entry->{domain}" - if $userid !~ m/@/ && $entry->{domain}; + return undef; +} - my $res = $ldap->bind($userid, password => $password); +sub assemble_spice_ticket { + my ($username, $vmid, $node) = @_; - my $code = $res->code(); - my $err = $res->error; + my $rsa_priv = get_privkey(); - $ldap->unbind(); + my $timestamp = sprintf("%08x", time()); - die "$err\n" if ($code); -} + my $randomstr = "PVESPICE:$timestamp:$vmid:$node:" . rand(10); -sub authenticate_user_ldap { + # 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)); - my ($entry, $server, $userid, $password) = @_; + # 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 $default_port = $entry->{secure} ? 636: 389; - my $port = $entry->{port} ? $entry->{port} : $default_port; - my $scheme = $entry->{secure} ? 'ldaps' : 'ldap'; - my $conn_string = "$scheme://${server}:$port"; + my $secret = &$get_csrfr_secret(); + my $plain = "pvespiceproxy:$timestamp:$vmid:$node"; - my $ldap = Net::LDAP->new($conn_string, verify => 'none') || die "$@\n"; - my $search = $entry->{user_attr} . "=" . $userid; - my $result = $ldap->search( base => "$entry->{base_dn}", - scope => "sub", - filter => "$search", - attrs => ['dn'] - ); - die "no entries returned\n" if !$result->entries; - my @entries = $result->entries; - my $res = $ldap->bind($entries[0]->dn, password => $password); + # produces 40 characters + my $sig = unpack("H*", Digest::SHA::sha1($plain, &$get_csrfr_secret())); - my $code = $res->code(); - my $err = $res->error; + #my $sig = unpack("H*", $rsa_priv->sign($plain)); # this produce too long strings (512) - $ldap->unbind(); + my $proxyticket = $plain . "::" . $sig; - die "$err\n" if ($code); + return ($ticket, $proxyticket); } -sub authenticate_user_domain { - my ($realm, $userid, $password) = @_; - - my $domain_cfg = cfs_read_file($domainconfigfile); +sub verify_spice_connect_url { + my ($connect_str) = @_; - die "no auth domain specified" if !$realm; + # Note: we pass the spice ticket as 'host', so the + # spice viewer connects with "$ticket:$port" - if ($realm eq 'pam') { - authenticate_user_pam($userid, $password); - return; - } + return undef if !$connect_str; - eval { - if ($realm eq 'pve') { - authenticate_user_shadow($userid, $password); - } else { + 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; - my $cfg = $domain_cfg->{$realm}; - die "auth domain '$realm' does not exists\n" if !$cfg; - - if ($cfg->{type} eq 'ad') { - eval { authenticate_user_ad($cfg, $cfg->{server1}, $userid, $password); }; - my $err = $@; - return if !$err; - die $err if !$cfg->{server2}; - authenticate_user_ad($cfg, $cfg->{server2}, $userid, $password); - } elsif ($cfg->{type} eq 'ldap') { - eval { authenticate_user_ldap($cfg, $cfg->{server1}, $userid, $password); }; - my $err = $@; - return if !$err; - die $err if !$cfg->{server2}; - authenticate_user_ldap($cfg, $cfg->{server2}, $userid, $password); - } else { - die "unknown auth type '$cfg->{type}'\n"; - } - } - }; - if (my $err = $@) { - sleep(2); # timeout after failed auth - die $err; + # 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); + } } + + return undef; } -sub user_enabled { - my ($usercfg, $username) = @_; +sub check_user_exist { + my ($usercfg, $username, $noerr) = @_; - $username = verify_username($username, 1); + $username = PVE::Auth::Plugin::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 - return 0; + die "user '$username' is disabled\n" if !$noerr; + + return undef; } # password should be utf8 encoded @@ -343,15 +310,16 @@ sub authenticate_user { die "no username specified\n" if !$username; - my ($userid, $realm); + my ($ruid, $realm); - ($username, $userid, $realm) = verify_username($username); + ($username, $ruid, $realm) = PVE::Auth::Plugin::verify_username($username); my $usercfg = cfs_read_file('user.cfg'); - if (!user_enabled($usercfg, $username)) { + eval { check_user_enabled($usercfg, $username); }; + if (my $err = $@) { sleep(2); - die "no such user ('$username')\n" + die $err; } my $ctime = time(); @@ -362,64 +330,33 @@ sub authenticate_user { die "account expired\n" } - authenticate_user_domain($realm, $userid, $password); - - return $username; -} - -sub delete_shadow_password { - my ($userid) = @_; - - lock_shadow_config(sub { - my $shadow_cfg = cfs_read_file($shadowconfigfile); - delete ($shadow_cfg->{users}->{$userid}) - if $shadow_cfg->{users}->{$userid}; - cfs_write_file($shadowconfigfile, $shadow_cfg); - }); -} + my $domain_cfg = cfs_read_file('domains.cfg'); -sub store_shadow_password { - my ($userid, $password) = @_; - - lock_shadow_config(sub { - my $shadow_cfg = cfs_read_file($shadowconfigfile); - $shadow_cfg->{users}->{$userid}->{shadow} = encrypt_pw($password); - cfs_write_file($shadowconfigfile, $shadow_cfg); - }); -} - -sub encrypt_pw { - my ($pw) = @_; - - my $time = substr (Digest::SHA::sha1_base64 (time), 0, 8); - return crypt (encode("utf8", $pw), "\$5\$$time\$"); -} - -sub store_pam_password { - my ($userid, $password) = @_; - - my $cmd = ['/usr/sbin/usermod']; - - my $epw = encrypt_pw($password); - push @$cmd, '-p', $epw; - - push @$cmd, $userid; + eval { + my $cfg = $domain_cfg->{ids}->{$realm}; + die "auth domain '$realm' does not exists\n" if !$cfg; + my $plugin = PVE::Auth::Plugin->lookup($cfg->{type}); + $plugin->authenticate_user($cfg, $realm, $ruid, $password); + }; + if (my $err = $@) { + sleep(2); # timeout after failed auth + die $err; + } - run_command($cmd); + return $username; } sub domain_set_password { - my ($realm, $userid, $password) = @_; + my ($realm, $username, $password) = @_; die "no auth domain specified" if !$realm; - if ($realm eq 'pam') { - store_pam_password($userid, $password); - } elsif ($realm eq 'pve') { - store_shadow_password($userid, $password); - } else { - die "can't set password on auth domain '$realm'\n"; - } + my $domain_cfg = cfs_read_file('domains.cfg'); + + my $cfg = $domain_cfg->{ids}->{$realm}; + die "auth domain '$realm' does not exists\n" if !$cfg; + my $plugin = PVE::Auth::Plugin->lookup($cfg->{type}); + $plugin->store_password($cfg, $realm, $username, $password); } sub add_user_group { @@ -449,8 +386,8 @@ sub delete_user_acl { delete ($usercfg->{acl}->{$acl}->{users}->{$username}) if $usercfg->{acl}->{$acl}->{users}->{$username}; } - } + sub delete_group_acl { my ($group, $usercfg) = @_; @@ -460,7 +397,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 @@ -472,25 +420,35 @@ 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.Clone', 'VM.Migrate', - 'Permissions.Modify', + 'VM.Monitor', + 'VM.Snapshot', ], 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', ], @@ -500,11 +458,11 @@ my $privgroups = { ], }, Datastore => { - root => [ + root => [], + admin => [ 'Datastore.Allocate', - 'Permissions.Modify', + 'Datastore.AllocateTemplate', ], - admin => [], user => [ 'Datastore.AllocateSpace', ], @@ -512,6 +470,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 = {}; @@ -543,30 +521,12 @@ sub create_roles { $special_roles->{"PVEAuditor"}->{$p} = 1; } } + + $special_roles->{"PVETemplateUser"} = { 'VM.Clone' => 1, 'VM.Audit' => 1 }; }; create_roles(); -my $valid_attributes = { - ad => { - server1 => '[\w\d]+(.[\w\d]+)*', - server2 => '[\w\d]+(.[\w\d]+)*', - domain => '\S+', - port => '\d+', - secure => '', - comment => '.*', - }, - ldap => { - server1 => '[\w\d]+(.[\w\d]+)*', - server2 => '[\w\d]+(.[\w\d]+)*', - base_dn => '\w+=[\w\s]+(,\s*\w+=[\w\s]+)*', - user_attr => '\S{2,}', - secure => '', - port => '\d+', - comment => '.*', - } -}; - sub add_role_privs { my ($role, $usercfg, $privs) = @_; @@ -586,65 +546,19 @@ 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; } -my $realm_regex = qr/[A-Za-z][A-Za-z0-9\.\-_]+/; - -sub pve_verify_realm { - my ($realm, $noerr) = @_; - - if ($realm !~ m/^${realm_regex}$/) { - return undef if $noerr; - die "value does not look like a valid realm\n"; - } - return $realm; -} - -PVE::JSONSchema::register_format('pve-userid', \&verify_username); -sub verify_username { - my ($username, $noerr) = @_; - - $username = '' if !$username; - my $len = length($username); - if ($len < 3) { - die "user name '$username' is too short\n" if !$noerr; - return undef; - } - if ($len > 64) { - die "user name '$username' is too long ($len > 64)\n" if !$noerr; - return undef; - } - - # we only allow a limited set of characters (colon is not allowed, - # because we store usernames in colon separated lists)! - if ($username =~ m/^([^\s:]+)\@(${realm_regex})$/) { - return wantarray ? ($username, $1, $2) : $username; - } - - die "value '$username' does not look like a valid user name\n" if !$noerr; - - return undef; -} -PVE::JSONSchema::register_standard_option('userid', { - description => "User ID", - type => 'string', format => 'pve-userid', - maxLength => 64, -}); - -PVE::JSONSchema::register_standard_option('realm', { - description => "Authentication domain ID", - type => 'string', format => 'pve-configid', - maxLength => 32, -}); PVE::JSONSchema::register_format('pve-groupid', \&verify_groupname); sub verify_groupname { @@ -674,6 +588,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) = @_; @@ -725,7 +653,7 @@ sub parse_user_config { if ($et eq 'user') { my ($user, $enable, $expire, $firstname, $lastname, $email, $comment) = @data; - my (undef, undef, $realm) = verify_username($user, 1); + my (undef, undef, $realm) = PVE::Auth::Plugin::verify_username($user, 1); if (!$realm) { warn "user config - ignore user '$user' - invalid user name\n"; next; @@ -774,7 +702,7 @@ sub parse_user_config { foreach my $user (split_list($userlist)) { - if (!verify_username($user, 1)) { + if (!PVE::Auth::Plugin::verify_username($user, 1)) { warn "user config - ignore invalid group member '$user'\n"; next; } @@ -818,14 +746,14 @@ 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; } else { warn "user config - ignore invalid acl group '$group'\n"; } - } elsif (verify_username($ug, 1)) { + } elsif (PVE::Auth::Plugin::verify_username($ug, 1)) { if ($cfg->{users}->{$ug}) { # user exists $cfg->{acl}->{$path}->{users}->{$ug}->{$role} = $propagate; } else { @@ -839,209 +767,60 @@ sub parse_user_config { } else { warn "user config - ignore invalid path in acl '$pathtxt'\n"; } - } else { - warn "user config - ignore config line: $line\n"; - } - } - - userconfig_force_defaults($cfg); - - return $cfg; -} + } elsif ($et eq 'pool') { + my ($pool, $comment, $vmlist, $storelist) = @data; -sub parse_shadow_passwd { - my ($filename, $raw) = @_; - - my $shadow = {}; - - while ($raw && $raw =~ s/^(.*?)(\n|$)//) { - my $line = $1; - - next if $line =~ m/^\s*$/; # skip empty lines - - if ($line !~ m/^\S+:\S+:$/) { - warn "pve shadow password: ignore invalid line $.\n"; - next; - } - - my ($userid, $crypt_pass) = split (/:/, $line); - $shadow->{users}->{$userid}->{shadow} = $crypt_pass; - } - - return $shadow; -} - -sub write_domains { - my ($filename, $cfg) = @_; - - my $data = ''; - - my $wrote_default; - - foreach my $realm (sort keys %$cfg) { - my $entry = $cfg->{$realm}; - my $type = lc($entry->{type}); - - next if !$type; - - next if ($type eq 'pam') || ($type eq 'pve'); - - my $formats = $valid_attributes->{$type}; - next if !$formats; - - $data .= "$type: $realm\n"; - - foreach my $k (sort keys %$entry) { - next if $k eq 'type'; - my $v = $entry->{$k}; - if ($k eq 'default') { - $data .= "\t$k\n" if $v && !$wrote_default; - $wrote_default = 1; - } elsif (defined($formats->{$k})) { - if (!$formats->{$k}) { - $data .= "\t$k\n" if $v; - } elsif ($v =~ m/^$formats->{$k}$/) { - $v = PVE::Tools::encode_text($v) if $k eq 'comment'; - $data .= "\t$k $v\n"; - } else { - die "invalid value '$v' for attribute '$k'\n"; - } - } else { - die "invalid attribute '$k' - not supported\n"; + if (!verify_poolname($pool, 1)) { + warn "user config - ignore pool '$pool' - invalid characters in pool name\n"; + next; } - } - $data .= "\n"; - } + # make sure to add the pool (even if there are no members) + $cfg->{pools}->{$pool} = { vms => {}, storage => {} } if !$cfg->{pools}->{$pool}; - return $data; -} + $cfg->{pools}->{$pool}->{comment} = PVE::Tools::decode_text($comment) if $comment; -sub parse_domains { - my ($filename, $raw) = @_; - - my $cfg = {}; - - my $default; - - while ($raw && $raw =~ s/^(.*?)(\n|$)//) { - my $line = $1; - - next if $line =~ m/^\#/; # skip comment lines - next if $line =~ m/^\s*$/; # skip empty lines - - if ($line =~ m/^(\S+):\s*(\S+)\s*$/) { - my $realm = $2; - my $type = lc($1); - - my $ignore = 0; - my $entry; - - my $formats = $valid_attributes->{$type}; - if (!$formats) { - $ignore = 1; - warn "ignoring domain '$realm' - (unsupported authentication type '$type')\n"; - } elsif (!pve_verify_realm($realm, 1)) { - $ignore = 1; - warn "ignoring domain '$realm' - (illegal characters)\n"; - } else { - $entry = { type => $type }; - } - - while ($raw && $raw =~ s/^(.*?)(\n|$)//) { - $line = $1; + 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); - next if $line =~ m/^\#/; #skip comment lines - last if $line =~ m/^\s*$/; - - next if $ignore; # skip - - if ($line =~ m/^\s+(default)\s*$/) { - $default = $realm if !$default; - } elsif ($line =~ m/^\s+(\S+)(\s+(.*\S))?\s*$/) { - my ($k, $v) = (lc($1), $3); - if (defined($formats->{$k})) { - if (!$formats->{$k} && !defined($v)) { - $entry->{$k} = 1; - } elsif ($formats->{$k} && $v =~ m/^$formats->{$k}$/) { - if (!defined($entry->{$k})) { - $v = PVE::Tools::decode_text($v) if $k eq 'comment'; - $entry->{$k} = $v; - } else { - warn "ignoring duplicate attribute '$k $v'\n"; - } - } else { - warn "ignoring value '$v' for attribute '$k' - invalid format\n"; - } - } else { - warn "ignoring attribute '$k' - not supported\n"; - } - } else { - warn "ignore config line: $line\n"; + if ($cfg->{vms}->{$vmid}) { + warn "user config - ignore duplicate vmid '$vmid' in pool '$pool'\n"; + next; } - } - if ($entry->{server2} && !$entry->{server1}) { - $entry->{server1} = $entry->{server2}; - delete $entry->{server2}; + $cfg->{pools}->{$pool}->{vms}->{$vmid} = 1; + + # record vmid ==> pool relation + $cfg->{vms}->{$vmid} = $pool; } - if ($ignore) { - # do nothing - } elsif (!$entry->{server1}) { - warn "ignoring domain '$realm' - missing server attribute\n"; - } elsif (($entry->{type} eq "ldap") && !$entry->{user_attr}) { - warn "ignoring domain '$realm' - missing user attribute\n"; - } elsif (($entry->{type} eq "ldap") && !$entry->{base_dn}) { - warn "ignoring domain '$realm' - missing base_dn attribute\n"; - } elsif (($entry->{type} eq "ad") && !$entry->{domain}) { - warn "ignoring domain '$realm' - missing domain attribute\n"; - } else { - $cfg->{$realm} = $entry; + 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 "ignore config line: $line\n"; + warn "user config - ignore config line: $line\n"; } } - $cfg->{$default}->{default} = 1 if $default; - - # add default domains - - $cfg->{pve} = { - type => 'builtin', - comment => "Proxmox VE authentication server", - }; + userconfig_force_defaults($cfg); - $cfg->{pam} = { - type => 'builtin', - comment => "Linux PAM standard authentication", - }; - return $cfg; } -sub write_shadow_config { - my ($filename, $cfg) = @_; - - my $data = ''; - foreach my $userid (keys %{$cfg->{users}}) { - my $crypt_pass = $cfg->{users}->{$userid}->{shadow}; - $data .= "$userid:$crypt_pass:\n"; - } - - return $data -} - sub write_user_config { my ($filename, $cfg) = @_; my $data = ''; foreach my $user (keys %{$cfg->{users}}) { - next if $user eq 'root@pam'; - my $d = $cfg->{users}->{$user}; my $firstname = $d->{firstname} ? PVE::Tools::encode_text($d->{firstname}) : ''; my $lastname = $d->{lastname} ? PVE::Tools::encode_text($d->{lastname}) : ''; @@ -1063,6 +842,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}; @@ -1131,6 +920,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 = {}; @@ -1179,18 +971,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"; @@ -1200,7 +988,7 @@ sub roles { sub permission { my ($cfg, $user, $path) = @_; - $user = verify_username($user, 1); + $user = PVE::Auth::Plugin::verify_username($user, 1); return {} if !$user; my @ra = roles($cfg, $user, $path); @@ -1234,4 +1022,36 @@ sub check_permissions { return 1; } +sub add_vm_to_pool { + my ($vmid, $pool) = @_; + + my $addVMtoPoolFn = sub { + my $usercfg = cfs_read_file("user.cfg"); + if (my $data = $usercfg->{pools}->{$pool}) { + $data->{vms}->{$vmid} = 1; + $usercfg->{vms}->{$vmid} = $pool; + cfs_write_file("user.cfg", $usercfg); + } + }; + + lock_user_config($addVMtoPoolFn, "can't add VM $vmid to pool '$pool'"); +} + +sub remove_vm_from_pool { + my ($vmid) = @_; + + my $delVMfromPoolFn = sub { + my $usercfg = cfs_read_file("user.cfg"); + if (my $pool = $usercfg->{vms}->{$vmid}) { + if (my $data = $usercfg->{pools}->{$pool}) { + delete $data->{vms}->{$vmid}; + delete $usercfg->{vms}->{$vmid}; + cfs_write_file("user.cfg", $usercfg); + } + } + }; + + lock_user_config($delVMfromPoolFn, "pool cleanup for VM $vmid failed"); +} + 1;