[ARVADOS] updated: 1.3.0-2575-g374cc9ffd

[Git user]

Summary of changes:
 build/rails-package-scripts/arvados-sso-server.sh  |   2 +-
 doc/_config.yml                                    |   2 -
 doc/admin/metrics.html.textile.liquid              |   1 -
 doc/admin/migrating-providers.html.textile.liquid  |  35 +--
 doc/admin/upgrading.html.textile.liquid            |   6 +-
 doc/admin/user-management.html.textile.liquid      |   2 +-
 doc/install/google-auth.html.textile.liquid        |  27 ---
 doc/install/install-components.html.textile.liquid |  28 ---
 ...nstall-manual-prerequisites.html.textile.liquid |  22 +-
 doc/install/install-sso.html.textile.liquid        | 237 ---------------------
 doc/install/install-ws.html.textile.liquid         |  13 +-
 doc/install/setup-login.html.textile.liquid        |  58 +++--
 go.mod                                             |   4 +
 go.sum                                             |   8 +
 lib/config/config.default.yml                      | 165 +++++++++-----
 lib/config/deprecated.go                           |  35 +++
 lib/config/deprecated_test.go                      |  35 +++
 lib/config/export.go                               |  35 ++-
 lib/config/generated_config.go                     | 165 +++++++++-----
 lib/controller/federation/login_test.go            |   3 +-
 lib/controller/handler_test.go                     |  11 +-
 lib/controller/localdb/login.go                    |  40 +++-
 lib/controller/localdb/login_google.go             |   6 +-
 lib/controller/localdb/login_google_test.go        |  10 +-
 lib/controller/localdb/login_ldap.go               | 152 +++++++++++++
 lib/controller/localdb/login_ldap_docker_test.go   |  48 +++++
 ...am_docker_test.sh => login_ldap_docker_test.sh} |  96 +++++++--
 lib/controller/localdb/login_ldap_test.go          | 133 ++++++++++++
 lib/controller/localdb/login_pam.go                |  33 +--
 lib/controller/localdb/login_pam_docker_test.go    |  23 --
 lib/controller/localdb/login_pam_test.go           |   6 +-
 sdk/go/arvados/config.go                           |  43 +++-
 sdk/python/tests/run_test_server.py                |   6 +-
 services/api/config/arvados_config.rb              |   8 +-
 services/api/config/initializers/omniauth_init.rb  |   8 +-
 tools/arvbox/lib/arvbox/docker/cluster-config.sh   |   5 +-
 36 files changed, 930 insertions(+), 581 deletions(-)
 delete mode 100644 doc/install/google-auth.html.textile.liquid
 delete mode 100644 doc/install/install-components.html.textile.liquid
 delete mode 100644 doc/install/install-sso.html.textile.liquid
 create mode 100644 lib/controller/localdb/login_ldap.go
 create mode 100644 lib/controller/localdb/login_ldap_docker_test.go
 rename lib/controller/localdb/{login_pam_docker_test.sh => login_ldap_docker_test.sh} (63%)
 create mode 100644 lib/controller/localdb/login_ldap_test.go
 delete mode 100644 lib/controller/localdb/login_pam_docker_test.go

       via  374cc9ffdd945cec08abbc3ff91b4b2b147cd840 (commit)
       via  f26e4dec04ed9d68a9f826f72b4a9e627ddc4a5c (commit)
       via  3e927bdbfcb088f27f660cc0454f9be064b64004 (commit)
       via  852ab2e6837697e16b947b86a0cb9fdd93a40222 (commit)
       via  ca1eb648712232558014d648939868b2a902558a (commit)
       via  28e68f813bd7c48847c39a9e07d66ff5cf61662d (commit)
       via  ad00c515d3a34a8247a08be5a332470f8563086c (commit)
       via  3198e16b3e7ae214a2e739c1676d7550c5e6209c (commit)
       via  e7e1b1114a550b462d73f3887074799b6b6e5e66 (commit)
       via  0780fdfbd08ca817ffeabc88b46f39130ac1e6c4 (commit)
       via  f0d798af105d042e3129fca334c080ce9a90293f (commit)
       via  0634b763dd27914cff5ca49c6cfe11233746ee31 (commit)
       via  87cfe4746d5930f8b28568f75256a1b1a399faa7 (commit)
       via  92da01ee9c52ca89b36a0edd21a4f42b8eb48e0d (commit)
       via  6002ef855cd7a5bbbf353ec3304fccec412e68fa (commit)
       via  8f435f4bac86e7ba7dbd9770d2db9bb4db6cf569 (commit)
       via  3cf3136d736ed18fffd43714eff01693a464c790 (commit)
       via  f01f7eebfe771300be72d1bec5b4fab664138feb (commit)
       via  62c33a15f68895d6a388f68d2827e9fd5705c5df (commit)
       via  bbb132e983f9ec5c7d50cf0ab709ec041af1f844 (commit)
       via  5763409818cd2ab68c0f59b6a97d0c3df090907f (commit)
      from  79e9da3f2062145f535cf63f06d868811414a41b (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 374cc9ffdd945cec08abbc3ff91b4b2b147cd840
Merge: 79e9da3f2 f26e4dec0
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Thu May 14 13:38:04 2020 -0400

    Merge branch '15881-ldap'
    
    refs #15881
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --cc services/api/config/initializers/omniauth_init.rb
index 35a318b94,5557be1dc..a1b2356bd
--- a/services/api/config/initializers/omniauth_init.rb
+++ b/services/api/config/initializers/omniauth_init.rb
@@@ -9,9 -9,9 +9,9 @@@
  
  if defined? CUSTOM_PROVIDER_URL
    Rails.logger.warn "Copying omniauth from globals in legacy config file."
-   Rails.configuration.Login["ProviderAppID"] = APP_ID
-   Rails.configuration.Login["ProviderAppSecret"] = APP_SECRET
+   Rails.configuration.Login["SSO"]["ProviderAppID"] = APP_ID
+   Rails.configuration.Login["SSO"]["ProviderAppSecret"] = APP_SECRET
 -  Rails.configuration.Services["SSO"]["ExternalURL"] = CUSTOM_PROVIDER_URL
 +  Rails.configuration.Services["SSO"]["ExternalURL"] = CUSTOM_PROVIDER_URL.sub(/\/$/, "") + "/"
  else
    Rails.application.config.middleware.use OmniAuth::Builder do
      provider(:josh_id,

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


hooks/post-receive
--