Added Country:US to new CA certs created by Fleet. (#40081)

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #38699 

The fix will only apply to new Fleet instances. To fix existing Fleet
instances, we need to support rotation:
https://github.com/fleetdm/fleet/issues/40080

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [x] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.

## Testing

- [x] QA'd all new/changed functionality manually
This commit is contained in:
Victor Lyuboslavsky
2026-02-19 09:26:22 -06:00
committed by GitHub
parent 1f925527a1
commit 357c42cb08
4 changed files with 5 additions and 0 deletions
+1
View File
@@ -0,0 +1 @@
- Added Country:US to new CA certs created by Fleet.
+2
View File
@@ -37,6 +37,7 @@ func initAssets(ctx context.Context, ds fleet.Datastore) error {
depot.WithCommonName("Fleet conditional access CA"),
// Signal that the CA is local to the deployment and not necessarily managed by Fleet or another external vendor
depot.WithOrganization("Local certificate authority"),
depot.WithCountry("US"),
)
scepCert, scepKey, err := depot.NewCACertKey(caCert)
if err != nil {
@@ -69,6 +70,7 @@ func initAssets(ctx context.Context, ds fleet.Datastore) error {
depot.WithYears(10),
depot.WithCommonName("Fleet conditional access IdP"),
depot.WithOrganization("Local certificate authority"),
depot.WithCountry("US"),
)
idpCertX509, idpKey, err := depot.NewCACertKey(idpCert)
if err != nil {
+1
View File
@@ -30,6 +30,7 @@ func initAssets(ds fleet.Datastore) error {
depot.WithCommonName("Fleet Host Identity CA"),
// Signal that the CA is local to the deployment and not necessarily managed by Fleet or another external vendor
depot.WithOrganization("Local Certificate Authority"),
depot.WithCountry("US"),
)
scepCert, scepKey, err := depot.NewCACertKey(caCert)
if err != nil {
+1
View File
@@ -33,6 +33,7 @@ func NewSCEPCACertKey() (*x509.Certificate, *rsa.PrivateKey, error) {
caCert := NewCACert(
WithYears(10),
WithCommonName("Fleet"),
WithCountry("US"),
)
return NewCACertKey(caCert)
}