Skip to content
This repository was archived by the owner on Jun 13, 2024. It is now read-only.

Commit e8920f0

Browse files
alericksonalerickson
committed
Merge remote-tracking branch 'origin/development'
2 parents 8f33bdc + bc6a4af commit e8920f0

13 files changed

+111
-16
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changelog
2+
### 2.2.4
3+
- Enforce a security protocol of TLS 1.2 when interacting with online repositories (#598)
4+
25
### 2.2.3
36

47
- Update `HelpInfoUri` to point to the latest content (#560)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Daily Build status
6565
Documentation
6666
=============
6767

68-
[Click here](https://msdn.microsoft.com/en-us/powershell/gallery/psget/overview)
68+
[Click here](https://docs.microsoft.com/powershell/scripting/gallery/installing-psget?view=powershell-6)
6969

7070

7171
Requirements

‎src/PowerShellGet/PowerShellGet.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@{
22
RootModule = 'PSModule.psm1'
3-
ModuleVersion = '2.2.3'
3+
ModuleVersion = '2.2.4'
44
GUID = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
55
Author = 'Microsoft Corporation'
66
CompanyName = 'Microsoft Corporation'

‎src/PowerShellGet/public/psgetfunctions/Find-Module.ps1

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ function Find-Module {
9090
)
9191

9292
Begin {
93+
# Change security protocol to TLS 1.2
94+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
95+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
96+
9397
Install-NuGetClientBinaries -CallerPSCmdlet $PSCmdlet -Proxy $Proxy -ProxyCredential $ProxyCredential
9498
}
9599

@@ -158,12 +162,13 @@ function Find-Module {
158162
else {
159163
$psgetItemInfo
160164
}
161-
} elseif ($PSBoundParameters['Name'] -and -not (Test-WildcardPattern -Name ($Name | Microsoft.PowerShell.Core\Where-Object { $psgetItemInfo.Name -like $_ }))) {
165+
}
166+
elseif ($PSBoundParameters['Name'] -and -not (Test-WildcardPattern -Name ($Name | Microsoft.PowerShell.Core\Where-Object { $psgetItemInfo.Name -like $_ }))) {
162167
$message = $LocalizedData.MatchInvalidType -f ($psgetItemInfo.Name, $psgetItemInfo.Type, $script:PSArtifactTypeModule)
163168
Write-Error -Message $message `
164-
-ErrorId 'MatchInvalidType' `
165-
-Category InvalidArgument `
166-
-TargetObject $Name
169+
-ErrorId 'MatchInvalidType' `
170+
-Category InvalidArgument `
171+
-TargetObject $Name
167172
}
168173

169174
if ($psgetItemInfo -and
@@ -181,4 +186,9 @@ function Find-Module {
181186
Log-ArtifactNotFoundInPSGallery -SearchedName $Name -FoundName $modulesFoundInPSGallery -operationName 'PSGET_FIND_MODULE'
182187
}
183188
}
189+
190+
End {
191+
# Change back to user specified security protocol
192+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
193+
}
184194
}

‎src/PowerShellGet/public/psgetfunctions/Find-Script.ps1

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ function Find-Script {
8080
)
8181

8282
Begin {
83+
# Change security protocol to TLS 1.2
84+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
85+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
86+
8387
Install-NuGetClientBinaries -CallerPSCmdlet $PSCmdlet -Proxy $Proxy -ProxyCredential $ProxyCredential
8488
}
8589

@@ -166,12 +170,13 @@ function Find-Script {
166170
else {
167171
$psgetItemInfo
168172
}
169-
} elseif ($PSBoundParameters['Name'] -and -not (Test-WildcardPattern -Name ($Name | Microsoft.PowerShell.Core\Where-Object { $psgetItemInfo.Name -like $_ }))) {
173+
}
174+
elseif ($PSBoundParameters['Name'] -and -not (Test-WildcardPattern -Name ($Name | Microsoft.PowerShell.Core\Where-Object { $psgetItemInfo.Name -like $_ }))) {
170175
$message = $LocalizedData.MatchInvalidType -f ($psgetItemInfo.Name, $psgetItemInfo.Type, $script:PSArtifactTypeScript)
171176
Write-Error -Message $message `
172-
-ErrorId 'MatchInvalidType' `
173-
-Category InvalidArgument `
174-
-TargetObject $Name
177+
-ErrorId 'MatchInvalidType' `
178+
-Category InvalidArgument `
179+
-TargetObject $Name
175180
}
176181

177182
if ($psgetItemInfo -and
@@ -188,4 +193,9 @@ function Find-Script {
188193
Log-ArtifactNotFoundInPSGallery -SearchedName $Name -FoundName $scriptsFoundInPSGallery -operationName PSGET_FIND_SCRIPT
189194
}
190195
}
196+
197+
End {
198+
# Change back to user specified security protocol
199+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
200+
}
191201
}

‎src/PowerShellGet/public/psgetfunctions/Install-Module.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ function Install-Module {
9191
)
9292

9393
Begin {
94+
# Change security protocol to TLS 1.2
95+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
96+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
97+
9498
if ($Scope -eq "AllUsers" -and -not (Test-RunningAsElevated)) {
9599
# Throw an error when Install-Module is used as a non-admin user and '-Scope AllUsers'
96100
$message = $LocalizedData.InstallModuleAdminPrivilegeRequiredForAllUsersScope -f @($script:programFilesModulesPath, $script:MyDocumentsModulesPath)
@@ -269,4 +273,9 @@ function Install-Module {
269273
}
270274
}
271275
}
276+
277+
End {
278+
# Change back to user specified security protocol
279+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
280+
}
272281
}

‎src/PowerShellGet/public/psgetfunctions/Install-Script.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ function Install-Script {
8787
)
8888

8989
Begin {
90+
# Change security protocol to TLS 1.2
91+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
92+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
93+
9094
if ($Scope -eq "AllUsers" -and -not (Test-RunningAsElevated)) {
9195
# Throw an error when Install-Script is used as a non-admin user and '-Scope AllUsers'
9296
$message = $LocalizedData.InstallScriptAdminPrivilegeRequiredForAllUsersScope -f @($script:ProgramFilesScriptsPath, $script:MyDocumentsScriptsPath)
@@ -318,4 +322,9 @@ function Install-Script {
318322
}
319323
}
320324
}
325+
326+
End {
327+
# Change back to user specified security protocol
328+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
329+
}
321330
}

‎src/PowerShellGet/public/psgetfunctions/Publish-Module.ps1

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ function Publish-Module {
8989
)
9090

9191
Begin {
92+
# Change security protocol to TLS 1.2
93+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
94+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
95+
9296
if ($LicenseUri -and -not (Test-WebUri -uri $LicenseUri)) {
9397
$message = $LocalizedData.InvalidWebUri -f ($LicenseUri, "LicenseUri")
9498
ThrowError -ExceptionName "System.ArgumentException" `
@@ -214,7 +218,7 @@ function Publish-Module {
214218

215219
# Find the module to be published locally, search by name and RequiredVersion
216220
$module = Microsoft.PowerShell.Core\Get-Module -ListAvailable -Name $Name -Verbose:$false |
217-
Microsoft.PowerShell.Core\Where-Object {
221+
Microsoft.PowerShell.Core\Where-Object {
218222
$modInfoPrerelease = $null
219223
if ($_.PrivateData -and
220224
$_.PrivateData.GetType().ToString() -eq "System.Collections.Hashtable" -and
@@ -377,7 +381,7 @@ function Publish-Module {
377381
# Copy-Item -Recurse -Force includes hidden items like .git directories, which we don't want
378382
# This finds all the items without force (leaving out hidden files and dirs) then copies them
379383
Microsoft.PowerShell.Management\Get-ChildItem $Path -recurse |
380-
Microsoft.PowerShell.Management\Copy-Item -Force -Confirm:$false -WhatIf:$false -Destination {
384+
Microsoft.PowerShell.Management\Copy-Item -Force -Confirm:$false -WhatIf:$false -Destination {
381385
if ($_.PSIsContainer) {
382386
Join-Path $tempModulePathForFormatVersion $_.Parent.FullName.substring($path.length)
383387
}
@@ -458,8 +462,8 @@ function Publish-Module {
458462
# Check if the specified module name is already used for a script on the specified repository
459463
# Use Find-Script to check if that name is already used as scriptname
460464
$scriptPSGetItemInfo = Find-Script @FindParameters |
461-
Microsoft.PowerShell.Core\Where-Object {$_.Name -eq $moduleName} |
462-
Microsoft.PowerShell.Utility\Select-Object -Last 1 -ErrorAction Ignore
465+
Microsoft.PowerShell.Core\Where-Object { $_.Name -eq $moduleName } |
466+
Microsoft.PowerShell.Utility\Select-Object -Last 1 -ErrorAction Ignore
463467
if ($scriptPSGetItemInfo) {
464468
$message = $LocalizedData.SpecifiedNameIsAlearyUsed -f ($moduleName, $Repository, 'Find-Script')
465469
ThrowError -ExceptionName "System.InvalidOperationException" `
@@ -472,8 +476,8 @@ function Publish-Module {
472476

473477
$null = $FindParameters.Remove('Tag')
474478
$currentPSGetItemInfo = Find-Module @FindParameters |
475-
Microsoft.PowerShell.Core\Where-Object {$_.Name -eq $moduleInfo.Name} |
476-
Microsoft.PowerShell.Utility\Select-Object -Last 1 -ErrorAction Ignore
479+
Microsoft.PowerShell.Core\Where-Object { $_.Name -eq $moduleInfo.Name } |
480+
Microsoft.PowerShell.Utility\Select-Object -Last 1 -ErrorAction Ignore
477481

478482
if ($currentPSGetItemInfo) {
479483
$result = ValidateAndGet-VersionPrereleaseStrings -Version $currentPSGetItemInfo.Version -CallerPSCmdlet $PSCmdlet
@@ -580,4 +584,9 @@ function Publish-Module {
580584
Microsoft.PowerShell.Management\Remove-Item $tempModulePath -Force -Recurse -ErrorAction Ignore -WarningAction SilentlyContinue -Confirm:$false -WhatIf:$false
581585
}
582586
}
587+
588+
End {
589+
# Change back to user specified security protocol
590+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
591+
}
583592
}

‎src/PowerShellGet/public/psgetfunctions/Publish-Script.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ function Publish-Script {
4343
)
4444

4545
Begin {
46+
# Change security protocol to TLS 1.2
47+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
48+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
49+
4650
Install-NuGetClientBinaries -CallerPSCmdlet $PSCmdlet -BootstrapNuGetExe -Force:$Force
4751
}
4852

@@ -336,4 +340,9 @@ function Publish-Script {
336340
Microsoft.PowerShell.Management\Remove-Item $tempScriptPath -Force -Recurse -ErrorAction Ignore -WarningAction SilentlyContinue -Confirm:$false -WhatIf:$false
337341
}
338342
}
343+
344+
End {
345+
# Change back to user specified security protocol
346+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
347+
}
339348
}

‎src/PowerShellGet/public/psgetfunctions/Save-Module.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ function Save-Module {
114114
)
115115

116116
Begin {
117+
# Change security protocol to TLS 1.2
118+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
119+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
120+
117121
Install-NuGetClientBinaries -CallerPSCmdlet $PSCmdlet -Proxy $Proxy -ProxyCredential $ProxyCredential
118122

119123
# Module names already tried in the current pipeline for InputObject parameterset
@@ -252,4 +256,9 @@ function Save-Module {
252256
}
253257
}
254258
}
259+
260+
End {
261+
# Change back to user specified security protocol
262+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
263+
}
255264
}

‎src/PowerShellGet/public/psgetfunctions/Save-Script.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ function Save-Script {
116116
)
117117

118118
Begin {
119+
# Change security protocol to TLS 1.2
120+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
121+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
122+
119123
Install-NuGetClientBinaries -CallerPSCmdlet $PSCmdlet -Proxy $Proxy -ProxyCredential $ProxyCredential
120124

121125
# Script names already tried in the current pipeline for InputObject parameterset
@@ -258,4 +262,9 @@ function Save-Script {
258262
}
259263
}
260264
}
265+
266+
End {
267+
# Change back to user specified security protocol
268+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
269+
}
261270
}

‎src/PowerShellGet/public/psgetfunctions/Update-Module.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ function Update-Module {
5858
)
5959

6060
Begin {
61+
# Change security protocol to TLS 1.2
62+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
63+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
64+
6165
Install-NuGetClientBinaries -CallerPSCmdlet $PSCmdlet -Proxy $Proxy -ProxyCredential $ProxyCredential
6266

6367
if ($Scope -eq "AllUsers" -and -not (Test-RunningAsElevated)) {
@@ -169,4 +173,9 @@ function Update-Module {
169173
}
170174
}
171175
}
176+
177+
End {
178+
# Change back to user specified security protocol
179+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
180+
}
172181
}

‎src/PowerShellGet/public/psgetfunctions/Update-Script.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ function Update-Script {
5353
)
5454

5555
Begin {
56+
# Change security protocol to TLS 1.2
57+
$script:securityProtocol = [Net.ServicePointManager]::SecurityProtocol
58+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
59+
5660
Install-NuGetClientBinaries -CallerPSCmdlet $PSCmdlet -Proxy $Proxy -ProxyCredential $ProxyCredential
5761

5862
# Script names already tried in the current pipeline
@@ -176,4 +180,9 @@ function Update-Script {
176180
}
177181
}
178182
}
183+
184+
End {
185+
# Change back to user specified security protocol
186+
[Net.ServicePointManager]::SecurityProtocol = $script:securityProtocol
187+
}
179188
}

0 commit comments

Comments
 (0)