use Net::SSLeay;
use Net::IP;
use MIME::Base64;
+use MIME::Base32; #libmime-base32-perl
use Digest::SHA;
-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);
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);
}
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);
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;
my $digest = Digest::SHA::sha1_base64("$timestamp:$username", &$get_csrfr_secret());
- return "$timestamp:$digest";
+ return "$timestamp:$digest";
}
sub verify_csrf_prevention_token {
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);
my $randomstr = "PVESPICE:$timestamp:$vmid:$node:" . rand(10);
- # this should be uses as one-time password
+ # this should be used 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
+ # we use a signature/timestamp to make sure nobody can fake such a 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
+ # The proxy needs 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
+ # Note: RSA signature are too long (>=256 charaters) and make problems with remote-viewer
my $secret = &$get_csrfr_secret();
my $plain = "pvespiceproxy:$timestamp:$vmid:" . lc($node);
if ($sig eq $hexsig) {
return ($vmid, $node, $port);
- }
+ }
}
return undef;
# 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;
'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,
$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;
}
return 1 if $data->{enable};
die "user '$username' is disabled\n" if !$noerr;
-
+
return undef;
}
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;
}
# 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);
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 => [],
admin => [
'User.Modify',
'Group.Allocate', # edit/change group settings
- 'Realm.AllocateUser',
+ 'Realm.AllocateUser',
],
user => [],
audit => [],
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;
}
if (defined ($valid_privs->{$priv})) {
$usercfg->{roles}->{$role}->{$priv} = 1;
} else {
- die "invalid priviledge '$priv'\n";
- }
- }
+ die "invalid privilege '$priv'\n";
+ }
+ }
}
sub normalize_path {
return undef if $path !~ m|^[[:alnum:]\.\-\_\/]+$|;
return $path;
-}
+}
PVE::JSONSchema::register_format('pve-groupid', \&verify_groupname);
return undef;
}
-
+
return $groupname;
}
return undef;
}
-
+
return $rolename;
}
return undef;
}
-
+
return $poolname;
}
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;
}
# add root user if not exists
if (!$cfg->{users}->{'root@pam'}) {
- $cfg->{users}->{'root@pam'}->{enable} = 1;
+ $cfg->{users}->{'root@pam'}->{enable} = 1;
}
}
my @data;
foreach my $d (split (/:/, $line)) {
- $d =~ s/^\s+//;
+ $d =~ s/^\s+//;
$d =~ s/\s+$//;
push @data, $d
}
$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;
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 {
} 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;
$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;
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";
}
$cfg->{pools}->{$pool}->{vms}->{$vmid} = 1;
-
+
# record vmid ==> pool relation
$cfg->{vms}->{$vmid} = $pool;
}
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";
}
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";
}
}
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 = '';
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
return ('NoAccess') if defined ($perm->{NoAccess});
#return () if defined ($perm->{NoAccess});
-
+
#print "permission $user $path = " . Dumper ($perm);
my @ra = keys %$perm;
return @ra;
}
-
+
sub permission {
my ($cfg, $user, $path) = @_;
return {} if !$user;
my @ra = roles($cfg, $user, $path);
-
+
my $privs = {};
foreach my $role (@ra) {
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) = @_;
sub remove_vm_from_pool {
my ($vmid) = @_;
-
+
my $delVMfromPoolFn = sub {
my $usercfg = cfs_read_file("user.cfg");
if (my $pool = $usercfg->{vms}->{$vmid}) {
lock_user_config($delVMfromPoolFn, "pool cleanup for VM $vmid failed");
}
+# hotp/totp code
+
+sub hotp($$;$) {
+ my ($binsecret, $number, $digits) = @_;
+
+ $digits = 6 if !defined($digits);
+
+ my $bincounter = pack('Q>', $number);
+ my $hmac = Digest::SHA::hmac_sha1($bincounter, $binsecret);
+
+ my $offset = unpack('C', substr($hmac,19) & pack('C', 0x0F));
+ my $part = substr($hmac, $offset, 4);
+ my $otp = unpack('N', $part);
+ my $value = ($otp & 0x7fffffff) % (10**$digits);
+ return sprintf("%0${digits}d", $value);
+}
+
# experimental code for yubico OTP verification
sub yubico_compute_param_sig {
$paramstr .= "$key=$param->{$key}";
}
- my $sig = uri_escape(encode_base64(Digest::HMAC_SHA1::hmac_sha1($paramstr, decode_base64($api_key || '')), ''));
+ # hmac_sha1_base64 does not add '=' padding characters, so we use encode_base64
+ my $sig = uri_escape(encode_base64(Digest::SHA::hmac_sha1($paramstr, decode_base64($api_key || '')), ''));
return ($paramstr, $sig);
}
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);
+ die "yubico: no associated yubico keys\n" if $keys =~ m/^\s+$/;
- # we always use http, because https cert verification always make problem, and
- # some proxies does not work with https.
+ die "yubico: wrong OTP length\n" if (length($otp) < 32) || (length($otp) > 48);
$url = 'http://api2.yubico.com/wsapi/2.0/verify' if !defined($url);
-
+
my $params = {
- nonce => Digest::HMAC_SHA1::hmac_sha1_hex(time(), rand()),
+ nonce => Digest::SHA::hmac_sha1_hex(time(), rand()),
id => $api_id,
otp => uri_escape($otp),
timestamp => 1,
my $req = HTTP::Request->new('GET' => "$url?$paramstr");
- my $ua = LWP::UserAgent->new(protocols_allowed => ['http'], timeout => 30);
+ my $ua = LWP::UserAgent->new(protocols_allowed => ['http', 'https'], timeout => 30);
if ($proxy) {
- $ua->proxy(['http'], $proxy);
+ $ua->proxy(['http', 'https'], $proxy);
} else {
$ua->env_proxy;
}
my ($otp, $keys, $step, $digits) = @_;
die "oath: missing password\n" if !defined($otp);
- die "oath: no associated oath keys\n" if $keys =~ m/^\s+$/;
+ 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 {}); };
+ my $binkey;
+ if ($k =~ /^[A-Z2-7=]{16}$/) {
+ $binkey = MIME::Base32::decode_rfc3548($k);
+ } elsif ($k =~ /^[A-Fa-f0-9]{40}$/) {
+ $binkey = pack('H*', $k);
+ } else {
+ die "unrecognized key format, must be hex or base32 encoded\n";
+ }
+
+ # force integer division for time/step
+ use integer;
+ my $now = time()/$step - 1;
+ $found = 1 if $otp eq hotp($binkey, $now+0, $digits);
+ $found = 1 if $otp eq hotp($binkey, $now+1, $digits);
+ $found = 1 if $otp eq hotp($binkey, $now+2, $digits);
last if $found;
}
die "oath auth failed\n" if !$found;
}
+# bash completion helpers
+
+sub complete_username {
+
+ my $user_cfg = cfs_read_file('user.cfg');
+
+ return [ keys %{$user_cfg->{users}} ];
+}
+
+sub complete_group {
+
+ my $user_cfg = cfs_read_file('user.cfg');
+
+ return [ keys %{$user_cfg->{groups}} ];
+}
+
+sub complete_realm {
+
+ my $domain_cfg = cfs_read_file('domains.cfg');
+
+ return [ keys %{$domain_cfg->{ids}} ];
+}
+
1;
projects / pve-access-control.git / blobdiff