knife-windows 0.8.3 → 0.8.4.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76abe8c93575af58e3d472671533917f41eff4be
-  data.tar.gz: f5a2255af0c8c68c36b6a42e370401f496650a76
+  metadata.gz: bda9f8a781d7517b19471617994e0a99a645aabe
+  data.tar.gz: 7043f0be06bbd01a3ca2b552f0426e2a0d6ba9d2
 SHA512:
-  metadata.gz: 7fdeeb529f3aca5e57e56b3f89421547ebe12a1b26e0d529caf23f6d038619136430d62ee8d0782bbb8589010af72b7a0813332e12422d8f53ccc4d87a2050f7
-  data.tar.gz: 5320a7db65675d48e115c8d21add1e1f82d598b7c1c4e8201775a271cdf9c3c4b605c114ad884209435e3c1b203a8c0143e9fa1b61b38f243c61bc4e46570e70
+  metadata.gz: 77a2c6f152d91f98865b8f4a026aba720f8a957aa4126547e78507cb739e40b8daf4d1bfea23d030e5c8d09fabe234505767113f086efe896f315c6ecd0ac88b
+  data.tar.gz: f19532056eff8f30562d1cc0b8561bb197c4d6dcacbd2426ccbcfc4c6cb21870259fd834902c431ded1b33e793cd5d2f1cfb19febe032a26e240f6e554674372

data/CHANGELOG.md

@@ -1,9 +1,9 @@
 # knife-windows Change Log
 
-## Unreleased changes
-None.
+## Latest release: 0.8.4
+* [knife-windows #133](https://github.com/opscode/knife-windows/issues/133) Bootstrap failure -- unable to validate SSL chef server endpoints
 
-## Latest release: 0.8.3
+## Release: 0.8.3
 * [knife-windows #131](https://github.com/opscode/knife-windows/issues/108): Windows should be bootstrapped using latest Chef Client version compatible with knife's version just like non-Windows systems
 * [knife-windows #162](https://github.com/chef/knife-windows/issues/162): fixes "uninitialized constant Chef::Knife::Bootstrap (NameError)"
 

data/lib/chef/knife/bootstrap/windows-chef-client-msi.erb

@@ -198,6 +198,11 @@ echo Validation key written.
 )
 <% end -%>
 
+<% unless trusted_certs.empty? -%>
+mkdir -p C:/chef/trusted_certs
+<%= trusted_certs %>
+<% end -%>
+
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir <%= bootstrap_directory %>\ohai\hints

data/lib/chef/knife/core/windows_bootstrap_context.rb

@@ -44,6 +44,10 @@ class Chef
           escape_and_echo(@config[:encrypted_data_bag_secret])
         end
 
+        def trusted_certs
+          @trusted_certs ||= trusted_certs_content
+        end
+
         def config_content
           client_rb = <<-CONFIG
 log_level        :info
@@ -65,6 +69,36 @@ CONFIG
             client_rb << "# Using default node name (fqdn)\n"
           end
 
+          # We configure :verify_api_cert only when it's overridden on the CLI
+          # or when specified in the knife config.
+          if !@config[:node_verify_api_cert].nil? || knife_config.has_key?(:verify_api_cert)
+            value = @config[:node_verify_api_cert].nil? ? knife_config[:verify_api_cert] : @config[:node_verify_api_cert]
+            client_rb << %Q{verify_api_cert #{value}\n}
+          end
+
+          # We configure :ssl_verify_mode only when it's overridden on the CLI
+          # or when specified in the knife config.
+          if @config[:node_ssl_verify_mode] || knife_config.has_key?(:ssl_verify_mode)
+            value = case @config[:node_ssl_verify_mode]
+            when "peer"
+              :verify_peer
+            when "none"
+              :verify_none
+            when nil
+              knife_config[:ssl_verify_mode]
+            else
+              nil
+            end
+
+            if value
+              client_rb << %Q{ssl_verify_mode :#{value}\n}
+            end
+          end
+
+          if @config[:ssl_verify_mode]
+            client_rb << %Q{ssl_verify_mode :#{knife_config[:ssl_verify_mode]}\n}
+          end
+
           if knife_config[:bootstrap_proxy]
             client_rb << "\n"
             client_rb << %Q{http_proxy        "#{knife_config[:bootstrap_proxy]}"\n}
@@ -72,10 +106,18 @@ CONFIG
             client_rb << %Q{no_proxy          "#{knife_config[:bootstrap_no_proxy]}"\n} if knife_config[:bootstrap_no_proxy]
           end
 
+          if knife_config[:bootstrap_no_proxy]
+            client_rb << %Q{no_proxy       "#{knife_config[:bootstrap_no_proxy]}"\n}
+          end
+
           if @config[:encrypted_data_bag_secret]
             client_rb << %Q{encrypted_data_bag_secret "c:/chef/encrypted_data_bag_secret"\n}
           end
 
+          unless trusted_certs.empty?
+            client_rb << %Q{trusted_certs_dir "C:/chef/trusted_certs"\n}
+          end
+
           escape_and_echo(client_rb)
         end
 
@@ -202,6 +244,17 @@ WGET_PS
           "msiexec /qn /log #{executor_quote}%CHEF_CLIENT_MSI_LOG_PATH%#{executor_quote} /i #{executor_quote}%LOCAL_DESTINATION_MSI_PATH%#{executor_quote}"
         end
 
+        def trusted_certs_content
+          content = ""
+          if @chef_config[:trusted_certs_dir]
+            Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(@chef_config[:trusted_certs_dir]), "*.{crt,pem}")).each do |cert|
+              content << "cat > /C:/chef/trusted_certs/#{File.basename(cert)} <<'EOP'\n" +
+                         IO.read(File.expand_path(cert)) + "\nEOP\n"
+            end
+          end
+          content
+        end
+
         def fallback_install_task_command
           # This command will be executed by schtasks.exe in the batch
           # code below. To handle tasks that contain arguments that

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "0.8.3"
+    VERSION = "0.8.4.rc.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/unit/knife/bootstrap_template_spec.rb

@@ -69,7 +69,8 @@ describe Chef::Knife::BootstrapWindowsWinrm do
       knife.instance_variable_set("@template_file", template_file)
       knife.parse_options(options)
       # Avoid referencing a validation keyfile we won't find during #render_template
-      template_string = knife.read_template.gsub(/^.*[Vv]alidation_key.*$/, '')
+      template = IO.read(template_file).chomp
+      template_string = template.gsub(/^.*[Vv]alidation_key.*$/, '')
       knife.render_template(template_string)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4.rc.0
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm-s
@@ -103,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1