package PVE::AccessControl;
use strict;
+use warnings;
use Encode;
use Crypt::OpenSSL::Random;
use Crypt::OpenSSL::RSA;
+use Net::SSLeay;
+use Net::IP;
use MIME::Base64;
use Digest::SHA;
-use Authen::PAM qw(:constants);
-use Net::LDAP;
+use Digest::HMAC_SHA1;
+use URI::Escape;
+use LWP::UserAgent;
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
\&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;
}
}
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;
}
}
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 $rsa_priv = get_privkey();
- 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 $timestamp = sprintf("%08X", time());
-sub authenticate_user_pam {
- my ($userid, $password) = @_;
+ my $plain = "PVEVNC:$timestamp";
- # user (www-data) need to be able to read /etc/passwd /etc/shadow
+ $path = normalize_path($path);
- die "no password\n" if !$password;
+ my $full = "$plain:$username:$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 $ticket = $plain . "::" . encode_base64($rsa_priv->sign($full), '');
- if (!ref ($pamh)) {
- my $err = $pamh->pam_strerror($pamh);
- die "error during PAM init: $err";
- }
+ return $ticket;
+}
- my $res;
+sub verify_vnc_ticket {
+ my ($ticket, $username, $path, $noerr) = @_;
- if (($res = $pamh->pam_authenticate(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";
- if (($res = $pamh->pam_acct_mgmt (0)) != PAM_SUCCESS) {
- my $err = $pamh->pam_strerror($res);
- die "$err\n";
+ 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;
+ }
+ }
+ }
}
- $pamh = 0; # call destructor
+ die "permission denied - invalid vnc ticket\n" if !$noerr;
+
+ return undef;
}
-sub authenticate_user_ad {
+sub assemble_spice_ticket {
+ my ($username, $vmid, $node) = @_;
+
+ my $rsa_priv = get_privkey();
- my ($entry, $server, $userid, $password) = @_;
+ my $timestamp = sprintf("%08x", time());
- 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";
+ 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));
- $userid = "$userid\@$entry->{domain}"
- if $userid !~ m/@/ && $entry->{domain};
+ # 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 $res = $ldap->bind($userid, password => $password);
+ my $secret = &$get_csrfr_secret();
+ my $plain = "pvespiceproxy:$timestamp:$vmid:" . lc($node);
- my $code = $res->code();
- my $err = $res->error;
+ # produces 40 characters
+ my $sig = unpack("H*", Digest::SHA::sha1($plain, &$get_csrfr_secret()));
- $ldap->unbind();
+ #my $sig = unpack("H*", $rsa_priv->sign($plain)); # this produce too long strings (512)
- die "$err\n" if ($code);
+ my $proxyticket = $plain . "::" . $sig;
+
+ return ($ticket, $proxyticket);
}
-sub authenticate_user_ldap {
+sub verify_spice_connect_url {
+ my ($connect_str) = @_;
+
+ # Note: we pass the spice ticket as 'host', so the
+ # spice viewer connects with "$ticket:$port"
- my ($entry, $server, $userid, $password) = @_;
+ return undef if !$connect_str;
- 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";
+ 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 $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);
+ # use very limited lifetime - is this enough?
+ return undef if !(($age > -20) && ($age < 40));
- my $code = $res->code();
- my $err = $res->error;
+ my $plain = "pvespiceproxy:$timestamp:$vmid:$node";
+ my $sig = unpack("H*", Digest::SHA::sha1($plain, &$get_csrfr_secret()));
- $ldap->unbind();
+ if ($sig eq $hexsig) {
+ return ($vmid, $node, $port);
+ }
+ }
- die "$err\n" if ($code);
+ return undef;
}
-sub authenticate_user_domain {
- my ($realm, $userid, $password) = @_;
-
- my $domain_cfg = cfs_read_file($domainconfigfile);
+sub read_x509_subject_spice {
+ my ($filename) = @_;
- die "no auth domain specified" if !$realm;
+ # read x509 subject
+ my $bio = Net::SSLeay::BIO_new_file($filename, 'r');
+ my $x509 = Net::SSLeay::PEM_read_bio_X509($bio);
+ Net::SSLeay::BIO_free($bio);
+ 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;
- if ($realm eq 'pam') {
- authenticate_user_pam($userid, $password);
- return;
- }
+ return $subject;
+}
- eval {
- if ($realm eq 'pve') {
- authenticate_user_shadow($userid, $password);
- } else {
+# helper to generate SPICE remote-viewer configuration
+sub remote_viewer_config {
+ my ($authuser, $vmid, $node, $proxy, $title, $port) = @_;
- 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;
+ if (!$proxy) {
+ my $host = `hostname -f` || PVE::INotify::nodename();
+ chomp $host;
+ $proxy = $host;
}
+
+ my ($ticket, $proxyticket) = assemble_spice_ticket($authuser, $vmid, $node);
+
+ my $filename = "/etc/pve/local/pve-ssl.pem";
+ my $subject = read_x509_subject_spice($filename);
+
+ 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'
+ proxy => "http://$proxy:3128",
+ 'tls-port' => $port,
+ 'host-subject' => $subject,
+ ca => $cacert,
+ password => $ticket,
+ 'delete-this-file' => 1,
+ };
+
+ return ($ticket, $proxyticket, $config);
}
-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};
- return 1 if $username eq 'root@pam'; # root is always enabled
-
- return 0;
+ die "no such user ('$username')\n" if !$noerr;
+
+ return undef;
}
-# password should be utf8 encoded
-sub authenticate_user {
- my ($username, $password) = @_;
+sub check_user_enabled {
+ my ($usercfg, $username, $noerr) = @_;
- die "no username specified\n" if !$username;
-
- my ($userid, $realm);
+ my $data = check_user_exist($usercfg, $username, $noerr);
+ return undef if !$data;
- ($username, $userid, $realm) = verify_username($username);
+ return 1 if $data->{enable};
- my $usercfg = cfs_read_file('user.cfg');
+ die "user '$username' is disabled\n" if !$noerr;
+
+ return undef;
+}
- if (!user_enabled($usercfg, $username)) {
- sleep(2);
- die "no such user ('$username')\n"
- }
+sub verify_one_time_pw {
+ my ($usercfg, $username, $tfa_cfg, $otp) = @_;
- my $ctime = time();
- my $expire = $usercfg->{users}->{$username}->{expire};
+ my $type = $tfa_cfg->{type};
- if ($expire && ($expire < $ctime)) {
- sleep(2);
- die "account expired\n"
- }
+ die "missing one time password for Factor-two authentication '$type'\n" if !$otp;
- authenticate_user_domain($realm, $userid, $password);
+ # fixme: proxy support?
+ my $proxy;
- return $username;
+ 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);
+ } elsif ($type eq 'oath') {
+ my $keys = $usercfg->{users}->{$username}->{keys};
+ oath_verify_otp($otp, $keys, $tfa_cfg->{step}, $tfa_cfg->{digits});
+ } else {
+ die "unknown tfa type '$type'\n";
+ }
}
-sub delete_shadow_password {
- my ($userid) = @_;
+# password should be utf8 encoded
+# Note: some pluging delay/sleep if auth fails
+sub authenticate_user {
+ my ($username, $password, $otp) = @_;
+
+ die "no username specified\n" if !$username;
- 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 ($ruid, $realm);
-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);
- });
-}
+ ($username, $ruid, $realm) = PVE::Auth::Plugin::verify_username($username);
-sub encrypt_pw {
- my ($pw) = @_;
+ my $usercfg = cfs_read_file('user.cfg');
- my $time = substr (Digest::SHA::sha1_base64 (time), 0, 8);
- return crypt (encode("utf8", $pw), "\$5\$$time\$");
-}
+ check_user_enabled($usercfg, $username);
-sub store_pam_password {
- my ($userid, $password) = @_;
+ my $ctime = time();
+ my $expire = $usercfg->{users}->{$username}->{expire};
- my $cmd = ['/usr/sbin/usermod'];
+ die "account expired\n" if $expire && ($expire < $ctime);
- my $epw = encrypt_pw($password);
- push @$cmd, '-p', $epw;
+ my $domain_cfg = cfs_read_file('domains.cfg');
- push @$cmd, $userid;
+ 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);
- run_command($cmd);
+ if ($cfg->{tfa}) {
+ my $tfa_cfg = PVE::Auth::Plugin::parse_tfa_config($cfg->{tfa});
+ verify_one_time_pw($usercfg, $username, $tfa_cfg, $otp);
+ }
+
+ 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 {
delete ($usercfg->{acl}->{$acl}->{users}->{$username})
if $usercfg->{acl}->{$acl}->{users}->{$username};
}
-
}
+
sub delete_group_acl {
my ($group, $usercfg) = @_;
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
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',
],
],
},
Datastore => {
- root => [
+ root => [],
+ admin => [
'Datastore.Allocate',
- 'Permissions.Modify',
+ 'Datastore.AllocateTemplate',
],
- admin => [],
user => [
'Datastore.AllocateSpace',
],
'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 = {};
$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) = @_;
sub normalize_path {
my $path = shift;
- $path =~ s|/+|/|;
+ $path =~ s|/+|/|g;
$path =~ s|/$||;
$path = '/' if !$path;
- return undef if $path !~ m|^[[:alnum:]\-\_\/]+$|;
+ $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 {
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) = @_;
$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 {
my $et = shift @data;
if ($et eq 'user') {
- my ($user, $enable, $expire, $firstname, $lastname, $email, $comment) = @data;
+ my ($user, $enable, $expire, $firstname, $lastname, $email, $comment, $keys) = @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;
$cfg->{users}->{$user}->{email} = $email;
$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}->{groups}->{$group} = 1;
#$cfg->{groups}->{$group}->{$user} = 1;
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;
}
}
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 {
} 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;
-}
-
-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 = '';
+ } elsif ($et eq 'pool') {
+ my ($pool, $comment, $vmlist, $storelist) = @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";
- } 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";
- }
-
- return $data;
-}
-
-sub parse_domains {
- my ($filename, $raw) = @_;
-
- my $cfg = {};
- my $default;
+ # make sure to add the pool (even if there are no members)
+ $cfg->{pools}->{$pool} = { vms => {}, storage => {} } if !$cfg->{pools}->{$pool};
- 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);
+ $cfg->{pools}->{$pool}->{comment} = PVE::Tools::decode_text($comment) if $comment;
- 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";
- } 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}) : '';
my $comment = $d->{comment} ? PVE::Tools::encode_text($d->{comment}) : '';
my $expire = int($d->{expire} || 0);
my $enable = $d->{enable} ? 1 : 0;
- $data .= "user:$user:$enable:$expire:$firstname:$lastname:$email:$comment:\n";
+ my $keys = $d->{keys} ? $d->{keys} : '';
+ $data .= "user:$user:$enable:$expire:$firstname:$lastname:$email:$comment:$keys:\n";
}
$data .= "\n";
$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};
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 = {};
$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";
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);
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");
+}
+
+# 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;
+}
+
1;
projects / pve-access-control.git / blobdiff