[ARVADOS] updated: 1.3.0-1917-g6749376dd

[Git user]

Summary of changes:
 services/api/app/models/api_client_authorization.rb | 4 ++++
 services/api/config/arvados_config.rb               | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  6749376dd2fbd5f6bc6f870ae382bdb5cb8aaf17 (commit)
      from  41fe33dff783af98076272a155121e8a96748778 (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 6749376dd2fbd5f6bc6f870ae382bdb5cb8aaf17
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Nov 25 12:05:16 2019 -0500

    15795: API server allowed to start up if SystemRootToken is empty
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/models/api_client_authorization.rb b/services/api/app/models/api_client_authorization.rb
index c19445c40..1bcf4e968 100644
--- a/services/api/app/models/api_client_authorization.rb
+++ b/services/api/app/models/api_client_authorization.rb
@@ -109,6 +109,10 @@ class ApiClientAuthorization < ArvadosModel
   end
 
   def self.check_system_root_token auth, token
+    if Rails.configuration.SystemRootToken == ""
+      return auth
+    end
+
     root_token_uuid = [Rails.configuration.ClusterID,
                        ApiClientAuthorization.uuid_prefix,
                        '000000000000000'].join('-')
diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index 5551aaf6f..7d5eef2ae 100644
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -85,7 +85,7 @@ end
 arvcfg = ConfigLoader.new
 arvcfg.declare_config "ClusterID", NonemptyString, :uuid_prefix
 arvcfg.declare_config "ManagementToken", String, :ManagementToken
-arvcfg.declare_config "SystemRootToken", NonemptyString
+arvcfg.declare_config "SystemRootToken", String
 arvcfg.declare_config "Git.Repositories", String, :git_repositories_dir
 arvcfg.declare_config "API.DisabledAPIs", Hash, :disable_api_methods, ->(cfg, k, v) { arrayToHash cfg, "API.DisabledAPIs", v }
 arvcfg.declare_config "API.MaxRequestSize", Integer, :max_request_size

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


hooks/post-receive
--