[ARVADOS] updated: be4e5f225cf1615504ee2c1feb0f200d6904716c
git at public.curoverse.com
git at public.curoverse.com
Mon Aug 10 14:16:57 EDT 2015
Summary of changes:
apps/workbench/Gemfile.lock | 3 -
.../app/controllers/actions_controller.rb | 10 +
apps/workbench/app/controllers/users_controller.rb | 19 +-
.../app/helpers/pipeline_instances_helper.rb | 4 +-
apps/workbench/app/models/arvados_base.rb | 4 +
apps/workbench/app/models/user.rb | 3 +
.../application/_delete_object_button.html.erb | 2 +-
.../views/application/_show_home_button.html.erb | 3 +
.../app/views/application/_show_recent.html.erb | 18 +-
apps/workbench/app/views/layouts/body.html.erb | 30 +-
.../notifications/_ssh_key_notification.html.erb | 5 +-
.../pipeline_instances/_running_component.html.erb | 16 +-
.../_show_components_running.html.erb | 24 +-
...rent_token.html.erb => _current_token.html.erb} | 5 +-
.../app/views/users/_manage_account.html.erb | 22 -
...epositories.html.erb => _repositories.html.erb} | 6 +-
...manage_ssh_keys.html.erb => _ssh_keys.html.erb} | 9 +-
...achines.html.erb => _virtual_machines.html.erb} | 14 +-
.../app/views/users/current_token.html.erb | 1 +
.../app/views/users/manage_account.html.erb | 1 -
.../app/views/users/repositories.html.erb | 2 +
apps/workbench/app/views/users/ssh_keys.html.erb | 2 +
.../app/views/users/virtual_machines.html.erb | 1 +
.../app/views/virtual_machines/webshell.html.erb | 4 +-
apps/workbench/config/routes.rb | 5 +-
.../test/controllers/actions_controller_test.rb | 39 ++
.../controllers/application_controller_test.rb | 41 ++
.../test/controllers/projects_controller_test.rb | 10 +
.../test/controllers/users_controller_test.rb | 4 +-
.../test/integration/application_layout_test.rb | 14 +-
.../test/integration/pipeline_instances_test.rb | 2 +-
.../test/integration/user_profile_test.rb | 5 +-
..._account_test.rb => user_settings_menu_test.rb} | 88 +++-
doc/_config.yml | 8 +-
doc/_includes/_arv_copy_expectations.liquid | 5 +-
doc/_includes/_install_git_curl.liquid | 13 +
doc/_includes/_install_postgres.liquid | 22 +
.../_install_ruby_and_bundler.liquid} | 19 +-
doc/_includes/_ssh_addkey.liquid | 4 +-
.../create-standard-objects.html.textile.liquid | 31 +-
doc/install/install-api-server.html.textile.liquid | 183 +++++---
.../install-arv-git-httpd.html.textile.liquid | 325 +++++++++++++-
.../install-compute-node.html.textile.liquid | 24 +-
.../install-crunch-dispatch.html.textile.liquid | 45 +-
doc/install/install-docker.html.textile.liquid | 6 +-
doc/install/install-keepproxy.html.textile.liquid | 6 +-
doc/install/install-keepstore.html.textile.liquid | 2 +-
...nstall-manual-prerequisites.html.textile.liquid | 28 +-
.../install-shell-server.html.textile.liquid | 16 +-
doc/install/install-sso.html.textile.liquid | 299 ++++++++-----
.../install-workbench-app.html.textile.liquid | 39 +-
doc/sdk/cli/install.html.textile.liquid | 8 +-
doc/sdk/cli/subcommands.html.textile.liquid | 2 +-
doc/sdk/perl/index.html.textile.liquid | 2 +-
.../vm-login-with-webshell.html.textile.liquid | 4 +-
doc/user/reference/api-tokens.html.textile.liquid | 4 +-
doc/user/topics/arv-copy.html.textile.liquid | 2 +-
doc/user/topics/arv-run.html.textile.liquid | 2 +-
.../add-new-repository.html.textile.liquid | 6 +-
.../running-external-program.html.textile.liquid | 17 +-
.../tutorial-submit-job.html.textile.liquid | 6 +-
docker/api/Dockerfile | 4 +-
docker/api/setup-gitolite.sh.in | 2 +-
sdk/cli/bin/crunch-job | 39 +-
sdk/cli/test/binstub_clean_fail/mount | 3 +
sdk/cli/test/binstub_docker_noop/docker.io | 2 +
sdk/cli/test/binstub_sanity_check/docker.io | 2 +
sdk/cli/test/binstub_sanity_check/true | 2 +
sdk/cli/test/test_arv-collection-create.rb | 2 -
sdk/cli/test/test_arv-get.rb | 42 +-
sdk/cli/test/test_arv-put.rb | 26 --
sdk/cli/test/test_arv-run-pipeline-instance.rb | 2 -
sdk/cli/test/test_arv-tag.rb | 2 +-
sdk/cli/test/test_crunch-job.rb | 126 ++++++
sdk/perl/Makefile.PL | 7 +-
sdk/python/arvados/arvfile.py | 4 +-
sdk/python/arvados/commands/arv_copy.py | 51 ++-
sdk/python/arvados/commands/put.py | 19 +-
sdk/python/arvados/commands/run.py | 9 +-
sdk/python/arvados/events.py | 60 ++-
sdk/python/arvados/keep.py | 5 +-
sdk/python/arvados/retry.py | 3 +-
sdk/python/bin/arv-get | 73 +--
sdk/python/tests/test_retry.py | 6 +-
sdk/python/tests/test_websockets.py | 136 +++---
.../arvados/v1/repositories_controller.rb | 136 ++++--
services/api/app/models/arvados_model.rb | 11 +-
services/api/app/models/authorized_key.rb | 4 +-
services/api/app/models/collection.rb | 18 +-
services/api/app/models/commit.rb | 32 +-
.../views/user_notifier/account_is_setup.text.erb | 4 +-
services/api/config/application.default.yml | 488 +++++++++++----------
services/api/config/application.yml.example | 31 +-
.../{database.yml.sample => database.yml.example} | 0
.../initializers/hardcoded_api_tokens.rb.example | 3 -
services/api/lib/eventbus.rb | 11 +-
.../api/script/arvados-git-sync.rb | 7 +-
services/api/script/crunch-dispatch.rb | 7 +
services/api/test/fixtures/humans.yml | 1 +
services/api/test/fixtures/links.yml | 14 +
services/api/test/fixtures/users.yml | 1 +
.../arvados/v1/collections_controller_test.rb | 78 ++++
.../arvados/v1/repositories_controller_test.rb | 97 +++-
.../functional/arvados/v1/users_controller_test.rb | 3 +-
services/api/test/integration/websocket_test.rb | 47 +-
services/api/test/unit/authorized_key_test.rb | 46 +-
services/api/test/unit/collection_test.rb | 60 +++
services/arv-git-httpd/auth_handler.go | 16 +-
services/arv-git-httpd/server_test.go | 15 +
services/datamanager/datamanager.go | 44 +-
services/datamanager/keep/keep.go | 84 +++-
services/datamanager/keep/keep_test.go | 81 ++++
services/datamanager/summary/pull_list.go | 6 +-
services/datamanager/summary/pull_list_test.go | 81 ++--
services/datamanager/summary/trash_list.go | 60 +++
services/datamanager/summary/trash_list_test.go | 76 ++++
services/fuse/arvados_fuse/__init__.py | 64 ++-
services/fuse/arvados_fuse/fusedir.py | 12 +-
services/fuse/tests/mount_test_base.py | 4 +-
services/fuse/tests/test_mount.py | 37 +-
services/keepstore/trash_worker.go | 8 +-
121 files changed, 2767 insertions(+), 1091 deletions(-)
create mode 100644 apps/workbench/app/views/application/_show_home_button.html.erb
rename apps/workbench/app/views/users/{_manage_current_token.html.erb => _current_token.html.erb} (69%)
delete mode 100644 apps/workbench/app/views/users/_manage_account.html.erb
rename apps/workbench/app/views/users/{_manage_repositories.html.erb => _repositories.html.erb} (83%)
rename apps/workbench/app/views/users/{_manage_ssh_keys.html.erb => _ssh_keys.html.erb} (91%)
rename apps/workbench/app/views/users/{_manage_virtual_machines.html.erb => _virtual_machines.html.erb} (92%)
create mode 100644 apps/workbench/app/views/users/current_token.html.erb
delete mode 100644 apps/workbench/app/views/users/manage_account.html.erb
create mode 100644 apps/workbench/app/views/users/repositories.html.erb
create mode 100644 apps/workbench/app/views/users/ssh_keys.html.erb
create mode 100644 apps/workbench/app/views/users/virtual_machines.html.erb
rename apps/workbench/test/integration/{user_manage_account_test.rb => user_settings_menu_test.rb} (65%)
create mode 100644 doc/_includes/_install_git_curl.liquid
create mode 100644 doc/_includes/_install_postgres.liquid
rename doc/{install/install-manual-prerequisites-ruby.html.textile.liquid => _includes/_install_ruby_and_bundler.liquid} (85%)
create mode 100755 sdk/cli/test/binstub_clean_fail/mount
create mode 100755 sdk/cli/test/binstub_docker_noop/docker.io
create mode 100755 sdk/cli/test/binstub_sanity_check/docker.io
create mode 100755 sdk/cli/test/binstub_sanity_check/true
create mode 100644 sdk/cli/test/test_crunch-job.rb
rename services/api/config/{database.yml.sample => database.yml.example} (100%)
delete mode 100644 services/api/config/initializers/hardcoded_api_tokens.rb.example
rename docker/api/update-gitolite.rb => services/api/script/arvados-git-sync.rb (96%)
create mode 100644 services/api/test/fixtures/humans.yml
create mode 100644 services/datamanager/keep/keep_test.go
create mode 100644 services/datamanager/summary/trash_list.go
create mode 100644 services/datamanager/summary/trash_list_test.go
via be4e5f225cf1615504ee2c1feb0f200d6904716c (commit)
via e0213cbec6a151e077b8cca00700815c3c3d18e7 (commit)
via 2553fde59a3cf872be891a4f689c241055080c35 (commit)
via 63b82f437c0f237c76f460ef71be0bb3ed42f7f4 (commit)
via 2a96c097e5a176018d078a5d6985403072e8672e (commit)
via 970907f28866a09a9fe95da48dffa6cd34ab4dca (commit)
via 3959d7afff8bb3c3b8da9eb7d178919275180f2a (commit)
via bdb850521603561439429c99e414ec702d7f83b1 (commit)
via 50ff63e948234f6f67acce0aec909f7b6f4705b8 (commit)
via 06f774bc61654ea0bb6ddd7b9f61bde1dd56b884 (commit)
via 4357a60b2805af7151e7c24a8e616b36584a22e3 (commit)
via c24168b75a7bfb6813843bd0c1825baae7434cc9 (commit)
via 6cfe8a2abb6121617286c0931ca723cadfc9e98f (commit)
via 9209660a3bd951c3945bce0da2fa9195cb002e44 (commit)
via 0988acb472849dc08d576ee40493e70bde2132ca (commit)
via f46b05c041684ced4cf438ae6cade577156f81a5 (commit)
via fc851b249ea25a40a1fb392906705142113ac5b9 (commit)
via d2d7138c84a55ef87937cdaefd9c58a66916d76f (commit)
via 8fe01fcc1b88a49f1f7eff14d0435e3ac0649721 (commit)
via 8089b2f5c97b1db9bd826a1b6488f1b060830def (commit)
via 97f16e9b6ce0095a40b68781238550d066a15261 (commit)
via 43338e77fc9ac255511395d8a8b1ae4bb8c98577 (commit)
via bbf7272aa2b831102c47fc93f8966ec32e918205 (commit)
via 03d5c4df2f33c5bb2117c45869808fa018e855f1 (commit)
via 261fe4c689858952b19991e0055eda669ab144af (commit)
via 427d9052d59ca7819acba9fb2e5f381d3e44a53e (commit)
via c8bea0c6dd47a9b9a7a892602d9869177d4c231f (commit)
via 93e0931ea059355ffc26add1303a52f13d2964c9 (commit)
via db717120a687b2851e526117a135a45be75cba1a (commit)
via b7c99efa73a3b0ccfec85915f04545d634b235b0 (commit)
via 5f642789f87c1f0cefbb878cbb031c9b71fc7a09 (commit)
via 54ad79868ed16e4a53f943ec9dc104c28dee2343 (commit)
via 092e1b42918850f7166cb4e3bbda25b67049105f (commit)
via 5916ac79faa2384d75cc41ab4af3ff1a881e8d6e (commit)
via 29a54ec4795c707b19858e3e02dcc48bf3d77e75 (commit)
via 467b636f7d1b34f7695f55af972ae90132fc8063 (commit)
via 75eaaaa74a4a7ec6821008fe93dbee598ee24dee (commit)
via d6b2ead0824fe6810917e5281b4feb969528eb46 (commit)
via 15ac44ec46bbbea31bf6a1ccc1842f7703b9f832 (commit)
via 7e112cd7504e7e379604e2b1fd46b53054a24050 (commit)
via 5641c4b171f72dd600e17e6db46b3723ab861a4c (commit)
via 27daf08f38eec505c224e7776678b32d50241e13 (commit)
via 29d73c8ab33b0d9c34074cd09e581cd7584da31e (commit)
via 559acee1dca5524f9650e360d5f16fc1582a77f0 (commit)
via 9036e4876fa3710b12a1dfb465652c04b9a73901 (commit)
via e76165d4c3b0cb5929bfec08f36a95ecd80cd564 (commit)
via 48dd255814cfc90a095132b6f621af13430267e0 (commit)
via 595d517e5293855690fdc65255648c32970dd31d (commit)
via baccfce65b0c997202c22e36a2ebfc455eff0334 (commit)
via f097af1ebfdb1ff849c1d5be4bda5b098871b877 (commit)
via bdabb9aa520b598107e319e51638f899f136aff5 (commit)
via 62f471c57d3acd04fe6bb3dc10c195f2cef10024 (commit)
via 5cff00f1efc7515fd0b8543f618214ecec384eb5 (commit)
via 44d4d43331979c87cee5df9ff952fd80a6e9c5f8 (commit)
via 5f3ac75bd946f743ca40ebf454dc29900cddfefb (commit)
via e0a1fc70f919741a8ad840dc40cfcc87f2751722 (commit)
via e9bee65d40255ab7aced5d380c546068c604bc38 (commit)
via 68481a07e385c86a03b9c963adc9be091373a78a (commit)
via 004243ab59e3a2fc36a708b66373297dd83e0b91 (commit)
via b369dfc85a356371e1bfb1eb1c3ddb8e8eaffc3d (commit)
via 6e65fde6143673c27ba85fef16acb1f5dce2d5b9 (commit)
via 3ba1af7f304edf32aea7250f569e5348f2af501e (commit)
via 89fccf123374c67e738381ea840e3535b2d1074f (commit)
via f2f4727cf8a91e363c2a1c85e98fcdd6419abdb5 (commit)
via 44184f3bebe52f3d4ea567b8105f3631fcb003fe (commit)
via 10556d8eea7e57dafe1495f8ceb6fae809d033a3 (commit)
via 6fad718eea05f4292d89470b62e067754873e85d (commit)
via 6f883592fd278398f8b5af3d4ff26196469a5050 (commit)
via f7e00eb55fbcc41b8cd1f416344ad4abdb020bc0 (commit)
via cca0d86de72487988b1a7d657e67143121461a0f (commit)
via 5b2e3d9c92b34603912872c2e10e13da91268a29 (commit)
via e32890977964e1c14169962edeba4f642e4e1091 (commit)
via 9fcd7e96ad9ed8c7f3a343663a06ee9cbaa15aa9 (commit)
via 8f93d1332a25d29aa96211920e1b399a1e94482c (commit)
via b958c247cba0cc0a9b13dfd4fbc10c1a807b5074 (commit)
via 01a76d36f6afcd3bb7c8e224881fe98364a47b85 (commit)
via 30d1623c0fe687acdef334c037c24752c0c61620 (commit)
via c94bc0d5c2ae1514a7b0799477279567fa4df177 (commit)
via 89dcdd013aef473cef6f2b94bfcd2308b60a55d4 (commit)
via 70a9d8683b62a91e7d3ee3e827af6b69b9aa9a94 (commit)
via 4c5925a0eceebcd86a4c59a0123dac49aabffae0 (commit)
via b9a61af34e1f77500d5d0850b4bfd6e11a6f783a (commit)
via 821cb42d42976ec6f750e0b0b191ccc36cbad295 (commit)
via cec08599bc15bccdf1acfebb4f773f139cc45dcb (commit)
via ed2e9fece8c44c5aa464de012b3fce84e7b049eb (commit)
via 0c96fc858f1f4954d997f2065550087dcc7f8bec (commit)
via 2e92762444af21749e1ef232aecb6eeb98b312cd (commit)
via 5f708f621d43585e59787d86d4e3565e09f9c6b8 (commit)
via 80abb8a0e679f4dd1a7ac00cd629f854af160de5 (commit)
via b3a25028eaf04bf77e1f0665968527a9084a84dc (commit)
via 7e773735e9d547381a77baeeb139696dfa66a7a6 (commit)
via 15c86f88f1f5124c082e77dedd0b97c5efc93388 (commit)
via 95135f30f13fe233da5d8713737561f77a97c6b6 (commit)
via 434be0f7e6420fee1b99e78466ee4a4d734734c1 (commit)
via b6f800ae7e474f1ceeb827fc9712296a96514592 (commit)
via b5b88cdaefb4f35b877c3279d6556fae7d62afcf (commit)
via a812a13a6e9854f37ecebccedeb163b8cbe7130e (commit)
via 93655055b823716a4e45abc4f35f6ba06920e11b (commit)
via d44692dedcf0af87f53653afc27154c38a7b72a5 (commit)
via a789f895a5cdbc2a548787f99197f9861521106b (commit)
via 97fa1e269cf5d33365d76fcdc6ec3f6734b0f468 (commit)
via 4d6e05c25c6a5d72afee37f8165b006267b4183d (commit)
via 41bb13b71c8593134c2b34884249ca862b185e04 (commit)
via 6988f4d44d2f8f7fc4aa2c381334c44d3133cf31 (commit)
via bb58564d632498a394ee75b07d17f41b724ef824 (commit)
via 71e1b1d62a71ad052487f5e8ecb8f36ae17ca8e1 (commit)
via f3504dc2b40eaa4235092b671ce0bece43732904 (commit)
via 5ef15a740ed578b2c5d3cc4ef28ef38bb1c433af (commit)
via a76d71558daa6b623c00c8e262840fc6dd68119f (commit)
via e8ba9a0432ab7a304bb4b41eb563443f34cf2d7d (commit)
via fe7f9a43e42f31c35d879aee3e0ec5f811b19abf (commit)
via 6870192ada3c34ffe5f0dc4c33ce2ad55bc2d263 (commit)
via 620fb9e0a294f8910ae82c9c38df69976f911c08 (commit)
via 43a95731adfcf942fd9ab598c2b8e2c80911de0c (commit)
via 31a61e326aa23228ab88bf83ff5866e8c7ca9d0a (commit)
via 1b8caff3ad598744e4a0379b01fc95ca4838caa0 (commit)
via 61da6612acb822a87fca157fe39757460213473f (commit)
via e51a22dc5b9da795b68c87cb9d0a45e4732ed2f6 (commit)
via 1000275df3e0b4207ae60d51d25b96f74bd06c23 (commit)
via 465cb9225cce74600349239a295b1360ce2b0fa6 (commit)
via d2cbbe5a55cec8e6a874ea65acec7bf36c8c0a83 (commit)
via 8d2aebfd3a0e4814b292659710386f949cafe092 (commit)
via 60f3ef78fe5dc269b2c06d980cc95cbc4f8fdd84 (commit)
via 800e8ba4da76590c8cbe9801bef49a7ffb30bfbc (commit)
via 70ce2cc8559b74907458797f7fbd8abb6e2c5a23 (commit)
via 449c9871fb265f111251ee89669914652ac7b4c3 (commit)
via 6dff0705fd3b4e0acde7bdf5821ef115ba74099b (commit)
via 39fe0413aa14ff0ba41d790441c8621a877f61f8 (commit)
via 415ecc439212c2a670b1df05c3e8b1a90245243e (commit)
via 8e74a5f22b14f26d33c89dadf42600d417094009 (commit)
via 9b3223e5cbcd1eb89193e8421d430025ddf791d1 (commit)
via 157a17462d308d94c68bcdaa4dab055c0e5ccbe8 (commit)
via 52c8fd376a75558657969cdf11955334e95d9e83 (commit)
via 8797ab137a1d8824292a6f7202f6cd0c9744c4f9 (commit)
via 8699ba0baf2e346f0adc7ca79f0a8b129f56b9a7 (commit)
via 747e22c9341d00a3f093298a979175166e2898a7 (commit)
via a3d4fc92c1cfc2431adb55255793e0077c0a5bd1 (commit)
via eba475a918e4ae847ae6b5753016f2eb54e18085 (commit)
via ec752f92eff3990718d169fccc06a04ddc089578 (commit)
via db66ff7c2511f80f3795c388f314753064378543 (commit)
via cda68ba838b2595c631231a08a8e3b3ea03d2c7f (commit)
via 017d19d31606b8b313c04fffc33d44592ad9644b (commit)
via ccf30f40f46ea450d7ab3766f0923b486a7450d3 (commit)
via 21f8e36579eb7091041cf696d1e7fbb14caeb6ea (commit)
via 7d5d40c55d2a38b12e810f3b9d3e168ee434cbd2 (commit)
via 5058d1cbdbde801a2cf7e303d83e1a626015afdd (commit)
via a94ec93d3322320bbf075559c4693da816b815f4 (commit)
via 06d6b29b121b80cb975e5d9d29a9a6f9b3763c47 (commit)
via 1e6134579d0fd7f548a9340b67709d4731b29934 (commit)
via 7019bc98593c0603a2589d01cd028a242bf7f33f (commit)
via 67813302a9e6d923d3c803b652929f3803cf6ece (commit)
via 9fd9565ea0411b43943076add49d5bca2da8e379 (commit)
via 3be96c96a4ff1c519e03e6dc2036e0b93e41ee8c (commit)
via 2b7d9f3f2e687d524ccc1d88e470e721f63f9e51 (commit)
via d22b2efd246ec82a5888d500bcbc7669654b842d (commit)
via 6152230e1f77b925c2041d688805ab6764919805 (commit)
via fc8a283968b08b152d57a24d2c5711c876a3b379 (commit)
via ec64034683c31d76d02c293f0ae27d6ae80653cb (commit)
via 23d0c610d06eaabca9efa0ce36a672973b3e84c9 (commit)
via ff24bb94fdfc9dad61821aef56898e2c196c0aea (commit)
via ed5230f0e823445f56e7d6940b6fb178e328718b (commit)
via 0c447acb37a221a096249c6a9cfad4255c08f575 (commit)
via e39e11d5850c1a2509f377e2f2551105507f59e3 (commit)
via 5ac198c8fd7e329b08f344843fa5680add07566c (commit)
via 004bafda085386b50e074eedf370ec40a386d6e5 (commit)
via c21473474aba30c12921961483990908ba525b82 (commit)
via 56d94b28fc1ee2fe2f36f6743186e8b442c9e676 (commit)
via 3282d76febc482aab302a44bf594bcf9591ff868 (commit)
via da56d26d09a6b315bdb93aed4473310b939e1bd7 (commit)
via c8f0866051391c9932a8d39bbd3cacb83e60c20e (commit)
via 607c3ded2ab3ad0c04ef2e3520ce1b507774dedb (commit)
via c0893f609643a73950957c0aa228f167579951d7 (commit)
via fd1c8009f521564eaec4dbb22cead032e3784023 (commit)
via 6d2811a2e001369b950c452be3dee14db8d795c2 (commit)
via c86a3350fe212e35a7d745d5607fbc27bc1fd3c8 (commit)
via 76c38b6bf63fa7329abb135a40710cbdbea18d44 (commit)
via 0f0108a652d852b0bc165bf43e41fc378c49315a (commit)
via aa924bec2e4b5c029cb19f4e9021d72b665be76b (commit)
via e69333d856baabf8bbbc27602850dcfe86309d23 (commit)
via 66af20886def83f6a20cc1e6587de00cbf2f8b59 (commit)
via 4a5adfa084b3c3a8e586df5ac0acc0b3fc6150db (commit)
via a71c0bc8685f71dc9ebb2804626d2d12741eebc3 (commit)
via f4180d151eacadf1455b2ebe43ecb61cb095df7c (commit)
via 171ac077e7335978007daf8199559290e73b8180 (commit)
via 753c1446ea70d70043be0913e52bb270d28ecded (commit)
via 3e6ba5fa5f225c8aa431ce9a2796369c1e1dda2d (commit)
via aeb481ad2a9b9c3c090b15b317d6ce262ca95da9 (commit)
via 130cbc5cd46272834c2971b40bdba8c32eeee614 (commit)
via 15ac0086cc6623fa3e4c601c19a14fdcd6c139ca (commit)
via 9ce68afa9f3f1b558acd19561760c19e35b8a356 (commit)
via 2ab08e38376d9591394d35d7676badf96f7b99c9 (commit)
via 17ce65cd493d8040640f5a5c3d2a97a5175a0465 (commit)
via 1b9bb00665f837cbafc87bb6fca2252e453abefc (commit)
via 51641ba5579cb9ebe14234e0888a162b46d1627d (commit)
via 0ae899078093ac04cfdf416940f4faa821400641 (commit)
via 90071ec94bdc8bcbbfe6e5b2b2012863f27cd451 (commit)
via a467cb24c0a2db71c39ce1bf86507bff6f3cea05 (commit)
via ce128902e008420f453eb29986280d72777bec32 (commit)
via 5b2b5f57eee063c102a5f76b199273ee57eb00fe (commit)
via 591315b0be613c32666b404cde2b1fe9724baa41 (commit)
via 51dc4f3f6d1faa0dfa79ae4d282f584fbe797299 (commit)
via 28bdc3c6fd49e1f3761183a939b163315b413195 (commit)
via 51a7226a1cf217fe4ea41f6d1b111b55d396485d (commit)
via 229773c2aa3ddc798ae4eb1eff62f8f77db85391 (commit)
via 997b13a64e1e224f77c4f1f39f0033d4750413de (commit)
via e302c2a74072ebe734adfb45fc6b525f299bb9fb (commit)
via 5e33262f1aad92582215e29b875411d514846269 (commit)
via 119d87107846d77274fdaa52dc8cdadd2a7b9765 (commit)
via f7f91a7085f8acfbbdd120575e88dcea53297554 (commit)
via 6aac88a912ded276ed151501ac3977cfcc78600d (commit)
via 50419ea603e697dd53690842a07a279577d1ca68 (commit)
via 91b7b7fd54c4728ac6cf12181efc1fed60157ecb (commit)
via f51b562b9def7f6bc17e0cc52b60ffc2641d40b5 (commit)
via f63e86a3270836ab5e5f1de31e28b686ff809739 (commit)
via 7da85b85af2dd9b22186bfd48190de7b68f75837 (commit)
via 036140f305fc34fdefe0ae393b1011f4c3f840de (commit)
via b0b276ff6121aace3c52ee855752df6852120343 (commit)
via 2578d032288f24988a54ee57708fe71902e4ef92 (commit)
from 12c47d0c0dc38a9e1d1e5a0e953a226a1a0557c6 (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 be4e5f225cf1615504ee2c1feb0f200d6904716c
Merge: 12c47d0 e0213cb
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Aug 10 14:13:45 2015 -0400
Merge branch 'master' into 5824-go-sdk
Conflicts:
services/arv-git-httpd/auth_handler.go
diff --cc services/arv-git-httpd/auth_handler.go
index 0fb1567,b284f19..dccbe7f
--- a/services/arv-git-httpd/auth_handler.go
+++ b/services/arv-git-httpd/auth_handler.go
@@@ -34,11 -52,25 +34,25 @@@ func (h *authHandler) ServeHTTP(wOrig h
w.WriteHeader(statusCode)
w.Write([]byte(statusText))
}
- httpserver.Log(r.RemoteAddr, apiToken, w.WroteStatus(), statusText, repoName, r.Method, r.URL.Path)
+
- // If the given password is a valid token, log the first 10 characters of the token.
- // Otherwise: log the string <invalid> if a password is given, else an empty string.
++ // If the given password is a valid token, log the
++ // first 10 characters of the token. Otherwise: log
++ // the string <invalid> if a password is given, else
++ // an empty string.
+ passwordToLog := ""
+ if statusCode == 401 || strings.Contains(statusText, "Unauthorized") {
- if len(password) > 0 {
++ if len(apiToken) > 0 {
+ passwordToLog = "<invalid>"
+ }
+ } else {
- passwordToLog = password[0:10]
++ passwordToLog = apiToken[0:10]
+ }
+
- log.Println(quoteStrings(r.RemoteAddr, username, passwordToLog, wroteStatus, statusText, repoName, r.Method, r.URL.Path)...)
++ httpserver.Log(r.RemoteAddr, passwordToLog, w.WroteStatus(), statusText, repoName, r.Method, r.URL.Path)
}()
- // HTTP request username is logged, but unused. Password is an
- // Arvados API token.
- username, password, ok := BasicAuth(r)
- if !ok || username == "" || password == "" {
+ creds := auth.NewCredentialsFromHTTPRequest(r)
+ if len(creds.Tokens) == 0 {
statusCode, statusText = http.StatusUnauthorized, "no credentials provided"
w.Header().Add("WWW-Authenticate", "Basic realm=\"git\"")
return
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list