Skip to content

Improvement/unattended authentication issue38 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Improvement/unattended authentication issue38 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c27b48c
Added Login parameter to Unlock-SecretVault and Invoke-VaultToken.
Oct 27, 2022
54efe14
Revert "Added Login parameter to Unlock-SecretVault and Invoke-VaultT…
Oct 31, 2022
a86509d
Added Login parameter into AdditionalParameters.
Nov 2, 2022
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 ...anagement.Hashicorp.Vault.KV.Extension/SecretManagement.Hashicorp.Vault.KV.Extension.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@{
ModuleVersion = '2.0.1'
ModuleVersion = '2.0.2'
RootModule = 'SecretManagement.Hashicorp.Vault.KV.Extension.psm1'
FunctionsToExport = @('Set-Secret', 'Get-Secret', 'Remove-Secret', 'Get-SecretInfo', 'Test-SecretVault', 'Unlock-SecretVault', 'Unregister-SecretVault')
}
18 changes: 11 additions & 7 deletions ...anagement.Hashicorp.Vault.KV.Extension/SecretManagement.Hashicorp.Vault.KV.Extension.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using namespace System.Collections.ObjectModel
using namespace System.Collections.Generic
# enum and Variables setup for use
$script:HashicorpVaultConfigValues = @('VaultServer', 'VaultAuthType', 'VaultToken', 'VaultAPIVersion', 'VaultSkipVerify', 'KVVersion', 'OutputType', 'Verbose')
$script:AllVariables = @('VaultServer', 'VaultAuthType', 'VaultToken', 'VaultAPIVersion', 'VaultSkipVerify', 'KVVersion', 'OutputType', 'TokenRenewable', 'TokenLifespan', 'TokenType', 'TokenExpireTime', 'Verbose')
$script:HashicorpVaultConfigValues = @('VaultServer', 'VaultAuthType', 'VaultToken', 'VaultAPIVersion', 'VaultSkipVerify', 'KVVersion', 'Login', 'OutputType', 'Verbose')
$script:AllVariables = @('VaultServer', 'VaultAuthType', 'VaultToken', 'VaultAPIVersion', 'VaultSkipVerify', 'KVVersion', 'Login', 'OutputType', 'TokenRenewable', 'TokenLifespan', 'TokenType', 'TokenExpireTime', 'Verbose')

enum HashicorpVaultAuthTypes {
None
Expand Down Expand Up @@ -172,13 +172,13 @@ function Invoke-VaultToken {
Write-Verbose "Retrieving a Token for authenticating to Vault"
$RenewToken = $false
#continue
} elseif ($Null -ne $script:VaultToken -and $script:TokenExpireTime -lt (Get-date) -and -not $script:RootToken) {
} elseif ($Null -ne $script:VaultToken -and $script:TokenExpireTime -lt (Get-Date) -and -not $script:RootToken) {
# Retrieve a new token if expired
Write-Verbose "Token Expired at $($script:TokenExpireTime). Retieving a new token"
$script:VaultToken = $null
$RenewToken = $false
#continue
} elseif ($Null -ne $script:VaultToken -and (New-TimeSpan -Start (Get-date) -End ($script:TokenExpireTime)).Minutes -le 1 -and $script:TokenRenewable) {
} elseif ($Null -ne $script:VaultToken -and (New-TimeSpan -Start (Get-Date) -End ($script:TokenExpireTime)).Minutes -le 1 -and $script:TokenRenewable) {
# Renew a new token if about to expire
Write-Verbose "Token about to Expire at $($script:TokenExpireTime). Renewing the token for $($script:TokenLifespan) seconds."
$RenewToken = $true
Expand All @@ -196,7 +196,11 @@ function Invoke-VaultToken {
$AuthType = $script:VaultAuthType

if ($Password -and $AuthType -ne 'Token' -and -not $RenewToken) {
$Login = Read-Host -Prompt "What is the $(if($AuthType -eq 'Approle'){'Role-Id'} else {'Username'})?"
if (-not $AdditionalParameters['Login']) {
$Login = Read-Host -Prompt "What is the $(if($AuthType -eq 'Approle'){'Role-Id'} else {'Username'})?"
} else {
$Login = $AdditionalParameters['Login']
}
$Credential = [System.Management.Automation.PSCredential]::new($Login, $Password)
}
switch ($script:VaultAuthType) {
Expand Down Expand Up @@ -564,8 +568,8 @@ function Get-SecretInfo {
$Filter = "*$Filter"
$VaultSecrets = Resolve-VaultSecretPath -VaultName $VaultName @VerboseSplat
$VaultSecrets |
Where-Object { $PSItem -like $Filter } |
ForEach-Object {
Where-Object { $PSItem -like $Filter } |
ForEach-Object {
if ($script:KVVersion -eq 'v1') {
$Metadata = $null
} else {
Expand Down