')
$IntroText = $IntroText + "The location information for this IP is as follows:
$LocationTable"
}
- $ButtonUrl = "$CIPPPURL/identity/administration/ViewBec?userId=$($data.ObjectId)&tenantDomain=$($data.OrganizationId)"
- $ButtonText = 'User Management'
- $AfterButtonText = 'If this is incorrect, use the user management screen to block the user and revoke the sessions
'
+ $ButtonUrl = "$CIPPPURL/tenant/tools/geoiplookup?ip=$($data.ClientIP)&SearchNow=true&customerId=$($data.OrganizationId)"
+ $ButtonText = 'Whitelist IP'
+ $AfterButtonText = 'If this is incorrect, you can whitelist the following IP.
'
}
'HostedIP' {
$Table = ($TableObj | ConvertTo-Html -Fragment -As List | Out-String).Replace('', ' ')
@@ -191,9 +189,9 @@ function New-CIPPAlertTemplate {
$LocationTable = ($LocationInfo | ConvertTo-Html -Fragment -As List | Out-String).Replace('', ' ')
$IntroText = $IntroText + "The location information for this IP is as follows:
$LocationTable"
}
- $ButtonUrl = "$CIPPPURL/identity/administration/ViewBec?userId=$($data.ObjectId)&tenantDomain=$($data.OrganizationId)"
- $ButtonText = 'User Management'
- $AfterButtonText = 'If this is incorrect, use the user management screen to block the user and revoke the sessions
'
+ $ButtonUrl = "$CIPPPURL/tenant/tools/geoiplookup?ip=$($data.ClientIP)&SearchNow=true&customerId=$($data.OrganizationId)"
+ $ButtonText = 'Whitelist IP'
+ $AfterButtonText = 'If this is incorrect, you can whitelist the following IP.
'
}
'Add service principal.' {
if ($Appname) { $AppName = $AppName.'Application Name' } else { $appName = $data.ApplicationId }
diff --git a/Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1 b/Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1
index 345d5fa7af97..ee1a1002cc0b 100644
--- a/Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1
+++ b/Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1
@@ -6,30 +6,25 @@ function New-CIPPCAPolicy {
$TenantFilter,
$State,
$Overwrite,
- $APIName = "Create CA Policy",
+ $APIName = 'Create CA Policy',
$ExecutingUser
)
function Remove-EmptyArrays ($Object) {
if ($Object -is [Array]) {
foreach ($Item in $Object) { Remove-EmptyArrays $Item }
- }
- elseif ($Object -is [HashTable]) {
+ } elseif ($Object -is [HashTable]) {
foreach ($Key in @($Object.get_Keys())) {
if ($Object[$Key] -is [Array] -and $Object[$Key].get_Count() -eq 0) {
$Object.Remove($Key)
- }
- else { Remove-EmptyArrays $Object[$Key] }
+ } else { Remove-EmptyArrays $Object[$Key] }
}
- }
- elseif ($Object -is [PSCustomObject]) {
+ } elseif ($Object -is [PSCustomObject]) {
foreach ($Name in @($Object.psobject.properties.Name)) {
if ($Object.$Name -is [Array] -and $Object.$Name.get_Count() -eq 0) {
$Object.PSObject.Properties.Remove($Name)
- }
- elseif ($object.$name -eq $null) {
+ } elseif ($object.$name -eq $null) {
$Object.PSObject.Properties.Remove($Name)
- }
- else { Remove-EmptyArrays $Object.$Name }
+ } else { Remove-EmptyArrays $Object.$Name }
}
}
}
@@ -46,8 +41,7 @@ function New-CIPPCAPolicy {
if ($State -and $State -ne 'donotchange') {
$Jsonobj.state = $State
}
- }
- catch {
+ } catch {
# no issues here.
}
@@ -55,19 +49,18 @@ function New-CIPPCAPolicy {
$LocationLookupTable = foreach ($locations in $jsonobj.LocationInfo) {
foreach ($location in $locations) {
if (!$location.displayName) { continue }
- $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/namedLocations" -tenantid $TenantFilter
+ $CheckExististing = New-GraphGETRequest -uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/namedLocations' -tenantid $TenantFilter
if ($Location.displayName -in $CheckExististing.displayName) {
[pscustomobject]@{
id = ($CheckExististing | Where-Object -Property displayName -EQ $Location.displayName).id
name = ($CheckExististing | Where-Object -Property displayName -EQ $Location.displayName).displayName
}
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Matched a CA policy with the existing Named Location: $($location.displayName)" -Sev "Info"
+ Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Matched a CA policy with the existing Named Location: $($location.displayName)" -Sev 'Info'
- }
- else {
+ } else {
$Body = ConvertTo-Json -InputObject $Location
- $GraphRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/namedLocations" -body $body -Type POST -tenantid $tenantfilter
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Created new Named Location: $($location.displayName)" -Sev "Info"
+ $GraphRequest = New-GraphPOSTRequest -uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/namedLocations' -body $body -Type POST -tenantid $tenantfilter
+ Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message "Created new Named Location: $($location.displayName)" -Sev 'Info'
[pscustomobject]@{
id = $GraphRequest.id
name = $GraphRequest.displayName
@@ -75,7 +68,7 @@ function New-CIPPCAPolicy {
}
}
}
- Write-Host "here5"
+ Write-Host 'here5'
foreach ($location in $JSONObj.conditions.locations.includeLocations) {
Write-Host "Replacting $location"
@@ -97,29 +90,26 @@ function New-CIPPCAPolicy {
$RawJSON = $JSONObj | ConvertTo-Json -Depth 10
Write-Host $RawJSON
try {
- Write-Host "Checking"
- $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/v1.0/identity/conditionalAccess/policies" -tenantid $TenantFilter
+ Write-Host 'Checking'
+ $CheckExististing = New-GraphGETRequest -uri 'https://graph.microsoft.com/v1.0/identity/conditionalAccess/policies' -tenantid $TenantFilter
if ($displayname -in $CheckExististing.displayName) {
if ($Overwrite -ne $true) {
Throw "Conditional Access Policy with Display Name $($Displayname) Already exists"
return $false
- }
- else {
- Write-Host "overwriting"
+ } else {
+ Write-Host 'overwriting'
$PatchRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExististing.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Updated Conditional Access Policy $($JSONObj.Displayname) to the template standard." -Sev "Info"
+ Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Updated Conditional Access Policy $($JSONObj.Displayname) to the template standard." -Sev 'Info'
return "Updated policy $displayname for $tenantfilter"
}
- }
- else {
- Write-Host "Creating"
- $CreateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies" -tenantid $tenantfilter -type POST -body $RawJSON
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added Conditional Access Policy $($JSONObj.Displayname)" -Sev "Info"
+ } else {
+ Write-Host 'Creating'
+ $CreateRequest = New-GraphPOSTRequest -uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/policies' -tenantid $tenantfilter -type POST -body $RawJSON
+ Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added Conditional Access Policy $($JSONObj.Displayname)" -Sev 'Info'
return "Created policy $displayname for $tenantfilter"
}
- }
- catch {
+ } catch {
throw "Failed to create or update conditional access rule $($JSONObj.displayName): $($_.exception.message)"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to create or update conditional access rule $($JSONObj.displayName): $($_.exception.message) " -sev "Error"
+ Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update conditional access rule $($JSONObj.displayName): $($_.exception.message) " -sev 'Error'
}
}
diff --git a/Modules/CIPPCore/Public/Set-CIPPCAExclusion.ps1 b/Modules/CIPPCore/Public/Set-CIPPCAExclusion.ps1
new file mode 100644
index 000000000000..888a90749cd8
--- /dev/null
+++ b/Modules/CIPPCore/Public/Set-CIPPCAExclusion.ps1
@@ -0,0 +1,41 @@
+function Set-CIPPCAExclusion {
+ [CmdletBinding()]
+ param(
+ $TenantFilter,
+ $ExclusionType,
+ $UserID,
+ $PolicyId,
+ $Username,
+ $executingUser
+ )
+ try {
+ $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($PolicyId)" -tenantid $TenantFilter
+ if ($ExclusionType -eq 'add') {
+ $NewExclusions = [pscustomobject]@{
+ conditions = [pscustomobject]@{ users = [pscustomobject]@{
+ excludeUsers = @($CheckExististing.conditions.users.excludeUsers + $UserID)
+ }
+ }
+ }
+ $RawJson = ConvertTo-Json -Depth 10 -InputObject $NewExclusions
+ New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExististing.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON
+
+ }
+
+ if ($ExclusionType -eq 'remove') {
+ $NewExclusions = [pscustomobject]@{
+ conditions = [pscustomobject]@{ users = [pscustomobject]@{
+ excludeUsers = @($CheckExististing.conditions.users.excludeUsers | Where-Object { $_ -ne $UserID })
+ }
+ }
+ }
+ $RawJson = ConvertTo-Json -Depth 10 -InputObject $NewExclusions
+ New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExististing.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON
+ }
+ "Successfully performed $($ExclusionType) exclusion for $username from policy $($PolicyId)"
+ Write-LogMessage -user $executingUser -API 'Set-CIPPConditionalAccessExclusion' -message "Successfully performed $($ExclusionType) exclusion for $username from policy $($PolicyId)" -Sev 'Info' -tenant $TenantFilter
+ } catch {
+ "Failed to $($ExclusionType) user exclusion for $username from policy $($PolicyId): $_"
+ Write-LogMessage -user $executingUser -API 'Set-CIPPConditionalAccessExclusion' -message "Failed to $($ExclusionType) user exclusion for $username from policy $($PolicyId): $_" -Sev 'Error' -tenant $TenantFilter
+ }
+}
\ No newline at end of file
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1
new file mode 100644
index 000000000000..51991bf57f9e
--- /dev/null
+++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1
@@ -0,0 +1,42 @@
+function Invoke-CIPPStandardEnableMailTips {
+ <#
+ .FUNCTIONALITY
+ Internal
+ #>
+
+ param($Tenant, $Settings)
+
+ if ($Settings.remediate) {
+
+
+ try {
+ New-ExoRequest -tenantid $Tenant -cmdlet 'Set-OrganizationConfig' -cmdparams @{ MailTipsAllTipsEnabled = $true; MailTipsExternalRecipientsTipsEnabled = $true; MailTipsGroupMetricsEnabled = $true; MailTipsLargeAudienceThreshold = $Settings.MailTipsLargeAudienceThreshold }
+ Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Enabled all MailTips' -sev Info
+ } catch {
+ Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to enable all MailTips: $($_.exception.message)" -sev Error
+ }
+ }
+
+
+ if ($Settings.alert -or $Settings.report) {
+ $MailTipsState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-OrganizationConfig' | Select-Object MailTipsAllTipsEnabled, MailTipsExternalRecipientsTipsEnabled, MailTipsGroupMetricsEnabled, MailTipsLargeAudienceThreshold
+
+ if ($Settings.alert) {
+ if ($MailTipsState.MailTipsAllTipsEnabled -and $MailTipsState.MailTipsExternalRecipientsTipsEnabled -and $MailTipsState.MailTipsGroupMetricsEnabled -and $MailTipsState.MailTipsLargeAudienceThreshold -eq $Settings.MailTipsLargeAudienceThreshold) {
+ Write-LogMessage -API 'Standards' -tenant $Tenant -message 'All MailTips are enabled' -sev Info
+ } else {
+ Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Not all MailTips are enabled' -sev Alert
+ }
+ }
+
+ if ($Settings.report) {
+
+ if ($MailTipsState.MailTipsAllTipsEnabled -and $MailTipsState.MailTipsExternalRecipientsTipsEnabled -and $MailTipsState.MailTipsGroupMetricsEnabled -and $MailTipsState.MailTipsLargeAudienceThreshold -eq $Settings.MailTipsLargeAudienceThreshold) {
+ $MailTipsState = $true
+ } else {
+ $MailTipsState = $false
+ }
+ Add-CIPPBPAField -FieldName 'MailTipsEnabled' -FieldValue [bool]$MailTipsState -StoreAs bool -Tenant $tenant
+ }
+ }
+}
\ No newline at end of file
diff --git a/Modules/CippExtensions/Private/Get-HaloMapping.ps1 b/Modules/CippExtensions/Private/Get-HaloMapping.ps1
index d86753f29306..adfdd8e72102 100644
--- a/Modules/CippExtensions/Private/Get-HaloMapping.ps1
+++ b/Modules/CippExtensions/Private/Get-HaloMapping.ps1
@@ -24,8 +24,10 @@ function Get-HaloMapping {
$i++
$pagecount = [Math]::Ceiling($Result.record_count / 999)
} while ($i -le $pagecount)
+ } catch {
+ Write-LogMessage -Message "Could not get HaloPSA Clients, error: $($_.Exception.Message)" -Level Error -tenant 'CIPP' -API 'HaloMapping'
+ $RawHaloClients = @(@{name = "Could not get HaloPSA Clients, error: $($_.Exception.Message)" })
}
- catch { $RawHaloClients = @() }
$HaloClients = $RawHaloClients | ForEach-Object {
[PSCustomObject]@{
name = $_.name
diff --git a/Modules/CippExtensions/Private/New-HaloPSATicket.ps1 b/Modules/CippExtensions/Private/New-HaloPSATicket.ps1
index 2b1b18486d7b..3dd96ee6eb28 100644
--- a/Modules/CippExtensions/Private/New-HaloPSATicket.ps1
+++ b/Modules/CippExtensions/Private/New-HaloPSATicket.ps1
@@ -15,7 +15,7 @@ function New-HaloPSATicket {
usertype = 1
userlookup = @{
id = -1
- lookupdisplay = "Enter Details Manually"
+ lookupdisplay = 'Enter Details Manually'
}
client_id = $client
site_id = $null
@@ -28,20 +28,19 @@ function New-HaloPSATicket {
}
if ($Configuration.TicketType) {
- $object | Add-Member -MemberType NoteProperty -Name "tickettype_id" -Value $Configuration.TicketType
+ $object | Add-Member -MemberType NoteProperty -Name 'tickettype_id' -Value $Configuration.TicketType
}
#use the token to create a new ticket in HaloPSA
$body = ConvertTo-Json -Compress -Depth 10 -InputObject @($Object)
- Write-Host "Sending ticket to HaloPSA"
+ Write-Host 'Sending ticket to HaloPSA'
Write-Host $body
try {
$Ticket = Invoke-RestMethod -Uri "$($Configuration.ResourceURL)/Tickets" -ContentType 'application/json; charset=utf-8' -Method Post -Body $body -Headers @{Authorization = "Bearer $($token.access_token)" }
- }
- catch {
- Write-Host "Failed to send ticket to HaloPSA"
- Write-Host $_.Exception.Message
+ } catch {
+ Write-LogMessage -message "Failed to send ticket to HaloPSA: $($_.Exception.Message)" -API 'HaloPSATicket' -sev Error
+ Write-Host "Failed to send ticket to HaloPSA: $($_.Exception.Message)"
}
}
\ No newline at end of file
diff --git a/PublicWebhooks/run.ps1 b/PublicWebhooks/run.ps1
index 124f05bd761a..2a44861c59c9 100644
--- a/PublicWebhooks/run.ps1
+++ b/PublicWebhooks/run.ps1
@@ -3,7 +3,7 @@ using namespace System.Net
# Input bindings are passed in via param block.
param($Request, $TriggerMetadata)
-
+Set-Location (Get-Item $PSScriptRoot).Parent.FullName
$WebhookTable = Get-CIPPTable -TableName webhookTable
$Webhooks = Get-CIPPAzDataTableEntity @WebhookTable
Write-Host 'Received request'
diff --git a/PublicWebhooksProcess/run.ps1 b/PublicWebhooksProcess/run.ps1
index 69e153f60e01..50bbde87cfb2 100644
--- a/PublicWebhooksProcess/run.ps1
+++ b/PublicWebhooksProcess/run.ps1
@@ -30,7 +30,7 @@ if ($Request.query.CIPPID -in $Webhooks.RowKey) {
Write-Host "Webhook TenantFilter: $TenantFilter"
$ConfigTable = get-cipptable -TableName 'SchedulerConfig'
$Alertconfig = Get-CIPPAzDataTableEntity @ConfigTable | Where-Object { $_.Tenant -eq $TenantFilter -or $_.Tenant -eq 'AllTenants' }
- $Operations = ($AlertConfig.if | ConvertFrom-Json -ErrorAction SilentlyContinue).selection, 'UserLoggedIn'
+ $Operations = ($AlertConfig.if | ConvertFrom-Json -ErrorAction SilentlyContinue).selection + 'UserLoggedIn'
$Webhookinfo = $Webhooks | Where-Object -Property RowKey -EQ $Request.query.CIPPID
#Increased download efficiency: only download the data we need for processing. Todo: Change this to load from table or dynamic source.
$MappingTable = [pscustomobject]@{
@@ -53,14 +53,16 @@ if ($Request.query.CIPPID -in $Webhooks.RowKey) {
#Compare $Operations to $MappingTable. If there is a match, we make a new variable called $LogsToDownload
#Example: $Operations = 'UserLoggedIn', 'Set-InboxRule' makes : $LogsToDownload = @('Audit.AzureActiveDirectory',Audit.Exchange)
$LogsToDownload = $Operations | Where-Object { $MappingTable.$_ } | ForEach-Object { $MappingTable.$_ }
- if ($ReceivedItem.ContentType -in $LogsToDownload -or $LogsToDownload -contains 'AnyLog') {
+ Write-Host "Our operations: $Operations"
+ Write-Host "Logs to download: $LogsToDownload"
+ if ($ReceivedItem.ContentType -in $LogsToDownload -or 'AnyLog' -in $LogsToDownload) {
$Data = New-GraphPostRequest -type GET -uri "https://manage.office.com/api/v1.0/$($ReceivedItem.tenantId)/activity/feed/audit/$($ReceivedItem.contentid)" -tenantid $TenantFilter -scope 'https://manage.office.com/.default'
} else {
Write-Host "No data to download for $($ReceivedItem.ContentType)"
continue
}
Write-Host "Data found: $($data.count) items"
- $DataToProcess = $Data | Where-Object -Property Operation -In $Operations
+ $DataToProcess = if ('anylog' -NotIn $LogsToDownload) { $Data | Where-Object -Property Operation -In $Operations } else { $Data }
Write-Host "Data to process found: $($DataToProcess.count) items"
foreach ($Item in $DataToProcess) {
Write-Host "Processing $($item.operation)"
@@ -68,7 +70,7 @@ if ($Request.query.CIPPID -in $Webhooks.RowKey) {
}
}
} catch {
- Write-Host "Webhook Failed: $($_.Exception.Message)"
+ Write-Host "Webhook Failed: $($_.Exception.Message). Line number $($_.InvocationInfo.ScriptLineNumber)"
}
}
diff --git a/version_latest.txt b/version_latest.txt
index 14d8a90bcd7a..ec4595317e77 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-4.9.6
\ No newline at end of file
+4.9.8
\ No newline at end of file