Merge branch 'issue#97' into develop

Author: Marcin Przepiorowski

bin/dx_ctl_users.pl

@@ -54,6 +54,7 @@
   'username=s' => \(my $username),
   'password=s' => \(my $password),
   'timeout=n'  => \(my $timeout),
+  'sshkeyfile=s'  => \(my $sshkeyfile),
   'force' => \(my $force),
   'all' => (\my $all),
   'version' => \(my $print_version),
@@ -90,7 +91,8 @@
     exit (1);
   }
 
-} elsif ((lc $action eq 'lock') || (lc $action eq 'unlock') || (lc $action eq 'password')  || (lc $action eq 'timeout')) {
+} elsif ((lc $action eq 'lock') || (lc $action eq 'unlock') || (lc $action eq 'password')  || (lc $action eq 'timeout')
+        || (lc $action eq 'sshkey') ) {
 
   if (!defined($username)) {
     print "Parameter -username is required for action $action\n";
@@ -104,6 +106,12 @@
     exit (1);
   }
 
+  if ((lc $action eq 'sshkey') && !defined($sshkeyfile)) {
+    print "Parameter -sshkeyfile is required for action $action\n";
+    pod2usage(-verbose => 1,  -input=>\*DATA);
+    exit (1);
+  }
+
 } else {
   print "Unknown action $action\n";
   pod2usage(-verbose => 1,  -input=>\*DATA);
@@ -134,7 +142,13 @@
   }
 
   if (defined($file) || defined($username)) {
-    $ret = $ret + process_user($engine_obj, $file, $action, $username, $jscontainers, $timeout);
+    if (lc $action eq 'sshkey') {
+      my $users_obj = new Users ($engine_obj, undef, $debug);
+      my $loginuser = $users_obj->getCurrentUser();
+      $ret = $ret + $users_obj->setSSHkey($username, $loginuser->{userType}, $sshkeyfile);
+    } else {
+      $ret = $ret + process_user($engine_obj, $file, $action, $username, $jscontainers, $timeout);
+    }
   }
 
   if (defined($profile)) {
@@ -350,10 +364,11 @@ =head1 SYNOPSIS
 
  dx_ctl_users    [ -engine|d <delphix identifier> | -all ] [ -configfile file ]
                  [-action import] <-file filename | -profile filename >
-                 -action lock|unlock|password|timeout
+                 -action lock|unlock|password|timeout|sshkey
                  -username name|all
                  [-password password]
                  [-timeout timeout]
+                 [-sshkeyfile filename]
                  [-help|?]
                  [-debug]
 
@@ -386,7 +401,7 @@ =head2 Options
 
 =over 4
 
-=item B<-action import|lock|unlock|password>
+=item B<-action import|lock|unlock|password|sshkey>
 Action for a particular user or file
 Actions:
 
@@ -395,6 +410,7 @@ =head2 Options
  - unlock - enable (unlock) user account
  - password - change user password
  - timeout - change user timeout
+ - sshkey - set a user SSH key
 
 =item B<-username user|all>
 Username for particular action.
@@ -406,6 +422,9 @@ =head2 Options
 =item B<-timeout time>
 Update a timeout for an user. Timeout is set in minutes
 
+=item B<-sshkeyfile filename>
+File with one or more SSH public key to set for user
+
 =item B<-file filename>
 CSV file name with user definition and actions. Field list as follow:
 
@@ -549,4 +568,9 @@ =head1 EXAMPLES
   User js deleted.
   User js created.
 
+Setting a SSH key for user
+
+ dx_ctl_users -d 53 -action sshkey -username admin -sshkeyfile /tmp/id_rsa.pub
+ SSH key for admin set.
+
 =cut

lib/Databases.pm

@@ -190,7 +190,9 @@ sub LoadDBList
         } else {
           logger($self->{_debug},"config name - not available ",2);
         }
-        logger($self->{_debug},"Source config to assign " . Dumper $self->{_sourceconfigs}->getSourceConfig($configname),2);
+        logger($self->{_debug},"Source config to assign ",2);
+        my $sc = Dumper $self->{_sourceconfigs}->getSourceConfig($configname);
+        logger($self->{_debug}, $sc , 2);
         $db->{"sourceConfig"}  = $self->{_sourceconfigs}->getSourceConfig($configname);
 
         #added to keep object

lib/User_obj.pm

@@ -92,6 +92,18 @@ sub setNames {
 }
 
 
+# Procedure setSSHkey
+# parameters:
+# - $sshkey
+
+sub setSSHkey {
+    my $self = shift;
+    my $sshkey = shift;
+
+    logger($self->{_debug}, "Entering User_obj::setSSHkey",1);
+    $self->{_new}->{publicKey} = $sshkey;
+}
+
 # Procedure getAuthType
 # Return:
 # - Native / LDAP

lib/Users.pm

@@ -518,4 +518,36 @@ sub unlockUser
   return $ret;
 }
 
+sub setSSHkey
+{
+  my $self = shift;
+  my $username = shift;
+  my $usertype = shift;
+  my $sshfile = shift;
+
+  my $ret = 0;
+  my $user = $self->getUserByName($username, $usertype);
+
+  if (defined($user) ) {
+    my $FD;
+    open($FD,$sshfile) or die("Can't open file $sshfile $!" );
+    my @sshkeylines = <$FD>;
+    close $FD;
+    $user->setSSHkey(\@sshkeylines);
+    if ($user->updateUser() ) {
+      print "Problem with ssh key setting. \n";
+      $ret = $ret + 1;
+    } else {
+      print "SSH key(s) for $username set. \n";
+    }
+
+  }
+  else {
+    print "User $username doesn't exist. Can't set SSH key\n";
+    $ret = $ret + 1;
+  }
+
+  return $ret;
+}
+
 1;