Changeset 2200 for trunk/LA-Tools

Timestamp:

02/12/19 17:14:14 (5 years ago)

Author:

nanardon

Message:

Use new attribute authorizedKeys

File:

• trunk/LA-Tools/bin/rla-sshkey (modified) (7 diffs)

trunk/LA-Tools/bin/rla-sshkey

@@ -9 +9 @@
 use Getopt::Long;
 use Pod::Usage;
+use DateTime;
 
 =head1 NAME
@@ -72 +73 @@
     {
         otype     => 'user',
-        q         => [ 'exported=1', 'sshPublicKey=*' ],
-        attribute => [ qw(sshPublicKey uidNumber gidNumber homeDirectory) ],
+        q         => [ 'exported=1', 'authorizedKeys=*' ],
+        attribute => [ qw(authorizedKeys delUnknownSshKey uidNumber gidNumber homeDirectory rev) ],
     }
 );
@@ -87 +88 @@
 foreach my $user (keys %{ $var }) {
 
-
     my ($uid,$gid) = ($var->{$user}->{uidNumber}[0], $var->{$user}->{gidNumber}[0]);
+    my $rev = $var->{$user}->{rev}[0];
 
     my $home = $var->{$user}->{homeDirectory}[0];
-    my @keys = @{ $var->{$user}->{sshPublicKey} || [] };
+    my $delUnknownSshKey = $var->{$user}->{delUnknownSshKey}[0];
+    my @keys = @{ $var->{$user}->{authorizedKeys} || [] };
 
     my @stat = stat($home) or do {
@@ -109 +111 @@
     if (open(my $handle, '<', "$home/.ssh/authorized_keys")) {
         while (my $line = <$handle>) {
+            $line =~ /^# RLA:/ and next;
             chomp($line);
             push(@curkeys, $line);
@@ -114 +117 @@
         close($handle);
     }
+
+    my $needWrite = 0;
 
     my @newkeys;
@@ -124 +129 @@
             }
         }
-        push(@newkeys, $key) if ($need);
+        if ($need) {
+            push(@newkeys, $key);
+            $needWrite = 1;
+        }
     }
 
-    @newkeys or next;
+    if ($delUnknownSshKey) {
+        my %existing = map { $_ => 1 } @keys;
+        my @ncurkeys = grep { $existing{ $_ } } @curkeys;
+        if (scalar(@ncurkeys) != scalar(@curkeys)) {
+            @curkeys = @ncurkeys;
+            $needWrite = 1;
+        }
+    }
+
+    $needWrite or next;
 
     if (! -d "$home/.ssh") {
@@ -134 +151 @@
             next;
         };
-        chown($uid, $gid, "$home/.ssh");        
+            chown($uid, $gid, "$home/.ssh");    
     }
 
-    if (open(my $handle, '>>', "$home/.ssh/authorized_keys")) {
-        print $handle "$_\n" foreach(@newkeys);
+    if (open(my $handle, '>', "$home/.ssh/authorized_keys")) {
+        print $handle "# RLA: $rev, " . DateTime->now->iso8601 . "\n";
+        print $handle "$_\n" foreach(@curkeys, @newkeys);
         close($handle);
-        chown($uid, $gid, "$home/.ssh/authorized_keys");        
+            chown($uid, $gid, "$home/.ssh/authorized_keys");    
     } else {
         warn "Cannot open $home/.ssh/authorized_keys: $!\n";