use Crypt::OpenSSL::Random;
use Crypt::OpenSSL::RSA;
use Net::SSLeay;
+use Net::IP;
use MIME::Base64;
use Digest::SHA;
use Digest::HMAC_SHA1;
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);
if ($sig eq $hexsig) {
return ($vmid, $node, $port);
- }
+ }
}
return undef;
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;
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",
$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};
- return 1 if $username eq 'root@pam'; # root is always enabled
-
die "user '$username' is disabled\n" if !$noerr;
-
+
return undef;
}
my ($username, $password, $otp) = @_;
die "no username specified\n" if !$username;
-
+
my ($ruid, $realm);
($username, $ruid, $realm) = PVE::Auth::Plugin::verify_username($username);
}
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
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 => [],
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;
}
$usercfg->{roles}->{$role}->{$priv} = 1;
} else {
die "invalid priviledge '$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;
}
return undef;
}
-
+
return $priv;
}
$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 {
userconfig_force_defaults($cfg);
- while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
+ $raw = '' if !defined($raw);
+ while ($raw =~ /^\s*(.+?)\s*$/gm) {
my $line = $1;
-
- next if $line =~ m/^\s*$/; # skip empty lines
-
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';
+ 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}) {
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: no associated yubico keys\n" if $keys =~ m/^\s+$/;
die "yubico: wrong OTP lenght\n" if (length($otp) < 32) || (length($otp) > 48);
# 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,
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 $line = shift;
if ($line =~ m/^\d{6}$/) {
- print "GOT:$line\n";
$found = 1 if $otp eq $line;
}
};
projects / pve-access-control.git / blobdiff