(GH-599) Restrict calls to choco.org to https

This proved the changes required to ensure that client communicates with chocolatey.org using HTTPS.
chocolatey-archive · Nov 2, 2014 · 3d2ee3e · 3d2ee3e
1 parent 372a262
commit 3d2ee3e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 38 deletions.
diff --git a/chocolateyInstall/InstallChocolatey.ps1 b/chocolateyInstall/InstallChocolatey.ps1
@@ -1,6 +1,6 @@
 # ==============================================================================
 #
-# Fervent Coder Copyright � 2011 - Released under the Apache 2.0 License
+# Fervent Coder Copyright 2011 - Present - Released under the Apache 2.0 License
 #
 # Copyright 2007-2008 The Apache Software Foundation.
 #
@@ -17,9 +17,9 @@
 # ==============================================================================
 
 # variables
-#$url = "http://chocolatey.org/packages/chocolatey/DownloadPackage"
-$url = "http://chocolatey.org/api/v2/package/chocolatey/"
-#$url = "http://chocolatey.org/api/v1/package/chocolatey"
+#$url = "https://chocolatey.org/packages/chocolatey/DownloadPackage"
+$url = "https://chocolatey.org/api/v2/package/chocolatey/"
+#$url = "https://chocolatey.org/api/v1/package/chocolatey"
 $chocTempDir = Join-Path $env:TEMP "chocolatey"
 $tempDir = Join-Path $chocTempDir "chocInstall"
 if (![System.IO.Directory]::Exists($tempDir)) {[System.IO.Directory]::CreateDirectory($tempDir)}
@@ -47,7 +47,7 @@ $chocInstallPS1 = Join-Path $toolsFolder "chocolateyInstall.ps1"
 write-host 'Ensuring chocolatey commands are on the path'
 $chocInstallVariableName = "ChocolateyInstall"
 $nuGetPath = [Environment]::GetEnvironmentVariable($chocInstallVariableName, [System.EnvironmentVariableTarget]::User)
-$nugetExePath = 'C:\NuGet\bin'
+$nugetExePath = 'C:\ProgramData\Chocolatey\bin'
 if ($nuGetPath -ne $null) {
   $nugetExePath = Join-Path $nuGetPath 'bin'
 }

diff --git a/nuget/chocolatey.nuspec b/nuget/chocolatey.nuspec
@@ -128,7 +128,7 @@ See all - https://github.com/chocolatey/chocolatey/blob/master/CHANGELOG.md
  * Update to Nuget.exe 2.8.2 - https://github.com/chocolatey/chocolatey/issues/379
 
     </releaseNotes>
-    <projectUrl>http://chocolatey.org</projectUrl>
+    <projectUrl>https://chocolatey.org</projectUrl>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>RealDimensions Software, LLC - 2011-Present</copyright>

diff --git a/readme.markdown b/readme.markdown
@@ -1,4 +1,4 @@
-Chocolatey NuGet (like apt-get, but for Windows) [![](http://img.shields.io/gittip/Chocolatey.svg)](https://www.gittip.com/Chocolatey/) [![](http://img.shields.io/chocolatey/dt/chocolatey.svg)](http://chocolatey.org/packages/chocolatey) [![](http://img.shields.io/chocolatey/v/chocolatey.svg)](http://chocolatey.org/packages/chocolatey)  [![Build status](https://ci.appveyor.com/api/projects/status/jj9h1tobakhpbiwx/branch/master)](https://ci.appveyor.com/project/ferventcoder/chocolatey/branch/master)  [![](http://img.shields.io/teamcity/codebetter/bt802.svg)](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt802)
+Chocolatey NuGet (like apt-get, but for Windows) [![](http://img.shields.io/gittip/Chocolatey.svg)](https://www.gittip.com/Chocolatey/) [![](http://img.shields.io/chocolatey/dt/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](http://img.shields.io/chocolatey/v/chocolatey.svg)](https://chocolatey.org/packages/chocolatey)  [![Build status](https://ci.appveyor.com/api/projects/status/jj9h1tobakhpbiwx/branch/master)](https://ci.appveyor.com/project/ferventcoder/chocolatey/branch/master)  [![](http://img.shields.io/teamcity/codebetter/bt802.svg)](http://teamcity.codebetter.com/viewType.html?buildTypeId=bt802)
 =======
 ![Chocolatey Logo](https://github.com/chocolatey/chocolatey/raw/master/docs/logo/chocolateyicon.gif "Chocolatey")
 

diff --git a/src/chocolatey.ps1 b/src/chocolatey.ps1
@@ -122,37 +122,10 @@ The default install location has been changed to '$newChocoPath'.
 "@ | Write-Host  -ForegroundColor $Warning -BackgroundColor Black
 }
 
-# Win2003/XP do not support SNI
-if ([Environment]::OSVersion.Version -lt (new-object 'Version' 6,0)){
-  $originalSource = $source
-  Write-Debug 'This version of Windows does not support SNI, so configuring chocolatey to use Http automatically'
-  $chocoHttpExists = $false
-  $chocoHttpId = 'chocolateyHttp'
-  $sources = Chocolatey-Sources 'list'
-  Write-Debug 'Checking sources to see if chocolatey http is configured'
-  foreach ($sourceConfig in $sources) {
-    if ($sourceConfig.ID -eq "$chocoHttpId") {
-      Write-Debug 'ChocolateyHttp found'
-      $chocoHttpExists = $true
-      break
-    }
-  }
-
-  if (!$chocoHttpExists) {
-    Write-Debug 'Removing https version of chocolatey and re-adding as http'
-    Chocolatey-Sources 'disable' 'chocolatey'
-    Chocolatey-Sources 'add' "$chocoHttpId" 'http://chocolatey.org/api/v2/'
-  }
-
-  #this command fixes a small change somewhere that messes up the original source specified
-  $source = $originalSource
-}
-
 # bump installarguments back to quotes
 $installArguments = $installArguments.Replace("'","""")
 $packageParameters = $packageParameters.Replace("'","""")
 
-
 #main entry point
 Append-Log
 

diff --git a/src/functions/Chocolatey-InstallAll.ps1 b/src/functions/Chocolatey-InstallAll.ps1
@@ -5,7 +5,7 @@ param(
 
   Write-Debug "Running 'Chocolatey-InstallAll' with source:`'$source`'";
 
-  if ($source -eq '' -or $source -eq 'https://go.microsoft.com/fwlink/?LinkID=230477' -or $source -eq 'http://chocolatey.org/api/v2/') {
+  if ($source -eq '' -or $source -eq 'https://go.microsoft.com/fwlink/?LinkID=230477' -or $source -eq 'https://chocolatey.org/api/v2/') {
     write-host 'Source must be specified and cannot be nuget.org/chocolatey.org'
     return
   }

diff --git a/src/functions/Chocolatey-Push.ps1 b/src/functions/Chocolatey-Push.ps1
@@ -1,13 +1,13 @@
 function Chocolatey-Push {
 param(
   [string] $packageName,
-  [string] $source = 'http://chocolatey.org/'
+  [string] $source = 'https://chocolatey.org/'
 )
   Write-Debug "Running 'Chocolatey-Push' for $packageName with source:`'$source`'";
 
   $srcArgs = "-source $source"
   if ($source -like '') {
-    $srcArgs = '-source http://chocolatey.org/'
+    $srcArgs = '-source https://chocolatey.org/'
     Write-Debug "Setting source to `'$srcArgs`'"
   }
 

diff --git a/tests/unit/Get-ConfigValue.tests.ps1 b/tests/unit/Get-ConfigValue.tests.ps1
@@ -32,7 +32,7 @@ Describe "Get-ConfigValue" {
 <?xml version="1.0"?>
 <chocolatey>
     <sources>
-        <source id="chocolatey" value="http://chocolatey.org/api/v2/" />
+        <source id="chocolatey" value="https://chocolatey.org/api/v2/" />
         <source id="nuget" value="https://go.microsoft.com/fwlink/?LinkID=230477" />
     </sources>
 </chocolatey>