empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of enroll secret env vars in Orbit (#3458)

Browse Source
This commit is contained in:
Zach Wasserman 2021-12-22 15:57:09 -08:00 committed by GitHub
parent d3b2bd362d
commit d377923750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
orbit/changes/fix-enroll-secret Normal file
View File

@ -0,0 +1 @@
* Fix handling of enroll secrets to address 0.0.3 enrollment issue.

2
orbit/cmd/orbit/orbit.go
View File

@ -219,7 +219,7 @@ func main() {
if enrollSecret != "" {
const enrollSecretEnvName = "ENROLL_SECRET"
options = append(options,
osquery.WithEnv([]string{enrollSecretEnvName, enrollSecret}),
osquery.WithEnv([]string{enrollSecretEnvName + "=" + enrollSecret}),
osquery.WithFlags([]string{"--enroll_secret_env", enrollSecretEnvName}),
)
}

2
orbit/pkg/update/hash.go
View File

@ -38,7 +38,7 @@ func CheckFileHash(meta *data.TargetFileMeta, localPath string) error {
}
// selectHashFunction returns the first matching hash function and expected
// hash, otherwise returning an error if not matching hash can be found.
// hash, otherwise returning an error if no matching hash can be found.
//
// SHA512 is preferred, and SHA256 is returned if 512 is not available.