yield props if block_given?
end
- def assert_auth_logged_with_clean_properties(auth, event_type)
- assert_logged(auth, event_type) do |props|
+ def assert_logged_with_clean_properties(obj, event_type, excluded_attr)
+ assert_logged(obj, event_type) do |props|
['old_attributes', 'new_attributes'].map { |k| props[k] }.compact
.each do |attributes|
- refute_includes(attributes, 'api_token',
- "auth log properties include sensitive API token")
+ refute_includes(attributes, excluded_attr,
+ "log properties includes #{excluded_attr}")
end
yield props if block_given?
end
end
end
+ test "old_attributes preserves values deep inside a hash" do
+ set_user_from_auth :active
+ it = specimens(:owned_by_active_user)
+ it.properties = {'foo' => {'bar' => ['baz', 'qux', {'quux' => 'bleat'}]}}
+ it.save!
+ @log_count += 1
+ it.properties['foo']['bar'][2]['quux'] = 'blert'
+ it.save!
+ assert_logged it, :update do |props|
+ assert_equal 'bleat', props['old_attributes']['properties']['foo']['bar'][2]['quux']
+ assert_equal 'blert', props['new_attributes']['properties']['foo']['bar'][2]['quux']
+ end
+ end
+
test "destroying an authorization makes a log" do
set_user_from_auth :admin_trustedclient
auth = api_client_authorizations(:spectator)
auth.user = users(:spectator)
auth.api_client = api_clients(:untrusted)
auth.save!
- assert_auth_logged_with_clean_properties(auth, :create)
+ assert_logged_with_clean_properties(auth, :create, 'api_token')
auth.expires_at = Time.now
auth.save!
- assert_auth_logged_with_clean_properties(auth, :update)
+ assert_logged_with_clean_properties(auth, :update, 'api_token')
auth.destroy
- assert_auth_logged_with_clean_properties(auth, :destroy)
+ assert_logged_with_clean_properties(auth, :destroy, 'api_token')
end
test "use ownership and permission links to determine which logs a user can see" do
+ known_logs = [:noop,
+ :admin_changes_repository2,
+ :admin_changes_specimen,
+ :system_adds_foo_file,
+ :system_adds_baz,
+ :log_owned_by_active,
+ :crunchstat_for_running_job]
+
c = Log.readable_by(users(:admin)).order("id asc").each.to_a
- assert_equal 5, c.size
- assert_equal 1, c[0].id # no-op
- assert_equal 2, c[1].id # admin changes repository foo, which is owned by active user
- assert_equal 3, c[2].id # admin changes specimen owned_by_spectator
- assert_equal 4, c[3].id # foo collection added, readable by active through link
- assert_equal 5, c[4].id # baz collection added, readable by active and spectator through group 'all users' group membership
+ assert_log_result c, known_logs, known_logs
c = Log.readable_by(users(:active)).order("id asc").each.to_a
- assert_equal 3, c.size
- assert_equal 2, c[0].id # admin changes repository foo, which is owned by active user
- assert_equal 4, c[1].id # foo collection added, readable by active through link
- assert_equal 5, c[2].id # baz collection added, readable by active and spectator through group 'all users' group membership
+ assert_log_result c, known_logs, [:admin_changes_repository2, # owned by active
+ :system_adds_foo_file, # readable via link
+ :system_adds_baz, # readable via 'all users' group
+ :log_owned_by_active, # log owned by active
+ :crunchstat_for_running_job] # log & job owned by active
c = Log.readable_by(users(:spectator)).order("id asc").each.to_a
- assert_equal 2, c.size
- assert_equal 3, c[0].id # admin changes specimen owned_by_spectator
- assert_equal 5, c[1].id # baz collection added, readable by active and spectator through group 'all users' group membership
+ assert_log_result c, known_logs, [:admin_changes_specimen, # owned by spectator
+ :system_adds_baz] # readable via 'all users' group
+ end
+
+ def assert_log_result result, known_logs, expected_logs
+ # All of expected_logs must appear in result. Additional logs can
+ # appear too, but only if they are _not_ listed in known_logs
+ # (i.e., we do not make any assertions about logs not mentioned in
+ # either "known" or "expected".)
+ result_ids = result.collect &:id
+ expected_logs.each do |want|
+ assert_includes result_ids, logs(want).id
+ end
+ (known_logs - expected_logs).each do |notwant|
+ refute_includes result_ids, logs(notwant).id
+ end
+ end
+
+ test "manifest_text not included in collection logs" do
+ act_as_system_user do
+ coll = Collection.create(manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n")
+ assert_logged_with_clean_properties(coll, :create, 'manifest_text')
+ coll.name = "testing"
+ coll.save!
+ assert_logged_with_clean_properties(coll, :update, 'manifest_text')
+ coll.destroy
+ assert_logged_with_clean_properties(coll, :destroy, 'manifest_text')
+ end
end
end
projects / arvados.git / blobdiff