foreman_cockpit 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fdaf362cfb67b4ce1ed4b009e78bc1dab6e71ba
-  data.tar.gz: b8091282c44018675e15269f5c3498815ec29540
+  metadata.gz: 93dcc6130c7c7f4b933117ab027d0e3677b143fe
+  data.tar.gz: 0dc9311b8863fd4993d3e1c1a543dc8d05444c26
 SHA512:
-  metadata.gz: 104cee72dfc7774ae2175ab476bedef07d63a5ad4b0a32ea3b012581e99879c19030d82ada67df635c2f1d372057517147cdedba141671b8fc226bdae34f9b72
-  data.tar.gz: 950e0c39b6a6544cc39ad11af2f36896aa10bcd212747c2876b084e1e3ae63f73b02318a45450320862634209c2727333ebe301b7b98b05e35ebdf32dd10cd62
+  metadata.gz: e71862322f80a250d01706e4033d2a2d249596d3995c7838662bacfa10516a3eb1393260c72d4c97cf8879376e7f502d7f75d608f44dddc1b3a6bf898da42a94
+  data.tar.gz: 339dcf2ef621bf8e6c5c00ed447828227dbfd27c2f644deacf72fda165fc7fb8b5bec1fb2ae40167cfba8e584fa73470bd2e4a21500cd27dd10160c258feee21

data/app/controllers/concerns/foreman_cockpit/hosts_controller_extensions.rb

@@ -4,7 +4,7 @@ module ForemanCockpit
     extend ActiveSupport::Concern
 
     included do
-      before_filter :allow_cockpit_iframe, :only => :show
+      before_action :allow_cockpit_iframe, :only => :show
     end
 
     ForemanCockpit::COCKPIT_ACTIONS.each do |action|
@@ -15,16 +15,14 @@ module ForemanCockpit
         suburl = ForemanCockpit::COCKPIT_SUBURL[action.to_sym]
         render :partial => 'foreman_cockpit/hosts/cockpit',
                :locals => { :fqdn => @host.fqdn, :suburl => suburl,
-                            :protocol => cockpit_protocol }
+                            :protocol => request.protocol }
       end
     end
 
     private
 
     def allow_cockpit_iframe
-      response.headers['Content-Security-Policy'].
-        sub!("frame-src 'self'",
-             "frame-src 'self' #{cockpit_protocol}://#{@host.fqdn}:9090")
+      append_content_security_policy_directives(child_src: ["#{request.protocol}#{@host.fqdn}:9090"])
     end
 
     def action_permission
@@ -35,9 +33,5 @@ module ForemanCockpit
         super
       end
     end
-
-    def cockpit_protocol
-      request.ssl? ? 'https' : 'http'
-    end
   end
 end

data/app/views/foreman_cockpit/hosts/_cockpit.html.erb

@@ -1,2 +1,2 @@
 <iframe class='col-md-12' height='600px' frameBorder="0"
-  src="<%= protocol %>://<%= fqdn %>:9090/cockpit/@localhost/<%= suburl %>"/>
+  src="<%= protocol %><%= fqdn %>:9090/cockpit/@localhost/<%= suburl %>"/>

data/lib/foreman_cockpit/engine.rb

@@ -22,6 +22,14 @@ module ForemanCockpit
                 :before => :finisher_hook) do
       Foreman::Plugin.register :foreman_cockpit do
         requires_foreman '>= 1.7'
+
+        security_block :foreman_cockpit do
+          ForemanCockpit::COCKPIT_ACTIONS.each do |action|
+            permission :"view_cockpit_#{action.to_s}",
+              { :hosts => [action] },
+              :resource_type => 'Host'
+          end
+        end
       end
     end
 

data/lib/foreman_cockpit/version.rb

@@ -1,4 +1,4 @@
 # Specify the version to be picked up in the Gemspec
 module ForemanCockpit
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_cockpit
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Use your hosts' Cockpit in Foreman.