[ARVADOS] updated: 1.3.0-3082-ga5b73a1a4

Git user git at public.arvados.org
Thu Sep 3 18:31:02 UTC 2020


Summary of changes:
 .../install-shell-server.html.textile.liquid       | 50 +++++++++++-----------
 doc/install/install-webshell.html.textile.liquid   | 11 +++--
 services/login-sync/bin/arvados-login-sync         | 35 +++++++++++++--
 3 files changed, 63 insertions(+), 33 deletions(-)

       via  a5b73a1a47bed348098dc116950a01b77c04c208 (commit)
       via  72beb46ad804361a8ae012b1bc4475480912d8a8 (commit)
       via  6ed2e2c51fe463bfcf1b484d764af5bf47d416ad (commit)
       via  71c57454fc3adf2d63db8b3cb1d0e8ecdff5c93f (commit)
      from  201812edc08fc1fd11cc6635e2224adad2b913f5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a5b73a1a47bed348098dc116950a01b77c04c208
Merge: 201812edc 72beb46ad
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Sep 3 14:30:48 2020 -0400

    Merge branch '16803-shell-sync-tokens' refs #16803
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit 72beb46ad804361a8ae012b1bc4475480912d8a8
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Sep 3 14:29:31 2020 -0400

    16803: Tweak permission setting on created files/dirs
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/login-sync/bin/arvados-login-sync b/services/login-sync/bin/arvados-login-sync
index 61260990c..aee911cfc 100755
--- a/services/login-sync/bin/arvados-login-sync
+++ b/services/login-sync/bin/arvados-login-sync
@@ -154,8 +154,6 @@ begin
     userdotconfig = File.join(homedir, ".config")
     if !File.exist?(userdotconfig)
       Dir.mkdir(userdotconfig)
-      FileUtils.chown_R(l[:username], nil, userdotconfig)
-      File.chmod(0700, userdotconfig)
     end
 
     configarvados = File.join(userdotconfig, "arvados")
@@ -170,18 +168,21 @@ begin
         f.write("ARVADOS_API_HOST=#{ENV['ARVADOS_API_HOST']}\n")
         f.write("ARVADOS_API_TOKEN=v2/#{user_token[:uuid]}/#{user_token[:api_token]}\n")
         f.close()
-        File.chmod(0600, tokenfile)
       end
     rescue => e
       STDERR.puts "Error setting token for #{l[:username]}: #{e}"
     end
 
     FileUtils.chown_R(l[:username], nil, userdotssh)
-    FileUtils.chown_R(l[:username], nil, configarvados)
+    FileUtils.chown_R(l[:username], nil, userdotconfig)
     File.chmod(0700, userdotssh)
+    File.chmod(0700, userdotconfig)
+    File.chmod(0700, configarvados)
     File.chmod(0750, homedir)
     File.chmod(0600, keysfile)
-    File.chmod(0700, configarvados)
+    if File.exist?(tokenfile)
+      File.chmod(0600, tokenfile)
+    end
   end
 
   devnull.close

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list