arvados-login-sync 0.1.20161012155037 → 0.1.20161018143726

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9f6e86f167fa7c609285a33749c95377225667
-  data.tar.gz: 50d7d9079b53aa1e2ea6b3680b57b1abe2dc2dae
+  metadata.gz: 4e3ad3433425add7575e18420152fff83fb8c738
+  data.tar.gz: 5efbc9ab38321f8b6a4e997d63c469195919d7bb
 SHA512:
-  metadata.gz: 14ec34078a358fd675c730c9049e48477624a726e716b24ff865fdb21495c31a3dde12afd55af59c7bc3d412356fabb994cdb97597b21981026583e685f7c89c
-  data.tar.gz: ebc548d79a9c5d4d14519253126499b72c7bed4b13cea423f6797708c868cb869b3124d17dc911909bdb513f6b7c6014df0b90eb82b96761975486f7dd947311
+  metadata.gz: b7c09fb2e812e1bf248e64312046998fcb3de7f1b001c82960dd10e2cff44698646c56a8fc23f09cfd8f75dca2abdf5231035e7c94ab8f204ccb4de0eec16e18
+  data.tar.gz: afc9b71294d789cdc032cb66495e0a97eaf961ad3844047eff9afed70025c751779d5c8785f03a2a3006a797b9dca44740b8a858b50e2ed22b05484ce3c16c54

data/bin/arvados-login-sync

@@ -14,6 +14,13 @@ req_envs.each do |k|
   end
 end
 
+exclusive_mode = ARGV.index("--exclusive")
+exclusive_banner = "#######################################################################################
+#  THIS FILE IS MANAGED BY #{$0} -- CHANGES WILL BE OVERWRITTEN  #
+#######################################################################################\n\n"
+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 = ''
 
 seen = Hash.new
@@ -87,20 +94,36 @@ begin
     @homedir = Etc.getpwnam(l[:username]).dir
     userdotssh = File.join(@homedir, ".ssh")
     Dir.mkdir(userdotssh) if !File.exists?(userdotssh)
-    @key = "#######################################################################################
-#  THIS FILE IS MANAGED BY #{$0} -- CHANGES WILL BE OVERWRITTEN  #
-#######################################################################################\n\n"
-    @key += keys[l[:username]].join("\n") + "\n"
-    userauthkeys = File.join(userdotssh, "authorized_keys")
-    if !File.exists?(userauthkeys) or IO::read(userauthkeys) != @key then
-      f = File.new(userauthkeys, 'w')
-      f.write(@key)
+
+    newkeys = "###\n###\n" + keys[l[:username]].join("\n") + "\n###\n###\n"
+
+    keysfile = File.join(userdotssh, "authorized_keys")
+
+    if File.exists?(keysfile)
+      oldkeys = IO::read(keysfile)
+    else
+      oldkeys = ""
+    end
+
+    if exclusive_mode
+      newkeys = exclusive_banner + newkeys
+    elsif oldkeys.start_with?(exclusive_banner)
+      newkeys = start_banner + newkeys + end_banner
+    elsif (m = /^(.*?\n|)#{start_banner}(.*?\n|)#{end_banner}(.*)/m.match(oldkeys))
+      newkeys = m[1] + start_banner + newkeys + end_banner + m[3]
+    else
+      newkeys = start_banner + newkeys + end_banner + oldkeys
+    end
+
+    if oldkeys != newkeys then
+      f = File.new(keysfile, 'w')
+      f.write(newkeys)
       f.close()
     end
     FileUtils.chown_R(l[:username], nil, userdotssh)
     File.chmod(0700, userdotssh)
     File.chmod(0750, @homedir)
-    File.chmod(0600, userauthkeys)
+    File.chmod(0600, keysfile)
   end
 
   devnull.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-login-sync
 version: !ruby/object:Gem::Version
-  version: 0.1.20161012155037
+  version: 0.1.20161018143726
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-18 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 b1b6efe84c40e5672a33f9a08cb7e1e4979460b5
+  git commit 94588fc14c200e4163144cd53bfa548a27fff7e0
 email: gem-dev@curoverse.com
 executables:
 - arvados-login-sync