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

drop types.PluginsV1 from audit log payload #46830

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

tigrato
Copy link
Contributor

@tigrato tigrato commented Sep 20, 2024

Okta plugin sets plugin.spec.settings which is a oneof message and our audit log incorrectly uses json.Marshal/Unmarshal to marshal and Unmarshal objects from json.

When unmarshaling the oneof, json parser fails because it can't decode the correct message.

This PR changes the type to use a google.protobuf.Struct so it can hold any static data.

Changelog: Fixes a regression that made it impossible to read the Teleport Audit Log after creating a plugin if the audit event is present.

Okta plugin sets `plugin.spec.settings` which is a one of message and our audit log incorrectly uses `json.Marshal/Unmarshal` to marshal and Unmarshal objects from json.

When unmarshaling the oneof, json parser fails because it can't decode the correct message.

This PR changes the type to use a `google.protobuf.Struct` so it can hold any static data.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
@tigrato tigrato added this pull request to the merge queue Sep 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 20, 2024
@tigrato tigrato added this pull request to the merge queue Sep 20, 2024
Merged via the queue into master with commit f9c9991 Sep 20, 2024
45 of 48 checks passed
@tigrato tigrato deleted the tigrato/drop-plugin-type-from-message branch September 20, 2024 21:19
@public-teleport-github-review-bot

@tigrato See the table below for backport results.

Branch Result
branch/v16 Failed

tigrato added a commit that referenced this pull request Sep 20, 2024
Okta plugin sets `plugin.spec.settings` which is a one of message and our audit log incorrectly uses `json.Marshal/Unmarshal` to marshal and Unmarshal objects from json.

When unmarshaling the oneof, json parser fails because it can't decode the correct message.

This PR changes the type to use a `google.protobuf.Struct` so it can hold any static data.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
tigrato added a commit that referenced this pull request Sep 21, 2024
Okta plugin sets `plugin.spec.settings` which is a one of message and our audit log incorrectly uses `json.Marshal/Unmarshal` to marshal and Unmarshal objects from json.

When unmarshaling the oneof, json parser fails because it can't decode the correct message.

This PR changes the type to use a `google.protobuf.Struct` so it can hold any static data.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
tigrato added a commit that referenced this pull request Sep 21, 2024
Okta plugin sets `plugin.spec.settings` which is a one of message and our audit log incorrectly uses `json.Marshal/Unmarshal` to marshal and Unmarshal objects from json.

When unmarshaling the oneof, json parser fails because it can't decode the correct message.

This PR changes the type to use a `google.protobuf.Struct` so it can hold any static data.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
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