Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 1 addition & 10 deletions parts/windows/windowsconfigfunc.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ function Install-GmsaPlugin {
[String] $GmsaPackageUrl
)

$tempInstallPackageFoler = $env:TEMP
$tempInstallPackageFoler = [Io.path]::Combine($env:TEMP, "CCGAKVPlugin")
$tempPluginZipFile = [Io.path]::Combine($ENV:TEMP, "gmsa.zip")

Write-Log "Getting the GMSA plugin package"
Expand All @@ -237,19 +237,10 @@ function Install-GmsaPlugin {
}
Remove-Item -Path $tempPluginZipFile -Force

$tempInstallPackageFoler = [Io.path]::Combine($tempInstallPackageFoler, "CCGPlugin")

# Copy the plugin DLL file.
Write-Log "Installing the GMSA plugin"
Copy-Item -Force -Path "$tempInstallPackageFoler\CCGAKVPlugin.dll" -Destination "${env:SystemRoot}\System32\"

# Enable the logging manifest.
Write-Log "Importing the CCGEvents manifest file"
wevtutil.exe im "$tempInstallPackageFoler\CCGEvents.man"
if ($LASTEXITCODE) {
Set-ExitCode -ExitCode $global:WINDOWS_CSE_ERROR_GMSA_IMPORT_CCGEVENTS -ErrorMessage "Failed to import the CCGEvents.man manifest file."
Comment thread
AbelHu marked this conversation as resolved.
}

# Enable the PowerShell privilege to set the registry permissions.
Write-Log "Enabling the PowerShell privilege"
$enablePrivilegeResponse=$false
Expand Down
7 changes: 3 additions & 4 deletions parts/windows/windowscsehelper.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ $global:WINDOWS_CSE_ERROR_DOWNLOAD_CA_CERTIFICATES=20
$global:WINDOWS_CSE_ERROR_EMPTY_CA_CERTIFICATES=21
$global:WINDOWS_CSE_ERROR_ENABLE_SECURE_TLS=22
$global:WINDOWS_CSE_ERROR_GMSA_EXPAND_ARCHIVE=23
$global:WINDOWS_CSE_ERROR_GMSA_IMPORT_CCGEVENTS=24
$global:WINDOWS_CSE_ERROR_GMSA_ENABLE_POWERSHELL_PRIVILEGE=25
$global:WINDOWS_CSE_ERROR_GMSA_SET_REGISTRY_PERMISSION=26
$global:WINDOWS_CSE_ERROR_GMSA_SET_REGISTRY_VALUES=27
$global:WINDOWS_CSE_ERROR_GMSA_ENABLE_POWERSHELL_PRIVILEGE=24
$global:WINDOWS_CSE_ERROR_GMSA_SET_REGISTRY_PERMISSION=25
$global:WINDOWS_CSE_ERROR_GMSA_SET_REGISTRY_VALUES=26
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S116/CustomData

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S117/CustomData

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S118/CustomData

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSWindows2019+K8S119/CustomData

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

18 changes: 4 additions & 14 deletions pkg/templates/templates_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vhdbuilder/scripts/windows/gmsa/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`registerplugin.reg` is used for registering `CCGAKVPlugin.dll`. This file will be downloaded by AKS build pipeline to build `windows-gmsa-ccgakvplugin-[VERSION].zip` with `CCGAKVPlugin.dll`.
32 changes: 32 additions & 0 deletions vhdbuilder/scripts/windows/gmsa/registerplugin.reg
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Windows Registry Editor Version 5.00
Comment thread
AbelHu marked this conversation as resolved.

; Registering the interface
[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6ECDA518-2010-4437-8BC3-46E752B7B172}]
@="ICcgDomainAuthCredentials"
[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Interface\{6ECDA518-2010-4437-8BC3-46E752B7B172}\ProxyStubClsid32]
@="{A6FF50C0-56C0-71CA-5732-BED303A59628}"

;Registering the Stub COM object to activate out of proc (in dllhost.exe)

[HKEY_LOCAL_MACHINE\Software\CLASSES\Appid\{557110E1-88BC-4583-8281-6AAC6F708584}]
"AccessPermission"=hex:01,00,04,80,44,00,00,00,54,00,00,00,00,00,00,00,14,00,00,00,02,00,30,00,02,00,00,00,00,00,14,00,0B,00,00,00,01,01,\
00,00,00,00,00,05,12,00,00,00,00,00,14,00,0B,00,00,00,01,01,00,00,00,00,00,05,0B,00,00,00,01,02,00,00,00,00,00,05,\
20,00,00,00,20,02,00,00,01,02,00,00,00,00,00,05,20,00,00,00,20,02,00,00
"LaunchPermission"=hex:01,00,04,80,44,00,00,00,54,00,00,00,00,00,00,00,14,00,00,00,02,00,30,00,02,00,00,00,00,00,14,00,0B,00,00,00,01,01,\
00,00,00,00,00,05,12,00,00,00,00,00,14,00,0B,00,00,00,01,01,00,00,00,00,00,05,0B,00,00,00,01,02,00,00,00,00,00,05,\
20,00,00,00,20,02,00,00,01,02,00,00,00,00,00,05,20,00,00,00,20,02,00,00

"DllSurrogate"=""

;Register the COM implementation

[HKEY_LOCAL_MACHINE\SOFTWARE\CLASSES\CLSID\{CCC2A336-D7F3-4818-A213-272B7924213E}]
"AppID"="{557110E1-88BC-4583-8281-6AAC6F708584}"

[HKEY_LOCAL_MACHINE\SOFTWARE\CLASSES\CLSID\{CCC2A336-D7F3-4818-A213-272B7924213E}\InprocServer32]
@="C:\\Windows\\System32\\CCGAKVPlugin.dll"
"ThreadingModel"="Both"

; Register the COM implementation for CCG
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\CCG\COMClasses\{CCC2A336-D7F3-4818-A213-272B7924213E}]
@=""