hosted tweaks

JohnDuprey · JohnDuprey · commit baf275c08760 · 2025-03-24T11:22:47.000-04:00
diff --git a/Modules/CippExtensions/Public/HIBP/Get-HIBPAuth.ps1 b/Modules/CippExtensions/Public/HIBP/Get-HIBPAuth.ps1
@@ -19,8 +19,11 @@ function Get-HIBPAuth {
                 $Secret = $null
             }
 
-            if ([string]::IsNullOrEmpty($Secret) -and $ENV:WEBSITE_OWNER_NAME -like '3e625d35-bf18-4e55*' -or $ENV:WEBSITE_OWNER_NAME -like '61e84181-ff2a-4ba3*') {
+            if ([string]::IsNullOrEmpty($Secret) -and $ENV:CIPP_HOSTED -eq 'true') {
                 $VaultName = 'hibp-kv'
+                if ($SubscriptionId -ne $ENV:CIPP_HOSTED_KV_SUB -and $ENV:CIPP_HOSTED_KV_SUB -match '^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$') {
+                    $null = Set-AzContext -SubscriptionId $ENV:CIPP_HOSTED_KV_SUB
+                }
                 $Secret = Get-AzKeyVaultSecret -VaultName $VaultName -Name 'HIBP' -AsPlainText
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,11 @@ function Get-HIBPAuth {`
`19`	`19`	`$Secret = $null`
`20`	`20`	`}`
`21`	`21`
`22`		`- if ([string]::IsNullOrEmpty($Secret) -and $ENV:WEBSITE_OWNER_NAME -like '3e625d35-bf18-4e55' -or $ENV:WEBSITE_OWNER_NAME -like '61e84181-ff2a-4ba3') {`
	`22`	`+ if ([string]::IsNullOrEmpty($Secret) -and $ENV:CIPP_HOSTED -eq 'true') {`
`23`	`23`	`$VaultName = 'hibp-kv'`
	`24`	`+ if ($SubscriptionId -ne $ENV:CIPP_HOSTED_KV_SUB -and $ENV:CIPP_HOSTED_KV_SUB -match '^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$') {`
	`25`	`+ $null = Set-AzContext -SubscriptionId $ENV:CIPP_HOSTED_KV_SUB`
	`26`	`+ }`
`24`	`27`	`$Secret = Get-AzKeyVaultSecret -VaultName $VaultName -Name 'HIBP' -AsPlainText`
`25`	`28`	`}`
`26`	`29`	`}`