arvados-login-sync 0.1.20161018143726 → 0.1.20161021200845

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e3ad3433425add7575e18420152fff83fb8c738
-  data.tar.gz: 5efbc9ab38321f8b6a4e997d63c469195919d7bb
+  metadata.gz: d2553513ca970d72e9a639e61b8b26eb8e8692aa
+  data.tar.gz: c491d7eea6888e807f6080c8ea7c8b3dfc75883e
 SHA512:
-  metadata.gz: b7c09fb2e812e1bf248e64312046998fcb3de7f1b001c82960dd10e2cff44698646c56a8fc23f09cfd8f75dca2abdf5231035e7c94ab8f204ccb4de0eec16e18
-  data.tar.gz: afc9b71294d789cdc032cb66495e0a97eaf961ad3844047eff9afed70025c751779d5c8785f03a2a3006a797b9dca44740b8a858b50e2ed22b05484ce3c16c54
+  metadata.gz: 55002005a5b93990e4d81226399129303f6314de45900cb9a70421bffa110e3ec4c9a0bc84f0e9b6b2c7ac091bca1dbdc8745dceb6e02672550a0a1a5f0e4489
+  data.tar.gz: b7a582e2275cec292a4b851d438f391a6712fb0b550de0164cf510982256655571e38347c34899e0ab71135c05621b3df690689e536ee33a7e1ce785642db7bc

data/bin/arvados-login-sync

@@ -21,13 +21,12 @@ exclusive_banner = "############################################################
 start_banner = "### BEGIN Arvados-managed keys -- changes between markers will be overwritten\n"
 end_banner = "### END Arvados-managed keys -- changes between markers will be overwritten\n"
 
-keys = ''
+# Don't try to create any local accounts
+skip_missing_users = ARGV.index("--skip-missing-users")
 
-seen = Hash.new
+keys = ''
 
 begin
-  uids = Hash[Etc.to_enum(:passwd).map { |ent| [ent.name, ent.uid] }]
-  gids = Hash[Etc.to_enum(:group).map { |ent| [ent.name, ent.gid] }]
   arv = Arvados.new({ :suppress_ssl_warnings => false })
 
   vm_uuid = ENV['ARVADOS_VIRTUAL_MACHINE_UUID']
@@ -52,8 +51,24 @@ begin
       uid_min = new_uid_min if (new_uid_min > 0)
     end
   end
-  logins.reject! { |l| (uids[l[:username]] || 65535) < uid_min }
 
+  pwnam = Hash.new()
+  logins.reject! do |l|
+    return false if pwnam[l[:username]]
+    begin
+      pwnam[l[:username]] = Etc.getpwnam(l[:username])
+    rescue
+      if skip_missing_users
+        STDERR.puts "Account #{l[:username]} not found. Skipping"
+        true
+      end
+    else
+      if pwnam[l[:username]].uid < uid_min
+        STDERR.puts "Account #{l[:username]} uid #{pwnam[l[:username]].uid} < uid_min #{uid_min}. Skipping"
+        true
+      end
+    end
+  end
   keys = Hash.new()
 
   # Collect all keys
@@ -74,24 +89,33 @@ begin
 
   logins.each do |l|
     next if seen[l[:username]]
-    seen[l[:username]] = true if not seen.has_key?(l[:username])
+    seen[l[:username]] = true
 
-    unless uids[l[:username]]
+    unless pwnam[l[:username]]
       STDERR.puts "Creating account #{l[:username]}"
       groups = l[:groups] || []
       # Adding users to the FUSE group has long been hardcoded behavior.
       groups << "fuse"
-      groups.select! { |name| gids[name] }
+      groups.select! { |g| Etc.getgrnam(g) rescue false }
       # Create new user
-      next unless system("useradd", "-m",
-                         "-c", l[:username],
-                         "-s", "/bin/bash",
-                         "-G", groups.join(","),
-                         l[:username],
-                         out: devnull)
+      unless system("useradd", "-m",
+                "-c", l[:username],
+                "-s", "/bin/bash",
+                "-G", groups.join(","),
+                l[:username],
+                out: devnull)
+        STDERR.puts "Account creation failed for #{l[:username]}: $?"
+        next
+      end
+      begin
+        pwnam[l[:username]] = Etc.getpwnam(l[:username])
+      rescue => e
+        STDERR.puts "Created account but then getpwnam() failed for #{l[:username]}: #{e}"
+        raise
+      end
     end
-    # Create .ssh directory if necessary
-    @homedir = Etc.getpwnam(l[:username]).dir
+
+    @homedir = pwnam[l[:username]].dir
     userdotssh = File.join(@homedir, ".ssh")
     Dir.mkdir(userdotssh) if !File.exists?(userdotssh)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-login-sync
 version: !ruby/object:Gem::Version
-  version: 0.1.20161018143726
+  version: 0.1.20161021200845
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.20150615153458
 description: Creates and updates local login accounts for Arvados users. Built from
-  git commit 94588fc14c200e4163144cd53bfa548a27fff7e0
+  git commit cd0052e87bfa9d7e3d501427c7ff47e08c68d8d5
 email: gem-dev@curoverse.com
 executables:
 - arvados-login-sync