beaker-pe 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3836bb5be9ca1f5c0b6d979ff83124f1711b14d6
-  data.tar.gz: c607fd4a611be985864f6a55f31bc3d8f9a13871
+  metadata.gz: 73d231599095e931cf054b800746fb39665542f8
+  data.tar.gz: bec99267d66d13224c9a8940d968314ad9a3ff28
 SHA512:
-  metadata.gz: c114903f80197effa0935591e6a9c57ea0a8649606441f46f510a3ed79f8d861aff6a80f9960332247f727527d54c6792ea636936d9689a211254de1f3a256ad
-  data.tar.gz: a80eaaa44c7f346ed4aee07fcf08fc4a3229a2ec055b52dfa239eed6964b9e389cc1d5899452eed6f3f218226662adcab2f17c042702442d9c00664dee2d7585
+  metadata.gz: 137573f028c61d473ff5ff344493bd73cc2849f23d6da2a8fc569930ff4146b69563a2b9d967679d8404e29593d9482f5913a09ac01439ab38c525905cb7b42a
+  data.tar.gz: 2cd43286b2ca2d7c0cac7f451f273b913bdf1db609e346b31c2e1b5fdf5baf91a560d97567d6a1f2b5138b476673d54f3ccb773f75c23615b4f982392b431675

data/lib/beaker-pe/install/pe_utils.rb

@@ -139,7 +139,7 @@ module Beaker
         #Return true if tlsv1 protocol needs to be enforced
         #param [Host] the host
         def require_tlsv1?(host)
-          tlsv1_platforms = [/aix/, /el-5/, /solaris10/]
+          tlsv1_platforms = [/aix/, /el-5/, /solaris10/, /windows-2008/]
           return tlsv1_platforms.any? {|platform_regex| host['platform'] =~ platform_regex}
         end
 
@@ -191,8 +191,13 @@ module Beaker
             else
               cert_validator = '[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true}'
             end
+            if version_is_less(pe_version, '2019.1.0') || require_tlsv1?(host) then
+              protocol_to_use =''
+            else
+              protocol_to_use = '[System.Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12'
+            end
 
-            cmd = %Q{powershell -c "cd #{host['working_dir']};#{cert_validator};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{downloadhost}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
+            cmd = %Q{powershell -c "cd #{host['working_dir']};#{protocol_to_use};#{cert_validator};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{downloadhost}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
           else
             curl_opts = %w{-O}
             if version_is_less(pe_version, '2019.1.0') || require_tlsv1?(host)

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.1.1'
+        STRING = '2.1.2'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -270,9 +270,11 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'generates a PS1 frictionless install command for windows' do
       host['platform'] = 'windows-2012-64'
+      protocol = ''
       expecting = "powershell -c \"" +
                   [
                     "cd /tmp",
+                    "#{protocol}",
                     "[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true}",
                     "\\$webClient = New-Object System.Net.WebClient",
                     "\\$webClient.DownloadFile('https://testmaster:8140/packages/current/install.ps1', '/tmp/install.ps1')",
@@ -286,9 +288,11 @@ describe ClassMixedWithDSLInstallUtils do
       host['platform'] = 'windows-2012-64'
       host['puppetpath'] = '/PuppetLabs/puppet/etc'
       host['use_puppet_ca_cert'] = true
+      protocol = ''
       expecting = "powershell -c \"" +
       [
         "cd /tmp",
+        "#{protocol}",
         "\\$callback = {param(\\$sender,[System.Security.Cryptography.X509Certificates.X509Certificate]\\$certificate,[System.Security.Cryptography.X509Certificates.X509Chain]\\$chain,[System.Net.Security.SslPolicyErrors]\\$sslPolicyErrors)",
         "\\$CertificateType=[System.Security.Cryptography.X509Certificates.X509Certificate2]",
         "\\$CACert=\\$CertificateType::CreateFromCertFile('/PuppetLabs/puppet/etc/ssl/certs/ca.pem') -as \\$CertificateType",
@@ -303,6 +307,38 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
     end
 
+    it 'generates a PS1 frictionless install command for windows with Tls12 protocol' do
+      host['platform'] = 'windows-20012-64'
+      protocol = '[System.Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12'
+      expecting = "powershell -c \"" +
+                  [
+                    "cd /tmp",
+                    "#{protocol}",
+                    "[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true}",
+                    "\\$webClient = New-Object System.Net.WebClient",
+                    "\\$webClient.DownloadFile('https://testmaster:8140/packages/current/install.ps1', '/tmp/install.ps1')",
+                    "/tmp/install.ps1 -verbose "
+                  ].join(";") +
+                  "\""
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2019.1.0' ) ).to eq(expecting)
+    end
+
+    it 'generates a PS1 frictionless install command for windows-2008 without Tls12 protocol' do
+      host['platform'] = 'windows-2008-64'
+      protocol = ''
+      expecting = "powershell -c \"" +
+                  [
+                    "cd /tmp",
+                    "#{protocol}",
+                    "[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true}",
+                    "\\$webClient = New-Object System.Net.WebClient",
+                    "\\$webClient.DownloadFile('https://testmaster:8140/packages/current/install.ps1', '/tmp/install.ps1')",
+                    "/tmp/install.ps1 -verbose "
+                  ].join(";") +
+                  "\""
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2019.1.0' ) ).to eq(expecting)
+    end
+
     it 'generates a frictionless install command with loadbalancer as download host' do
       hosts = lb_test_hosts
       expect( subject ).to receive( :get_lb_downloadhost ).with(lb_test_hosts[3]).and_return( 'testloadbalancer' )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec