X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/27ffca811e6f43225fc82d582d1962eebbd1ab6e..7d81fa519e768fd3bbafebef1530b1dfc5d845bc:/services/api/test/functional/arvados/v1/collections_controller_test.rb diff --git a/services/api/test/functional/arvados/v1/collections_controller_test.rb b/services/api/test/functional/arvados/v1/collections_controller_test.rb index afda91cc02..30559a5094 100644 --- a/services/api/test/functional/arvados/v1/collections_controller_test.rb +++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb @@ -2,6 +2,21 @@ require 'test_helper' class Arvados::V1::CollectionsControllerTest < ActionController::TestCase + setup do + # Unless otherwise specified in the test, we want normal/secure behavior. + permit_unsigned_manifests false + end + + teardown do + # Reset to secure behavior after each test. + permit_unsigned_manifests false + end + + def permit_unsigned_manifests isok=true + # Set security model for the life of a test. + Rails.configuration.permit_create_collection_with_unsigned_manifest = isok + end + test "should get index" do authorize_with :active get :index @@ -42,7 +57,8 @@ class Arvados::V1::CollectionsControllerTest < ActionController::TestCase assert_equal 99999, resp['offset'] end - test "should create" do + test "create with unsigned manifest" do + permit_unsigned_manifests authorize_with :active test_collection = { manifest_text: <<-EOS @@ -52,24 +68,33 @@ class Arvados::V1::CollectionsControllerTest < ActionController::TestCase ./baz acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:bar.txt EOS } - test_collection[:uuid] = + test_collection[:portable_data_hash] = Digest::MD5.hexdigest(test_collection[:manifest_text]) + '+' + test_collection[:manifest_text].length.to_s + + # post :create will modify test_collection in place, so we save a copy first. + # Hash.deep_dup is not sufficient as it preserves references of strings (??!?) + post_collection = Marshal.load(Marshal.dump(test_collection)) post :create, { - collection: test_collection + collection: post_collection } + assert_response :success assert_nil assigns(:objects) get :show, { - id: test_collection[:uuid] + id: test_collection[:portable_data_hash] } assert_response :success assert_not_nil assigns(:object) resp = JSON.parse(@response.body) assert_equal test_collection[:uuid], resp['uuid'] - assert_equal test_collection[:manifest_text], resp['manifest_text'] + + # The manifest in the response will have had permission hints added. + # Remove any permission hints in the response before comparing it to the source. + stripped_manifest = resp['manifest_text'].gsub(/\+A[A-Za-z0-9@_-]+/, '') + assert_equal test_collection[:manifest_text], stripped_manifest assert_equal 9, resp['data_size'] assert_equal [['.', 'foo.txt', 0], ['.', 'bar.txt', 6], @@ -80,7 +105,7 @@ EOS authorize_with :active test_collection = { manifest_text: "", - uuid: "d41d8cd98f00b204e9800998ecf8427e+0" + portable_data_hash: "d41d8cd98f00b204e9800998ecf8427e+0" } post :create, { collection: test_collection @@ -96,68 +121,87 @@ EOS end test "create with owner_uuid set to owned group" do + permit_unsigned_manifests authorize_with :active manifest_text = ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n" post :create, { collection: { owner_uuid: 'zzzzz-j7d0g-rew6elm53kancon', manifest_text: manifest_text, - uuid: "d30fe8ae534397864cb96c544f4cf102" + portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47" } } assert_response :success resp = JSON.parse(@response.body) - assert_equal 'zzzzz-tpzed-000000000000000', resp['owner_uuid'] + assert_equal 'zzzzz-j7d0g-rew6elm53kancon', resp['owner_uuid'] end test "create with owner_uuid set to group i can_manage" do + permit_unsigned_manifests authorize_with :active manifest_text = ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n" post :create, { collection: { - owner_uuid: 'zzzzz-j7d0g-8ulrifv67tve5sx', + owner_uuid: groups(:system_owned_group).uuid, manifest_text: manifest_text, - uuid: "d30fe8ae534397864cb96c544f4cf102" + portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47" } } assert_response :success resp = JSON.parse(@response.body) - assert_equal 'zzzzz-tpzed-000000000000000', resp['owner_uuid'] + assert_equal 'zzzzz-j7d0g-8ulrifv67tve5sx', resp['owner_uuid'] end - test "create with owner_uuid set to group with no can_manage permission" do + test "create with owner_uuid fails on group with can_read permission" do + permit_unsigned_manifests authorize_with :active manifest_text = ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n" post :create, { collection: { - owner_uuid: 'zzzzz-j7d0g-it30l961gq3t0oi', + owner_uuid: groups(:all_users).uuid, manifest_text: manifest_text, - uuid: "d30fe8ae534397864cb96c544f4cf102" + portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47" } } assert_response 403 end + test "create with owner_uuid fails on group with no permission" do + permit_unsigned_manifests + authorize_with :active + manifest_text = ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n" + post :create, { + collection: { + owner_uuid: groups(:public).uuid, + manifest_text: manifest_text, + portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47" + } + } + assert_response 422 + end + test "admin create with owner_uuid set to group with no permission" do + permit_unsigned_manifests authorize_with :admin manifest_text = ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n" post :create, { collection: { owner_uuid: 'zzzzz-j7d0g-it30l961gq3t0oi', manifest_text: manifest_text, - uuid: "d30fe8ae534397864cb96c544f4cf102" + portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47" } } assert_response :success end test "should create with collection passed as json" do + permit_unsigned_manifests authorize_with :active post :create, { collection: <<-EOS { "manifest_text":". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n",\ - "uuid":"d30fe8ae534397864cb96c544f4cf102"\ + "portable_data_hash":"d30fe8ae534397864cb96c544f4cf102+47"\ } EOS } @@ -165,18 +209,34 @@ EOS end test "should fail to create with checksum mismatch" do + permit_unsigned_manifests authorize_with :active post :create, { collection: <<-EOS { "manifest_text":". d41d8cd98f00b204e9800998ecf8427e 0:0:bar.txt\n",\ - "uuid":"d30fe8ae534397864cb96c544f4cf102"\ + "portable_data_hash":"d30fe8ae534397864cb96c544f4cf102+47"\ } EOS } assert_response 422 end + test "collection UUID is normalized when created" do + permit_unsigned_manifests + authorize_with :active + post :create, { + collection: { + manifest_text: ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n", + portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47+Khint+Xhint+Zhint" + } + } + assert_response :success + assert_not_nil assigns(:object) + resp = JSON.parse(@response.body) + assert_equal "d30fe8ae534397864cb96c544f4cf102+47", resp['portable_data_hash'] + end + test "get full provenance for baz file" do authorize_with :active get :provenance, id: 'ea10d51bcf88862dbcc36eb292017dfd+45' @@ -215,53 +275,64 @@ EOS where: { any: ['contains', '7f9102c395f4ffc5e3'] } } assert_response :success - found = assigns(:objects).collect(&:uuid) - assert_equal 1, found.count + found = assigns(:objects).collect(&:portable_data_hash) + assert_equal 2, found.count assert_equal true, !!found.index('1f4b0bc7583c2a7f9102c395f4ffc5e3+45') end - test "create collection with signed manifest" do - authorize_with :active - locators = %w( + [false, true].each do |permit_unsigned| + test "create collection with signed manifest, permit_unsigned=#{permit_unsigned}" do + permit_unsigned_manifests permit_unsigned + authorize_with :active + locators = %w( d41d8cd98f00b204e9800998ecf8427e+0 acbd18db4cc2f85cedef654fccc4a4d8+3 ea10d51bcf88862dbcc36eb292017dfd+45) - unsigned_manifest = locators.map { |loc| - ". " + loc + " 0:0:foo.txt\n" - }.join() - manifest_uuid = Digest::MD5.hexdigest(unsigned_manifest) + - '+' + - unsigned_manifest.length.to_s - - # build a manifest with both signed and unsigned locators. - # TODO(twp): in phase 4, all locators will need to be signed, so - # this test should break and will need to be rewritten. Issue #2755. - signing_opts = { - key: Rails.configuration.blob_signing_key, - api_token: api_token(:active), - } - signed_manifest = - ". " + locators[0] + " 0:0:foo.txt\n" + - ". " + Blob.sign_locator(locators[1], signing_opts) + " 0:0:foo.txt\n" + - ". " + Blob.sign_locator(locators[2], signing_opts) + " 0:0:foo.txt\n" - - post :create, { - collection: { - manifest_text: signed_manifest, - uuid: manifest_uuid, + unsigned_manifest = locators.map { |loc| + ". " + loc + " 0:0:foo.txt\n" + }.join() + manifest_uuid = Digest::MD5.hexdigest(unsigned_manifest) + + '+' + + unsigned_manifest.length.to_s + + # Build a manifest with both signed and unsigned locators. + signing_opts = { + key: Rails.configuration.blob_signing_key, + api_token: api_token(:active), } - } - assert_response :success - assert_not_nil assigns(:object) - resp = JSON.parse(@response.body) - assert_equal manifest_uuid, resp['uuid'] - assert_equal 48, resp['data_size'] - # All of the locators in the output must be signed. - resp['manifest_text'].lines.each do |entry| - m = /([[:xdigit:]]{32}\+\S+)/.match(entry) - if m - assert Blob.verify_signature m[0], signing_opts + signed_locators = locators.collect do |x| + Blob.sign_locator x, signing_opts + end + if permit_unsigned + # Leave a non-empty blob unsigned. + signed_locators[1] = locators[1] + else + # Leave the empty blob unsigned. This should still be allowed. + signed_locators[0] = locators[0] + end + signed_manifest = + ". " + signed_locators[0] + " 0:0:foo.txt\n" + + ". " + signed_locators[1] + " 0:0:foo.txt\n" + + ". " + signed_locators[2] + " 0:0:foo.txt\n" + + post :create, { + collection: { + manifest_text: signed_manifest, + portable_data_hash: manifest_uuid, + } + } + assert_response :success + assert_not_nil assigns(:object) + resp = JSON.parse(@response.body) + assert_equal manifest_uuid, resp['portable_data_hash'] + assert_equal 48, resp['data_size'] + # All of the locators in the output must be signed. + resp['manifest_text'].lines.each do |entry| + m = /([[:xdigit:]]{32}\+\S+)/.match(entry) + if m + assert Blob.verify_signature m[0], signing_opts + end end end end @@ -296,13 +367,13 @@ EOS post :create, { collection: { manifest_text: signed_manifest, - uuid: manifest_uuid, + portable_data_hash: manifest_uuid, } } assert_response :success assert_not_nil assigns(:object) resp = JSON.parse(@response.body) - assert_equal manifest_uuid, resp['uuid'] + assert_equal manifest_uuid, resp['portable_data_hash'] assert_equal 48, resp['data_size'] # All of the locators in the output must be signed. resp['manifest_text'].lines.each do |entry| @@ -336,7 +407,7 @@ EOS post :create, { collection: { manifest_text: bad_manifest, - uuid: manifest_uuid + portable_data_hash: manifest_uuid } } @@ -360,7 +431,7 @@ EOS post :create, { collection: { manifest_text: signed_manifest, - uuid: manifest_uuid + portable_data_hash: manifest_uuid } } @@ -368,6 +439,7 @@ EOS end test "multiple locators per line" do + permit_unsigned_manifests authorize_with :active locators = %w( d41d8cd98f00b204e9800998ecf8427e+0 @@ -379,21 +451,28 @@ EOS '+' + manifest_text.length.to_s + test_collection = { + manifest_text: manifest_text, + portable_data_hash: manifest_uuid, + } + post_collection = Marshal.load(Marshal.dump(test_collection)) post :create, { - collection: { - manifest_text: manifest_text, - uuid: manifest_uuid, - } + collection: post_collection } assert_response :success assert_not_nil assigns(:object) resp = JSON.parse(@response.body) - assert_equal manifest_uuid, resp['uuid'] + assert_equal manifest_uuid, resp['portable_data_hash'] assert_equal 48, resp['data_size'] - assert_equal resp['manifest_text'], manifest_text + + # The manifest in the response will have had permission hints added. + # Remove any permission hints in the response before comparing it to the source. + stripped_manifest = resp['manifest_text'].gsub(/\+A[A-Za-z0-9@_-]+/, '') + assert_equal manifest_text, stripped_manifest end test "multiple signed locators per line" do + permit_unsigned_manifests authorize_with :active locators = %w( d41d8cd98f00b204e9800998ecf8427e+0 @@ -416,13 +495,13 @@ EOS post :create, { collection: { manifest_text: signed_manifest, - uuid: manifest_uuid, + portable_data_hash: manifest_uuid, } } assert_response :success assert_not_nil assigns(:object) resp = JSON.parse(@response.body) - assert_equal manifest_uuid, resp['uuid'] + assert_equal manifest_uuid, resp['portable_data_hash'] assert_equal 48, resp['data_size'] # All of the locators in the output must be signed. # Each line is of the form "path locator locator ... 0:0:file.txt" @@ -436,4 +515,20 @@ EOS end assert_equal locators.count, returned_locator_count end + + test 'Reject manifest with unsigned blob' do + authorize_with :active + unsigned_manifest = ". 0cc175b9c0f1b6a831c399e269772661+1 0:1:a.txt\n" + manifest_uuid = Digest::MD5.hexdigest(unsigned_manifest) + post :create, { + collection: { + manifest_text: unsigned_manifest, + portable_data_hash: manifest_uuid, + } + } + assert_response 403, + "Creating a collection with unsigned blobs should respond 403" + assert_empty Collection.where('uuid like ?', manifest_uuid+'%'), + "Collection should not exist in database after failed create" + end end