Skip to content

[v11] Allow unknown fields when unmarshaling types.MFADevice#25446

Merged
rosstimothy merged 1 commit intobranch/v11from
bot/backport-25437-branch/v11
May 2, 2023
Merged

[v11] Allow unknown fields when unmarshaling types.MFADevice#25446
rosstimothy merged 1 commit intobranch/v11from
bot/backport-25437-branch/v11

Conversation

@rosstimothy
Copy link
Copy Markdown
Contributor

Backport #25437 to branch/v11

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 rosstimothy requested a review from codingllama May 2, 2023 15:24
@rosstimothy rosstimothy added this pull request to the merge queue May 2, 2023
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from zmb3 May 2, 2023 17:23
Merged via the queue into branch/v11 with commit cb67ccd May 2, 2023
@rosstimothy rosstimothy deleted the bot/backport-25437-branch/v11 branch May 2, 2023 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants