forked from OCram85/PSCredentialStore
fix lint (PSScriptAnalyzer) issues (#62)
#### 📖 Summary <!-- Provide a summary of your changes. Describe the why and not how. --> #### 📑 Test Plan > 💡 Select your test plan for the code changes. - [x] Tested via Drone.io pipeline - [ ] Custom test - [ ] No test plan ##### Details / Justification <!-- Add your test details or justification for missing tests here. --> #### 📚 Additional Notes <!-- A place for additional detail notes. --> Co-authored-by: OCram85 <marco.blessing@googlemail.com> Reviewed-on: OCram85/PSCredentialStore#62
This commit is contained in:
@ -34,10 +34,23 @@ function New-CSCertAttribute {
|
||||
[PSCredentialStore.Certificate.CSRDetails]
|
||||
|
||||
.EXAMPLE
|
||||
New-CSCertAttribute -Country 'DE' -State 'BW' -City 'Karlsruhe' -Organization 'AwesomeIT' -OrganizationalUnitName '' -CommonName 'MyPrivateCert'
|
||||
$AttribParams = @{
|
||||
Country = 'DE'
|
||||
State = 'BW'
|
||||
City = 'Karlsruhe'
|
||||
Organization ='AwesomeIT'
|
||||
OrganizationalUnitName ='PSCredentialStore'
|
||||
CommonName ='MyPrivateCert'
|
||||
}
|
||||
New-CSCertAttribute @AttribParams
|
||||
#>
|
||||
|
||||
[CmdletBinding()]
|
||||
[Diagnostics.CodeAnalysis.SuppressMessageAttribute(
|
||||
'PSUseShouldProcessForStateChangingFunctions',
|
||||
'',
|
||||
Justification = 'Returns a new object and does not change data'
|
||||
)]
|
||||
[OutputType('PSCredentialStore.Certificate.Attribute')]
|
||||
param (
|
||||
[Parameter(Mandatory = $true)]
|
||||
|
@ -26,6 +26,11 @@ function New-CSCertificate {
|
||||
#>
|
||||
|
||||
[CmdletBinding(SupportsShouldProcess = $true)]
|
||||
[Diagnostics.CodeAnalysis.SuppressMessageAttribute(
|
||||
'PSAvoidUsingInvokeExpression',
|
||||
'',
|
||||
Justification = 'needed for openssl wrapping'
|
||||
)]
|
||||
[OutputType()]
|
||||
param (
|
||||
[Parameter(Mandatory = $true, ValueFromPipeline = $true)]
|
||||
@ -57,7 +62,10 @@ function New-CSCertificate {
|
||||
Write-Error @ErrorParams
|
||||
}
|
||||
}
|
||||
elseif (($PSVersionTable.PSEdition -eq 'Desktop' -and $PSVersionTable.PSVersion.Major -lt 6) -or ($IsWindows -eq $true)) {
|
||||
elseif (
|
||||
($PSVersionTable.PSEdition -eq 'Desktop' -and $PSVersionTable.PSVersion.Major -lt 6) -or
|
||||
($IsWindows -eq $true)
|
||||
) {
|
||||
$openssl = Join-Path -Path $ModuleBase -ChildPath '/Vendor/libressl255/openssl.exe'
|
||||
}
|
||||
|
||||
@ -77,7 +85,9 @@ function New-CSCertificate {
|
||||
$Subj = $SubjPattern -f $SubjValues
|
||||
|
||||
$PEMCertName = $CertName -replace '.pfx', '.crt'
|
||||
$ExpPattern = '& ''{0}'' req -x509 -sha256 -nodes -days {1} -newkey rsa:2048 -keyout {2} -out {3} -subj "{4}" *>$null'
|
||||
$ExpPattern = (
|
||||
'& ''{0}'' req -x509 -sha256 -nodes -days {1} -newkey rsa:2048 -keyout {2} -out {3} -subj "{4}" *>$null'
|
||||
)
|
||||
$ExpValues = @(
|
||||
$openssl,
|
||||
$CRTAttribute.Days
|
||||
|
@ -35,7 +35,10 @@ function Test-CSCertificate {
|
||||
$CS = Get-CredentialStore -Shared
|
||||
}
|
||||
if ($null -ne $CS.PfxCertificate) {
|
||||
Write-Warning 'There is a Pfx certificate file linked in the store. Certificates saved in the Cert store will be ignored!'
|
||||
Write-Warning -Message (
|
||||
'There is a Pfx certificate file linked in the store. ' +
|
||||
'Certificates saved in the Cert store will be ignored!'
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
@ -47,13 +50,28 @@ function Test-CSCertificate {
|
||||
if ( $isLinux) {
|
||||
$cert = Get-CSPfxCertificate -Thumbprint $CS.Thumbprint -StoreName 'My' -StoreLocation 'CurrentUser'
|
||||
if ($null -eq $cert) {
|
||||
$cert = Get-CSPfxCertificate -Thumbprint $CS.Thumbprint -StoreName 'Root' -StoreLocation 'LocalMachine'
|
||||
$PFXParams = @{
|
||||
Thumbprint = $CS.Thumbprint
|
||||
StoreName = 'Root'
|
||||
StoreLocation = 'LocalMachine'
|
||||
}
|
||||
$cert = Get-CSPfxCertificate @PFXParams
|
||||
}
|
||||
}
|
||||
elseif ( (! $isLinux) -or ($isWindows) ) {
|
||||
$cert = Get-CSPfxCertificate -Thumbprint $CS.Thumbprint -StoreName 'My' -StoreLocation 'LocalMachine'
|
||||
$PFXParams = @{
|
||||
Thumbprint = $CS.Thumbprint
|
||||
StoreName = 'My'
|
||||
StoreLocation = 'LocalMachine'
|
||||
}
|
||||
$cert = Get-CSPfxCertificate @PFXParams
|
||||
if ($null -eq $cert) {
|
||||
$cert = Get-CSPfxCertificate -Thumbprint $CS.Thumbprint -StoreName 'Root' -StoreLocation 'LocalMachine'
|
||||
$PFXParams = @{
|
||||
Thumbprint = $CS.Thumbprint
|
||||
StoreName = 'Root'
|
||||
StoreLocation = 'LocalMachine'
|
||||
}
|
||||
$cert = Get-CSPfxCertificate @PFXParams
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user