Skip to content

merge main into dev #99

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

Merged
JohnDuprey merged 2 commits into from
Nov 5, 2025
+22 −7
Merged

merge main into dev #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
650a780
fix: urlAllowlist registry entries to be in the correct format and Ed…
Oct 16, 2025
638c177
Merge pull request #90 from PeakeIT/main
KelvinTegelaar Oct 21, 2025
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
17 changes: 16 additions & 1 deletion enterprise/Deploy-Windows-Chrome-and-Edge.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,24 @@ function Configure-ExtensionSettings {
New-ItemProperty -Path $ManagedStorageKey -Name "cippTenantId" -PropertyType String -Value $cippTenantId -Force | Out-Null
New-ItemProperty -Path $ManagedStorageKey -Name "customRulesUrl" -PropertyType String -Value $customRulesUrl -Force | Out-Null
New-ItemProperty -Path $ManagedStorageKey -Name "updateInterval" -PropertyType DWord -Value $updateInterval -Force | Out-Null
New-ItemProperty -Path $ManagedStorageKey -Name "urlAllowlist" -PropertyType MultiString -Value $urlAllowlist -Force | Out-Null
New-ItemProperty -Path $ManagedStorageKey -Name "enableDebugLogging" -PropertyType DWord -Value $enableDebugLogging -Force | Out-Null

# Create and configure URL allow list
$urlAllowlistKey = "$ManagedStorageKey\urlAllowlist"
if (!(Test-Path $urlAllowlistKey)) {
New-Item -Path $urlAllowlistKey -Force | Out-Null
}

# Clear any existing properties
Remove-ItemProperty -Path $urlAllowlistKey -Name * -Force | Out-Null

# Set URL allow list properties with names starting from 1
for ($i = 0; $i -lt $urlAllowlist.Count; $i++) {
$propertyName = ($i + 1).ToString()
$propertyValue = $urlAllowlist[$i]
New-ItemProperty -Path $urlAllowlistKey -Name $propertyName -PropertyType String -Value $propertyValue -Force | Out-Null
}

# Create and configure custom branding
$customBrandingKey = "$ManagedStorageKey\customBranding"
if (!(Test-Path $customBrandingKey)) {
Expand Down
12 changes: 6 additions & 6 deletions enterprise/admx/Check-Extension.admx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
<string>https://edge.microsoft.com/extensionwebstorebase/v1/crx</string>
</value>
</item>
<item key="SOFTWARE\Policies\Microsoft\Edge\ExtensionSettings\knepjpocdagponkonnbggpcnhnaikajg" valueName="toolbar_pin">
<item key="SOFTWARE\Policies\Microsoft\Edge\ExtensionSettings\knepjpocdagponkonnbggpcnhnaikajg" valueName="toolbar_state">
<value>
<string>force_pinned</string>
<string>force_shown</string>
</value>
</item>
</enabledList>
Expand Down Expand Up @@ -132,11 +132,11 @@
</policy>

<!-- URL Allowlist -->
<policy name="CheckUrlAllowlist" class="Machine" displayName="$(string.CheckUrlAllowlist)" explainText="$(string.CheckUrlAllowlist_Explain)" key="SOFTWARE\Policies\Microsoft\Edge\3rdparty\extensions\knepjpocdagponkonnbggpcnhnaikajg\policy" presentation="$(presentation.CheckUrlAllowlist)">
<policy name="CheckUrlAllowlist" class="Machine" displayName="$(string.CheckUrlAllowlist)" explainText="$(string.CheckUrlAllowlist_Explain)" key="SOFTWARE\Policies\Microsoft\Edge\3rdparty\extensions\knepjpocdagponkonnbggpcnhnaikajg\policy\urlAllowlist" presentation="$(presentation.CheckUrlAllowlist)">
<parentCategory ref="CheckExtensionEdge" />
<supportedOn ref="SUPPORTED_WIN7" />
<elements>
<list id="UrlAllowlistList" valueName="urlAllowlist" />
<list id="UrlAllowlistList" valueName="urlAllowlist" valuePrefix="" />
</elements>
</policy>

Expand Down Expand Up @@ -307,11 +307,11 @@
</policy>

<!-- URL Allowlist - Chrome -->
<policy name="CheckUrlAllowlistChrome" class="Machine" displayName="$(string.CheckUrlAllowlistChrome)" explainText="$(string.CheckUrlAllowlistChrome_Explain)" key="SOFTWARE\Policies\Google\Chrome\3rdparty\extensions\benimdeioplgkhanklclahllklceahbe\policy" presentation="$(presentation.CheckUrlAllowlistChrome)">
<policy name="CheckUrlAllowlistChrome" class="Machine" displayName="$(string.CheckUrlAllowlistChrome)" explainText="$(string.CheckUrlAllowlistChrome_Explain)" key="SOFTWARE\Policies\Google\Chrome\3rdparty\extensions\benimdeioplgkhanklclahllklceahbe\policy\urlAllowlist" presentation="$(presentation.CheckUrlAllowlistChrome)">
<parentCategory ref="CheckExtensionChrome" />
<supportedOn ref="SUPPORTED_WIN7" />
<elements>
<list id="UrlAllowlistListChrome" valueName="urlAllowlist" />
<list id="UrlAllowlistListChrome" valueName="urlAllowlist" valuePrefix="" />
</elements>
</policy>

Expand Down