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

1.15 CVE Fixes #5373

Merged
merged 2 commits into from
Mar 29, 2018
Merged

1.15 CVE Fixes #5373

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
09d0f3e
Fixes #23028 - Properly escape params passed to where (CVE-2018-1096)
martinpovolny Mar 27, 2018
47cf4ca
Fixes #22546 - Return power action status for ovirt (CVE-2018-1097)
orrabin Mar 28, 2018
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
2 changes: 1 addition & 1 deletion app/controllers/dashboard_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def save_positions
errors = []
filter = self.class.widget_params_filter
params.fetch(:widgets, []).each do |id, values|
widget = User.current.widgets.where("id = #{id}").first
widget = User.current.widgets.where(:id => id).first
values = filter.filter_params(values, parameter_filter_context, :none)
errors << widget.errors unless widget.update_attributes(values)
end
Expand Down
7 changes: 6 additions & 1 deletion app/services/power_manager/virt.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ def state_output(result)
end

def default_action(action)
vm.send(action)
action_status = vm.send(action)
# Temporary fix until fog-ovirt is updated
if action_status.is_a?(Fog::Compute::Ovirt::Server)
return true
end
action_status
end

def action_map
Expand Down