Skip to content

Commit 1a52659

Browse files
pull[bot]pull[bot]
authored
Merge pull request #610 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 46efaa2 + 2b68fc7 commit 1a52659

20 files changed

+255
-87
lines changed

‎Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ListMailQuarantineAllTenants.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
try {
1414
$quarantineMessages = New-ExoRequest -tenantid $domainName -cmdlet 'Get-QuarantineMessage' -cmdParams @{ 'PageSize' = 1000 } | Select-Object -ExcludeProperty *data.type*
15-
$GraphRequest = foreach ($message in $quarantineMessages) {
15+
foreach ($message in $quarantineMessages) {
1616
$messageData = @{
1717
QuarantineMessage = [string]($message | ConvertTo-Json -Depth 10 -Compress)
1818
RowKey = [string](New-Guid).Guid

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ListMailboxRules.ps1‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ function Invoke-ListMailboxRules {
3131
QueueMessage = "Still loading data for $TenantFilter. Please check back in a few more minutes"
3232
QueueId = $RunningQueue.RowKey
3333
}
34-
[PSCustomObject]@{
35-
Waiting = $true
36-
}
3734
} elseif ((!$Rows -and !$RunningQueue) -or ($TenantFilter -eq 'AllTenants' -and ($Rows | Measure-Object).Count -eq 1)) {
3835
Write-Information "No cached mailbox rules found for $TenantFilter, starting new orchestration"
3936
if ($TenantFilter -eq 'AllTenants') {
@@ -58,7 +55,7 @@ function Invoke-ListMailboxRules {
5855
SkipLog = $true
5956
}
6057
#Write-Host ($InputObject | ConvertTo-Json)
61-
$InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress)
58+
Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress)
6259
Write-Host "Started mailbox rules orchestration with ID = '$InstanceId'"
6360
}
6461

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-ListMailQuarantine.ps1‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ function Invoke-ListMailQuarantine {
1919
$Filter = "PartitionKey eq '$PartitionKey'"
2020
$Rows = Get-CIPPAzDataTableEntity @Table -filter $Filter | Where-Object -Property Timestamp -GT (Get-Date).AddMinutes(-30)
2121
$QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
22-
$RunningQueue = Invoke-ListCippQueue | Where-Object { $_.Reference -eq $QueueReference -and $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
22+
$RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
2323
# If a queue is running, we will not start a new one
2424
if ($RunningQueue) {
2525
$Metadata = [PSCustomObject]@{
2626
QueueMessage = 'Still loading data for all tenants. Please check back in a few more minutes'
2727
QueueId = $RunningQueue.RowKey
2828
}
29-
[PSCustomObject]@{
30-
Waiting = $true
31-
}
3229
} elseif (!$Rows -and !$RunningQueue) {
3330
# If no rows are found and no queue is running, we will start a new one
3431
$TenantList = Get-Tenants -IncludeErrors
@@ -49,16 +46,13 @@ function Invoke-ListMailQuarantine {
4946
}
5047
SkipLog = $true
5148
}
52-
Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress)
53-
[PSCustomObject]@{
54-
Waiting = $true
55-
}
49+
$null = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress)
5650
} else {
5751
$Metadata = [PSCustomObject]@{
5852
QueueId = $RunningQueue.RowKey ?? $null
5953
}
60-
$messages = $Rows
61-
foreach ($message in $messages) {
54+
$Messages = $Rows
55+
foreach ($message in $Messages) {
6256
$messageObj = $message.QuarantineMessage | ConvertFrom-Json
6357
$messageObj | Add-Member -NotePropertyName 'Tenant' -NotePropertyValue $message.Tenant -Force
6458
$messageObj

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecJITAdmin.ps1‎

Lines changed: 71 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@ function Invoke-ExecJITAdmin {
1616
$TenantFilter = $Request.Body.tenantFilter.value ? $Request.Body.tenantFilter.value : $Request.Body.tenantFilter
1717

1818

19-
if ($Request.Body.existingUser.value -match '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$') {
20-
$Username = (New-GraphGetRequest -uri "https://graph.microsoft.com/v1.0/users/$($Request.Body.existingUser.value)" -tenantid $TenantFilter).userPrincipalName
21-
}
22-
2319
$Start = ([System.DateTimeOffset]::FromUnixTimeSeconds($Request.Body.StartDate)).DateTime.ToLocalTime()
2420
$Expiration = ([System.DateTimeOffset]::FromUnixTimeSeconds($Request.Body.EndDate)).DateTime.ToLocalTime()
25-
$Results = [System.Collections.Generic.List[string]]::new()
21+
$Results = [System.Collections.Generic.List[object]]::new()
2622

2723
if ($Request.Body.userAction -eq 'create') {
2824
$Domain = $Request.Body.Domain.value ? $Request.Body.Domain.value : $Request.Body.Domain
@@ -39,17 +35,62 @@ function Invoke-ExecJITAdmin {
3935
Reason = $Request.Body.reason
4036
Action = 'Create'
4137
TenantFilter = $TenantFilter
38+
Headers = $Headers
39+
APIName = $APIName
40+
}
41+
try {
42+
$CreateResult = Set-CIPPUserJITAdmin @JITAdmin
43+
} catch {
44+
return ([HttpResponseContext]@{
45+
StatusCode = [HttpStatusCode]::BadRequest
46+
Body = @{'Results' = @("Failed to create JIT Admin user: $($_.Exception.Message)") }
47+
})
4248
}
43-
$CreateResult = Set-CIPPUserJITAdmin @JITAdmin
44-
Write-LogMessage -Headers $Headers -API $APIName -tenant $TenantFilter -message "Created JIT Admin user: $Username. Reason: $($Request.Body.reason). Roles: $($Request.Body.adminRoles.label -join ', ')" -Sev 'Info' -LogData $JITAdmin
45-
$Results.Add("Created User: $Username")
49+
$Results.Add(@{
50+
resultText = "Created User: $Username"
51+
copyField = $Username
52+
state = 'success'
53+
})
4654
if (!$Request.Body.UseTAP) {
47-
$Results.Add("Password: $($CreateResult.password)")
55+
$Results.Add(@{
56+
resultText = "Password: $($CreateResult.password)"
57+
copyField = $CreateResult.password
58+
state = 'success'
59+
})
4860
}
4961
$Results.Add("JIT Admin Expires: $($Expiration)")
5062
Start-Sleep -Seconds 1
63+
} else {
64+
65+
$Username = $Request.Body.existingUser.value
66+
if ($Username -match '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$') {
67+
Write-Information "Resolving UserPrincipalName from ObjectId: $($Request.Body.existingUser.value)"
68+
$Username = (New-GraphGetRequest -uri "https://graph.microsoft.com/v1.0/users/$($Request.Body.existingUser.value)" -tenantid $TenantFilter).userPrincipalName
69+
70+
# If the resolved username is a guest user, we need to use the id instead of the UPN
71+
if ($Username -clike '*#EXT#*') {
72+
$Username = $Request.Body.existingUser.value
73+
}
74+
}
75+
76+
# Validate we have a username
77+
if ([string]::IsNullOrWhiteSpace($Username)) {
78+
return [HttpResponseContext]@{
79+
StatusCode = [HttpStatusCode]::BadRequest
80+
Body = @{ 'Results' = @("Could not resolve username from existingUser value: $($Request.Body.existingUser.value)") }
81+
}
82+
}
83+
84+
# Add username result for existing user
85+
$Results.Add(@{
86+
resultText = "User: $Username"
87+
copyField = $Username
88+
state = 'success'
89+
})
5190
}
5291

92+
93+
5394
#Region TAP creation
5495
if ($Request.Body.UseTAP) {
5596
try {
@@ -82,13 +123,21 @@ function Invoke-ExecJITAdmin {
82123
$PasswordLink = New-PwPushLink -Payload $TempPass
83124
$Password = $PasswordLink ? $PasswordLink : $TempPass
84125

85-
$Results.Add("Temporary Access Pass: $Password")
126+
$Results.Add(@{
127+
resultText = "Temporary Access Pass: $Password"
128+
copyField = $Password
129+
state = 'success'
130+
})
86131
$Results.Add("This TAP is usable starting at $($TapRequest.startDateTime) UTC for the next $PasswordExpiration minutes")
87132
} catch {
88133
$Results.Add('Failed to create TAP, if this is not yet enabled, use the Standards to push the settings to the tenant.')
89134
Write-Information (Get-CippException -Exception $_ | ConvertTo-Json -Depth 5)
90135
if ($Password) {
91-
$Results.Add("Password: $Password")
136+
$Results.Add(@{
137+
resultText = "Password: $Password"
138+
copyField = $Password
139+
state = 'success'
140+
})
92141
}
93142
}
94143
}
@@ -103,6 +152,8 @@ function Invoke-ExecJITAdmin {
103152
Action = 'AddRoles'
104153
Reason = $Request.Body.Reason
105154
Expiration = $Expiration
155+
Headers = $Headers
156+
APIName = $APIName
106157
}
107158
if ($Start -gt (Get-Date)) {
108159
$TaskBody = @{
@@ -125,11 +176,16 @@ function Invoke-ExecJITAdmin {
125176
Set-CIPPUserJITAdminProperties -TenantFilter $TenantFilter -UserId $Request.Body.existingUser.value -Expiration $Expiration -Reason $Request.Body.Reason
126177
}
127178
$Results.Add("Scheduling JIT Admin enable task for $Username")
128-
Write-LogMessage -Headers $Headers -API $APIName -message "Scheduling JIT Admin for existing user: $Username. Reason: $($Request.Body.reason). Roles: $($Request.Body.adminRoles.label -join ', ') " -tenant $TenantFilter -Sev 'Info'
129179
} else {
130-
$Results.Add("Executing JIT Admin enable task for $Username")
131-
Set-CIPPUserJITAdmin @Parameters
132-
Write-LogMessage -Headers $Headers -API $APIName -message "Executing JIT Admin for existing user: $Username. Reason: $($Request.Body.reason). Roles: $($Request.Body.adminRoles.label -join ', ') " -tenant $TenantFilter -Sev 'Info'
180+
try {
181+
$Results.Add("Executing JIT Admin enable task for $Username")
182+
Set-CIPPUserJITAdmin @Parameters
183+
} catch {
184+
return ([HttpResponseContext]@{
185+
StatusCode = [HttpStatusCode]::BadRequest
186+
Body = @{'Results' = @("Failed to execute JIT Admin enable task: $($_.Exception.Message)") }
187+
})
188+
}
133189
}
134190

135191
$DisableTaskBody = [pscustomobject]@{
@@ -158,7 +214,6 @@ function Invoke-ExecJITAdmin {
158214
$null = Add-CIPPScheduledTask -Task $DisableTaskBody -hidden $false
159215
$Results.Add("Scheduling JIT Admin $($Request.Body.ExpireAction.value) task for $Username")
160216

161-
# TODO - We should find a way to have this return a HTTP status code based on the success or failure of the operation. This also doesn't return the results of the operation in a Results hash table, like most of the rest of the API.
162217
return ([HttpResponseContext]@{
163218
StatusCode = [HttpStatusCode]::OK
164219
Body = @{'Results' = @($Results) }

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListNewUserDefaults.ps1‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ function Invoke-ListNewUserDefaults {
1313
# Get the TenantFilter from query parameters
1414
$TenantFilter = $Request.Query.TenantFilter
1515
Write-Host "TenantFilter from request: $TenantFilter"
16+
17+
# Get the includeAllTenants flag from query or body parameters (defaults to true)
18+
$IncludeAllTenants = if ($Request.Query.includeAllTenants -eq 'false' -or $Request.Body.includeAllTenants -eq 'false') {
19+
$false
20+
} else {
21+
$true
22+
}
23+
Write-Host "IncludeAllTenants: $IncludeAllTenants"
1624

1725
# Get the templates table
1826
$Table = Get-CippTable -tablename 'templates'
@@ -36,7 +44,19 @@ function Invoke-ListNewUserDefaults {
3644

3745
# Filter by tenant if TenantFilter is provided
3846
if ($TenantFilter) {
39-
$Templates = $Templates | Where-Object -Property tenantFilter -EQ $TenantFilter
47+
if ($TenantFilter -eq 'AllTenants') {
48+
# When requesting AllTenants, return only templates stored under AllTenants
49+
$Templates = $Templates | Where-Object -Property tenantFilter -eq 'AllTenants'
50+
} else {
51+
# When requesting a specific tenant
52+
if ($IncludeAllTenants) {
53+
# Include both tenant-specific and AllTenants templates
54+
$Templates = $Templates | Where-Object { $_.tenantFilter -eq $TenantFilter -or $_.tenantFilter -eq 'AllTenants' }
55+
} else {
56+
# Return only tenant-specific templates (exclude AllTenants)
57+
$Templates = $Templates | Where-Object -Property tenantFilter -eq $TenantFilter
58+
}
59+
}
4060
Write-Host "Templates after filtering: $($Templates.Count)"
4161
}
4262

@@ -45,7 +65,7 @@ function Invoke-ListNewUserDefaults {
4565

4666
# If a specific ID is requested, filter to that template
4767
if ($Request.query.ID) {
48-
$Templates = $Templates | Where-Object -Property GUID -EQ $Request.query.ID
68+
$Templates = $Templates | Where-Object -Property GUID -eq $Request.query.ID
4969
}
5070

5171
$Templates = ConvertTo-Json -InputObject @($Templates) -Depth 100

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecAlertsList.ps1‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ function Invoke-ExecAlertsList {
6262
QueueMessage = 'Still loading data for all tenants. Please check back in a few more minutes'
6363
QueueId = $RunningQueue.RowKey
6464
}
65-
[PSCustomObject]@{
66-
Waiting = $true
67-
}
6865
} elseif (!$Rows -and !$RunningQueue) {
6966
# If no rows are found and no queue is running, we will start a new one
7067
$TenantList = Get-Tenants -IncludeErrors
@@ -85,11 +82,7 @@ function Invoke-ExecAlertsList {
8582
}
8683
SkipLog = $true
8784
} | ConvertTo-Json -Depth 10
88-
$InstanceId = Start-NewOrchestration -FunctionName CIPPOrchestrator -InputObject $InputObject
89-
[PSCustomObject]@{
90-
Waiting = $true
91-
InstanceId = $InstanceId
92-
}
85+
Start-NewOrchestration -FunctionName CIPPOrchestrator -InputObject $InputObject
9386
} else {
9487
$Metadata = [PSCustomObject]@{
9588
QueueId = $RunningQueue.RowKey ?? $null

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-CIPPStandardsRun.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function Invoke-CIPPStandardsRun {
8080
$BatchItem
8181
}
8282

83-
Write-Information "Built batch of $($Batch.Count) tenant standards list activities"
83+
Write-Information "Built batch of $($Batch.Count) tenant standards list activities: $($Batch | ConvertTo-Json -Depth 5 -Compress)"
8484

8585
# Start orchestrator with distributed batch and post-exec aggregation
8686
$InputObject = [PSCustomObject]@{

0 commit comments

Comments
 (0)