mirror of
https://github.com/fleetdm/fleet
synced 2026-05-11 03:00:58 +00:00
* Fix access control issues with users * Fix access control issues with packs * Fix access control issues with software * Changes suggested by Martin * All users can access the global schedule * Restrict access to activities * Add explicit test for team admin escalation vuln * All global users should be able to read all software * Handbook editor pass - Security - GitHub Security (#5108) * Update security.md All edits are recorded by line: 395 replaced “open-source” with “open source” 411 replaced “open-source” with “open source” 439 added “the” before “comment”; replaced “repositories,” with “repositories” 445 deleted “being” before “located” 458 added “and” after “PR” 489 replaced “on” with “in” 493 replaced “open-source” with “open source”; Replaced “privileges,” with “privileges” * Update security.md line 479 * Update security.md added (static analysis tools used to identify problems in code) to line 479 * Fix UI * Fix UI * revert api v1 to latest in documentation (#5149) * revert api v1 to latest in documentation * Update fleetctl doc page Co-authored-by: Noah Talerman <noahtal@umich.edu> * Add team admin team policy automation; fix e2e * Update to company page of the handbook (#5164) Updated "Why do we use a wireframe-first approach?" section of company.md * removed extra data on smaller screens (#5154) * Update for team automations; e2e * Jira Integration: Cypress e2e tests only (#5055) * Update company.md (#5170) This is to update the formatting under "empathy" and to fix the spelling of "help text." This was done as per @mikermcneil . This is related to #https://github.com/fleetdm/fleet/pull/4941 and https://github.com/fleetdm/fleet/issues/4902 * fix update updated_at for aggregated_stats (#5112) Update the updated_at column when using ON DUPLICATE UPDATE so that the counts_updated_at is up to date * basic sql formatting in code ie whitespace around operators * Fix e2e test * Fix tests in server/authz Co-authored-by: gillespi314 <73313222+gillespi314@users.noreply.github.com> Co-authored-by: Desmi-Dizney <99777687+Desmi-Dizney@users.noreply.github.com> Co-authored-by: Michal Nicpon <39177923+michalnicp@users.noreply.github.com> Co-authored-by: Noah Talerman <noahtal@umich.edu> Co-authored-by: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com> Co-authored-by: Martavis Parker <47053705+martavis@users.noreply.github.com> Co-authored-by: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
94 lines
2.6 KiB
Go
94 lines
2.6 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/fleetdm/fleet/v4/server/fleet"
|
|
)
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
// List
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
type listSoftwareRequest struct {
|
|
fleet.SoftwareListOptions
|
|
}
|
|
|
|
type listSoftwareResponse struct {
|
|
CountsUpdatedAt *time.Time `json:"counts_updated_at"`
|
|
Software []fleet.Software `json:"software,omitempty"`
|
|
Err error `json:"error,omitempty"`
|
|
}
|
|
|
|
func (r listSoftwareResponse) error() error { return r.Err }
|
|
|
|
func listSoftwareEndpoint(ctx context.Context, request interface{}, svc fleet.Service) (interface{}, error) {
|
|
req := request.(*listSoftwareRequest)
|
|
resp, err := svc.ListSoftware(ctx, req.SoftwareListOptions)
|
|
if err != nil {
|
|
return listSoftwareResponse{Err: err}, nil
|
|
}
|
|
|
|
var latest time.Time
|
|
for _, sw := range resp {
|
|
if !sw.CountsUpdatedAt.IsZero() && sw.CountsUpdatedAt.After(latest) {
|
|
latest = sw.CountsUpdatedAt
|
|
}
|
|
}
|
|
listResp := listSoftwareResponse{Software: resp}
|
|
if !latest.IsZero() {
|
|
listResp.CountsUpdatedAt = &latest
|
|
}
|
|
return listResp, nil
|
|
}
|
|
|
|
func (svc Service) ListSoftware(ctx context.Context, opt fleet.SoftwareListOptions) ([]fleet.Software, error) {
|
|
if err := svc.authz.Authorize(ctx, &fleet.AuthzSoftwareInventory{
|
|
TeamID: opt.TeamID,
|
|
}, fleet.ActionRead); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// default sort order to hosts_count descending
|
|
if opt.OrderKey == "" {
|
|
opt.OrderKey = "hosts_count"
|
|
opt.OrderDirection = fleet.OrderDescending
|
|
}
|
|
opt.WithHostCounts = true
|
|
return svc.ds.ListSoftware(ctx, opt)
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
// Count
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
type countSoftwareRequest struct {
|
|
fleet.SoftwareListOptions
|
|
}
|
|
|
|
type countSoftwareResponse struct {
|
|
Count int `json:"count"`
|
|
Err error `json:"error,omitempty"`
|
|
}
|
|
|
|
func (r countSoftwareResponse) error() error { return r.Err }
|
|
|
|
func countSoftwareEndpoint(ctx context.Context, request interface{}, svc fleet.Service) (interface{}, error) {
|
|
req := request.(*countSoftwareRequest)
|
|
count, err := svc.CountSoftware(ctx, req.SoftwareListOptions)
|
|
if err != nil {
|
|
return countSoftwareResponse{Err: err}, nil
|
|
}
|
|
return countSoftwareResponse{Count: count}, nil
|
|
}
|
|
|
|
func (svc Service) CountSoftware(ctx context.Context, opt fleet.SoftwareListOptions) (int, error) {
|
|
if err := svc.authz.Authorize(ctx, &fleet.AuthzSoftwareInventory{
|
|
TeamID: opt.TeamID,
|
|
}, fleet.ActionRead); err != nil {
|
|
return 0, err
|
|
}
|
|
|
|
return svc.ds.CountSoftware(ctx, opt)
|
|
}
|