-
Notifications
You must be signed in to change notification settings - Fork 483
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feat-fleet-app-library' into fleet-managed-apps-list-apps
- Loading branch information
Showing
65 changed files
with
1,294 additions
and
233 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| * Reset install counts and cancel pending installs/uninstalls when GitOps installer updates change package contents |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| - Adds the `POST /software/fleet_maintained` endpoint for adding Fleet-maintained apps. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| - Fixed UI design bug where software package file name was not displayed as expected. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| * Support the software status filter for 'No teams' on the hosts page |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| * Allow custom SCEP CA certificates with any kind of extendedKeyUsage attributes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "crypto/sha256" | ||
| "encoding/hex" | ||
|
|
||
| "github.com/fleetdm/fleet/v4/server/contexts/ctxerr" | ||
| "github.com/fleetdm/fleet/v4/server/contexts/viewer" | ||
| "github.com/fleetdm/fleet/v4/server/fleet" | ||
| "github.com/fleetdm/fleet/v4/server/mdm/maintainedapps" | ||
| ) | ||
|
|
||
| func (svc *Service) AddFleetMaintainedApp(ctx context.Context, teamID *uint, appID uint, installScript, preInstallQuery, postInstallScript string, selfService bool) error { | ||
| if err := svc.authz.Authorize(ctx, &fleet.SoftwareInstaller{TeamID: teamID}, fleet.ActionWrite); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| vc, ok := viewer.FromContext(ctx) | ||
| if !ok { | ||
| return fleet.ErrNoContext | ||
| } | ||
|
|
||
| app, err := svc.ds.GetMaintainedAppByID(ctx, appID) | ||
| if err != nil { | ||
| return ctxerr.Wrap(ctx, err, "getting maintained app by id") | ||
| } | ||
|
|
||
| // Download installer from the URL | ||
| installerBytes, filename, err := maintainedapps.DownloadInstaller(ctx, app.InstallerURL) | ||
| if err != nil { | ||
| return ctxerr.Wrap(ctx, err, "downloading app installer") | ||
| } | ||
|
|
||
| // Validate the bytes we got are what we expected | ||
| h := sha256.New() | ||
| _, err = h.Write(installerBytes) | ||
| if err != nil { | ||
| return ctxerr.Wrap(ctx, err, "generating SHA256 of maintained app installer") | ||
| } | ||
| gotHash := hex.EncodeToString(h.Sum(nil)) | ||
|
|
||
| if gotHash != app.SHA256 { | ||
| return ctxerr.New(ctx, "mismatch in maintained app SHA256 hash") | ||
| } | ||
|
|
||
| // Fall back to the filename if we weren't able to extract a filename from the installer response | ||
| if filename == "" { | ||
| filename = app.Name | ||
| } | ||
|
|
||
| installerReader := bytes.NewReader(installerBytes) | ||
| payload := &fleet.UploadSoftwareInstallerPayload{ | ||
| InstallerFile: installerReader, | ||
| Title: app.Name, | ||
| UserID: vc.UserID(), | ||
| TeamID: teamID, | ||
| Version: app.Version, | ||
| Filename: filename, | ||
| Platform: string(app.Platform), | ||
| BundleIdentifier: app.BundleIdentifier, | ||
| StorageID: app.SHA256, | ||
| FleetLibraryAppID: &app.ID, | ||
| PreInstallQuery: preInstallQuery, | ||
| PostInstallScript: postInstallScript, | ||
| SelfService: selfService, | ||
| InstallScript: installScript, | ||
| } | ||
|
|
||
| // Create record in software installers table | ||
| _, err = svc.ds.MatchOrCreateSoftwareInstaller(ctx, payload) | ||
| if err != nil { | ||
| return ctxerr.Wrap(ctx, err, "setting downloaded installer") | ||
| } | ||
|
|
||
| // Save in S3 | ||
| if err := svc.storeSoftware(ctx, payload); err != nil { | ||
| return ctxerr.Wrap(ctx, err, "upload maintained app installer to S3") | ||
| } | ||
|
|
||
| // Create activity | ||
| var teamName *string | ||
| if payload.TeamID != nil && *payload.TeamID != 0 { | ||
| t, err := svc.ds.Team(ctx, *payload.TeamID) | ||
| if err != nil { | ||
| return ctxerr.Wrap(ctx, err, "getting team") | ||
| } | ||
| teamName = &t.Name | ||
| } | ||
|
|
||
| if err := svc.NewActivity(ctx, vc.User, fleet.ActivityTypeAddedSoftware{ | ||
| SoftwareTitle: payload.Title, | ||
| SoftwarePackage: payload.Filename, | ||
| TeamName: teamName, | ||
| TeamID: payload.TeamID, | ||
| SelfService: payload.SelfService, | ||
| }); err != nil { | ||
| return ctxerr.Wrap(ctx, err, "creating activity for added software") | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.