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

Revert "Change all instances of 'whitelist' to 'allowlist'" #683

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Bug fixes
New features

- Allow Pester/PSReadline installation when signed by non-Microsoft certificate (#258)
- Allowlist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.
- Whitelist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.

Build and Code Cleanup Improvements

Expand Down
4 changes: 2 additions & 2 deletions Tests/PSGetInstallModule.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function SuiteSetup {
# If it doesn't exist, attempt to download it.
# If this is run offline, just fail the test for now.
# This module is expected to be Microsoft-signed.
# This is essentially a test hook to get around the hardcoded allowlist.
# This is essentially a test hook to get around the hardcoded whitelist.
$signedPester = (Get-Module Pester -ListAvailable | Where-Object { $_.Version -eq '3.4.0' }).ModuleBase
if (-not $signedPester) {
$psName = [System.Guid]::NewGuid().ToString()
Expand Down Expand Up @@ -849,7 +849,7 @@ Describe PowerShell.PSGet.InstallModuleTests -Tags 'BVT', 'InnerLoop' {
AssertEquals $res.Name $moduleName2 "Install-Module failed to install with Find-Command output"
}

# Purpose: Install a allowlisted non-Microsoft signed Pester or PSReadline version without -SkipPublisherCheck
# Purpose: Install a whitelisted non-Microsoft signed Pester or PSReadline version without -SkipPublisherCheck
#
# Action: Install-Module -Name Pester -RequiredVersion <Anything non-Microsoft signed>
#
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ build: off

# branches to build
branches:
# allowlist
# whitelist
only:
- master
- development
Expand Down
118 changes: 59 additions & 59 deletions src/PowerShellGet/PowerShellGet.psd1
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
@{
RootModule = 'PSModule.psm1'
ModuleVersion = '2.2.5'
GUID = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
Author = 'Microsoft Corporation'
CompanyName = 'Microsoft Corporation'
Copyright = '(c) Microsoft Corporation. All rights reserved.'
Description = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
PowerShellVersion = '3.0'
FormatsToProcess = 'PSGet.Format.ps1xml'
FunctionsToExport = @(
'Find-Command',
'Find-DSCResource',
'Find-Module',
'Find-RoleCapability',
'Find-Script',
'Get-CredsFromCredentialProvider',
'Get-InstalledModule',
'Get-InstalledScript',
'Get-PSRepository',
'Install-Module',
'Install-Script',
'New-ScriptFileInfo',
'Publish-Module',
'Publish-Script',
'Register-PSRepository',
'Save-Module',
'Save-Script',
'Set-PSRepository',
'Test-ScriptFileInfo',
'Uninstall-Module',
'Uninstall-Script',
'Unregister-PSRepository',
'Update-Module',
'Update-ModuleManifest',
'Update-Script',
'Update-ScriptFileInfo')

VariablesToExport = 'PSGetPath'
AliasesToExport = @('inmo', 'fimo', 'upmo', 'pumo')
FileList = @('PSModule.psm1',
'PSGet.Format.ps1xml',
'PSGet.Resource.psd1')
RequiredModules = @(@{ModuleName = 'PackageManagement'; ModuleVersion = '1.4.4' })
PrivateData = @{
"PackageManagementProviders" = 'PSModule.psm1'
"SupportedPowerShellGetFormatVersions" = @('1.x', '2.x')
PSData = @{
Tags = @('Packagemanagement',
'Provider',
'PSEdition_Desktop',
'PSEdition_Core',
'Linux',
'Mac')
ProjectUri = 'https://go.microsoft.com/fwlink/?LinkId=828955'
LicenseUri = 'https://go.microsoft.com/fwlink/?LinkId=829061'
ReleaseNotes = @'
RootModule = 'PSModule.psm1'
ModuleVersion = '2.2.5'
GUID = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
Author = 'Microsoft Corporation'
CompanyName = 'Microsoft Corporation'
Copyright = '(c) Microsoft Corporation. All rights reserved.'
Description = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
PowerShellVersion = '3.0'
FormatsToProcess = 'PSGet.Format.ps1xml'
FunctionsToExport = @(
'Find-Command',
'Find-DSCResource',
'Find-Module',
'Find-RoleCapability',
'Find-Script',
'Get-CredsFromCredentialProvider',
'Get-InstalledModule',
'Get-InstalledScript',
'Get-PSRepository',
'Install-Module',
'Install-Script',
'New-ScriptFileInfo',
'Publish-Module',
'Publish-Script',
'Register-PSRepository',
'Save-Module',
'Save-Script',
'Set-PSRepository',
'Test-ScriptFileInfo',
'Uninstall-Module',
'Uninstall-Script',
'Unregister-PSRepository',
'Update-Module',
'Update-ModuleManifest',
'Update-Script',
'Update-ScriptFileInfo')

VariablesToExport = 'PSGetPath'
AliasesToExport = @('inmo', 'fimo', 'upmo', 'pumo')
FileList = @('PSModule.psm1',
'PSGet.Format.ps1xml',
'PSGet.Resource.psd1')
RequiredModules = @(@{ModuleName = 'PackageManagement'; ModuleVersion = '1.4.4' })
PrivateData = @{
"PackageManagementProviders" = 'PSModule.psm1'
"SupportedPowerShellGetFormatVersions" = @('1.x', '2.x')
PSData = @{
Tags = @('Packagemanagement',
'Provider',
'PSEdition_Desktop',
'PSEdition_Core',
'Linux',
'Mac')
ProjectUri = 'https://go.microsoft.com/fwlink/?LinkId=828955'
LicenseUri = 'https://go.microsoft.com/fwlink/?LinkId=829061'
ReleaseNotes = @'
### 2.2.5
- Security patch for code injection bug

Expand Down Expand Up @@ -190,7 +190,7 @@ Bug fixes

New features
* Allow Pester/PSReadline installation when signed by non-Microsoft certificate (#258)
- Allowlist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.
- Whitelist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.

Build and Code Cleanup Improvements
* Splitting of functions (#229) (Thanks @Benny1007)
Expand Down Expand Up @@ -280,8 +280,8 @@ Bug fixes
## For full history of release notes see changelog:
https://github.com/PowerShell/PowerShellGet/blob/master/CHANGELOG.md
'@
}
}
}

HelpInfoURI = 'http://go.microsoft.com/fwlink/?linkid=855963'
HelpInfoURI = 'http://go.microsoft.com/fwlink/?linkid=855963'
}