x-pack/filebeat/input/entityanalytics/provider/internal/okta: relax profile shape #40359
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,22 +117,23 @@ | |
| }) | ||
|
|
||
| t.Run("user", func(t *testing.T) { | ||
| login, _ := me.Profile["login"].(string) | ||
| if login == "" { | ||
| b, _ := json.Marshal(me) | ||
| t.Skipf("cannot run user test without profile.login field set: %s", b) | ||
| } | ||
|
|
||
| query := make(url.Values) | ||
| query.Set("limit", "200") | ||
| users, _, err := GetUserDetails(context.Background(), http.DefaultClient, host, key, login, query, omit, limiter, window, logger) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| if len(users) != 1 { | ||
| t.Fatalf("unexpected len(users): got:%d want:1", len(users)) | ||
| } | ||
| if !cmp.Equal(me, users[0]) { | ||
| t.Errorf("unexpected result:\n-'me'\n+'%s'\n%s", login, cmp.Diff(me, users[0])) | ||
| } | ||
| }) | ||
|
|
||
|
|
@@ -218,7 +219,7 @@ | |
| { | ||
| // Test case constructed from API-returned value with details anonymised. | ||
| name: "users", | ||
| msg: `[{"id":"userid","status":"STATUS","created":"2023-05-14T13:37:20.000Z","activated":null,"statusChanged":"2023-05-15T01:50:30.000Z","lastLogin":"2023-05-15T01:59:20.000Z","lastUpdated":"2023-05-15T01:50:32.000Z","passwordChanged":"2023-05-15T01:50:32.000Z","recovery_question":{"question":"Who's a major player in the cowboy scene?","answer":"Annie Oakley"},"type":{"id":"typeid"},"profile":{"firstName":"name","lastName":"surname","mobilePhone":null,"secondEmail":null,"login":"[email protected]","email":"[email protected]"},"credentials":{"password":{"value":"secret"},"emails":[{"value":"[email protected]","status":"VERIFIED","type":"PRIMARY"}],"provider":{"type":"OKTA","name":"OKTA"}},"_links":{"self":{"href":"https://localhost/api/v1/users/userid"}}}]`, | ||
| fn: func(ctx context.Context, cli *http.Client, host, key, user string, query url.Values, lim *rate.Limiter, window time.Duration, log *logp.Logger) (any, http.Header, error) { | ||
| return GetUserDetails(context.Background(), cli, host, key, user, query, OmitNone, lim, window, log) | ||
| }, | ||
|
|
@@ -236,7 +237,7 @@ | |
| { | ||
| // Test case constructed from API-returned value with details anonymised. | ||
| name: "devices_users", | ||
| msg: `[{"created":"2023-08-07T21:48:27.000Z","managementStatus":"NOT_MANAGED","user":{"id":"userid","status":"STATUS","created":"2023-05-14T13:37:20.000Z","activated":null,"statusChanged":"2023-05-15T01:50:30.000Z","lastLogin":"2023-05-15T01:59:20.000Z","lastUpdated":"2023-05-15T01:50:32.000Z","passwordChanged":"2023-05-15T01:50:32.000Z","type":{"id":"typeid"},"profile":{"firstName":"name","lastName":"surname","mobilePhone":null,"secondEmail":null,"login":"[email protected]","email":"[email protected]"},"credentials":{"password":{"value":"secret"},"recovery_question":{"question":"Who's a major player in the cowboy scene?","answer":"Annie Oakley"},"emails":[{"value":"[email protected]","status":"VERIFIED","type":"PRIMARY"}],"provider":{"type":"OKTA","name":"OKTA"}},"_links":{"self":{"href":"https://localhost/api/v1/users/userid"}}}}]`, | ||
| id: "devid", | ||
| fn: func(ctx context.Context, cli *http.Client, host, key, device string, query url.Values, lim *rate.Limiter, window time.Duration, log *logp.Logger) (any, http.Header, error) { | ||
| return GetDeviceUsers(context.Background(), cli, host, key, device, query, OmitNone, lim, window, log) | ||
|
|
@@ -386,7 +387,7 @@ | |
| func TestNext(t *testing.T) { | ||
| for i, test := range nextTests { | ||
| got, err := Next(test.header) | ||
| if err != test.wantErr { | ||
| t.Errorf("unexpected ok result for %d: got:%v want:%v", i, err, test.wantErr) | ||
| } | ||
| if got.Encode() != test.want { | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -104,14 +104,15 @@ func TestStateStore(t *testing.T) { | |
| Type: map[string]interface{}{ | ||
| "id": "typeid", | ||
| }, | ||
| Profile: map[string]interface{}{ | ||
| "login": "[email protected]", | ||
| "email": "[email protected]", | ||
| "firstName": "name", | ||
| "lastName": "surname", | ||
| }, | ||
| Credentials: &okta.Credentials{ | ||
| Password: &struct{}{}, // Had a password: not retained. | ||
| RecoveryQuestion: &struct{}{}, // Had a question: not retained. | ||
| Provider: okta.Provider{ | ||
| Type: "OKTA", | ||
| Name: ptr("OKTA"), | ||
|
|
||
Oops, something went wrong.
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 problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.