Skip to content

enable secret-backend (SGC) fips for windows #46226

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

Open
s-alad wants to merge 1 commit into
base: main
Choose a base branch
from
Open

enable secret-backend (SGC) fips for windows #46226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .gitlab/deploy/container_build/docker_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
# Omnibus uses a slightly different path than the actual install
# TODO: This overwrites an extra agent.exe, we should also remove it from the zip
- mv "Datadog Agent\bin\agent\agent.exe" "Datadog Agent\bin\agent.exe" -Force
# TODO(AGENTCFG-XXX): SGC is not supported in FIPS mode
- if (Test-Path "Datadog Agent\bin\agent\secret-generic-connector.exe") { mv "Datadog Agent\bin\agent\secret-generic-connector.exe" "Datadog Agent\bin\secret-generic-connector.exe" -Force }
- mv "Datadog Agent\bin\agent\secret-generic-connector.exe" "Datadog Agent\bin\secret-generic-connector.exe" -Force
- popd

- get-childitem ${BUILD_CONTEXT}
Expand Down
5 changes: 1 addition & 4 deletions omnibus/config/projects/agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,7 @@
"#{install_dir}\\datadog-installer.exe"
]

if not fips_mode?
# TODO(AGENTCFG-XXX): SGC is not supported in FIPS mode
GO_BINARIES << "#{install_dir}\\bin\\agent\\secret-generic-connector.exe"
end
GO_BINARIES << "#{install_dir}\\bin\\agent\\secret-generic-connector.exe"
Comment on lines 323 to +326
Copy link
Contributor

@clarkb7 clarkb7 Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could just add to the static list definition now


if not windows_arch_i386? and ENV['WINDOWS_DDPROCMON_DRIVER'] and not ENV['WINDOWS_DDPROCMON_DRIVER'].empty?
GO_BINARIES << "#{install_dir}\\bin\\agent\\security-agent.exe"
Expand Down
3 changes: 1 addition & 2 deletions tools/windows/DatadogAgentInstaller/WixSetup/Datadog Agent/AgentInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,10 +645,9 @@ private Dir CreateBinFolder()
),
scriptsBinDir
);
// TODO(AGENTCFG-XXX): SGC is not supported in FIPS mode
targetBinFolder.AddFile(new WixSharp.File(_agentBinaries.SecretGenericConnector));
if (_agentFlavor.FlavorName != Constants.FipsFlavor)
{
targetBinFolder.AddFile(new WixSharp.File(_agentBinaries.SecretGenericConnector));
targetBinFolder.AddFile(new WixSharp.File(_agentBinaries.DdCompilePolicy));
}

Expand Down
Loading