api/ticket: move getting cluster name into an eval

[pve-access-control.git] / PVE / Auth / PVE.pm

diff --git a/PVE/Auth/PVE.pm b/PVE/Auth/PVE.pm
index 7f771fafde56c74e4241ce73f99dcdd1e5177f0f..de39d35bef9022c48d8e9ef17499cf2e1e37070f 100755 (executable)
--- a/PVE/Auth/PVE.pm
+++ b/PVE/Auth/PVE.pm
@@ -1,6 +1,10 @@
 package PVE::Auth::PVE;
 
 use strict;
+use warnings;
+use Encode;
+
+use PVE::Tools;
 use PVE::Auth::Plugin;
 use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file cfs_lock_file);
 
@@ -17,10 +21,10 @@ sub parse_shadow_passwd {
 
     my $shadow = {};
 
-    while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
-       my $line = $1;
+    return $shadow if !defined($raw);
 
-       next if $line =~ m/^\s*$/; # skip empty lines
+    while ($raw =~ /^\s*(.+?)\s*$/gm) {
+       my $line = $1;
 
        if ($line !~ m/^\S+:\S+:$/) {
            warn "pve shadow password: ignore invalid line $.\n";
@@ -60,10 +64,11 @@ sub type {
     return 'pve';
 }
 
-sub defaults {
+sub options {
     return {
        default => { optional => 1 },
        comment => { optional => 1 },
+       tfa => { optional => 1 },
     };
 }
 
@@ -75,8 +80,9 @@ sub authenticate_user {
     my $shadow_cfg = cfs_read_file($shadowconfigfile);
     
     if ($shadow_cfg->{users}->{$username}) {
-       my $encpw = crypt($password, $shadow_cfg->{users}->{$username}->{shadow});
-        die "invalid credentials\n" if ($encpw ne $shadow_cfg->{users}->{$username}->{shadow});
+       my $encpw = crypt(Encode::encode('utf8', $password),
+                         $shadow_cfg->{users}->{$username}->{shadow});
+       die "invalid credentials\n" if ($encpw ne $shadow_cfg->{users}->{$username}->{shadow});
     } else {
        die "no password set\n";
     }
@@ -89,7 +95,7 @@ sub store_password {
 
     lock_shadow_config(sub {
        my $shadow_cfg = cfs_read_file($shadowconfigfile);
-       my $epw = PVE::Auth::Plugin::encrypt_pw($password);
+       my $epw = PVE::Tools::encrypt_pw($password);
        $shadow_cfg->{users}->{$username}->{shadow} = $epw;
        cfs_write_file($shadowconfigfile, $shadow_cfg);
     });