Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Flare] Update a couple things in how flares are shipped #1420

Merged
merged 5 commits into from
Oct 30, 2023

Conversation

directionless
Copy link
Contributor

@directionless directionless commented Oct 23, 2023

Now that the SaaS side supports flare shipping, I've found a couple of issues, and tweaks:

  • The most important is that we need to set a Content-Type header. Otherwise rails won't parse the data and we don't get the extra stuff.
  • Rails will return the file name the flare is saved as. I've added that into the json struct.
  • Update the output to and unify the call paths
  • Set flare to upload by default

I considered, but did not, adjust flare to also print doctor output. I'm on the fence about output in general. So it's still TBD

James-Pickett
James-Pickett previously approved these changes Oct 23, 2023
@directionless directionless changed the title Flare shipping adjustments [Flare] Update a couple things in how flares are shipped Oct 30, 2023
@directionless directionless marked this pull request as ready for review October 30, 2023 17:15
flagset = flag.NewFlagSet("flare", flag.ExitOnError)
flSave = flagset.String("save", "upload", "local | upload")
flOutputDir = flagset.String("output_dir", ".", "path to directory to save flare output")
flUploadRequestURL = flagset.String("upload_request_url", "", "URL to request a signed upload URL")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we populate this with the default URL or do we want to send down from control server? But sending from control server would mean that a non-enrolled launcher would still need this as a cmd line flag.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! I hadn't even realized it didn't default to something. Yeah, let me update that. Thank you

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How's that?

RebeccaMahany
RebeccaMahany previously approved these changes Oct 30, 2023
zackattack01
zackattack01 previously approved these changes Oct 30, 2023
@directionless directionless added this pull request to the merge queue Oct 30, 2023
Merged via the queue into kolide:main with commit 3380fa0 Oct 30, 2023
26 checks passed
@directionless directionless deleted the seph/flare-tweaks branch October 30, 2023 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants