fix: Move module-based device trust check to the teleport binary #44105
Conversation
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
codingllama
commented
Jul 11, 2024
| @@ -427,6 +426,8 @@ func ReadResources(filePath string) ([]types.Resource, error) { | |||
|
|
|||
| // ApplyFileConfig applies configuration from a YAML file to Teleport | |||
| // runtime config | |||
| // | |||
| // ApplyFileConfig is used by both teleport and tctl binaries. | |||
| func ApplyFileConfig(fc *FileConfig, cfg *servicecfg.Config) error { | |||
There was a problem hiding this comment.
One could argue that tctl using ApplyFileConfig is the real problem, as the function is written mainly with teleport in mind (or at least that was my reading of it).
This is a harder problem to solve (if it's even a problem), so I've opted to move the modules-based check instead.
|
FYI @benarent. |
rosstimothy
approved these changes
Jul 11, 2024
justinas
approved these changes
Jul 12, 2024
public-teleport-github-review-bot
bot
removed the request for review
from nklaassen
|
@codingllama See the table below for backport results.
|
This was referenced Jul 12, 2024
codingllama
added a commit
that referenced
this pull request
Jul 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move a module-based device mode check from ApplyFileConfig (which is used by both
teleportandtctl) exclusively to theteleportbinary.Fixes an issue where an "OSS"
tctlfails to load a file-based config because it can't clear the modules check.#44089
Changelog: Fixes "device trust mode x requires Teleport Enterprise" errors on
tctl.