[ARVADOS] updated: 1.3.0-1656-g5fef2516e
Git user
git at public.curoverse.com
Fri Sep 27 16:55:09 UTC 2019
Summary of changes:
build/run-tests.sh | 16 +-
doc/_includes/_assign_volume_uuid.liquid | 7 +
doc/admin/config-migration.html.textile.liquid | 8 +-
doc/admin/upgrading.html.textile.liquid | 19 +-
doc/api/permission-model.html.textile.liquid | 2 +-
...onfigure-azure-blob-storage.html.textile.liquid | 152 ++--
.../configure-fs-storage.html.textile.liquid | 117 +--
...configure-s3-object-storage.html.textile.liquid | 177 ++---
.../install-keep-balance.html.textile.liquid | 43 +-
doc/install/install-keepstore.html.textile.liquid | 200 ++----
lib/config/cmd_test.go | 4 +-
lib/config/config.default.yml | 133 +++-
lib/config/deprecated.go | 35 -
lib/config/deprecated_keepstore.go | 684 ++++++++++++++++++
lib/config/deprecated_keepstore_test.go | 787 +++++++++++++++++++++
lib/config/deprecated_test.go | 2 +-
lib/config/export.go | 18 +
lib/config/generated_config.go | 133 +++-
lib/config/load.go | 13 +-
lib/config/load_test.go | 39 +-
lib/controller/cmd.go | 3 +-
lib/controller/handler_test.go | 3 +-
lib/dispatchcloud/cmd.go | 4 +-
lib/dispatchcloud/dispatcher.go | 11 +-
lib/dispatchcloud/dispatcher_test.go | 2 +
lib/service/cmd.go | 71 +-
lib/service/cmd_test.go | 72 +-
lib/service/tls.go | 81 +++
sdk/go/arvados/config.go | 73 +-
sdk/go/arvados/keep_service.go | 25 +-
sdk/go/arvadostest/run_servers.go | 10 +-
sdk/go/ctxlog/log.go | 5 +-
sdk/go/httpserver/httpserver.go | 7 +-
sdk/go/httpserver/request_limiter.go | 38 +-
sdk/go/httpserver/request_limiter_test.go | 4 +-
sdk/python/tests/run_test_server.py | 132 ++--
sdk/python/tests/test_arv_put.py | 21 +-
sdk/python/tests/test_keep_client.py | 67 +-
.../arvados/v1/keep_services_controller.rb | 7 +-
services/api/app/models/keep_service.rb | 58 ++
.../arvados/v1/keep_services_controller_test.rb | 29 +
services/arv-git-httpd/auth_handler_test.go | 3 +-
services/arv-git-httpd/git_handler_test.go | 3 +-
services/arv-git-httpd/gitolite_test.go | 3 +-
services/arv-git-httpd/integration_test.go | 3 +-
services/crunch-run/git_mount_test.go | 3 +-
services/fuse/tests/integration_test.py | 2 +-
services/fuse/tests/test_exec.py | 2 +-
services/health/main.go | 3 +-
services/keep-balance/balance.go | 2 +-
services/keep-balance/balance_test.go | 8 +-
services/keep-web/handler_test.go | 3 +-
services/keep-web/server_test.go | 3 +-
services/keepproxy/keepproxy_test.go | 3 +-
services/keepstore/azure_blob_volume.go | 305 +++-----
services/keepstore/azure_blob_volume_test.go | 255 +++----
services/keepstore/bufferpool.go | 15 +-
services/keepstore/bufferpool_test.go | 14 +-
services/keepstore/command.go | 219 ++++++
services/keepstore/command_test.go | 29 +
services/keepstore/config.go | 226 ------
services/keepstore/config_test.go | 14 -
services/keepstore/deprecated.go | 47 --
services/keepstore/handler_test.go | 592 ++++++++--------
services/keepstore/handlers.go | 176 +++--
.../keepstore/handlers_with_generic_volume_test.go | 127 ----
services/keepstore/keepstore.go | 199 +-----
services/keepstore/keepstore.service | 1 -
services/keepstore/keepstore_test.go | 456 ------------
services/keepstore/metrics.go | 22 -
services/keepstore/mounts_test.go | 64 +-
services/keepstore/perms.go | 12 +-
services/keepstore/perms_test.go | 46 +-
services/keepstore/proxy_remote.go | 19 +-
services/keepstore/proxy_remote_test.go | 29 +-
services/keepstore/pull_worker.go | 51 +-
services/keepstore/pull_worker_integration_test.go | 74 +-
services/keepstore/pull_worker_test.go | 84 ++-
services/keepstore/s3_volume.go | 327 +++------
services/keepstore/s3_volume_test.go | 126 ++--
services/keepstore/server.go | 78 --
services/keepstore/server_test.go | 47 --
services/keepstore/status_test.go | 4 +-
services/keepstore/trash_worker.go | 23 +-
services/keepstore/trash_worker_test.go | 125 ++--
services/keepstore/unix_volume.go | 205 ++----
services/keepstore/unix_volume_test.go | 273 ++++---
services/keepstore/usage.go | 162 -----
services/keepstore/volume.go | 124 ++--
services/keepstore/volume_generic_test.go | 329 ++++-----
services/keepstore/volume_test.go | 79 ++-
services/ws/server_test.go | 7 +-
tools/arvbox/lib/arvbox/docker/cluster-config.sh | 25 +-
tools/arvbox/lib/arvbox/docker/keep-setup.sh | 9 +-
tools/arvbox/lib/arvbox/docker/service/nginx/run | 7 +
95 files changed, 4356 insertions(+), 4023 deletions(-)
create mode 100644 doc/_includes/_assign_volume_uuid.liquid
create mode 100644 lib/config/deprecated_keepstore.go
create mode 100644 lib/config/deprecated_keepstore_test.go
create mode 100644 lib/service/tls.go
create mode 100644 services/keepstore/command.go
create mode 100644 services/keepstore/command_test.go
delete mode 100644 services/keepstore/config.go
delete mode 100644 services/keepstore/config_test.go
delete mode 100644 services/keepstore/deprecated.go
delete mode 100644 services/keepstore/handlers_with_generic_volume_test.go
delete mode 100644 services/keepstore/keepstore_test.go
delete mode 100644 services/keepstore/server.go
delete mode 100644 services/keepstore/server_test.go
delete mode 100644 services/keepstore/usage.go
discards c16a69563c2748027da857d92083d81ff3eec261 (commit)
via 5fef2516e249671d288b35ba99a3c6730de0be91 (commit)
via 7c0257925a75185937c4a84dfd077458a24c53f9 (commit)
via 0bb53c1cbcbcb8b3be50e6ecf3fdf0bb7cbd96b5 (commit)
via 6527c64378ebd1970be69f6502db181c8272da5a (commit)
via f5862345c56afa3ea3565db9e6e0edb365b9fa03 (commit)
via 3cec8c10796bb6de9c02c96bbe7dd644c7366e42 (commit)
via 608a1591840dfbeac3d5580c505b50bfface5929 (commit)
via 18de39ed805bd1abd36ff4fcf83b5b130d321e74 (commit)
via 28f250ee0a43e873760d43b39119e5710de75fe8 (commit)
via 1b6b38c5d2e181f357cab883b63917cb5eaa778c (commit)
via 3056c56352955911bc8e844bc1e655cec5abe242 (commit)
via faeaccc982ec3fc89263342e26e9bed4b0ee50ed (commit)
via 1267366d66cadcc09972721bf7381f96f8fe73d6 (commit)
via a5b7b00aff9debab6607afb09b387de627bc2603 (commit)
via ce0df2b962b83137d97b75f594aa28fd694fb015 (commit)
via 55dc07e524cf221c3e572fb86de01255be6c759c (commit)
via 9dcec2ce4a077f14204fdfd6c4b1ec208ea281ab (commit)
via 32d0b751985b6e8adef29a71c3e4542e87f7c54f (commit)
via 0e0f69c6164339f4d0babb1d9d5a68fae24c01d5 (commit)
via 453fe7852de9b01a10ace4ded7b3b7825326e599 (commit)
via fc86370e31e1bb3a5d7b234419e29015c165bc67 (commit)
via baa2bf80cc078868191494ccb1631c426f4e0496 (commit)
via cf5d136d81bd22ce5340243643a4734f3cf20856 (commit)
via 07724cb2413ea22e583b9d579b514d81a97911be (commit)
via e201aabcc4d6d457a662ad0b4e51f3524b5bc865 (commit)
via ef2d67b9251839b44146f1df16f8cdd2d8faa38f (commit)
via 3dec49afe102f61d6db045aa8dadec442d055b71 (commit)
via 76ee36c49088274ab4e8465c0f4b20878d66c706 (commit)
via 6653f96c23ff461bc4cadf5184a95e1c9142f7e6 (commit)
via 11597243529c762114fc34907f772c331d6f6ef5 (commit)
via e5437560d2f30350370a1c96397716ac56a7398d (commit)
via d99713e58b0b9eb284fc3ea7f4008fa80bc5bcc5 (commit)
via a0ce99d4067878a7a32a9a2db44eb4bc0929d879 (commit)
via 08d2f48c3cf3eac9d71261172677c54f03669fe5 (commit)
via 04dd8d57e5ef90dd68876ffe5c72003645c6e3a2 (commit)
via c9a3f26fb35a6903178c3dbbc4dc3decb0ba2cf0 (commit)
via b144996ab73b15233f027713faf3114f34985e72 (commit)
via 90d84d8578b760b493ac76b22c42bc284868bc0c (commit)
via 20a69e126c68236a3c73daab101e351346f8bfaf (commit)
via f04693da1811e670d4cbb981debeecf14d79137c (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (c16a69563c2748027da857d92083d81ff3eec261)
\
N -- N -- N (5fef2516e249671d288b35ba99a3c6730de0be91)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 5fef2516e249671d288b35ba99a3c6730de0be91
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Sep 26 10:47:33 2019 -0400
15656: Fix missing permission check.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 8999b3e14..376be55ff 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -423,6 +423,10 @@ class Container < ArvadosModel
current_user.andand.is_admin
end
+ def permission_to_destroy
+ current_user.andand.is_admin
+ end
+
def ensure_owner_uuid_is_permitted
# validate_change ensures owner_uuid can't be changed at all --
# except during create, which requires admin privileges. Checking
diff --git a/services/api/test/unit/container_test.rb b/services/api/test/unit/container_test.rb
index 88fd5feb6..5f17efc44 100644
--- a/services/api/test/unit/container_test.rb
+++ b/services/api/test/unit/container_test.rb
@@ -980,6 +980,15 @@ class ContainerTest < ActiveSupport::TestCase
end
end
+ test "user cannot delete" do
+ set_user_from_auth :active
+ c, _ = minimal_new
+ assert_raises ArvadosModel::PermissionDeniedError do
+ c.destroy
+ end
+ assert Container.find_by_uuid(c.uuid)
+ end
+
[
{state: Container::Complete, exit_code: 0, output: '1f4b0bc7583c2a7f9102c395f4ffc5e3+45'},
{state: Container::Cancelled},
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list