[ARVADOS] updated: 1.3.0-1930-gabdbcca28
Git user
git at public.curoverse.com
Tue Nov 26 15:14:12 UTC 2019
Summary of changes:
apps/workbench/Gemfile.lock | 4 +-
.../workbench/app/views/users/_show_admin.html.erb | 6 +-
.../test/controllers/projects_controller_test.rb | 2 +-
build/package-build-dockerfiles/Makefile | 7 +-
.../{debian9 => debian10}/Dockerfile | 8 +-
build/package-test-dockerfiles/Makefile | 6 +-
.../{debian9 => debian10}/Dockerfile | 6 +-
build/package-testing/deb-common-test-packages.sh | 2 +-
...ckages-debian8.sh => test-packages-debian10.sh} | 0
build/run-build-packages-one-target.sh | 16 +-
build/run-build-packages-sso.sh | 4 +-
build/run-build-packages.sh | 21 +-
build/run-build-test-packages-one-target.sh | 4 +-
build/run-library.sh | 4 +-
build/run-tests.sh | 57 ++---
doc/Rakefile | 15 ++
doc/_config.yml | 11 +-
doc/_includes/_navbar_left.liquid | 4 +-
doc/admin/User account states.odg | Bin 0 -> 12087 bytes
doc/admin/activation.html.textile.liquid | 230 +--------------------
doc/admin/group-management.html.textile.liquid | 104 ++++++++++
....textile.liquid => logging.html.textile.liquid} | 8 +-
doc/admin/management-token.html.textile.liquid | 33 +--
doc/admin/migrating-providers.html.textile.liquid | 14 +-
doc/admin/reassign-ownership.html.textile.liquid | 51 +++++
doc/admin/troubleshooting.html.textile.liquid | 75 +------
.../user-management-cli.html.textile.liquid} | 37 ++--
doc/admin/user-management.html.textile.liquid | 185 +++++++++++++++++
doc/api/methods.html.textile.liquid | 5 +-
.../methods/container_requests.html.textile.liquid | 4 +-
doc/api/methods/containers.html.textile.liquid | 2 -
.../methods/user_agreements.html.textile.liquid | 44 ++++
doc/api/methods/users.html.textile.liquid | 32 ++-
doc/css/images.css | 5 +
doc/images/user-account-states.svg | 204 ++++++++++++++++++
doc/install/cheat_sheet.html.textile.liquid | 76 +------
lib/config/cmd.go | 27 ++-
lib/config/cmd_test.go | 18 +-
lib/config/config.default.yml | 8 +-
lib/config/export.go | 1 +
lib/config/generated_config.go | 8 +-
lib/controller/federation/conn.go | 155 +++++++++++++-
lib/controller/federation/federation_test.go | 75 +++++++
lib/controller/federation/generate.go | 4 +-
lib/controller/federation/generated.go | 83 +++++++-
lib/controller/federation/list.go | 22 +-
lib/controller/federation/list_test.go | 69 +------
lib/controller/federation/login_test.go | 12 +-
lib/controller/federation/user_test.go | 124 +++++++++++
lib/controller/handler.go | 2 +
lib/controller/localdb/login.go | 3 +
lib/controller/localdb/login_test.go | 9 +-
lib/controller/router/request.go | 7 +-
lib/controller/router/router.go | 108 +++++++++-
lib/controller/router/router_test.go | 11 +-
lib/controller/rpc/conn.go | 85 +++++++-
lib/dispatchcloud/container/queue.go | 2 +-
lib/dispatchcloud/scheduler/sync.go | 4 +-
.../tests/federation/arvbox-make-federation.cwl | 8 +
sdk/cwl/tests/federation/arvbox/fed-config.cwl | 6 +
sdk/cwl/tests/federation/arvbox/start.cwl | 23 ++-
sdk/go/arvados/api.go | 89 ++++++--
sdk/go/arvados/collection.go | 8 +-
sdk/go/arvados/config.go | 1 +
sdk/go/arvados/container.go | 3 +
sdk/go/arvados/fs_collection.go | 6 +-
sdk/go/arvados/fs_deferred.go | 6 +-
sdk/go/arvados/specimen.go | 13 +-
sdk/go/arvados/user.go | 23 ++-
sdk/go/arvadostest/api.go | 53 ++++-
sdk/go/arvadostest/fixtures.go | 1 +
sdk/python/arvados/commands/federation_migrate.py | 5 +-
sdk/python/tests/fed-migrate/CWLFile | 28 +++
.../tests/fed-migrate/arvbox-make-federation.cwl | 12 ++
sdk/python/tests/fed-migrate/check.py | 41 +++-
sdk/python/tests/fed-migrate/cwlex.cwl | 41 ++++
sdk/python/tests/fed-migrate/fed-migrate.cwl | 95 ++-------
sdk/python/tests/fed-migrate/fed-migrate.cwlex | 33 +--
sdk/python/tests/fed-migrate/set_login.py | 10 -
sdk/python/tests/run_test_server.py | 2 +-
services/api/Gemfile.lock | 6 +-
.../app/controllers/arvados/v1/users_controller.rb | 25 ++-
services/api/app/models/arvados_model.rb | 3 +
services/api/app/models/user.rb | 2 +-
services/api/config/routes.rb | 1 +
services/api/lib/record_filters.rb | 89 ++++----
.../v1/container_requests_controller_test.rb | 44 ++++
.../functional/arvados/v1/users_controller_test.rb | 41 ++++
services/api/test/helpers/users_test_helper.rb | 2 +-
services/api/test/integration/remote_user_test.rb | 18 ++
services/api/test/unit/permission_test.rb | 12 ++
services/keep-balance/collection.go | 8 +-
services/keep-balance/collection_test.go | 6 +-
services/keep-balance/integration_test.go | 4 +-
services/keepstore/handler_test.go | 2 +-
services/keepstore/mounts_test.go | 2 +-
services/keepstore/proxy_remote_test.go | 2 +-
services/login-sync/Gemfile.lock | 2 +-
tools/arvbox/lib/arvbox/docker/cluster-config.sh | 1 -
tools/arvbox/lib/arvbox/docker/go-setup.sh | 4 +-
.../lib/arvbox/docker/service/doc/run-service | 9 +-
tools/keep-rsync/keep-rsync_test.go | 12 +-
102 files changed, 2106 insertions(+), 819 deletions(-)
copy build/package-build-dockerfiles/{debian9 => debian10}/Dockerfile (88%)
copy build/package-test-dockerfiles/{debian9 => debian10}/Dockerfile (85%)
copy build/package-testing/{test-packages-debian8.sh => test-packages-debian10.sh} (100%)
create mode 100644 doc/admin/User account states.odg
mode change 100644 => 120000 doc/admin/activation.html.textile.liquid
create mode 100644 doc/admin/group-management.html.textile.liquid
copy doc/admin/{troubleshooting.html.textile.liquid => logging.html.textile.liquid} (95%)
create mode 100644 doc/admin/reassign-ownership.html.textile.liquid
mode change 100644 => 120000 doc/admin/troubleshooting.html.textile.liquid
copy doc/{install/cheat_sheet.html.textile.liquid => admin/user-management-cli.html.textile.liquid} (55%)
create mode 100644 doc/admin/user-management.html.textile.liquid
create mode 100644 doc/api/methods/user_agreements.html.textile.liquid
create mode 100644 doc/images/user-account-states.svg
mode change 100644 => 120000 doc/install/cheat_sheet.html.textile.liquid
create mode 100644 lib/controller/federation/federation_test.go
create mode 100644 lib/controller/federation/user_test.go
create mode 100644 sdk/python/tests/fed-migrate/CWLFile
create mode 100644 sdk/python/tests/fed-migrate/cwlex.cwl
delete mode 100644 sdk/python/tests/fed-migrate/set_login.py
via abdbcca280ac85b5f2276fb0be4c645292d113f8 (commit)
via 14a6eb786a0d01e86ccae7645e880661caf6f0cb (commit)
via c371555926e3f361497b2bb1c9531fcaf7283ed4 (commit)
via 0d11f61ddd0bee6a679956ef2c15b868fa825add (commit)
via f6c2b3f1f1fc0ee7144fbd200b8bb17f0b0f9b63 (commit)
via 5ee93e408c0e547dfb03b2f3d039a7715126395b (commit)
via 607d2b1190bbba7c018fcbc91e66fdb0db1ce90f (commit)
via 5ffd4a118ae8c97c4c75fc789b2b5c8437461797 (commit)
via 2e6208ee675505d9af3a9d7c837aabdf2d497f21 (commit)
via e087a608834328786d0aec7956646fdf63b5ed44 (commit)
via 0e2a467a923bd490f3e1dc4d8c00a9e2f29e59d4 (commit)
via 7737b743baed690e98882a1bb3e44d1a76e45030 (commit)
via 6361b15d39bdb78b5b1f8ca696fae543c677848c (commit)
via 66f6a487050e1cdb3fda6a32f195eb1913c83241 (commit)
via 1b6b00b1f3f1a1931c27c69f1624d2c34e94a880 (commit)
via ed5be18ec61d2edecbf878785633aea2b056b20a (commit)
via f3de4ad1c15b90edea0d166b4e48630bb191ac76 (commit)
via 06c9ea02435fb56e8c32a31694a414ca161dc2ce (commit)
via 76509a7932f48f945904163fd414b60da1d601a0 (commit)
via 086c972bae004544cb43d9ea15388d486d3cd1ed (commit)
via 35ed9c4e39306ddbeebdf0445149be72c1cc5284 (commit)
via 0c7319e50b1e5c35d8645b26758f19bce0f32cb0 (commit)
via c73f87c5fedba20b82a091152353f718d81ba6c3 (commit)
via 92d7d779d4f0415d09f536d286972bd953e7b566 (commit)
via e4b1a161bdc5a95b9dfd53a3b74bfa552bbc0f18 (commit)
via 002aec2a7db39d269bb3c9123783022c2e32a5cc (commit)
via 4ecc670983133293c49bacfb4815a4b18cf2cdee (commit)
via ae30520a25d494e7674fe53138f5cefad9c199a6 (commit)
via 3994322d0ae878ac0055d542157f01b09e3a2860 (commit)
via 6b1037d37dfeca503289cb54304189a6774db4e9 (commit)
via a729ffba72b79a8fbe7ba88c0a1c40c6ac5c48bf (commit)
via 5ad819e0aa69a8ea453abe18a8e00aa93daa90a2 (commit)
via 40e9a645da140a6b94497d1a79ba8783d22421f7 (commit)
via a1f06e4e118923d301683824ccd47bcf68c8ef69 (commit)
via 9d53a848044dab5daaeb76c65833afbd4748a33e (commit)
via 233a2b6bd23a3e2054cfc0690f2bc06c0f9f7323 (commit)
via bdc8a7630030494c63fb0426be4c15a93a9a37cb (commit)
via 542a72e8ea402a65d75a5251ba219341834fb2c9 (commit)
via ee341f1fc2579fdf28a8b8f07918f9ae195b0727 (commit)
via 98e4a92f007533b2924604e4f83da9a6d15e0ef3 (commit)
via 8b43f32b2c11d45f951bf4ff1bffab03d391ff41 (commit)
via ea42eaf1e8776704de1ef75d01259d33dcabaef3 (commit)
via b047cc92acab06d4c1f1d80173486f951b63d729 (commit)
via ef9107221d53f19bf848d3dca0b570f468519550 (commit)
via d12160e0b194eed8b059a54d92075fa1c6dfcd10 (commit)
via 943827578884b09a155443a9d2bb685a327070f9 (commit)
via 82d733300a8dd1859b9cd06f3989a2fe30c43887 (commit)
via f18f0e90022f7a78032d5e4ebf9995d5256a076e (commit)
via 89f10cd956b1282d8d650fd82f945f8169664df9 (commit)
via d30db61ea4bdcd686c418cef01ba00e89c4bc338 (commit)
via e6253e06dd350acb6f04b32785baa29bf269acfd (commit)
from 5022c4068227e4d354389169a9abd726206aff7d (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 abdbcca280ac85b5f2276fb0be4c645292d113f8
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Tue Nov 26 10:13:43 2019 -0500
15803: Add test that inactive user is not activated on remote.
Add links to documentation.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index 89dbac572..1da22d438 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -6,6 +6,10 @@ SPDX-License-Identifier: AGPL-3.0 %>
<div class="col-md-6">
<p>
+ This page enables you to <a href="https://doc.arvados.org/master/admin/user-management.html">manage users</a>.
+ </p>
+
+ <p>
This button sets up a user. After setup, they will be able use
Arvados. This dialog box also allows you to optionally set up a
shell account for this user. The login name is automatically
@@ -18,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
As an admin, you can deactivate and reset this user. This will
remove all repository/VM permissions for the user. If you
"setup" the user again, the user will have to sign the user
- agreement again.
+ agreement again. You may also want to <a href="https://doc.arvados.org/master/admin/reassign-ownership.html">reassign data ownership</a>.
</p>
<%= button_to "Deactivate #{@object.full_name}", unsetup_user_url(id: @object.uuid), class: 'btn btn-primary', data: {confirm: "Are you sure you want to deactivate #{@object.full_name}?"} %>
diff --git a/services/api/test/helpers/users_test_helper.rb b/services/api/test/helpers/users_test_helper.rb
index cb9a34735..6ca9977a5 100644
--- a/services/api/test/helpers/users_test_helper.rb
+++ b/services/api/test/helpers/users_test_helper.rb
@@ -49,7 +49,7 @@ module UsersTestHelper
link_class: 'permission',
name: 'can_login').where("head_uuid like ?", User.uuid_like_pattern)
- # these don't get added any more! they shouldn't be appear ever.
+ # these don't get added any more! they shouldn't appear ever.
assert !oid_login_perms.any?, "expected all oid_login_perms deleted"
repo_perms = Link.where(tail_uuid: uuid,
diff --git a/services/api/test/integration/remote_user_test.rb b/services/api/test/integration/remote_user_test.rb
index 4823aca5f..04a45420f 100644
--- a/services/api/test/integration/remote_user_test.rb
+++ b/services/api/test/integration/remote_user_test.rb
@@ -279,6 +279,24 @@ class RemoteUsersTest < ActionDispatch::IntegrationTest
refute_includes(group_uuids, groups(:testusergroup_admins).uuid)
end
+ test 'do not auto-activate user from untrusted cluster' do
+ Rails.configuration.RemoteClusters['zbbbb'].AutoSetupNewUsers = false
+ Rails.configuration.RemoteClusters['zbbbb'].ActivateUsers = false
+ get '/arvados/v1/users/current',
+ params: {format: 'json'},
+ headers: auth(remote: 'zbbbb')
+ assert_response :success
+ assert_equal 'zbbbb-tpzed-000000000000000', json_response['uuid']
+ assert_equal false, json_response['is_admin']
+ assert_equal false, json_response['is_active']
+ assert_equal 'foo at example.com', json_response['email']
+ assert_equal 'barney', json_response['username']
+ post '/arvados/v1/users/zbbbb-tpzed-000000000000000/activate',
+ params: {format: 'json'},
+ headers: auth(remote: 'zbbbb')
+ assert_response 422
+ end
+
test 'auto-activate user from trusted cluster' do
Rails.configuration.RemoteClusters['zbbbb'].ActivateUsers = true
get '/arvados/v1/users/current',
commit 14a6eb786a0d01e86ccae7645e880661caf6f0cb
Merge: 5022c4068 c37155592
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Mon Nov 25 17:37:25 2019 -0500
Merge branch 'master' into 15803-unsetup
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list