Merge branch 'stable'

* stable: (chocolateyGH-113) Add SHA-2 support for checksum # Conflicts: # src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1
ferventcoder · Sep 29, 2015 · f5d5ae5 · f5d5ae5
2 parents bffd853 + 2509f78
commit f5d5ae5
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 44 deletions.
diff --git a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1
@@ -28,9 +28,11 @@ param(
 
   if (!([System.IO.File]::Exists($file))) { throw "Unable to checksum a file that doesn't exist - Could not find file `'$file`'" }
 
-  if ($checksumType -ne 'sha1') { $checksumType = 'md5'}
-
-
+  if ($checksumType -ne 'sha1' -and $checksumType -ne 'sha256' -and $checksumType -ne 'sha512' -and $checksumType -ne 'md5') { 
+    Write-Debug 'Setting checksumType to md5 due to non-set value or type isn't specified correctly.'
+    $checksumType = 'md5'
+  }
+    
   $checksumExe = Join-Path "$helpersPath" '..\tools\checksum.exe'
   if (!([System.IO.File]::Exists($checksumExe))) {
 	Update-SessionEnvironment

diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1
@@ -1,15 +1,15 @@
-# Copyright 2011 - Present RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
+# Copyright 2011 - Present RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
 # limitations under the License.
 
 function Get-ChocolateyWebFile {
@@ -41,28 +41,28 @@ OPTIONAL (Right now) - This allows a checksum to be validated for files that are
 OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
 
 .PARAMETER ChecksumType
-OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+OPTIONAL (Right now) - 'md5', 'sha1', 'sha256' or 'sha512' - defaults to 'md5'
 
 .PARAMETER ChecksumType64
-OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to ChecksumType
-
-.PARAMETER options
-OPTIONAL - Specify custom headers
-
-Example:
--------- 
-	$options = 
-	@{
-		Headers = @{
-			Accept = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'; 
-			'Accept-Charset' = 'ISO-8859-1,utf-8;q=0.7,*;q=0.3';
-			'Accept-Language' = 'en-GB,en-US;q=0.8,en;q=0.6';
-			Cookie = 'products.download.email=ewilde@gmail.com';
-			Referer = 'http://submain.com/download/ghostdoc/';
-		}
-	}
-	
-	Get-ChocolateyWebFile 'ghostdoc' 'http://submain.com/download/GhostDoc_v4.0.zip' -options $options
+OPTIONAL (Right now) - 'md5', 'sha1', 'sha256' or 'sha512' - defaults to ChecksumType
+
+.PARAMETER options
+OPTIONAL - Specify custom headers
+
+Example:
+--------
+	$options =
+	@{
+		Headers = @{
+			Accept = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8';
+			'Accept-Charset' = 'ISO-8859-1,utf-8;q=0.7,*;q=0.3';
+			'Accept-Language' = 'en-GB,en-US;q=0.8,en;q=0.6';
+			Cookie = 'products.download.email=ewilde@gmail.com';
+			Referer = 'http://submain.com/download/ghostdoc/';
+		}
+	}
+
+	Get-ChocolateyWebFile 'ghostdoc' 'http://submain.com/download/GhostDoc_v4.0.zip' -options $options
 
 .EXAMPLE
 Get-ChocolateyWebFile '__NAME__' 'C:\somepath\somename.exe' 'URL' '64BIT_URL_DELETE_IF_NO_64BIT'
@@ -82,7 +82,7 @@ param(
   [string] $checksum = '',
   [string] $checksumType = '',
   [string] $checksum64 = '',
-  [string] $checksumType64 = $checksumType,
+  [string] $checksumType64 = $checksumType,
   [hashtable] $options = @{Headers=@{}}
 )
   Write-Debug "Running 'Get-ChocolateyWebFile' for $packageName with url:`'$url`', fileFullPath:`'$fileFullPath`', url64bit:`'$url64bit`', checksum: `'$checksum`', checksumType: `'$checksumType`', checksum64: `'$checksum64`', checksumType64: `'$checksumType64`'";
@@ -111,9 +111,9 @@ param(
   }
 
   try {
-    $fileDirectory = $([System.IO.Path]::GetDirectoryName($fileFullPath))
-    if (!(Test-Path($fileDirectory))) {
-      [System.IO.Directory]::CreateDirectory($fileDirectory) | Out-Null  
+    $fileDirectory = $([System.IO.Path]::GetDirectoryName($fileFullPath))
+    if (!(Test-Path($fileDirectory))) {
+      [System.IO.Directory]::CreateDirectory($fileDirectory) | Out-Null
     }
   } catch {
     Write-Host "Attempt to create directory failed for '$fileFullPath'."

diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1
@@ -48,10 +48,10 @@ OPTIONAL (Right now) - This allows a checksum to be validated for files that are
 OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
 
 .PARAMETER ChecksumType
-OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+OPTIONAL (Right now) - 'md5', 'sha1', 'sha256' or 'sha512' - defaults to 'md5'
 
 .PARAMETER ChecksumType64
-OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to ChecksumType
+OPTIONAL (Right now) - 'md5', 'sha1', 'sha256' or 'sha512' - defaults to ChecksumType
 
 .PARAMETER options
 OPTIONAL - Specify custom headers

diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1
@@ -35,7 +35,7 @@ will be targetted.
 OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
 
 .PARAMETER ChecksumType
-OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+OPTIONAL (Right now) - 'md5', 'sha1', 'sha256' or 'sha512' - defaults to 'md5'
 
 .EXAMPLE
 Install-ChocolateyVsixPackage "MyPackage" http://visualstudiogallery.msdn.microsoft.com/ea3a37c9-1c76-4628-803e-b10a109e7943/file/73131/1/AutoWrockTestable.vsix

diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1
@@ -40,10 +40,10 @@ OPTIONAL (Right now) - This allows a checksum to be validated for files that are
 OPTIONAL (Right now) - This allows a checksum to be validated for files that are not local
 
 .PARAMETER ChecksumType
-OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to 'md5'
+OPTIONAL (Right now) - 'md5', 'sha1', 'sha256' or 'sha512' - defaults to 'md5'
 
 .PARAMETER ChecksumType64
-OPTIONAL (Right now) - 'md5' or 'sha1' - defaults to ChecksumType
+OPTIONAL (Right now) - 'md5', 'sha1', 'sha256' or 'sha512' - defaults to ChecksumType
 
 .PARAMETER options
 OPTIONAL - Specify custom headers

diff --git a/src/chocolatey.resources/tools/checksum.exe b/src/chocolatey.resources/tools/checksum.exe