Project

General

Profile

« Previous | Next » 

Revision 5d7fa5fd

Added by Tomer Brisker about 8 years ago

Fixes #14505 - Correct authorization of broken smart proxy actions

Because the controller is named "smart_proxies" but the puppetca and
autosign actions are implemented in seperate controllers,
authorized_via_my_scope fails to find the correct permission.
This also fixes the link to show proxy when viewing as non-admin user.

(cherry picked from commit a88d4a3e9790bf863634688b286ec6f9eed12907)

View differences:

app/views/smart_proxies/index.html.erb
<tbody>
<% for proxy in @smart_proxies %>
<tr class="proxy-show" data-url="<%= ping_smart_proxy_path(proxy) %>">
<td><%= link_to_if_authorized proxy.name, hash_for_smart_proxy_path(:id => proxy).merge(:auth_object => proxy, :authorizer => authorizer), :title => proxy.url %></td>
<td><%= link_to_if_authorized proxy.name, {:action => :show, :id => proxy}, :title => proxy.url %></td>
<% unless SETTINGS[:locations_enabled] && SETTINGS[:organizations_enabled] %>
<td class="hidden-sm hidden-xs nbsp ellipsis"><%= proxy.url %></td>
<% end %>

Also available in: Unified diff