[ARVADOS] updated: 1.3.0-1536-gfb5b1feb7

[Git user]

Summary of changes:
 services/api/app/controllers/user_sessions_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

       via  fb5b1feb7acdfafed1bcbe932ff90e95e129c2a3 (commit)
      from  4653d82e57660b2f2d5cc9ce0960f44684b160ec (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 fb5b1feb7acdfafed1bcbe932ff90e95e129c2a3
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Aug 22 09:49:11 2019 -0400

    15529: Prevent local login when LoginCluster is set
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/controllers/user_sessions_controller.rb b/services/api/app/controllers/user_sessions_controller.rb
index 1c5842f96..f3591345d 100644
--- a/services/api/app/controllers/user_sessions_controller.rb
+++ b/services/api/app/controllers/user_sessions_controller.rb
@@ -13,6 +13,10 @@ class UserSessionsController < ApplicationController
 
   # omniauth callback method
   def create
+    if !Rails.configuration.Login.LoginCluster.empty? and Rails.configuration.Login.LoginCluster != Rails.configuration.ClusterID
+      raise "Local login disabled when LoginCluster is set"
+    end
+
     omniauth = request.env['omniauth.auth']
 
     identity_url_ok = (omniauth['info']['identity_url'].length > 0) rescue false

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


hooks/post-receive
--