mixlib-install 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fc991d852b256ce4a6a95d7d7263fb6189bde37
-  data.tar.gz: 40951a053a87cbc27c3a1dbdd9aeb5cdd99ed1db
+  metadata.gz: a18332899c9613f49a801ec4ceb6508511b29d81
+  data.tar.gz: 89d42e1043cdc5ae1da07b89fbb6f501a33b9e22
 SHA512:
-  metadata.gz: cca181d4b9a1049457ca73f1a7104d5a341918fc1540ab7b0f0cbe8bd2f9089331021813095747fe2fc6067517419d2eac5acb66140d44fe2f9d51b22bea38ea
-  data.tar.gz: a68d2666633af91189bc34e943b210601382c7104430a77c73044fab65c9ced6643027d9a0cf3d18f77d7a05baa7255b2f0e8ca0668a060736388fbafb609ecb
+  metadata.gz: 2fcaa63666676a96788e7b28375d033369bba761db6223b3d365ccfd316d9903ec66f5dd247f05b2ef5a26614a7b3aa9cbfeb42fc23643d885151903197a3b00
+  data.tar.gz: 9b3e8c8dad6034f288888cac36cfedb51a4a368f3c46bafcff47182db6508e35fe5234c15573143dc4f180c5b43dc27e917d6bd468369f53d76686f7fc9e68eb

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [3.3.2]
+- Fix bug where calling `products_available_on_downloads_site` would corrupt the product map.
+
 ## [3.3.1]
 - Add download_url_override and checksum options for powershell version of installer script
 - Update powershell execution due to policy changes in Windows 8, Windows Server 2012, and Windows 8.1

data/lib/mixlib/install/generator/bourne/scripts/install_package.sh

@@ -8,7 +8,7 @@
 # $version: The version requested. Used only for warning user if not set.
 ############
 
-if test "x$version" = "x"; then
+if test "x$version" = "x" -a "x$CI" != "xtrue"; then
   echo
   echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
   echo

data/lib/mixlib/install/generator/powershell/scripts/helpers.ps1.erb

@@ -111,23 +111,10 @@ function Test-ProjectPackage {
   [cmdletbinding()]
   param ($Path, $Algorithm = 'SHA256', $Hash)
 
-  if (-not (get-command get-filehash -ErrorAction 'SilentlyContinue')) {
-    function disposable($o){($o -is [IDisposable]) -and (($o | get-member | foreach-object {$_.name}) -contains 'Dispose')}
-    function use($obj, [scriptblock]$sb){try {& $sb} catch [exception]{throw $_} finally {if (disposable $obj) {$obj.Dispose()}} }
-    function Get-FileHash ($Path, $Algorithm) {
-      $Path = (resolve-path $path).providerpath
-      $hash = @{Algorithm = $Algorithm; Path = $Path}
-      use ($c = Get-SHA256Converter) {
-        use ($in = (gi $path).OpenRead()) {
-          $hash.Hash = ([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToUpper()
-        }
-      }
-      new-object PSObject -Property $hash
-    }
-  }
   Write-Verbose "Testing the $Algorithm hash for $path."
   $ActualHash = (Get-FileHash -Algorithm $Algorithm -Path $Path).Hash.ToLower()
-  Write-Verbose "`tDesired Hash - '$hash'"
+
+  Write-Verbose "`tDesired Hash - '$Hash'"
   Write-Verbose "`tActual Hash  - '$ActualHash'"
   $Valid = $ActualHash -eq $Hash
   if (-not $Valid) {
@@ -136,15 +123,36 @@ function Test-ProjectPackage {
   return $Valid
 }
 
-function Get-SHA256Converter {
-  if($PSVersionTable.PSEdition -eq 'Core') {
-    [System.Security.Cryptography.SHA256]::Create()
+function Get-FileHash ($Path, $Algorithm) {
+  function disposable($o){($o -is [IDisposable]) -and (($o | get-member | foreach-object {$_.name}) -contains 'Dispose')}
+  function use($obj, [scriptblock]$sb){try {& $sb} catch [exception]{throw $_} finally {if (disposable $obj) {$obj.Dispose()}} }
+  $Path = (resolve-path $Path).providerpath
+  $hash = @{Algorithm = $Algorithm; Path = $Path}
+  use ($c = Get-SHA256Converter) {
+    use ($in = (gi $Path).OpenRead()) {
+      $hash.Hash = ([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToUpper()
+    }
   }
-  else {
-    New-Object -TypeName Security.Cryptography.SHA256Managed
+  return $hash
+}
+
+function Get-SHA256Converter {
+  if (Is-FIPS) {
+    New-Object -TypeName Security.Cryptography.SHA256Cng
+  } else {
+    if($PSVersionTable.PSEdition -eq 'Core') {
+      [System.Security.Cryptography.SHA256]::Create()
+    }
+    else {
+      New-Object -TypeName Security.Cryptography.SHA256Managed
+    }
   }
 }
 
+function Is-FIPS {
+  (Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy).Enabled
+}
+
 function Get-WMIQuery {
   param ($class)
 
@@ -154,4 +162,4 @@ function Get-WMIQuery {
   else {
     Get-WmiObject $class
   }
-}
+}

data/lib/mixlib/install/product.rb

@@ -178,7 +178,7 @@ module Mixlib
       #   :key => product_key
       #   :value => Mixlib::Install::Product instance
       def products_available_on_downloads_site
-        @product_map.delete_if do |product_key, product|
+        @product_map.reject do |product_key, product|
           product.downloads_product_page_url == :not_available
         end
       end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.3.1"
+    VERSION = "3.3.2"
   end
 end

data/support/install_command.ps1

@@ -29,14 +29,22 @@ Function Get-SHA256($src) {
 }
 
 function Get-SHA256Converter {
-  if($PSVersionTable.PSEdition -eq 'Core') {
-    [System.Security.Cryptography.SHA256]::Create()
-  }
-  else {
-    New-Object -TypeName Security.Cryptography.SHA256Managed
+  if (Is-FIPS) {
+    New-Object -TypeName Security.Cryptography.SHA256Cng
+  } else {
+    if($PSVersionTable.PSEdition -eq 'Core') {
+      [System.Security.Cryptography.SHA256]::Create()
+    }
+    else {
+      New-Object -TypeName Security.Cryptography.SHA256Managed
+    }
   }
 }
 
+function Is-FIPS {
+  (Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy).Enabled
+}
+
 Function Download-Chef($url, $sha256, $dst) {
   Log "Downloading package from $url"
   Get-WebContent $url $dst

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout