Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move authorization config for snapshotting to vms section #13761

Merged
merged 2 commits into from
Feb 8, 2017
Merged

Move authorization config for snapshotting to vms section #13761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed579a7
Allow collection-specific resource actions
imtayadeway Feb 3, 2017
f948fed
Move role identifiers to collection-specific section
imtayadeway Feb 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/controllers/api/base_controller/parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,12 @@ def validate_method_action(method_name, action_name)
else
[@req.subject, request_type_target.last]
end
aspec = collection_config.typed_collection_actions(cname, target)
aspec = if @req.subcollection?
collection_config.typed_subcollection_actions(@req.collection, cname, target) ||
collection_config.typed_collection_actions(cname, target)
else
collection_config.typed_collection_actions(cname, target)
end
return if method_name == :get && aspec.nil?
action_hash = fetch_action_hash(aspec, method_name, action_name)
raise BadRequestError, "Disabled action #{action_name}" if action_hash[:disabled]
Expand All @@ -235,7 +240,12 @@ def request_type_target
def validate_post_api_action(cname, mname, type, target)
aname = @req.action

aspec = collection_config.typed_collection_actions(cname, target)
aspec = if @req.subcollection?
collection_config.typed_subcollection_actions(@req.collection, cname, target) ||
collection_config.typed_collection_actions(cname, target)
else
collection_config.typed_collection_actions(cname, target)
end
raise BadRequestError, "No actions are supported for #{cname} #{type}" unless aspec

action_hash = fetch_action_hash(aspec, mname, aname)
Expand Down
38 changes: 19 additions & 19 deletions config/api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,25 +1605,6 @@
- :subcollection
:verbs: *gpd
:klass: Snapshot
:subcollection_actions:
:get:
- :name: read
:identifier: vm_snapshot_view
:post:
- :name: create
:identifier: vm_snapshot_add
- :name: delete
:identifier: vm_snapshot_delete
:subresource_actions:
:get:
- :name: read
:identifier: vm_snapshot_view
:post:
- :name: delete
:identifier: vm_snapshot_delete
:delete:
- :name: delete
:identifier: vm_snapshot_delete
:software:
:description: Software
:options:
Expand Down Expand Up @@ -2046,6 +2027,25 @@
:identifier: vm_protect
- :name: resolve
:identifier: vm_policy_sim
:snapshots_subcollection_actions:
:get:
- :name: read
:identifier: vm_snapshot_view
:post:
- :name: create
:identifier: vm_snapshot_add
- :name: delete
:identifier: vm_snapshot_delete
:snapshots_subresource_actions:
:get:
- :name: read
:identifier: vm_snapshot_view
:post:
- :name: delete
:identifier: vm_snapshot_delete
:delete:
- :name: delete
:identifier: vm_snapshot_delete
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double check that spec/requests/api/config_spec.rb's test "contains only valid miq_feature identifiers" also test subresource actions as you have above ? If not, could you create another PR to update that test accordingly ? Thanks 🎵

:zones:
:description: Zones
:identifier: zone
Expand Down
4 changes: 2 additions & 2 deletions lib/api/collection_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def typed_collection_actions(collection_name, target)
self[collection_name]["#{target}_actions".to_sym]
end

def typed_subcollection_actions(collection_name, subcollection_name)
self[collection_name]["#{subcollection_name}_subcollection_actions".to_sym]
def typed_subcollection_actions(collection_name, subcollection_name, target = :subcollection)
self[collection_name]["#{subcollection_name}_#{target}_actions".to_sym]
end

def typed_subcollection_action(collection_name, subcollection_name, method)
Expand Down
8 changes: 4 additions & 4 deletions spec/requests/api/snapshots_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@

describe "POST /api/vms/:c_id/snapshots/:s_id with delete action" do
it "can queue a snapshot for deletion" do
api_basic_authorize(action_identifier(:snapshots, :delete, :subresource_actions, :delete))
api_basic_authorize(action_identifier(:vms, :delete, :snapshots_subresource_actions, :delete))
ems = FactoryGirl.create(:ext_management_system)
host = FactoryGirl.create(:host, :ext_management_system => ems)
vm = FactoryGirl.create(:vm_vmware, :name => "Alice's VM", :host => host, :ext_management_system => ems)
Expand All @@ -154,7 +154,7 @@
end

it "renders a failed action response if deleting is not supported" do
api_basic_authorize(action_identifier(:snapshots, :delete, :subresource_actions, :post))
api_basic_authorize(action_identifier(:vms, :delete, :snapshots_subresource_actions, :post))
vm = FactoryGirl.create(:vm_vmware)
snapshot = FactoryGirl.create(:snapshot, :vm_or_template => vm)

Expand All @@ -181,7 +181,7 @@

describe "POST /api/vms/:c_id/snapshots with delete action" do
it "can queue multiple snapshots for deletion" do
api_basic_authorize(action_identifier(:snapshots, :delete, :subresource_actions, :delete))
api_basic_authorize(action_identifier(:vms, :delete, :snapshots_subresource_actions, :delete))
ems = FactoryGirl.create(:ext_management_system)
host = FactoryGirl.create(:host, :ext_management_system => ems)
vm = FactoryGirl.create(:vm_vmware, :name => "Alice and Bob's VM", :host => host, :ext_management_system => ems)
Expand Down Expand Up @@ -220,7 +220,7 @@

describe "DELETE /api/vms/:c_id/snapshots/:s_id" do
it "can delete a snapshot" do
api_basic_authorize(action_identifier(:snapshots, :delete, :subresource_actions, :delete))
api_basic_authorize(action_identifier(:vms, :delete, :snapshots_subresource_actions, :delete))
vm = FactoryGirl.create(:vm_vmware)
snapshot = FactoryGirl.create(:snapshot, :vm_or_template => vm)

Expand Down