Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

better URL handling

Browse source
This commit is contained in:
Roberto Dip 2022-09-07 12:44:01 -03:00
parent c5c4d7d3d3
commit 77a59acd9e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
orbit/cmd/orbit/orbit.go
View file

@ -615,12 +615,17 @@ func (d *desktopRunner) execute() error {
if err != nil {
return fmt.Errorf("invalid fleet-url: %w", err)
}
deviceURL, err := url.Parse(d.fleetURL)
if err != nil {
return fmt.Errorf("invalid fleet-url: %w", err)
}
deviceURL.Path = path.Join(url.Path, "device", d.trw.GetCached())
opts := []execuser.Option{
execuser.WithEnv("FLEET_DESKTOP_FLEET_URL", url.String()),
execuser.WithEnv("FLEET_DESKTOP_DEVICE_IDENTIFIER_PATH", d.identifierPath),
// TODO(roperzh): this env var is keept only for backwards compatibility,
// we should remove it once we think is safe
execuser.WithEnv("FLEET_DESKTOP_DEVICE_URL", path.Join(url.String(), "device", d.trw.GetCached())),
execuser.WithEnv("FLEET_DESKTOP_DEVICE_URL", deviceURL.String()),
}
if d.fleetRootCA != "" {
opts = append(opts, execuser.WithEnv("FLEET_DESKTOP_FLEET_ROOT_CA", d.fleetRootCA))