Skip to content

Commit 701e705

Browse files
pull[bot]pull[bot]
authored
Merge pull request #479 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents deccc55 + a72cd80 commit 701e705

File tree

396 files changed

+1085
-1431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+1085
-1431
lines changed

‎AddChocoApp/Choco.App.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
2-
<Name>Install.ps1</Name>
3-
<UnencryptedContentSize>28319</UnencryptedContentSize>
2+
<Name>install.ps1</Name>
3+
<UnencryptedContentSize>1154</UnencryptedContentSize>
44
<FileName>IntunePackage.intunewin</FileName>
5-
<SetupFile>Install.ps1</SetupFile>
5+
<SetupFile>install.ps1</SetupFile>
66
<EncryptionInfo>
7-
<EncryptionKey>bmoyHXFtIws7JrnXNDV4rjzap+Be+4ZJEDJkTfbVIL8=</EncryptionKey>
8-
<MacKey>xNh8ZUZ6TLsAtihUEAU/NHiRfutDzz+eSgEdpaXUo9Q=</MacKey>
9-
<InitializationVector>3aQFPhO8ywEC4Ojby1lR0w==</InitializationVector>
10-
<Mac>PXX+hj3DXEpzMEMYBDXmAIlSyDIGuAwmAHIQpZIt8hU=</Mac>
7+
<EncryptionKey>v8i9okyqxp8xlw3/r2QXMNnXcuGwrBkD54QQ7F/UJbc=</EncryptionKey>
8+
<MacKey>XjT9kWc7gQRKRdEQ/PA/lbQDDH8kFjnuPFILxAldRTI=</MacKey>
9+
<InitializationVector>iyAbM3kIYqA4AlWP89S5oA==</InitializationVector>
10+
<Mac>w+2KMctRWmJzYjKcMTAKCLz15K559SgZ3pnQuQD3P/I=</Mac>
1111
<ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
12-
<FileDigest>fx41h3rGZYZO3Jux7JnPgatlmpMc2ZFIZS8ipF5VDDw=</FileDigest>
12+
<FileDigest>tyjBbJZ+Zj9AqD7UjEfQfe/HojN/q1+zFPidXWbiVuE=</FileDigest>
1313
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
1414
</EncryptionInfo>
1515
</ApplicationInfo>

‎AddChocoApp/IntunePackage.intunewin‎

-26.5 KB
Binary file not shown.

‎AddChocoApp/IntunePackage/Install.ps1‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ param (
1212
[string]
1313
$CustomRepo,
1414

15+
[Parameter()]
16+
[string]
17+
$CustomArguments,
18+
1519
[Parameter()]
1620
[switch]
1721
$Trace
@@ -36,13 +40,23 @@ try {
3640
try {
3741
$localprograms = & "$chocoPath" list --localonly
3842
$CustomRepoString = if ($CustomRepo) { "--source $customrepo" } else { $null }
43+
$CustomArgsArray = if ($CustomArguments) { $CustomArguments -split '\s+' } else { @() }
44+
3945
if ($localprograms -like "*$Packagename*" ) {
4046
Write-Host "Upgrading $packagename"
41-
& "$chocoPath" upgrade $Packagename $CustomRepoString
47+
if ($CustomArgsArray.Count -gt 0) {
48+
& "$chocoPath" upgrade $Packagename $CustomRepoString $CustomArgsArray
49+
} else {
50+
& "$chocoPath" upgrade $Packagename $CustomRepoString
51+
}
4252
}
4353
else {
4454
Write-Host "Installing $packagename"
45-
& "$chocoPath" install $Packagename -y $CustomRepoString
55+
if ($CustomArgsArray.Count -gt 0) {
56+
& "$chocoPath" install $Packagename -y $CustomRepoString $CustomArgsArray
57+
} else {
58+
& "$chocoPath" install $Packagename -y $CustomRepoString
59+
}
4660
}
4761
Write-Host 'Completed.'
4862
}

‎Config/standards.json‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,6 +2291,13 @@
22912291
],
22922292
"helpText": "This creates a Safe Links policy that automatically scans, tracks, and and enables safe links for Email, Office, and Teams for both external and internal senders",
22932293
"addedComponent": [
2294+
{
2295+
"type": "textField",
2296+
"name": "standards.SafeLinksPolicy.name",
2297+
"label": "Policy Name",
2298+
"required": true,
2299+
"defaultValue": "CIPP Default SafeLinks Policy"
2300+
},
22942301
{
22952302
"type": "switch",
22962303
"label": "AllowClickThrough",
@@ -2338,6 +2345,13 @@
23382345
],
23392346
"helpText": "This creates a Anti-Phishing policy that automatically enables Mailbox Intelligence and spoofing, optional switches for Mail tips.",
23402347
"addedComponent": [
2348+
{
2349+
"type": "textField",
2350+
"name": "standards.AntiPhishPolicy.name",
2351+
"label": "Policy Name",
2352+
"required": true,
2353+
"defaultValue": "CIPP Default Anti-Phishing Policy"
2354+
},
23412355
{
23422356
"type": "number",
23432357
"label": "Phishing email threshold. (Default 1)",
@@ -2548,6 +2562,13 @@
25482562
],
25492563
"helpText": "This creates a Safe Attachment policy",
25502564
"addedComponent": [
2565+
{
2566+
"type": "textField",
2567+
"name": "standards.SafeAttachmentPolicy.name",
2568+
"label": "Policy Name",
2569+
"required": true,
2570+
"defaultValue": "CIPP Default Safe Attachment Policy"
2571+
},
25512572
{
25522573
"type": "select",
25532574
"multiple": false,
@@ -2692,6 +2713,13 @@
26922713
],
26932714
"helpText": "This creates a Malware filter policy that enables the default File filter and Zero-hour auto purge for malware.",
26942715
"addedComponent": [
2716+
{
2717+
"type": "textField",
2718+
"name": "standards.MalwareFilterPolicy.name",
2719+
"label": "Policy Name",
2720+
"required": true,
2721+
"defaultValue": "CIPP Default Malware Policy"
2722+
},
26952723
{
26962724
"type": "select",
26972725
"multiple": false,
@@ -2811,7 +2839,15 @@
28112839
"cat": "Defender Standards",
28122840
"tag": [],
28132841
"helpText": "This standard creates a Spam filter policy similar to the default strict policy.",
2842+
"docsDescription": "This standard creates a Spam filter policy similar to the default strict policy, the following settings are configured to on by default: IncreaseScoreWithNumericIps, IncreaseScoreWithRedirectToOtherPort, MarkAsSpamEmptyMessages, MarkAsSpamJavaScriptInHtml, MarkAsSpamSpfRecordHardFail, MarkAsSpamFromAddressAuthFail, MarkAsSpamNdrBackscatter, MarkAsSpamBulkMail, InlineSafetyTipsEnabled, PhishZapEnabled, SpamZapEnabled",
28142843
"addedComponent": [
2844+
{
2845+
"type": "textField",
2846+
"name": "standards.SpamFilterPolicy.name",
2847+
"label": "Policy Name",
2848+
"required": true,
2849+
"defaultValue": "CIPP Default Spam Filter Policy"
2850+
},
28152851
{
28162852
"type": "number",
28172853
"label": "Bulk email threshold (Default 7)",
@@ -4772,6 +4808,30 @@
47724808
"type": "textField",
47734809
"required": false,
47744810
"helpText": "Enter the group name to exclude from the assignment. Wildcards are allowed."
4811+
},
4812+
{
4813+
"type": "textField",
4814+
"required": false,
4815+
"name": "assignmentFilter",
4816+
"label": "Assignment Filter Name (Optional)",
4817+
"helpText": "Enter the assignment filter name to apply to this policy assignment. Wildcards are allowed."
4818+
},
4819+
{
4820+
"name": "assignmentFilterType",
4821+
"label": "Assignment Filter Mode (Optional)",
4822+
"type": "radio",
4823+
"required": false,
4824+
"helpText": "Choose whether to include or exclude devices matching the filter. Only applies if you specified a filter name above. Defaults to Include if not specified.",
4825+
"options": [
4826+
{
4827+
"label": "Include - Assign to devices matching the filter",
4828+
"value": "include"
4829+
},
4830+
{
4831+
"label": "Exclude - Assign to devices NOT matching the filter",
4832+
"value": "exclude"
4833+
}
4834+
]
47754835
}
47764836
]
47774837
},
@@ -4915,6 +4975,35 @@
49154975
}
49164976
]
49174977
},
4978+
{
4979+
"name": "standards.AssignmentFilterTemplate",
4980+
"label": "Assignment Filter Template",
4981+
"multi": true,
4982+
"cat": "Templates",
4983+
"disabledFeatures": {
4984+
"report": true,
4985+
"warn": true,
4986+
"remediate": false
4987+
},
4988+
"impact": "Medium Impact",
4989+
"addedDate": "2025-10-04",
4990+
"helpText": "Deploy and manage assignment filter templates.",
4991+
"executiveText": "Creates standardized assignment filters with predefined settings. These templates ensure consistent assignment filter configurations across the organization, streamlining assignment management.",
4992+
"addedComponent": [
4993+
{
4994+
"type": "autoComplete",
4995+
"name": "assignmentFilterTemplate",
4996+
"label": "Select Assignment Filter Template",
4997+
"api": {
4998+
"url": "/api/ListAssignmentFilterTemplates",
4999+
"labelField": "Displayname",
5000+
"altLabelField": "displayName",
5001+
"valueField": "GUID",
5002+
"queryKey": "ListAssignmentFilterTemplates"
5003+
}
5004+
}
5005+
]
5006+
},
49185007
{
49195008
"name": "standards.MailboxRecipientLimits",
49205009
"cat": "Exchange Standards",

‎Modules/CIPPCore/Public/CippQueue/Invoke-RemoveCippQueue.ps1‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ function Invoke-RemoveCippQueue {
66
CIPP.Core.ReadWrite
77
#>
88
param($Request, $TriggerMetadata)
9-
10-
$APIName = $Request.Params.CIPPEndpoint
11-
$Headers = $Request.Headers
12-
13-
149
$CippQueue = Get-CippTable -TableName 'CippQueue'
1510
Clear-AzDataTable @CippQueue
1611
$CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAddAlert.ps1‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ function Invoke-ExecAddAlert {
99
#>
1010
[CmdletBinding()]
1111
param($Request, $TriggerMetadata)
12-
13-
$APIName = $Request.Params.CIPPEndpoint
1412
$Headers = $Request.Headers
1513

1614

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAzBobbyTables.ps1‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ function Invoke-ExecAzBobbyTables {
1212
#>
1313
[CmdletBinding()]
1414
param($Request, $TriggerMetadata)
15-
16-
$APIName = $Request.Params.CIPPEndpoint
17-
$Headers = $Request.Headers
18-
19-
2015
$AllowList = @(
2116
'Add-AzDataTableEntity'
2217
'Add-CIPPAzDataTableEntity'

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCPVRefresh.ps1‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ function Invoke-ExecCPVRefresh {
1111
#>
1212
[CmdletBinding()]
1313
param($Request, $TriggerMetadata)
14-
15-
$APIName = $Request.Params.CIPPEndpoint
16-
$Headers = $Request.Headers
17-
18-
1914
$InstanceId = Start-UpdatePermissionsOrchestrator
2015

2116
return @{

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCippFunction.ps1‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ function Invoke-ExecCippFunction {
1111
#>
1212
[CmdletBinding()]
1313
param($Request, $TriggerMetadata)
14-
15-
$APIName = $Request.Params.CIPPEndpoint
16-
$Headers = $Request.Headers
17-
18-
1914
$BlockList = @(
2015
'Get-GraphToken'
2116
'Get-GraphTokenFromCert'

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecDurableFunctions.ps1‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ function Invoke-ExecDurableFunctions {
77
#>
88
[CmdletBinding(SupportsShouldProcess = $true)]
99
param($Request, $TriggerMetadata)
10-
11-
$APIName = $Request.Params.CIPPEndpoint
12-
$Headers = $Request.Headers
13-
14-
1510
# Collect info
1611
$StorageContext = New-AzStorageContext -ConnectionString $env:AzureWebJobsStorage
1712
$FunctionName = $env:WEBSITE_SITE_NAME

0 commit comments

Comments
 (0)