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

x-pack/filebeat/input/entityanalytics/provider/internal/okta: relax profile shape #40359

Merged
merged 4 commits into from
Aug 6, 2024

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Jul 25, 2024

Proposed commit message

The deserialisation of profile data was into a struct, preventing custom profile fields from being collected. So replace these types with a generic container.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added Filebeat Filebeat bugfix Team:Security-Service Integrations Security Service Integrations Team backport-8.15 Automated backport to the 8.15 branch with mergify labels Jul 25, 2024
@efd6 efd6 self-assigned this Jul 25, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 25, 2024
@efd6 efd6 marked this pull request as ready for review July 25, 2024 23:48
@efd6 efd6 requested a review from a team as a code owner July 25, 2024 23:48
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@@ -39,49 +39,12 @@ type User struct {
PasswordChanged *time.Time `json:"passwordChanged,omitempty"`
Type map[string]any `json:"type"`
TransitioningToStatus *string `json:"transitioningToStatus,omitempty"`
Profile Profile `json:"profile"`
Profile map[string]any `json:"profile"`
Credentials *Credentials `json:"credentials,omitempty"`
Copy link
Member

@andrewkroh andrewkroh Jul 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the recovery_question.question to the credentials object please. That is field also part of a feature request.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add it, but I think this is not a safe change. I would like to get input from infosec on their views on its inclusion given that knowledge of the question will give significant information to an attacker that has details about a victim.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm checking with the user to understand what their use case is for having this information is. If they actually do want it and understand the risk, then maybe this should be opt-in in some manner.

@efd6 efd6 marked this pull request as draft July 31, 2024 21:24
…rofile shape

The deserialisation of profile data was into a struct, preventing custom
profile fields from being collected. So replace these types with a
generic container.
This reverts commit 562ccb2.

To be included in a future PR pending design decisions.
@efd6 efd6 requested a review from andrewkroh August 5, 2024 22:29
@efd6 efd6 marked this pull request as ready for review August 5, 2024 22:33
@efd6 efd6 merged commit 99c1138 into elastic:main Aug 6, 2024
17 of 19 checks passed
mergify bot pushed a commit that referenced this pull request Aug 6, 2024
…rofile shape (#40359)

The deserialisation of profile data was into a struct, preventing custom
profile fields from being collected. So replace these types with a
generic container.

(cherry picked from commit 99c1138)

# Conflicts:
#	x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta/okta_test.go
efd6 added a commit that referenced this pull request Aug 6, 2024
…r/internal/okta: relax profile shape (#40439)

* x-pack/filebeat/input/entityanalytics/provider/internal/okta: relax profile shape (#40359)

The deserialisation of profile data was into a struct, preventing custom
profile fields from being collected. So replace these types with a
generic container.

(cherry picked from commit 99c1138)

# Conflicts:
#	x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta/okta_test.go

* resolve conflicts

---------

Co-authored-by: Dan Kortschak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.15 Automated backport to the 8.15 branch with mergify bugfix Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants