Allow unknown fields when unmarshaling types.MFADevice#25437
Merged
rosstimothy merged 1 commit intomasterfrom May 1, 2023
Merged
Allow unknown fields when unmarshaling types.MFADevice#25437rosstimothy merged 1 commit intomasterfrom
rosstimothy merged 1 commit intomasterfrom
Conversation
There was a backward incompatible change introduce in #25238 that was preventing mfa devices from being unmarshalled due to an unknown field: ``` tctl users reset norbert ERROR: rpc error: code = Unknown desc = unknown field "credentialRpId" in types.WebauthnDevice ``` The custom `json.Unmarshaler` implemented by `types.MFADevice` did not initialize the protojson decoder to allow unknown fields. This prevented any reads of `types.MFADevice` from a backend that was upgraded and then downgraded.
rosstimothy
commented
May 1, 2023
Comment on lines
-142
to
-145
| _, err = s.GetUser(req.Name, false) | ||
| if err != nil { | ||
| return nil, trace.Wrap(err) | ||
| } |
Contributor
Author
There was a problem hiding this comment.
s.ResetPassword calls GetUser before proceeding. Removed to reduce redundant/unnecessary backend operations.
r0mant
approved these changes
May 1, 2023
zmb3
approved these changes
May 1, 2023
public-teleport-github-review-bot
Bot
removed request for
flyinghermit and
nklaassen
|
@rosstimothy See the table below for backport results.
|
This was referenced May 1, 2023
Contributor
|
Thanks for the fix! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
There was a backward incompatible change introduced in #25238 that was preventing mfa devices from being unmarshalled due to an unknown field:
The custom
json.Unmarshalerimplemented bytypes.MFADevicedid not initialize the protojson decoder to allow unknown fields. This prevented any reads oftypes.MFADevicefrom a backend that was upgraded and then downgraded.