X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAccessControl.pm;h=310a3f1dedf76d68790207ea98337beac6f71c4a;hp=3db2bff9e5dbaaf2e4cef014279fd9583d4543b5;hb=12683df7c4ee7dd10257a35189998ebe2bde5597;hpb=af4a8a8522118cfd15b0c58f81d748a9184a0ef8

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 3db2bff..310a3f1 100644
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -150,7 +150,7 @@ 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;
 
@@ -175,6 +175,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 +373,32 @@ sub authenticate_user_domain {
     }
 }
 
-sub user_enabled {
-    my ($usercfg, $username) = @_;
+sub check_user_exist {
+    my ($usercfg, $username, $noerr) = @_;
 
-    $username = verify_username($username, 1);
+    $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
 
-    return 0;
+    die "user '$username' is disabled\n" if !$noerr;
+ 
+    return undef;
 }
 
 # password should be utf8 encoded
@@ -349,9 +413,10 @@ sub authenticate_user {
 
     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();
@@ -488,7 +553,7 @@ my $privgroups = {
     Sys => {
 	root => [
 	    'Sys.PowerMgmt',	 
-	    'Sys.Modify', # edit/change node settings	 
+	    'Sys.Modify', # edit/change node settings
 	],
 	admin => [
 	    'Sys.Console',    
@@ -512,6 +577,18 @@ my $privgroups = {
 	    'Datastore.Audit',
 	],
     },
+    User => {
+	root => [
+
+	    ],
+	admin => [
+	    'User.Modify',
+	    'User.Add',
+	    'User.Delete',
+	    ],
+	user => [],
+	audit => [],
+    },
 };
 
 my $valid_privs = {};
@@ -899,7 +976,7 @@ sub write_domains {
 		    $wrote_default = 1;
 	    } elsif (defined($formats->{$k})) {
 		if (!$formats->{$k}) {
-		    $data .= "\t$k\n";
+		    $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";
@@ -994,6 +1071,8 @@ sub parse_domains {
 		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;
 	    }
@@ -1038,8 +1117,6 @@ sub write_user_config {
     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}) : '';