Full-stack: Make "Server url" validation conditions consistent across Fleet, update Web Address form validation and submission logic per Fleet best practices (frontend/docs/patterns.md) (#27455)
## For #27454 Consider Fleet web URL to be valid if it: - (Front end and back end): uses “https://” or “http://” scheme and - (Front end) accepts only valid or "localhost" hosts (e.g., "a.b.cc" or "localhost", but not "a.b") - (Back end) accepts any host (e.g., "localhost", "a.b.cc", or even "a.b") ### Setup flow UI URL validation:  ### Org settings UI URL validation:  ### Server URL validation: <img width="1464" alt="invalid-url-server" src="https://github.com/user-attachments/assets/83a112e1-6318-4b09-864d-fe66a223835d" /> ### Invalid Fleet server URL in DB error:  - [x] Changes file added for user-visible changes in `changes/`, - [x] Added/updated automated tests - [ ] A detailed QA plan exists on the associated ticket (if it isn't there, work with the product group's QA engineer to add it) - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
This commit is contained in:
co-authored by
Jacob Shandling
parent
4290dbbd43
commit
748b5bcd51
@@ -627,6 +627,9 @@ const (
|
||||
|
||||
// Labels
|
||||
InvalidLabelSpecifiedErrMsg = "Invalid label name(s):"
|
||||
|
||||
// Config
|
||||
InvalidServerURLMsg = `Fleet server URL must use “https” or “http”.`
|
||||
)
|
||||
|
||||
// ConflictError is used to indicate a conflict, such as a UUID conflict in the DB.
|
||||
|
||||
@@ -417,6 +417,10 @@ func (svc *Service) ModifyAppConfig(ctx context.Context, p []byte, applyOpts fle
|
||||
}
|
||||
if appConfig.ServerSettings.ServerURL == "" {
|
||||
invalid.Append("server_url", "Fleet server URL must be present")
|
||||
} else {
|
||||
if err := ValidateServerURL(appConfig.ServerSettings.ServerURL); err != nil {
|
||||
invalid.Append("server_url", "Couldn't update settings: "+err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
if appConfig.ActivityExpirySettings.ActivityExpiryEnabled && appConfig.ActivityExpirySettings.ActivityExpiryWindow < 1 {
|
||||
@@ -924,8 +928,8 @@ func (svc *Service) ModifyAppConfig(ctx context.Context, p []byte, applyOpts fle
|
||||
}
|
||||
|
||||
func (svc *Service) processAppConfigCAs(ctx context.Context, newAppConfig *fleet.AppConfig, oldAppConfig *fleet.AppConfig,
|
||||
appConfig *fleet.AppConfig, invalid *fleet.InvalidArgumentError) (appConfigCAStatus, error) {
|
||||
|
||||
appConfig *fleet.AppConfig, invalid *fleet.InvalidArgumentError,
|
||||
) (appConfigCAStatus, error) {
|
||||
var invalidLicense bool
|
||||
fleetLicense, _ := license.FromContext(ctx)
|
||||
if newAppConfig.Integrations.NDESSCEPProxy.Set && newAppConfig.Integrations.NDESSCEPProxy.Valid && !fleetLicense.IsPremium() {
|
||||
@@ -1249,7 +1253,8 @@ func (svc *Service) populateCustomSCEPChallenges(ctx context.Context, remainingO
|
||||
// filterDeletedDigiCertCAs identifies deleted DigiCert integrations in the provided configs.
|
||||
// It mutates the provided result to set a deleted status where applicable and returns a list of the remaining (non-deleted) integrations.
|
||||
func filterDeletedDigiCertCAs(oldAppConfig *fleet.AppConfig, newAppConfig *fleet.AppConfig,
|
||||
result *appConfigCAStatus) []fleet.DigiCertIntegration {
|
||||
result *appConfigCAStatus,
|
||||
) []fleet.DigiCertIntegration {
|
||||
remainingOldCAs := make([]fleet.DigiCertIntegration, 0, len(oldAppConfig.Integrations.DigiCert.Value))
|
||||
for _, oldCA := range oldAppConfig.Integrations.DigiCert.Value {
|
||||
var found bool
|
||||
@@ -1271,7 +1276,8 @@ func filterDeletedDigiCertCAs(oldAppConfig *fleet.AppConfig, newAppConfig *fleet
|
||||
// filterDeletedCustomSCEPCAs identifies deleted custom SCEP integrations in the provided configs.
|
||||
// It mutates the provided result to set a deleted status where applicable and returns a list of the remaining (non-deleted) integrations.
|
||||
func filterDeletedCustomSCEPCAs(oldAppConfig *fleet.AppConfig, newAppConfig *fleet.AppConfig,
|
||||
result *appConfigCAStatus) []fleet.CustomSCEPProxyIntegration {
|
||||
result *appConfigCAStatus,
|
||||
) []fleet.CustomSCEPProxyIntegration {
|
||||
remainingOldCAs := make([]fleet.CustomSCEPProxyIntegration, 0, len(oldAppConfig.Integrations.CustomSCEPProxy.Value))
|
||||
for _, oldCA := range oldAppConfig.Integrations.CustomSCEPProxy.Value {
|
||||
var found bool
|
||||
|
||||
@@ -18,7 +18,7 @@ func (mw validationMiddleware) NewAppConfig(ctx context.Context, payload fleet.A
|
||||
} else {
|
||||
serverURLString = cleanupURL(payload.ServerSettings.ServerURL)
|
||||
}
|
||||
if err := validateServerURL(serverURLString); err != nil {
|
||||
if err := ValidateServerURL(serverURLString); err != nil {
|
||||
invalid.Append("server_url", err.Error())
|
||||
}
|
||||
if invalid.HasErrors() {
|
||||
@@ -27,14 +27,21 @@ func (mw validationMiddleware) NewAppConfig(ctx context.Context, payload fleet.A
|
||||
return mw.Service.NewAppConfig(ctx, payload)
|
||||
}
|
||||
|
||||
func validateServerURL(urlString string) error {
|
||||
serverURL, err := url.Parse(urlString)
|
||||
func ValidateServerURL(urlString string) error {
|
||||
// TODO - implement more robust URL validation here
|
||||
|
||||
// no valid scheme provided
|
||||
if !(strings.HasPrefix(urlString, "http://") || strings.HasPrefix(urlString, "https://")) {
|
||||
return errors.New(fleet.InvalidServerURLMsg)
|
||||
}
|
||||
|
||||
// valid scheme provided - require host
|
||||
parsed, err := url.Parse(urlString)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if serverURL.Scheme != "https" && !strings.Contains(serverURL.Host, "localhost") {
|
||||
return errors.New("url scheme must be https")
|
||||
if parsed.Host == "" {
|
||||
return errors.New(fleet.InvalidServerURLMsg)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user