mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 21:47:20 +00:00
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #41091 # Details Implements the following config key aliases: - [x] Add a second name for `bootstrap_package`: `macos_bootstrap_package` - Support `bootstrap_package` for backwards compatibility - [x] Add a second name for `manual_agent_install`: `macos_manual_agent_install` - Support `manual_agent_install` for backwards compatibility - [x] Add a second name for `enable_release_device_manually `: `apple_ enable_release_device_manually ` - Support `enable_release_device_manually` for backwards compatibility - [x] Add a second name for `script`: `macos_script` - Support `script` for backwards compatibility Also cleans up some error messages missed in previous alias PRs. # 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`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. ## Testing - [X] Added/updated automated tests - [X] QA'd all new/changed functionality manually ran gitops successfully with new keys
2002 lines
76 KiB
Go
2002 lines
76 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/http/httputil"
|
|
"net/url"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/fleetdm/fleet/v4/pkg/optjson"
|
|
"github.com/fleetdm/fleet/v4/server/config"
|
|
"github.com/fleetdm/fleet/v4/server/contexts/viewer"
|
|
"github.com/fleetdm/fleet/v4/server/fleet"
|
|
nanodep_client "github.com/fleetdm/fleet/v4/server/mdm/nanodep/client"
|
|
"github.com/fleetdm/fleet/v4/server/mock"
|
|
nanodep_mock "github.com/fleetdm/fleet/v4/server/mock/nanodep"
|
|
"github.com/fleetdm/fleet/v4/server/ptr"
|
|
"github.com/fleetdm/fleet/v4/server/test"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestAppConfigAuth(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
svc, ctx := newTestService(t, ds, nil, nil)
|
|
|
|
// start a TLS server and use its URL as the server URL in the app config,
|
|
// required by the CertificateChain service call.
|
|
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
|
|
defer srv.Close()
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{
|
|
OrgName: "Test",
|
|
},
|
|
ServerSettings: fleet.ServerSettings{
|
|
ServerURL: srv.URL,
|
|
},
|
|
}, nil
|
|
}
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
return nil
|
|
}
|
|
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{}, nil
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
user *fleet.User
|
|
shouldFailWrite bool
|
|
shouldFailRead bool
|
|
}{
|
|
{
|
|
"global admin",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)},
|
|
false,
|
|
false,
|
|
},
|
|
{
|
|
"global maintainer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleMaintainer)},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"global observer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleObserver)},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"global observer+",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleObserverPlus)},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"global gitops",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleGitOps)},
|
|
false,
|
|
false,
|
|
},
|
|
{
|
|
"team admin",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleAdmin}}},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"team maintainer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleMaintainer}}},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"team observer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleObserver}}},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"team observer+",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleObserverPlus}}},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"team gitops",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleGitOps}}},
|
|
true,
|
|
false,
|
|
},
|
|
{
|
|
"user without roles",
|
|
&fleet.User{ID: 777},
|
|
true,
|
|
true,
|
|
},
|
|
}
|
|
for _, tt := range testCases {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
ctx := viewer.NewContext(ctx, viewer.Viewer{User: tt.user})
|
|
|
|
_, err := svc.AppConfigObfuscated(ctx)
|
|
checkAuthErr(t, tt.shouldFailRead, err)
|
|
|
|
_, err = svc.ModifyAppConfig(ctx, []byte(`{}`), fleet.ApplySpecOptions{})
|
|
checkAuthErr(t, tt.shouldFailWrite, err)
|
|
|
|
_, err = svc.CertificateChain(ctx)
|
|
checkAuthErr(t, tt.shouldFailRead, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestVersion tests that all users can access the version endpoint.
|
|
func TestVersion(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
svc, ctx := newTestService(t, ds, nil, nil)
|
|
|
|
testCases := []struct {
|
|
name string
|
|
user *fleet.User
|
|
}{
|
|
{
|
|
"global admin",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)},
|
|
},
|
|
{
|
|
"global maintainer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleMaintainer)},
|
|
},
|
|
{
|
|
"global observer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleObserver)},
|
|
},
|
|
{
|
|
"global observer+",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleObserverPlus)},
|
|
},
|
|
{
|
|
"global gitops",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleGitOps)},
|
|
},
|
|
{
|
|
"team admin",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleAdmin}}},
|
|
},
|
|
{
|
|
"team maintainer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleMaintainer}}},
|
|
},
|
|
{
|
|
"team observer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleObserver}}},
|
|
},
|
|
{
|
|
"team observer+",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleObserverPlus}}},
|
|
},
|
|
{
|
|
"team gitops",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleGitOps}}},
|
|
},
|
|
{
|
|
"user without roles",
|
|
&fleet.User{ID: 777},
|
|
},
|
|
}
|
|
for _, tt := range testCases {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
ctx := viewer.NewContext(ctx, viewer.Viewer{User: tt.user})
|
|
_, err := svc.Version(ctx)
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestEnrollSecretAuth(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
svc, ctx := newTestService(t, ds, nil, nil)
|
|
|
|
ds.ApplyEnrollSecretsFunc = func(ctx context.Context, tid *uint, secrets []*fleet.EnrollSecret) error {
|
|
return nil
|
|
}
|
|
ds.GetEnrollSecretsFunc = func(ctx context.Context, tid *uint) ([]*fleet.EnrollSecret, error) {
|
|
return nil, nil
|
|
}
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) { return &fleet.AppConfig{}, nil }
|
|
|
|
testCases := []struct {
|
|
name string
|
|
user *fleet.User
|
|
shouldFailWrite bool
|
|
shouldFailRead bool
|
|
}{
|
|
{
|
|
"global admin",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)},
|
|
false,
|
|
false,
|
|
},
|
|
{
|
|
"global maintainer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleMaintainer)},
|
|
false,
|
|
false,
|
|
},
|
|
{
|
|
"global observer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleObserver)},
|
|
true,
|
|
true,
|
|
},
|
|
{
|
|
"team admin",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleAdmin}}},
|
|
true,
|
|
true,
|
|
},
|
|
{
|
|
"team maintainer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleMaintainer}}},
|
|
true,
|
|
true,
|
|
},
|
|
{
|
|
"team observer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleObserver}}},
|
|
true,
|
|
true,
|
|
},
|
|
{
|
|
"user",
|
|
&fleet.User{ID: 777},
|
|
true,
|
|
true,
|
|
},
|
|
}
|
|
for _, tt := range testCases {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
ctx := viewer.NewContext(ctx, viewer.Viewer{User: tt.user})
|
|
|
|
err := svc.ApplyEnrollSecretSpec(
|
|
ctx, &fleet.EnrollSecretSpec{Secrets: []*fleet.EnrollSecret{{Secret: "ABC"}}}, fleet.ApplySpecOptions{},
|
|
)
|
|
checkAuthErr(t, tt.shouldFailWrite, err)
|
|
|
|
_, err = svc.GetEnrollSecretSpec(ctx)
|
|
checkAuthErr(t, tt.shouldFailRead, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestApplyEnrollSecretWithGlobalEnrollConfig(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
|
|
cfg := config.TestConfig()
|
|
svc, ctx := newTestServiceWithConfig(t, ds, cfg, nil, nil)
|
|
ctx = test.UserContext(ctx, test.UserAdmin)
|
|
|
|
// Dry run
|
|
ds.IsEnrollSecretAvailableFunc = func(ctx context.Context, secret string, isNew bool, teamID *uint) (bool, error) {
|
|
assert.False(t, isNew)
|
|
assert.Nil(t, teamID)
|
|
return true, nil
|
|
}
|
|
err := svc.ApplyEnrollSecretSpec(
|
|
ctx, &fleet.EnrollSecretSpec{Secrets: []*fleet.EnrollSecret{{Secret: "ABC"}}}, fleet.ApplySpecOptions{DryRun: true},
|
|
)
|
|
assert.True(t, ds.IsEnrollSecretAvailableFuncInvoked)
|
|
assert.NoError(t, err)
|
|
|
|
// Dry run fails
|
|
ds.IsEnrollSecretAvailableFuncInvoked = false
|
|
ds.IsEnrollSecretAvailableFunc = func(ctx context.Context, secret string, isNew bool, teamID *uint) (bool, error) {
|
|
assert.False(t, isNew)
|
|
assert.Nil(t, teamID)
|
|
return false, nil
|
|
}
|
|
err = svc.ApplyEnrollSecretSpec(
|
|
ctx, &fleet.EnrollSecretSpec{Secrets: []*fleet.EnrollSecret{{Secret: "ABC"}}}, fleet.ApplySpecOptions{DryRun: true},
|
|
)
|
|
assert.True(t, ds.IsEnrollSecretAvailableFuncInvoked)
|
|
assert.ErrorContains(t, err, "secret is already being used")
|
|
|
|
// Dry run with error
|
|
ds.IsEnrollSecretAvailableFuncInvoked = false
|
|
ds.IsEnrollSecretAvailableFunc = func(ctx context.Context, secret string, isNew bool, teamID *uint) (bool, error) {
|
|
return false, assert.AnError
|
|
}
|
|
err = svc.ApplyEnrollSecretSpec(
|
|
ctx, &fleet.EnrollSecretSpec{Secrets: []*fleet.EnrollSecret{{Secret: "ABC"}}}, fleet.ApplySpecOptions{DryRun: true},
|
|
)
|
|
assert.True(t, ds.IsEnrollSecretAvailableFuncInvoked)
|
|
assert.Equal(t, assert.AnError, err)
|
|
|
|
ds.GetEnrollSecretsFunc = func(ctx context.Context, teamID *uint) ([]*fleet.EnrollSecret, error) {
|
|
return nil, nil
|
|
}
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) { return &fleet.AppConfig{}, nil }
|
|
|
|
ds.IsEnrollSecretAvailableFunc = nil
|
|
ds.ApplyEnrollSecretsFunc = func(ctx context.Context, teamID *uint, secrets []*fleet.EnrollSecret) error {
|
|
return nil
|
|
}
|
|
err = svc.ApplyEnrollSecretSpec(
|
|
ctx, &fleet.EnrollSecretSpec{Secrets: []*fleet.EnrollSecret{{Secret: "ABC"}}}, fleet.ApplySpecOptions{},
|
|
)
|
|
require.True(t, ds.ApplyEnrollSecretsFuncInvoked)
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
func TestCertificateChain(t *testing.T) {
|
|
server, teardown := setupCertificateChain(t)
|
|
defer teardown()
|
|
|
|
certFile := "testdata/server.pem"
|
|
cert, err := tls.LoadX509KeyPair(certFile, "testdata/server.key")
|
|
require.Nil(t, err)
|
|
server.TLS = &tls.Config{
|
|
Certificates: []tls.Certificate{cert},
|
|
}
|
|
server.StartTLS()
|
|
|
|
u, err := url.Parse(server.URL)
|
|
require.Nil(t, err)
|
|
|
|
conn, err := connectTLS(context.Background(), u)
|
|
require.Nil(t, err)
|
|
|
|
have, want := len(conn.ConnectionState().PeerCertificates), len(cert.Certificate)
|
|
require.Equal(t, have, want)
|
|
|
|
original, _ := os.ReadFile(certFile)
|
|
returned, err := chain(context.Background(), conn.ConnectionState(), "")
|
|
require.Nil(t, err)
|
|
require.Equal(t, returned, original)
|
|
}
|
|
|
|
func echoHandler() http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
dump, err := httputil.DumpRequest(r, true)
|
|
if err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
w.Write(dump) //nolint:errcheck
|
|
})
|
|
}
|
|
|
|
func setupCertificateChain(t *testing.T) (server *httptest.Server, teardown func()) {
|
|
server = httptest.NewUnstartedServer(echoHandler())
|
|
return server, server.Close
|
|
}
|
|
|
|
func TestSSONotPresent(t *testing.T) {
|
|
invalid := &fleet.InvalidArgumentError{}
|
|
var p fleet.AppConfig
|
|
validateSSOSettings(p, &fleet.AppConfig{}, invalid, &fleet.LicenseInfo{})
|
|
assert.False(t, invalid.HasErrors())
|
|
}
|
|
|
|
func TestNeedFieldsPresent(t *testing.T) {
|
|
invalid := &fleet.InvalidArgumentError{}
|
|
config := fleet.AppConfig{
|
|
SSOSettings: &fleet.SSOSettings{
|
|
EnableSSO: true,
|
|
SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
IDPName: "onelogin",
|
|
},
|
|
},
|
|
}
|
|
validateSSOSettings(config, &fleet.AppConfig{}, invalid, &fleet.LicenseInfo{})
|
|
assert.False(t, invalid.HasErrors())
|
|
}
|
|
|
|
func TestShortIDPName(t *testing.T) {
|
|
invalid := &fleet.InvalidArgumentError{}
|
|
config := fleet.AppConfig{
|
|
SSOSettings: &fleet.SSOSettings{
|
|
EnableSSO: true,
|
|
SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
// A customer once found the Fleet server erroring when they used "SSO" for their IdP name.
|
|
IDPName: "SSO",
|
|
},
|
|
},
|
|
}
|
|
validateSSOSettings(config, &fleet.AppConfig{}, invalid, &fleet.LicenseInfo{})
|
|
assert.False(t, invalid.HasErrors())
|
|
}
|
|
|
|
func TestMissingMetadata(t *testing.T) {
|
|
invalid := &fleet.InvalidArgumentError{}
|
|
config := fleet.AppConfig{
|
|
SSOSettings: &fleet.SSOSettings{
|
|
EnableSSO: true,
|
|
SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
IDPName: "onelogin",
|
|
},
|
|
},
|
|
}
|
|
validateSSOSettings(config, &fleet.AppConfig{}, invalid, &fleet.LicenseInfo{})
|
|
require.True(t, invalid.HasErrors())
|
|
assert.Contains(t, invalid.Error(), "metadata")
|
|
assert.Contains(t, invalid.Error(), "either metadata or metadata_url must be defined")
|
|
}
|
|
|
|
func TestSSOValidationValidatesSchemaInMetadataURL(t *testing.T) {
|
|
var schemas []string
|
|
schemas = append(schemas, getURISchemas()...)
|
|
schemas = append(schemas, "asdfaklsdfjalksdfja")
|
|
|
|
for _, scheme := range schemas {
|
|
actual := &fleet.InvalidArgumentError{}
|
|
sut := fleet.AppConfig{
|
|
SSOSettings: &fleet.SSOSettings{
|
|
EnableSSO: true,
|
|
SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
IDPName: "onelogin",
|
|
MetadataURL: fmt.Sprintf("%s://somehost", scheme),
|
|
},
|
|
},
|
|
}
|
|
|
|
validateSSOSettings(sut, &fleet.AppConfig{}, actual, &fleet.LicenseInfo{})
|
|
|
|
require.Equal(t, scheme == "http" || scheme == "https", !actual.HasErrors())
|
|
require.Equal(t, scheme == "http" || scheme == "https", !strings.Contains(actual.Error(), "metadata_url"))
|
|
require.Equal(t, scheme == "http" || scheme == "https", !strings.Contains(actual.Error(), "must be either https or http"))
|
|
}
|
|
}
|
|
|
|
func TestJITProvisioning(t *testing.T) {
|
|
config := fleet.AppConfig{
|
|
SSOSettings: &fleet.SSOSettings{
|
|
EnableSSO: true,
|
|
EnableJITProvisioning: true,
|
|
SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
IDPName: "onelogin",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
},
|
|
},
|
|
}
|
|
|
|
t.Run("doesn't allow to enable JIT provisioning without a premium license", func(t *testing.T) {
|
|
invalid := &fleet.InvalidArgumentError{}
|
|
validateSSOSettings(config, &fleet.AppConfig{}, invalid, &fleet.LicenseInfo{})
|
|
require.True(t, invalid.HasErrors())
|
|
assert.Contains(t, invalid.Error(), "enable_jit_provisioning")
|
|
assert.Contains(t, invalid.Error(), "missing or invalid license")
|
|
})
|
|
|
|
t.Run("allows JIT provisioning to be enabled with a premium license", func(t *testing.T) {
|
|
invalid := &fleet.InvalidArgumentError{}
|
|
validateSSOSettings(config, &fleet.AppConfig{}, invalid, &fleet.LicenseInfo{Tier: fleet.TierPremium})
|
|
require.False(t, invalid.HasErrors())
|
|
})
|
|
|
|
t.Run("doesn't care if JIT provisioning is set to false on free licenses", func(t *testing.T) {
|
|
invalid := &fleet.InvalidArgumentError{}
|
|
oldConfig := &fleet.AppConfig{
|
|
SSOSettings: &fleet.SSOSettings{
|
|
EnableJITProvisioning: false,
|
|
},
|
|
}
|
|
config.SSOSettings.EnableJITProvisioning = false
|
|
validateSSOSettings(config, oldConfig, invalid, &fleet.LicenseInfo{})
|
|
require.False(t, invalid.HasErrors())
|
|
})
|
|
}
|
|
|
|
func TestAppConfigSecretsObfuscated(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
svc, ctx := newTestService(t, ds, nil, nil)
|
|
|
|
// start a TLS server and use its URL as the server URL in the app config,
|
|
// required by the CertificateChain service call.
|
|
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
|
|
defer srv.Close()
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return &fleet.AppConfig{
|
|
SMTPSettings: &fleet.SMTPSettings{
|
|
SMTPPassword: "smtppassword",
|
|
},
|
|
Integrations: fleet.Integrations{
|
|
Jira: []*fleet.JiraIntegration{
|
|
{APIToken: "jiratoken"},
|
|
},
|
|
Zendesk: []*fleet.ZendeskIntegration{
|
|
{APIToken: "zendesktoken"},
|
|
},
|
|
GoogleCalendar: []*fleet.GoogleCalendarIntegration{
|
|
{ApiKey: fleet.GoogleCalendarApiKey{Values: map[string]string{
|
|
"type": "service_account",
|
|
"project_id": "test-project-123",
|
|
"private_key_id": "key-id-456",
|
|
fleet.GoogleCalendarPrivateKey: "-----BEGIN PRIVATE KEY-----\nMIIE...\n-----END PRIVATE KEY-----",
|
|
fleet.GoogleCalendarEmail: "test@test-project.iam.gserviceaccount.com",
|
|
"client_id": "123456789",
|
|
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
|
"token_uri": "https://oauth2.googleapis.com/token",
|
|
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
|
|
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/test",
|
|
"universe_domain": "googleapis.com",
|
|
}}},
|
|
},
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
user *fleet.User
|
|
shouldFail bool
|
|
}{
|
|
{
|
|
"global admin",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)},
|
|
false,
|
|
},
|
|
{
|
|
"global maintainer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleMaintainer)},
|
|
false,
|
|
},
|
|
{
|
|
"global observer",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleObserver)},
|
|
false,
|
|
},
|
|
{
|
|
"global observer+",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleObserverPlus)},
|
|
false,
|
|
},
|
|
{
|
|
"global gitops",
|
|
&fleet.User{GlobalRole: ptr.String(fleet.RoleGitOps)},
|
|
false,
|
|
},
|
|
{
|
|
"team admin",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleAdmin}}},
|
|
false,
|
|
},
|
|
{
|
|
"team maintainer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleMaintainer}}},
|
|
false,
|
|
},
|
|
{
|
|
"team observer",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleObserver}}},
|
|
false,
|
|
},
|
|
{
|
|
"team observer+",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleObserverPlus}}},
|
|
false,
|
|
},
|
|
{
|
|
"team gitops",
|
|
&fleet.User{Teams: []fleet.UserTeam{{Team: fleet.Team{ID: 1}, Role: fleet.RoleGitOps}}},
|
|
false,
|
|
},
|
|
{
|
|
"user without roles",
|
|
&fleet.User{ID: 777},
|
|
true,
|
|
},
|
|
}
|
|
for _, tt := range testCases {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
ctx := viewer.NewContext(ctx, viewer.Viewer{User: tt.user})
|
|
|
|
ac, err := svc.AppConfigObfuscated(ctx)
|
|
if tt.shouldFail {
|
|
require.Error(t, err)
|
|
} else {
|
|
require.NoError(t, err)
|
|
require.Equal(t, ac.SMTPSettings.SMTPPassword, fleet.MaskedPassword)
|
|
require.Equal(t, ac.Integrations.Jira[0].APIToken, fleet.MaskedPassword)
|
|
require.Equal(t, ac.Integrations.Zendesk[0].APIToken, fleet.MaskedPassword)
|
|
// Verify Google Calendar API key is masked (will serialize to "********")
|
|
require.True(t, ac.Integrations.GoogleCalendar[0].ApiKey.IsMasked())
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestModifyAppConfigSMTPConfigured tests that disabling SMTP
|
|
// should set the SMTPConfigured field to false.
|
|
func TestModifyAppConfigSMTPConfigured(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
svc, ctx := newTestService(t, ds, nil, nil)
|
|
|
|
// SMTP is initially enabled and configured.
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{
|
|
OrgName: "Test",
|
|
},
|
|
ServerSettings: fleet.ServerSettings{
|
|
ServerURL: "https://example.org",
|
|
},
|
|
SMTPSettings: &fleet.SMTPSettings{
|
|
SMTPEnabled: true,
|
|
SMTPConfigured: true,
|
|
},
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig, nil
|
|
}
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{}, nil
|
|
}
|
|
|
|
// Disable SMTP.
|
|
newAppConfig := fleet.AppConfig{
|
|
SMTPSettings: &fleet.SMTPSettings{
|
|
SMTPEnabled: false,
|
|
SMTPConfigured: true,
|
|
},
|
|
}
|
|
b, err := json.Marshal(newAppConfig.SMTPSettings) // marshaling appconfig sets all fields, resetting e.g. OrgName to empty
|
|
require.NoError(t, err)
|
|
b = []byte(`{"smtp_settings":` + string(b) + `}`)
|
|
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
updatedAppConfig, err := svc.ModifyAppConfig(ctx, b, fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// After disabling SMTP, the app config should be "not configured".
|
|
require.False(t, updatedAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.False(t, updatedAppConfig.SMTPSettings.SMTPConfigured)
|
|
require.False(t, dsAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.False(t, dsAppConfig.SMTPSettings.SMTPConfigured)
|
|
}
|
|
|
|
// TestAppConfigFleetDesktopSettings tests that Fleet Premium licensees can set Fleet Desktop custom settings and that
|
|
// Fleet Free licensees are restricted.
|
|
func TestModifyAppConfigFleetDesktopSettings(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
licenseTier string
|
|
initialSettings fleet.FleetDesktopSettings
|
|
newSettings fleet.FleetDesktopSettings
|
|
expectedSettings fleet.FleetDesktopSettings
|
|
invalid []map[string]string
|
|
}{
|
|
{
|
|
name: "modifying Desktop settings on Free Tier",
|
|
licenseTier: fleet.TierFree,
|
|
initialSettings: fleet.FleetDesktopSettings{},
|
|
newSettings: fleet.FleetDesktopSettings{TransparencyURL: "customURL", AlternativeBrowserHost: "something.com"},
|
|
expectedSettings: fleet.FleetDesktopSettings{},
|
|
invalid: []map[string]string{
|
|
{"name": "transparency_url", "reason": "missing or invalid license"},
|
|
{"name": "alternative_browser_host", "reason": "missing or invalid license"},
|
|
},
|
|
},
|
|
{
|
|
name: "modifying Desktop settings on Premium Tier",
|
|
licenseTier: fleet.TierPremium,
|
|
initialSettings: fleet.FleetDesktopSettings{},
|
|
newSettings: fleet.FleetDesktopSettings{TransparencyURL: "customURL", AlternativeBrowserHost: "something.com"},
|
|
expectedSettings: fleet.FleetDesktopSettings{TransparencyURL: "customURL", AlternativeBrowserHost: "something.com"},
|
|
},
|
|
{
|
|
name: "empty values on Free tier",
|
|
licenseTier: fleet.TierFree,
|
|
initialSettings: fleet.FleetDesktopSettings{},
|
|
newSettings: fleet.FleetDesktopSettings{},
|
|
expectedSettings: fleet.FleetDesktopSettings{},
|
|
},
|
|
{
|
|
name: "empty values on Premium tier",
|
|
licenseTier: fleet.TierPremium,
|
|
initialSettings: fleet.FleetDesktopSettings{},
|
|
newSettings: fleet.FleetDesktopSettings{},
|
|
expectedSettings: fleet.FleetDesktopSettings{},
|
|
},
|
|
{
|
|
name: "using invalid values",
|
|
licenseTier: fleet.TierPremium,
|
|
initialSettings: fleet.FleetDesktopSettings{},
|
|
newSettings: fleet.FleetDesktopSettings{TransparencyURL: "@:13.com", AlternativeBrowserHost: "@:12.com"},
|
|
expectedSettings: fleet.FleetDesktopSettings{},
|
|
invalid: []map[string]string{
|
|
{"name": "transparency_url", "reason": "parse \"@:13.com\": first path segment in URL cannot contain colon"},
|
|
{"name": "alternative_browser_host", "reason": "must be a valid hostname or IP address"},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, tt := range testCases {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
svc, ctx := newTestService(t, ds, nil, nil, &TestServerOpts{License: &fleet.LicenseInfo{Tier: tt.licenseTier}})
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{
|
|
OrgName: "Test",
|
|
},
|
|
ServerSettings: fleet.ServerSettings{
|
|
ServerURL: "https://example.org",
|
|
},
|
|
FleetDesktop: tt.initialSettings,
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig, nil
|
|
}
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{}, nil
|
|
}
|
|
|
|
ac, err := svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.initialSettings.TransparencyURL, ac.FleetDesktop.TransparencyURL)
|
|
require.Equal(t, tt.initialSettings.AlternativeBrowserHost, ac.FleetDesktop.AlternativeBrowserHost)
|
|
|
|
raw, err := json.Marshal(tt.newSettings)
|
|
require.NoError(t, err)
|
|
raw = []byte(`{"fleet_desktop":` + string(raw) + `}`)
|
|
modified, err := svc.ModifyAppConfig(ctx, raw, fleet.ApplySpecOptions{})
|
|
|
|
if len(tt.invalid) != 0 {
|
|
var invalid *fleet.InvalidArgumentError
|
|
ok := errors.As(err, &invalid)
|
|
require.True(t, ok)
|
|
require.Equal(t, tt.invalid, invalid.Invalid())
|
|
}
|
|
if modified != nil {
|
|
require.Equal(t, tt.expectedSettings.TransparencyURL, modified.FleetDesktop.TransparencyURL)
|
|
require.Equal(t, tt.expectedSettings.AlternativeBrowserHost, modified.FleetDesktop.AlternativeBrowserHost)
|
|
|
|
ac, err = svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.expectedSettings.TransparencyURL, ac.FleetDesktop.TransparencyURL)
|
|
require.Equal(t, tt.expectedSettings.AlternativeBrowserHost, ac.FleetDesktop.AlternativeBrowserHost)
|
|
}
|
|
|
|
expectedURL := fleet.DefaultTransparencyURL
|
|
expectedSecureframeURL := fleet.SecureframeTransparencyURL
|
|
if tt.expectedSettings.TransparencyURL != "" {
|
|
expectedURL = tt.expectedSettings.TransparencyURL
|
|
expectedSecureframeURL = tt.expectedSettings.TransparencyURL
|
|
}
|
|
|
|
transparencyURL, err := svc.GetTransparencyURL(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, expectedURL, transparencyURL)
|
|
|
|
cfg := config.TestConfig()
|
|
cfg.Partnerships.EnableSecureframe = true
|
|
svc, ctx = newTestServiceWithConfig(t, ds, cfg, nil, nil, &TestServerOpts{License: &fleet.LicenseInfo{Tier: tt.licenseTier}})
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
transparencyURL, err = svc.GetTransparencyURL(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, expectedSecureframeURL, transparencyURL)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestTransparencyURLDowngradeLicense tests scenarios where a transparency url value has previously
|
|
// been stored (for example, if a licensee downgraded without manually resetting the transparency url)
|
|
func TestTransparencyURLDowngradeLicense(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
|
|
cfg := config.TestConfig()
|
|
svc, ctx := newTestServiceWithConfig(t, ds, cfg, nil, nil, &TestServerOpts{License: &fleet.LicenseInfo{Tier: "free"}})
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{
|
|
OrgName: "Test",
|
|
},
|
|
ServerSettings: fleet.ServerSettings{
|
|
ServerURL: "https://example.org",
|
|
},
|
|
FleetDesktop: fleet.FleetDesktopSettings{TransparencyURL: "https://example.com/transparency"},
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig, nil
|
|
}
|
|
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{}, nil
|
|
}
|
|
|
|
ac, err := svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, "https://example.com/transparency", ac.FleetDesktop.TransparencyURL)
|
|
|
|
// delivered URL should be the default one
|
|
transparencyUrl, err := svc.GetTransparencyURL(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, fleet.DefaultTransparencyURL, transparencyUrl)
|
|
|
|
// delivered URL should be the Secureframe one if we have that config value set
|
|
cfg.Partnerships.EnableSecureframe = true
|
|
svc, ctx = newTestServiceWithConfig(t, ds, cfg, nil, nil, &TestServerOpts{License: &fleet.LicenseInfo{Tier: "free"}})
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
transparencyUrl, err = svc.GetTransparencyURL(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, fleet.SecureframeTransparencyURL, transparencyUrl)
|
|
|
|
// setting transparency url fails
|
|
raw, err := json.Marshal(fleet.FleetDesktopSettings{TransparencyURL: "https://f1337.com/transparency"})
|
|
require.NoError(t, err)
|
|
raw = []byte(`{"fleet_desktop":` + string(raw) + `}`)
|
|
_, err = svc.ModifyAppConfig(ctx, raw, fleet.ApplySpecOptions{})
|
|
require.Error(t, err)
|
|
require.ErrorContains(t, err, "missing or invalid license")
|
|
|
|
// setting unrelated config value does not fail and resets transparency url to ""
|
|
raw, err = json.Marshal(fleet.OrgInfo{OrgName: "f1337"})
|
|
require.NoError(t, err)
|
|
raw = []byte(`{"org_info":` + string(raw) + `}`)
|
|
modified, err := svc.ModifyAppConfig(ctx, raw, fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
require.NotNil(t, modified)
|
|
require.Equal(t, "", modified.FleetDesktop.TransparencyURL)
|
|
ac, err = svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, "f1337", ac.OrgInfo.OrgName)
|
|
require.Equal(t, "", ac.FleetDesktop.TransparencyURL)
|
|
}
|
|
|
|
func TestMDMConfig(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
depStorage := new(nanodep_mock.Storage)
|
|
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
|
|
depSrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
w.WriteHeader(http.StatusOK)
|
|
switch r.URL.Path {
|
|
case "/session":
|
|
_, _ = w.Write([]byte(`{"auth_session_token": "xyz"}`))
|
|
case "/profile":
|
|
_, _ = w.Write([]byte(`{"profile_uuid": "xyz"}`))
|
|
}
|
|
}))
|
|
t.Cleanup(depSrv.Close)
|
|
|
|
const licenseErr = "missing or invalid license"
|
|
const notFoundErr = "not found"
|
|
testCases := []struct {
|
|
name string
|
|
licenseTier string
|
|
oldMDM fleet.MDM
|
|
newMDM fleet.MDM
|
|
expectedMDM fleet.MDM
|
|
expectedError string
|
|
findTeam bool
|
|
}{
|
|
{
|
|
name: "nochange",
|
|
licenseTier: "free",
|
|
expectedMDM: fleet.MDM{
|
|
AppleBusinessManager: optjson.Slice[fleet.MDMAppleABMAssignmentInfo]{Set: true, Value: []fleet.MDMAppleABMAssignmentInfo{}},
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
BootstrapPackage: optjson.String{Set: true},
|
|
MacOSSetupAssistant: optjson.String{Set: true},
|
|
EnableReleaseDeviceManually: optjson.SetBool(false),
|
|
LockEndUserInfo: optjson.SetBool(false),
|
|
Software: optjson.Slice[*fleet.MacOSSetupSoftware]{Set: true, Value: []*fleet.MacOSSetupSoftware{}},
|
|
Script: optjson.String{Set: true},
|
|
ManualAgentInstall: optjson.Bool{Set: true},
|
|
},
|
|
MacOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}, UpdateNewHosts: optjson.Bool{Set: true}},
|
|
IOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
IPadOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
VolumePurchasingProgram: optjson.Slice[fleet.MDMAppleVolumePurchasingProgramInfo]{Set: true, Value: []fleet.MDMAppleVolumePurchasingProgramInfo{}},
|
|
WindowsUpdates: fleet.WindowsUpdates{DeadlineDays: optjson.Int{Set: true}, GracePeriodDays: optjson.Int{Set: true}},
|
|
WindowsSettings: fleet.WindowsSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
},
|
|
AndroidSettings: fleet.AndroidSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
Certificates: optjson.Slice[fleet.CertificateTemplateSpec]{Set: true, Value: []fleet.CertificateTemplateSpec{}},
|
|
},
|
|
RequireBitLockerPIN: optjson.Bool{Set: true, Value: false},
|
|
EnableRecoveryLockPassword: optjson.Bool{Set: true, Value: false},
|
|
WindowsEntraTenantIDs: optjson.Slice[string]{Set: true, Value: []string{}},
|
|
},
|
|
},
|
|
{
|
|
name: "newDefaultTeamNoLicense",
|
|
licenseTier: "free",
|
|
newMDM: fleet.MDM{DeprecatedAppleBMDefaultTeam: "foobar"},
|
|
expectedError: licenseErr,
|
|
},
|
|
{
|
|
name: "notFoundNew",
|
|
licenseTier: "premium",
|
|
newMDM: fleet.MDM{DeprecatedAppleBMDefaultTeam: "foobar"},
|
|
expectedError: notFoundErr,
|
|
},
|
|
{
|
|
name: "notFoundEdit",
|
|
licenseTier: "premium",
|
|
oldMDM: fleet.MDM{DeprecatedAppleBMDefaultTeam: "foobar"},
|
|
newMDM: fleet.MDM{DeprecatedAppleBMDefaultTeam: "bar"},
|
|
expectedError: notFoundErr,
|
|
},
|
|
{
|
|
name: "foundNew",
|
|
licenseTier: "premium",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{DeprecatedAppleBMDefaultTeam: "foobar"},
|
|
expectedMDM: fleet.MDM{
|
|
AppleBusinessManager: optjson.Slice[fleet.MDMAppleABMAssignmentInfo]{Set: true, Value: []fleet.MDMAppleABMAssignmentInfo{}},
|
|
DeprecatedAppleBMDefaultTeam: "foobar",
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
BootstrapPackage: optjson.String{Set: true},
|
|
MacOSSetupAssistant: optjson.String{Set: true},
|
|
EnableReleaseDeviceManually: optjson.SetBool(false),
|
|
LockEndUserInfo: optjson.SetBool(false),
|
|
Software: optjson.Slice[*fleet.MacOSSetupSoftware]{Set: true, Value: []*fleet.MacOSSetupSoftware{}},
|
|
Script: optjson.String{Set: true},
|
|
ManualAgentInstall: optjson.Bool{Set: true},
|
|
},
|
|
MacOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}, UpdateNewHosts: optjson.Bool{Set: true}},
|
|
IOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
IPadOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
VolumePurchasingProgram: optjson.Slice[fleet.MDMAppleVolumePurchasingProgramInfo]{Set: true, Value: []fleet.MDMAppleVolumePurchasingProgramInfo{}},
|
|
WindowsUpdates: fleet.WindowsUpdates{DeadlineDays: optjson.Int{Set: true}, GracePeriodDays: optjson.Int{Set: true}},
|
|
WindowsSettings: fleet.WindowsSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
},
|
|
AndroidSettings: fleet.AndroidSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
Certificates: optjson.Slice[fleet.CertificateTemplateSpec]{Set: true, Value: []fleet.CertificateTemplateSpec{}},
|
|
},
|
|
RequireBitLockerPIN: optjson.Bool{Set: true, Value: false},
|
|
EnableRecoveryLockPassword: optjson.Bool{Set: true, Value: false},
|
|
WindowsEntraTenantIDs: optjson.Slice[string]{Set: true, Value: []string{}},
|
|
},
|
|
},
|
|
{
|
|
name: "foundEdit",
|
|
licenseTier: "premium",
|
|
findTeam: true,
|
|
oldMDM: fleet.MDM{DeprecatedAppleBMDefaultTeam: "bar"},
|
|
newMDM: fleet.MDM{DeprecatedAppleBMDefaultTeam: "foobar"},
|
|
expectedMDM: fleet.MDM{
|
|
AppleBusinessManager: optjson.Slice[fleet.MDMAppleABMAssignmentInfo]{Set: true, Value: []fleet.MDMAppleABMAssignmentInfo{}},
|
|
DeprecatedAppleBMDefaultTeam: "foobar",
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
BootstrapPackage: optjson.String{Set: true},
|
|
MacOSSetupAssistant: optjson.String{Set: true},
|
|
EnableReleaseDeviceManually: optjson.SetBool(false),
|
|
LockEndUserInfo: optjson.SetBool(false),
|
|
Software: optjson.Slice[*fleet.MacOSSetupSoftware]{Set: true, Value: []*fleet.MacOSSetupSoftware{}},
|
|
Script: optjson.String{Set: true},
|
|
ManualAgentInstall: optjson.Bool{Set: true},
|
|
},
|
|
MacOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}, UpdateNewHosts: optjson.Bool{Set: true}},
|
|
IOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
IPadOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
VolumePurchasingProgram: optjson.Slice[fleet.MDMAppleVolumePurchasingProgramInfo]{Set: true, Value: []fleet.MDMAppleVolumePurchasingProgramInfo{}},
|
|
WindowsUpdates: fleet.WindowsUpdates{DeadlineDays: optjson.Int{Set: true}, GracePeriodDays: optjson.Int{Set: true}},
|
|
WindowsSettings: fleet.WindowsSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
},
|
|
AndroidSettings: fleet.AndroidSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
Certificates: optjson.Slice[fleet.CertificateTemplateSpec]{Set: true, Value: []fleet.CertificateTemplateSpec{}},
|
|
},
|
|
RequireBitLockerPIN: optjson.Bool{Set: true, Value: false},
|
|
EnableRecoveryLockPassword: optjson.Bool{Set: true, Value: false},
|
|
WindowsEntraTenantIDs: optjson.Slice[string]{Set: true, Value: []string{}},
|
|
},
|
|
},
|
|
{
|
|
name: "ssoFree",
|
|
licenseTier: "free",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{EntityID: "foo"}}},
|
|
expectedError: licenseErr,
|
|
},
|
|
{
|
|
name: "ssoFreeNoChanges",
|
|
licenseTier: "free",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{EntityID: "foo"}}},
|
|
oldMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{EntityID: "foo"}}},
|
|
expectedMDM: fleet.MDM{
|
|
AppleBusinessManager: optjson.Slice[fleet.MDMAppleABMAssignmentInfo]{Set: true, Value: []fleet.MDMAppleABMAssignmentInfo{}},
|
|
EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{EntityID: "foo"}},
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
BootstrapPackage: optjson.String{Set: true},
|
|
MacOSSetupAssistant: optjson.String{Set: true},
|
|
EnableReleaseDeviceManually: optjson.SetBool(false),
|
|
LockEndUserInfo: optjson.SetBool(false),
|
|
Software: optjson.Slice[*fleet.MacOSSetupSoftware]{Set: true, Value: []*fleet.MacOSSetupSoftware{}},
|
|
Script: optjson.String{Set: true},
|
|
ManualAgentInstall: optjson.Bool{Set: true},
|
|
},
|
|
MacOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}, UpdateNewHosts: optjson.Bool{Set: true}},
|
|
IOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
IPadOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
VolumePurchasingProgram: optjson.Slice[fleet.MDMAppleVolumePurchasingProgramInfo]{Set: true, Value: []fleet.MDMAppleVolumePurchasingProgramInfo{}},
|
|
WindowsUpdates: fleet.WindowsUpdates{DeadlineDays: optjson.Int{Set: true}, GracePeriodDays: optjson.Int{Set: true}},
|
|
WindowsSettings: fleet.WindowsSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
},
|
|
AndroidSettings: fleet.AndroidSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
Certificates: optjson.Slice[fleet.CertificateTemplateSpec]{Set: true, Value: []fleet.CertificateTemplateSpec{}},
|
|
},
|
|
RequireBitLockerPIN: optjson.Bool{Set: true, Value: false},
|
|
EnableRecoveryLockPassword: optjson.Bool{Set: true, Value: false},
|
|
WindowsEntraTenantIDs: optjson.Slice[string]{Set: true, Value: []string{}},
|
|
},
|
|
},
|
|
{
|
|
name: "ssoAllFields",
|
|
licenseTier: "premium",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
IDPName: "onelogin",
|
|
}}},
|
|
expectedMDM: fleet.MDM{
|
|
AppleBusinessManager: optjson.Slice[fleet.MDMAppleABMAssignmentInfo]{Set: true, Value: []fleet.MDMAppleABMAssignmentInfo{}},
|
|
EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
IDPName: "onelogin",
|
|
}},
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
BootstrapPackage: optjson.String{Set: true},
|
|
MacOSSetupAssistant: optjson.String{Set: true},
|
|
EnableReleaseDeviceManually: optjson.SetBool(false),
|
|
LockEndUserInfo: optjson.SetBool(false),
|
|
Software: optjson.Slice[*fleet.MacOSSetupSoftware]{Set: true, Value: []*fleet.MacOSSetupSoftware{}},
|
|
Script: optjson.String{Set: true},
|
|
ManualAgentInstall: optjson.Bool{Set: true},
|
|
},
|
|
MacOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}, UpdateNewHosts: optjson.Bool{Set: true}},
|
|
IOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
IPadOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
VolumePurchasingProgram: optjson.Slice[fleet.MDMAppleVolumePurchasingProgramInfo]{Set: true, Value: []fleet.MDMAppleVolumePurchasingProgramInfo{}},
|
|
WindowsUpdates: fleet.WindowsUpdates{DeadlineDays: optjson.Int{Set: true}, GracePeriodDays: optjson.Int{Set: true}},
|
|
WindowsSettings: fleet.WindowsSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
},
|
|
AndroidSettings: fleet.AndroidSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
Certificates: optjson.Slice[fleet.CertificateTemplateSpec]{Set: true, Value: []fleet.CertificateTemplateSpec{}},
|
|
},
|
|
RequireBitLockerPIN: optjson.Bool{Set: true, Value: false},
|
|
EnableRecoveryLockPassword: optjson.Bool{Set: true, Value: false},
|
|
WindowsEntraTenantIDs: optjson.Slice[string]{Set: true, Value: []string{}},
|
|
},
|
|
},
|
|
{
|
|
name: "ssoShortEntityID",
|
|
licenseTier: "premium",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "f",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
IDPName: "onelogin",
|
|
}}},
|
|
expectedMDM: fleet.MDM{
|
|
AppleBusinessManager: optjson.Slice[fleet.MDMAppleABMAssignmentInfo]{Set: true, Value: []fleet.MDMAppleABMAssignmentInfo{}},
|
|
EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "f",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
IDPName: "onelogin",
|
|
}},
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
BootstrapPackage: optjson.String{Set: true},
|
|
MacOSSetupAssistant: optjson.String{Set: true},
|
|
EnableReleaseDeviceManually: optjson.SetBool(false),
|
|
LockEndUserInfo: optjson.SetBool(false),
|
|
Software: optjson.Slice[*fleet.MacOSSetupSoftware]{Set: true, Value: []*fleet.MacOSSetupSoftware{}},
|
|
Script: optjson.String{Set: true},
|
|
ManualAgentInstall: optjson.Bool{Set: true},
|
|
},
|
|
MacOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}, UpdateNewHosts: optjson.Bool{Set: true}},
|
|
IOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
IPadOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
VolumePurchasingProgram: optjson.Slice[fleet.MDMAppleVolumePurchasingProgramInfo]{Set: true, Value: []fleet.MDMAppleVolumePurchasingProgramInfo{}},
|
|
WindowsUpdates: fleet.WindowsUpdates{DeadlineDays: optjson.Int{Set: true}, GracePeriodDays: optjson.Int{Set: true}},
|
|
WindowsSettings: fleet.WindowsSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
},
|
|
AndroidSettings: fleet.AndroidSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
Certificates: optjson.Slice[fleet.CertificateTemplateSpec]{Set: true, Value: []fleet.CertificateTemplateSpec{}},
|
|
},
|
|
RequireBitLockerPIN: optjson.Bool{Set: true, Value: false},
|
|
EnableRecoveryLockPassword: optjson.Bool{Set: true, Value: false},
|
|
WindowsEntraTenantIDs: optjson.Slice[string]{Set: true, Value: []string{}},
|
|
},
|
|
},
|
|
{
|
|
name: "ssoMissingMetadata",
|
|
licenseTier: "premium",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
IDPName: "onelogin",
|
|
}}},
|
|
expectedError: "either metadata or metadata_url must be defined",
|
|
},
|
|
{
|
|
name: "ssoMultiMetadata",
|
|
licenseTier: "premium",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
Metadata: "not-empty",
|
|
MetadataURL: "not-empty",
|
|
IDPName: "onelogin",
|
|
}}},
|
|
expectedError: "invalid URI for request",
|
|
},
|
|
{
|
|
name: "ssoIdPName",
|
|
licenseTier: "premium",
|
|
findTeam: true,
|
|
newMDM: fleet.MDM{EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
Metadata: "not-empty",
|
|
}}},
|
|
expectedError: "idp_name required",
|
|
},
|
|
{
|
|
name: "disableDiskEncryption",
|
|
licenseTier: "premium",
|
|
newMDM: fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(false),
|
|
},
|
|
expectedMDM: fleet.MDM{
|
|
AppleBusinessManager: optjson.Slice[fleet.MDMAppleABMAssignmentInfo]{Set: true, Value: []fleet.MDMAppleABMAssignmentInfo{}},
|
|
EnableDiskEncryption: optjson.Bool{Set: true, Valid: true, Value: false},
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
BootstrapPackage: optjson.String{Set: true},
|
|
MacOSSetupAssistant: optjson.String{Set: true},
|
|
EnableReleaseDeviceManually: optjson.SetBool(false),
|
|
LockEndUserInfo: optjson.SetBool(false),
|
|
Software: optjson.Slice[*fleet.MacOSSetupSoftware]{Set: true, Value: []*fleet.MacOSSetupSoftware{}},
|
|
Script: optjson.String{Set: true},
|
|
ManualAgentInstall: optjson.Bool{Set: true},
|
|
},
|
|
MacOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}, UpdateNewHosts: optjson.Bool{Set: true}},
|
|
IOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
IPadOSUpdates: fleet.AppleOSUpdateSettings{MinimumVersion: optjson.String{Set: true}, Deadline: optjson.String{Set: true}},
|
|
VolumePurchasingProgram: optjson.Slice[fleet.MDMAppleVolumePurchasingProgramInfo]{Set: true, Value: []fleet.MDMAppleVolumePurchasingProgramInfo{}},
|
|
WindowsUpdates: fleet.WindowsUpdates{DeadlineDays: optjson.Int{Set: true}, GracePeriodDays: optjson.Int{Set: true}},
|
|
WindowsSettings: fleet.WindowsSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
},
|
|
AndroidSettings: fleet.AndroidSettings{
|
|
CustomSettings: optjson.Slice[fleet.MDMProfileSpec]{Set: true, Value: []fleet.MDMProfileSpec{}},
|
|
Certificates: optjson.Slice[fleet.CertificateTemplateSpec]{Set: true, Value: []fleet.CertificateTemplateSpec{}},
|
|
},
|
|
RequireBitLockerPIN: optjson.Bool{Set: true, Value: false},
|
|
EnableRecoveryLockPassword: optjson.Bool{Set: true, Value: false},
|
|
WindowsEntraTenantIDs: optjson.Slice[string]{Set: true, Value: []string{}},
|
|
},
|
|
},
|
|
{
|
|
name: "try to disable disk encryption with TPM PIN enabled",
|
|
licenseTier: "premium",
|
|
oldMDM: fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(true),
|
|
RequireBitLockerPIN: optjson.SetBool(true),
|
|
},
|
|
newMDM: fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(false),
|
|
RequireBitLockerPIN: optjson.SetBool(true),
|
|
},
|
|
expectedError: fleet.CantDisableDiskEncryptionIfPINRequiredErrMsg,
|
|
},
|
|
{
|
|
name: "try to enable disk encryption with TPM PIN enabled",
|
|
licenseTier: "premium",
|
|
oldMDM: fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(false),
|
|
RequireBitLockerPIN: optjson.SetBool(false),
|
|
},
|
|
newMDM: fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(false),
|
|
RequireBitLockerPIN: optjson.SetBool(true),
|
|
},
|
|
expectedError: fleet.CantEnablePINRequiredIfDiskEncryptionEnabled,
|
|
},
|
|
{
|
|
name: "try to disable disk encryption with TPM PIN enabled when disk encryption prev enabled",
|
|
licenseTier: "premium",
|
|
oldMDM: fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(true),
|
|
RequireBitLockerPIN: optjson.SetBool(false),
|
|
},
|
|
newMDM: fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(false),
|
|
RequireBitLockerPIN: optjson.SetBool(true),
|
|
},
|
|
expectedError: fleet.CantDisableDiskEncryptionIfPINRequiredErrMsg,
|
|
},
|
|
{
|
|
name: "manual_agent_install enabled without bootstrap package",
|
|
licenseTier: "premium",
|
|
oldMDM: fleet.MDM{
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
ManualAgentInstall: optjson.SetBool(false),
|
|
},
|
|
},
|
|
newMDM: fleet.MDM{
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
ManualAgentInstall: optjson.SetBool(true),
|
|
},
|
|
},
|
|
expectedError: "setup_experience.macos_manual_agent_install Couldn't enable macos_manual_agent_install. To use this option, first specify a bootstrap package.",
|
|
},
|
|
{
|
|
name: "try to disable End User Authentication with Lock End User Info enabled",
|
|
licenseTier: "premium",
|
|
newMDM: fleet.MDM{
|
|
MacOSSetup: fleet.MacOSSetup{
|
|
LockEndUserInfo: optjson.SetBool(true),
|
|
EnableEndUserAuthentication: false,
|
|
},
|
|
EndUserAuthentication: fleet.MDMEndUserAuthentication{SSOProviderSettings: fleet.SSOProviderSettings{
|
|
EntityID: "fleet",
|
|
MetadataURL: "http://isser.metadata.com",
|
|
IDPName: "onelogin",
|
|
}},
|
|
},
|
|
expectedError: `"enable_end_user_authentication" must be set to "true"`,
|
|
},
|
|
}
|
|
|
|
for _, tt := range testCases {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
svc, ctx := newTestService(t, ds, nil, nil, &TestServerOpts{License: &fleet.LicenseInfo{Tier: tt.licenseTier}, DEPStorage: depStorage})
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{OrgName: "Test"},
|
|
ServerSettings: fleet.ServerSettings{ServerURL: "https://example.org"},
|
|
MDM: tt.oldMDM,
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig, nil
|
|
}
|
|
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
ds.TeamByNameFunc = func(ctx context.Context, name string) (*fleet.Team, error) {
|
|
if tt.findTeam {
|
|
return &fleet.Team{}, nil
|
|
}
|
|
return nil, sql.ErrNoRows
|
|
}
|
|
ds.NewMDMAppleEnrollmentProfileFunc = func(ctx context.Context, enrollmentPayload fleet.MDMAppleEnrollmentProfilePayload) (*fleet.MDMAppleEnrollmentProfile, error) {
|
|
return &fleet.MDMAppleEnrollmentProfile{}, nil
|
|
}
|
|
ds.GetMDMAppleEnrollmentProfileByTypeFunc = func(ctx context.Context, typ fleet.MDMAppleEnrollmentType) (*fleet.MDMAppleEnrollmentProfile, error) {
|
|
raw := json.RawMessage("{}")
|
|
return &fleet.MDMAppleEnrollmentProfile{DEPProfile: &raw}, nil
|
|
}
|
|
ds.NewJobFunc = func(ctx context.Context, job *fleet.Job) (*fleet.Job, error) {
|
|
return job, nil
|
|
}
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{{ID: 1}}, nil
|
|
}
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, token *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
depStorage.RetrieveConfigFunc = func(p0 context.Context, p1 string) (*nanodep_client.Config, error) {
|
|
return &nanodep_client.Config{BaseURL: depSrv.URL}, nil
|
|
}
|
|
depStorage.RetrieveAuthTokensFunc = func(ctx context.Context, name string) (*nanodep_client.OAuth1Tokens, error) {
|
|
return &nanodep_client.OAuth1Tokens{}, nil
|
|
}
|
|
depStorage.StoreAssignerProfileFunc = func(ctx context.Context, name string, profileUUID string) error {
|
|
return nil
|
|
}
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{{OrganizationName: t.Name()}}, nil
|
|
}
|
|
|
|
ac, err := svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.oldMDM, ac.MDM)
|
|
|
|
raw, err := json.Marshal(tt.newMDM)
|
|
require.NoError(t, err)
|
|
raw = []byte(`{"mdm":` + string(raw) + `}`)
|
|
modified, err := svc.ModifyAppConfig(ctx, raw, fleet.ApplySpecOptions{})
|
|
if tt.expectedError != "" {
|
|
require.Error(t, err)
|
|
require.ErrorContains(t, err, tt.expectedError)
|
|
return
|
|
}
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.expectedMDM, modified.MDM)
|
|
ac, err = svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.expectedMDM, ac.MDM)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDiskEncryptionSetting(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
t.Run("enableDiskEncryptionWithNoPrivateKey", func(t *testing.T) {
|
|
testConfig = config.TestConfig()
|
|
testConfig.Server.PrivateKey = ""
|
|
svc, ctx := newTestServiceWithConfig(t, ds, testConfig, nil, nil, &TestServerOpts{License: &fleet.LicenseInfo{Tier: fleet.TierPremium}})
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{OrgName: "Test"},
|
|
ServerSettings: fleet.ServerSettings{ServerURL: "https://example.org"},
|
|
MDM: fleet.MDM{},
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig, nil
|
|
}
|
|
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
ds.TeamByNameFunc = func(ctx context.Context, name string) (*fleet.Team, error) {
|
|
return nil, sql.ErrNoRows
|
|
}
|
|
ds.NewMDMAppleEnrollmentProfileFunc = func(ctx context.Context, enrollmentPayload fleet.MDMAppleEnrollmentProfilePayload) (*fleet.MDMAppleEnrollmentProfile, error) {
|
|
return &fleet.MDMAppleEnrollmentProfile{}, nil
|
|
}
|
|
ds.GetMDMAppleEnrollmentProfileByTypeFunc = func(ctx context.Context, typ fleet.MDMAppleEnrollmentType) (*fleet.MDMAppleEnrollmentProfile, error) {
|
|
raw := json.RawMessage("{}")
|
|
return &fleet.MDMAppleEnrollmentProfile{DEPProfile: &raw}, nil
|
|
}
|
|
ds.NewJobFunc = func(ctx context.Context, job *fleet.Job) (*fleet.Job, error) {
|
|
return job, nil
|
|
}
|
|
|
|
ac, err := svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, dsAppConfig.MDM, ac.MDM)
|
|
|
|
raw, err := json.Marshal(fleet.MDM{
|
|
EnableDiskEncryption: optjson.SetBool(true),
|
|
})
|
|
require.NoError(t, err)
|
|
raw = []byte(`{"mdm":` + string(raw) + `}`)
|
|
_, err = svc.ModifyAppConfig(ctx, raw, fleet.ApplySpecOptions{})
|
|
require.Error(t, err)
|
|
require.ErrorContains(t, err, "Missing required private key")
|
|
})
|
|
}
|
|
|
|
func TestModifyAppConfigSMTPSSOAgentOptions(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
svc, ctx := newTestService(t, ds, nil, nil)
|
|
|
|
// SMTP and SSO are initially set.
|
|
agentOptions := json.RawMessage(`
|
|
{
|
|
"config": {
|
|
"options": {
|
|
"distributed_interval": 10
|
|
}
|
|
},
|
|
"overrides": {
|
|
"platforms": {
|
|
"darwin": {
|
|
"options": {
|
|
"distributed_interval": 5
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}`)
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{
|
|
OrgName: "Test",
|
|
},
|
|
ServerSettings: fleet.ServerSettings{
|
|
ServerURL: "https://example.org",
|
|
},
|
|
SMTPSettings: &fleet.SMTPSettings{
|
|
SMTPEnabled: true,
|
|
SMTPConfigured: true,
|
|
SMTPSenderAddress: "foobar@example.com",
|
|
},
|
|
SSOSettings: &fleet.SSOSettings{
|
|
EnableSSO: true,
|
|
SSOProviderSettings: fleet.SSOProviderSettings{
|
|
MetadataURL: "foobar.example.com/metadata",
|
|
},
|
|
},
|
|
AgentOptions: &agentOptions,
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig, nil
|
|
}
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{}, nil
|
|
}
|
|
|
|
// Not sending smtp_settings, sso_settings or agent_settings will do nothing.
|
|
b := []byte(`{}`)
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
updatedAppConfig, err := svc.ModifyAppConfig(ctx, b, fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
require.True(t, updatedAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.True(t, dsAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.True(t, updatedAppConfig.SSOSettings.EnableSSO)
|
|
require.True(t, dsAppConfig.SSOSettings.EnableSSO)
|
|
require.JSONEq(t, string(agentOptions), string(*updatedAppConfig.AgentOptions))
|
|
require.JSONEq(t, string(agentOptions), string(*dsAppConfig.AgentOptions))
|
|
|
|
// Not sending sso_settings or agent settings will not change them, and
|
|
// sending SMTP settings will change them.
|
|
b = []byte(`{"smtp_settings": {"enable_smtp": false}}`)
|
|
updatedAppConfig, err = svc.ModifyAppConfig(ctx, b, fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
require.False(t, updatedAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.False(t, dsAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.True(t, updatedAppConfig.SSOSettings.EnableSSO)
|
|
require.True(t, dsAppConfig.SSOSettings.EnableSSO)
|
|
require.JSONEq(t, string(agentOptions), string(*updatedAppConfig.AgentOptions))
|
|
require.JSONEq(t, string(agentOptions), string(*dsAppConfig.AgentOptions))
|
|
|
|
// Not sending smtp_settings or agent settings will not change them, and
|
|
// sending SSO settings will change them.
|
|
b = []byte(`{"sso_settings": {"enable_sso": false}}`)
|
|
updatedAppConfig, err = svc.ModifyAppConfig(ctx, b, fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
require.False(t, updatedAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.False(t, dsAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.False(t, updatedAppConfig.SSOSettings.EnableSSO)
|
|
require.False(t, dsAppConfig.SSOSettings.EnableSSO)
|
|
require.JSONEq(t, string(agentOptions), string(*updatedAppConfig.AgentOptions))
|
|
require.JSONEq(t, string(agentOptions), string(*dsAppConfig.AgentOptions))
|
|
|
|
// Not sending smtp_settings or sso_settings will not change them, and
|
|
// sending agent options will change them.
|
|
newAgentOptions := json.RawMessage(`{
|
|
"config": {
|
|
"options": {
|
|
"distributed_interval": 100
|
|
}
|
|
},
|
|
"overrides": {
|
|
"platforms": {
|
|
"darwin": {
|
|
"options": {
|
|
"distributed_interval": 2
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}`)
|
|
b = []byte(`{"agent_options": ` + string(newAgentOptions) + `}`)
|
|
updatedAppConfig, err = svc.ModifyAppConfig(ctx, b, fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
require.False(t, updatedAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.False(t, dsAppConfig.SMTPSettings.SMTPEnabled)
|
|
require.False(t, updatedAppConfig.SSOSettings.EnableSSO)
|
|
require.False(t, dsAppConfig.SSOSettings.EnableSSO)
|
|
require.JSONEq(t, string(newAgentOptions), string(*dsAppConfig.AgentOptions))
|
|
}
|
|
|
|
// TestModifyEnableAnalytics tests that a premium customer cannot set ServerSettings.EnableAnalytics to be false.
|
|
// Free customers should be able to set the value to false, however.
|
|
func TestModifyEnableAnalytics(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
expectedEnabled bool
|
|
newEnabled bool
|
|
initialEnabled bool
|
|
licenseTier string
|
|
allowDisableTelemetry bool
|
|
initialURL string
|
|
newURL string
|
|
expectedURL string
|
|
shouldFailModify bool
|
|
}{
|
|
{
|
|
name: "fleet free",
|
|
expectedEnabled: false,
|
|
initialEnabled: true,
|
|
newEnabled: false,
|
|
licenseTier: fleet.TierFree,
|
|
},
|
|
{
|
|
name: "fleet premium",
|
|
expectedEnabled: true,
|
|
initialEnabled: true,
|
|
newEnabled: false,
|
|
licenseTier: fleet.TierPremium,
|
|
},
|
|
{
|
|
name: "fleet premium with allow disable telemetry",
|
|
expectedEnabled: false,
|
|
initialEnabled: true,
|
|
newEnabled: false,
|
|
licenseTier: fleet.TierPremium,
|
|
allowDisableTelemetry: true,
|
|
},
|
|
}
|
|
|
|
for _, tt := range testCases {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
svc, ctx := newTestService(t, ds, nil, nil, &TestServerOpts{License: &fleet.LicenseInfo{Tier: tt.licenseTier, AllowDisableTelemetry: tt.allowDisableTelemetry}})
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{
|
|
OrgName: "Test",
|
|
},
|
|
ServerSettings: fleet.ServerSettings{
|
|
EnableAnalytics: true,
|
|
ServerURL: "https://localhost:8080",
|
|
},
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig, nil
|
|
}
|
|
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{}, nil
|
|
}
|
|
|
|
ac, err := svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.initialEnabled, ac.ServerSettings.EnableAnalytics)
|
|
|
|
raw, err := json.Marshal(fleet.ServerSettings{EnableAnalytics: tt.newEnabled, ServerURL: "https://localhost:8080"})
|
|
require.NoError(t, err)
|
|
raw = []byte(`{"server_settings":` + string(raw) + `}`)
|
|
modified, err := svc.ModifyAppConfig(ctx, raw, fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
if modified != nil {
|
|
require.Equal(t, tt.expectedEnabled, modified.ServerSettings.EnableAnalytics)
|
|
ac, err = svc.AppConfigObfuscated(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tt.expectedEnabled, ac.ServerSettings.EnableAnalytics)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidAddress(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
hostname string
|
|
expected bool
|
|
}{
|
|
// Empty and basic cases
|
|
{name: "empty string", hostname: "", expected: false},
|
|
|
|
// Make sure we don't allow URLs
|
|
{name: "http prefix", hostname: "http://example.com", expected: false},
|
|
{name: "https prefix", hostname: "https://example.com", expected: false},
|
|
{name: "with path", hostname: "example.com/path", expected: false},
|
|
{name: "with query", hostname: "example.com?query=value", expected: false},
|
|
{name: "with fragment", hostname: "example.com#fragment", expected: false},
|
|
|
|
// Test ports are allowd
|
|
{name: "with port", hostname: "example.com:9090", expected: true},
|
|
{name: "port without hostname", hostname: ":9090", expected: false},
|
|
{name: "port without hostname", hostname: " :9090", expected: false},
|
|
|
|
// Valid IPv4 addresses
|
|
{name: "IPv4 localhost", hostname: "127.0.0.1", expected: true},
|
|
{name: "IPv4 address", hostname: "192.168.1.1", expected: true},
|
|
{name: "IPv4 all zeros", hostname: "0.0.0.0", expected: false},
|
|
{name: "IPv4 loopback with port", hostname: "127.0.0.1:9090", expected: true},
|
|
|
|
// Valid IPv6 addresses
|
|
{name: "IPv6 localhost", hostname: "::1", expected: true},
|
|
{name: "IPv6 full", hostname: "2001:0db8:85a3:0000:0000:8a2e:0370:7334", expected: true},
|
|
{name: "IPv6 compressed", hostname: "2001:db8::1", expected: true},
|
|
{name: "IPv6 all zeros", hostname: "::", expected: false},
|
|
|
|
// IPv6 with brackets
|
|
{name: "IPv6 localhost with brackets", hostname: "[::1]", expected: true},
|
|
{name: "IPv6 with brackets", hostname: "[2001:db8::1]", expected: true},
|
|
{name: "brackets only", hostname: "[]", expected: false},
|
|
{name: "empty brackets", hostname: "[", expected: false},
|
|
{name: "IPv6 locahost brackets with port", hostname: "[::1]:8089", expected: true},
|
|
|
|
// Valid DNS hostnames
|
|
{name: "localhostname", hostname: "localhost", expected: true},
|
|
{name: "hostname with subdomain", hostname: "api.example.com", expected: true},
|
|
{name: "hostname with multiple subdomains", hostname: "a.b.c.example.com", expected: true},
|
|
{name: "hostname with numbers", hostname: "server1.example.com", expected: true},
|
|
{name: "hostname starting with number", hostname: "1server.example.com", expected: true},
|
|
{name: "all numeric label", hostname: "123.example.com", expected: true},
|
|
{name: "hostname with hyphen", hostname: "my-server.example.com", expected: true},
|
|
{name: "hostname with multiple hyphens", hostname: "my-cool-server.example.com", expected: true},
|
|
{name: "single character label", hostname: "a.b.c", expected: true},
|
|
{name: "single character hostname", hostname: "a", expected: true},
|
|
|
|
// Invalid DNS hostnames - hyphen rules
|
|
{name: "label starting with hyphen", hostname: "-example.com", expected: false},
|
|
{name: "label ending with hyphen", hostname: "example-.com", expected: false},
|
|
{name: "label starting and ending with hyphen", hostname: "-example-.com", expected: false},
|
|
{name: "only hyphen label", hostname: "-.com", expected: false},
|
|
|
|
// Invalid DNS hostnames - special characters
|
|
{name: "hostname with underscore", hostname: "my_server.example.com", expected: false},
|
|
{name: "hostname with space", hostname: "my server.example.com", expected: false},
|
|
{name: "hostname with at symbol", hostname: "user@example.com", expected: false},
|
|
{name: "hostname with exclamation", hostname: "example!.com", expected: false},
|
|
|
|
// Invalid DNS hostnames - empty labels
|
|
{name: "empty label (double dot)", hostname: "example..com", expected: false},
|
|
{name: "leading dot", hostname: ".example.com", expected: false},
|
|
{name: "trailing dot only", hostname: "example.com.", expected: false},
|
|
|
|
// Length limits
|
|
{name: "label exactly 63 chars", hostname: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com", expected: true},
|
|
{name: "label 64 chars (too long)", hostname: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com", expected: false},
|
|
|
|
// Real-world examples
|
|
{name: "fleet server URL", hostname: "fleet.example.com", expected: true},
|
|
{name: "AWS endpoint", hostname: "s3.us-west-2.amazonaws.com", expected: true},
|
|
{name: "internal hostname", hostname: "db-primary-01.internal", expected: true},
|
|
{name: "gibberish", hostname: "asdfasdfasdfashttps://lucas-fleet.ngrok.app", expected: false},
|
|
{name: "gibberish II", hostname: "asdfasdfasdfashttps://lucas-fleet.ngrok.app:9800", expected: false},
|
|
{name: "hostname with port", hostname: "example:8080", expected: true},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
result := validateAddress(tc.hostname)
|
|
assert.Equal(t, tc.expected, result, "isValidHostnameAndPort(%q) = %v, want %v", tc.hostname, result, tc.expected)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestModifyAppConfigGoogleCalendarAPIKey tests that Google Calendar API keys
|
|
// are preserved when omitted from the request, and replaced (not merged) when provided.
|
|
func TestModifyAppConfigGoogleCalendarAPIKey(t *testing.T) {
|
|
ds := new(mock.Store)
|
|
svc, ctx := newTestService(t, ds, nil, nil)
|
|
|
|
// Initial config with Google Calendar integration
|
|
dsAppConfig := &fleet.AppConfig{
|
|
OrgInfo: fleet.OrgInfo{
|
|
OrgName: "Test",
|
|
},
|
|
ServerSettings: fleet.ServerSettings{
|
|
ServerURL: "https://example.org",
|
|
},
|
|
Integrations: fleet.Integrations{
|
|
GoogleCalendar: []*fleet.GoogleCalendarIntegration{
|
|
{
|
|
Domain: "example.com",
|
|
ApiKey: fleet.GoogleCalendarApiKey{Values: map[string]string{
|
|
fleet.GoogleCalendarEmail: "test@example.com",
|
|
fleet.GoogleCalendarPrivateKey: "original-private-key",
|
|
"project_id": "original-project",
|
|
}},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
|
|
return dsAppConfig.Copy(), nil
|
|
}
|
|
ds.SaveAppConfigFunc = func(ctx context.Context, conf *fleet.AppConfig) error {
|
|
*dsAppConfig = *conf
|
|
return nil
|
|
}
|
|
ds.SaveABMTokenFunc = func(ctx context.Context, tok *fleet.ABMToken) error {
|
|
return nil
|
|
}
|
|
ds.ListVPPTokensFunc = func(ctx context.Context) ([]*fleet.VPPTokenDB, error) {
|
|
return []*fleet.VPPTokenDB{}, nil
|
|
}
|
|
ds.ListABMTokensFunc = func(ctx context.Context) ([]*fleet.ABMToken, error) {
|
|
return []*fleet.ABMToken{}, nil
|
|
}
|
|
|
|
admin := &fleet.User{GlobalRole: ptr.String(fleet.RoleAdmin)}
|
|
ctx = viewer.NewContext(ctx, viewer.Viewer{User: admin})
|
|
|
|
t.Run("preserve API key when omitted (no changes)", func(t *testing.T) {
|
|
// Reset to original state
|
|
dsAppConfig.Integrations.GoogleCalendar[0].Domain = "example.com"
|
|
dsAppConfig.Integrations.GoogleCalendar[0].ApiKey = fleet.GoogleCalendarApiKey{Values: map[string]string{
|
|
fleet.GoogleCalendarEmail: "test@example.com",
|
|
fleet.GoogleCalendarPrivateKey: "original-private-key",
|
|
"project_id": "original-project",
|
|
}}
|
|
|
|
// Update without including api_key_json (simulates frontend sending masked value)
|
|
updateJSON := `{
|
|
"integrations": {
|
|
"google_calendar": [{
|
|
"domain": "example.com"
|
|
}]
|
|
}
|
|
}`
|
|
|
|
updatedAppConfig, err := svc.ModifyAppConfig(ctx, []byte(updateJSON), fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// API key should be preserved (check datastore, not returned config which is obfuscated)
|
|
require.Len(t, dsAppConfig.Integrations.GoogleCalendar, 1)
|
|
require.Equal(t, "example.com", dsAppConfig.Integrations.GoogleCalendar[0].Domain)
|
|
require.Equal(t, "test@example.com", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarEmail])
|
|
require.Equal(t, "original-private-key", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarPrivateKey])
|
|
require.Equal(t, "original-project", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values["project_id"])
|
|
|
|
// Returned config should be obfuscated (masked)
|
|
require.True(t, updatedAppConfig.Integrations.GoogleCalendar[0].ApiKey.IsMasked())
|
|
})
|
|
|
|
t.Run("preserve API key when updating only domain", func(t *testing.T) {
|
|
// Reset to original state
|
|
dsAppConfig.Integrations.GoogleCalendar[0].Domain = "example.com"
|
|
dsAppConfig.Integrations.GoogleCalendar[0].ApiKey = fleet.GoogleCalendarApiKey{Values: map[string]string{
|
|
fleet.GoogleCalendarEmail: "test@example.com",
|
|
fleet.GoogleCalendarPrivateKey: "original-private-key",
|
|
"project_id": "original-project",
|
|
}}
|
|
|
|
// Update only domain, omit api_key_json
|
|
updateJSON := `{
|
|
"integrations": {
|
|
"google_calendar": [{
|
|
"domain": "newdomain.com"
|
|
}]
|
|
}
|
|
}`
|
|
|
|
updatedAppConfig, err := svc.ModifyAppConfig(ctx, []byte(updateJSON), fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// Domain should be updated, API key preserved (check datastore)
|
|
require.Len(t, dsAppConfig.Integrations.GoogleCalendar, 1)
|
|
require.Equal(t, "newdomain.com", dsAppConfig.Integrations.GoogleCalendar[0].Domain)
|
|
require.Equal(t, "test@example.com", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarEmail])
|
|
require.Equal(t, "original-private-key", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarPrivateKey])
|
|
require.Equal(t, "original-project", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values["project_id"])
|
|
|
|
// Returned config should be obfuscated (masked)
|
|
require.True(t, updatedAppConfig.Integrations.GoogleCalendar[0].ApiKey.IsMasked())
|
|
})
|
|
|
|
t.Run("replace API key when new one provided (not merge)", func(t *testing.T) {
|
|
// Reset to original state
|
|
dsAppConfig.Integrations.GoogleCalendar[0].Domain = "example.com"
|
|
dsAppConfig.Integrations.GoogleCalendar[0].ApiKey = fleet.GoogleCalendarApiKey{Values: map[string]string{
|
|
fleet.GoogleCalendarEmail: "test@example.com",
|
|
fleet.GoogleCalendarPrivateKey: "original-private-key",
|
|
"project_id": "original-project",
|
|
}}
|
|
|
|
// Provide new API key with different fields
|
|
updateJSON := `{
|
|
"integrations": {
|
|
"google_calendar": [{
|
|
"domain": "example.com",
|
|
"api_key_json": {
|
|
"client_email": "new@example.com",
|
|
"private_key": "new-private-key",
|
|
"new_field": "new-value"
|
|
}
|
|
}]
|
|
}
|
|
}`
|
|
|
|
updatedAppConfig, err := svc.ModifyAppConfig(ctx, []byte(updateJSON), fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// API key should be completely replaced (not merged) - check datastore
|
|
require.Len(t, dsAppConfig.Integrations.GoogleCalendar, 1)
|
|
require.Equal(t, "example.com", dsAppConfig.Integrations.GoogleCalendar[0].Domain)
|
|
require.Equal(t, "new@example.com", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarEmail])
|
|
require.Equal(t, "new-private-key", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarPrivateKey])
|
|
require.Equal(t, "new-value", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values["new_field"])
|
|
// Old fields should NOT be present (confirms replacement, not merge)
|
|
_, hasOldProject := dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values["project_id"]
|
|
require.False(t, hasOldProject, "old project_id should not be present after replacement")
|
|
|
|
// Returned config should be obfuscated (masked)
|
|
require.True(t, updatedAppConfig.Integrations.GoogleCalendar[0].ApiKey.IsMasked())
|
|
})
|
|
|
|
t.Run("validation passes with preserved API key", func(t *testing.T) {
|
|
// Reset to valid state
|
|
dsAppConfig.Integrations.GoogleCalendar[0].Domain = "example.com"
|
|
dsAppConfig.Integrations.GoogleCalendar[0].ApiKey = fleet.GoogleCalendarApiKey{Values: map[string]string{
|
|
fleet.GoogleCalendarEmail: "valid@example.com",
|
|
fleet.GoogleCalendarPrivateKey: "-----BEGIN PRIVATE KEY-----\nvalid-key\n-----END PRIVATE KEY-----",
|
|
}}
|
|
|
|
// Update without api_key_json (should preserve valid key and pass validation)
|
|
updateJSON := `{
|
|
"integrations": {
|
|
"google_calendar": [{
|
|
"domain": "example.com"
|
|
}]
|
|
}
|
|
}`
|
|
|
|
updatedAppConfig, err := svc.ModifyAppConfig(ctx, []byte(updateJSON), fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// Should succeed with preserved API key (check datastore)
|
|
require.Len(t, dsAppConfig.Integrations.GoogleCalendar, 1)
|
|
require.Equal(t, "valid@example.com", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarEmail])
|
|
require.Equal(t, "-----BEGIN PRIVATE KEY-----\nvalid-key\n-----END PRIVATE KEY-----", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarPrivateKey])
|
|
|
|
// Returned config should be obfuscated (masked)
|
|
require.True(t, updatedAppConfig.Integrations.GoogleCalendar[0].ApiKey.IsMasked())
|
|
})
|
|
|
|
t.Run("preserve API key when masked value sent", func(t *testing.T) {
|
|
// Reset to original state
|
|
dsAppConfig.Integrations.GoogleCalendar[0].Domain = "example.com"
|
|
dsAppConfig.Integrations.GoogleCalendar[0].ApiKey = fleet.GoogleCalendarApiKey{Values: map[string]string{
|
|
fleet.GoogleCalendarEmail: "test@example.com",
|
|
fleet.GoogleCalendarPrivateKey: "original-private-key",
|
|
"project_id": "original-project",
|
|
}}
|
|
|
|
// Send masked api_key_json (simulates frontend sending back obfuscated value)
|
|
updateJSON := `{
|
|
"integrations": {
|
|
"google_calendar": [{
|
|
"domain": "example.com",
|
|
"api_key_json": "********"
|
|
}]
|
|
}
|
|
}`
|
|
|
|
updatedAppConfig, err := svc.ModifyAppConfig(ctx, []byte(updateJSON), fleet.ApplySpecOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// API key should be preserved, not overwritten with masked values (check datastore)
|
|
require.Len(t, dsAppConfig.Integrations.GoogleCalendar, 1)
|
|
require.Equal(t, "example.com", dsAppConfig.Integrations.GoogleCalendar[0].Domain)
|
|
require.Equal(t, "test@example.com", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarEmail])
|
|
require.Equal(t, "original-private-key", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values[fleet.GoogleCalendarPrivateKey])
|
|
require.Equal(t, "original-project", dsAppConfig.Integrations.GoogleCalendar[0].ApiKey.Values["project_id"])
|
|
|
|
// Returned config should be obfuscated (masked)
|
|
require.True(t, updatedAppConfig.Integrations.GoogleCalendar[0].ApiKey.IsMasked())
|
|
})
|
|
}
|