foreman_cockpit 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d13f04b9de76228fe512bf9d5a7641bbaf1455
-  data.tar.gz: 04ec624bb2ff78805e3b003022c6dc69c4b259d4
+  metadata.gz: b2c185a866fa1fc170878ae2bb7fbdd329ec16dd
+  data.tar.gz: 7dccb1648a3029f60cf68ef9823f879ac1037000
 SHA512:
-  metadata.gz: b803a80760830af1a1b6e19f61c4cfe9f3f7cad45d6815d923308d17fa5798d2402e061ef068b274ecbf828078bd2c499de7ba7fa5ab1c141cbb3bcc466b5fda
-  data.tar.gz: e646b3d6a00d8faa7ec02d0e6cce821dbad30965756b41bb42734d0404878b7d009784c4d1de1b84a7d3043a63df951b89bb8b8ebc48dd0872758f132c9fd809
+  metadata.gz: 5e4e5f59bb9527f6bb472b7277a73488e7ff5e1f646644612967dd4fa9d43bc1fdf9c6c91964e62cc02621bf3e7e85de2ee15267b70f2bb897aaede1e4e1e500
+  data.tar.gz: 458c42416e20f2a905cb383ba6303ad0972dc242c5c7da19d9af48fe44e29a4408acd8f0766d7154d6328bbb37895fb7c829f307b4933b8ff085e501d6c0f443

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

@@ -14,7 +14,8 @@ module ForemanCockpit
         find_resource
         suburl = ForemanCockpit::COCKPIT_SUBURL[action.to_sym]
         render :partial => 'foreman_cockpit/hosts/cockpit',
-               :locals => { :fqdn => @host.fqdn, :suburl => suburl }
+               :locals => { :fqdn => @host.fqdn, :suburl => suburl,
+                            :protocol => cockpit_protocol }
       end
     end
 
@@ -23,7 +24,7 @@ module ForemanCockpit
     def allow_cockpit_iframe
       response.headers['Content-Security-Policy'].
         sub!("frame-src 'self'",
-             "frame-src 'self' http://#{@host.fqdn}:9090")
+             "frame-src 'self' #{cockpit_protocol}://#{@host.fqdn}:9090")
     end
 
     def action_permission
@@ -34,5 +35,9 @@ module ForemanCockpit
         super
       end
     end
+
+    def cockpit_protocol
+      require_ssl? ? 'https' : 'http'
+    end
   end
 end

data/app/overrides/add_load_partials_js_legacy.rb

@@ -0,0 +1,7 @@
+# In case deface < 1.0 is installed, for instance on Foreman 1.9 and older
+# we need to use a different matcher to match code
+Deface::Override.new(
+  :virtual_path => 'hosts/show',
+  :name => 'add_load_partials_js_legacy',
+  :insert_after => 'code:contains("javascript")',
+  :text => "<% javascript 'foreman_cockpit/load_partial' %>")

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

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

data/lib/foreman_cockpit/version.rb

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

data/test/unit/concerns/foreman_cockpit_test.rb

@@ -17,7 +17,7 @@ class CockpitTest < ActiveSupport::TestCase
     end
 
     test 'cockpit is enabled if cockpit ping is successful' do
-      @dummy_host.stubs(:fqdn).returns('http://foo.bar')
+      @dummy_host.stubs(:fqdn).returns('foo.bar')
       cockpit_ping_url = "#{@dummy_host.fqdn}:9090/ping"
       RestClient.expects(:get).with(cockpit_ping_url).
         returns('{"service": "cockpit"}')
@@ -32,13 +32,13 @@ class CockpitTest < ActiveSupport::TestCase
 
   test 'cockpit is not displayed when host does not have an OS' do
     @dummy_host.stubs(:os).returns(nil)
-    @dummy_host.stubs(:fqdn).returns('http://foo.bar')
+    @dummy_host.stubs(:fqdn).returns('foo.bar')
     refute @dummy_host.cockpit_enabled?
   end
 
   test 'cockpit is not displayed for incompatible OSs' do
     @dummy_host.stubs(:os).returns(OpenStruct.new(:type => 'Debian'))
-    @dummy_host.stubs(:fqdn).returns('http://foo.bar')
+    @dummy_host.stubs(:fqdn).returns('foo.bar')
     refute @dummy_host.cockpit_enabled?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_cockpit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -55,6 +55,7 @@ files:
 - app/helpers/concerns/foreman_cockpit/hosts_helper_extensions.rb
 - app/models/concerns/foreman_cockpit/host_extensions.rb
 - app/overrides/add_load_partials_js.rb
+- app/overrides/add_load_partials_js_legacy.rb
 - app/views/foreman_cockpit/hosts/_cockpit.html.erb
 - config/routes.rb
 - lib/foreman_cockpit.rb