-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[8.15](backport #40359) x-pack/filebeat/input/entityanalytics/provide…
…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]>
- Loading branch information
1 parent
5d591f6
commit 07c6c94
Showing
4 changed files
with
16 additions
and
71 deletions.
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 |
|---|---|---|
|
|
@@ -112,22 +112,23 @@ func Test(t *testing.T) { | |
| }) | ||
|
|
||
| t.Run("user", func(t *testing.T) { | ||
| if me.Profile.Login == "" { | ||
| 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, me.Profile.Login, query, omit, limiter, window) | ||
| users, _, err := GetUserDetails(context.Background(), http.DefaultClient, host, key, login, query, omit, limiter, window) | ||
| 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", me.Profile.Login, cmp.Diff(me, users[0])) | ||
| t.Errorf("unexpected result:\n-'me'\n+'%s'\n%s", login, cmp.Diff(me, users[0])) | ||
| } | ||
| }) | ||
|
|
||
|
|
@@ -213,7 +214,7 @@ var localTests = []struct { | |
| { | ||
| // 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","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"}}}]`, | ||
| 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) (any, http.Header, error) { | ||
| return GetUserDetails(context.Background(), cli, host, key, user, query, OmitNone, lim, window) | ||
| }, | ||
|
|
@@ -231,7 +232,7 @@ var localTests = []struct { | |
| { | ||
| // 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"},"emails":[{"value":"[email protected]","status":"VERIFIED","type":"PRIMARY"}],"provider":{"type":"OKTA","name":"OKTA"}},"_links":{"self":{"href":"https://localhost/api/v1/users/userid"}}}}]`, | ||
| 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) (any, http.Header, error) { | ||
| return GetDeviceUsers(context.Background(), cli, host, key, device, query, OmitNone, lim, window) | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -102,14 +102,15 @@ func TestStateStore(t *testing.T) { | |
| Type: map[string]interface{}{ | ||
| "id": "typeid", | ||
| }, | ||
| Profile: okta.Profile{ | ||
| Login: "[email protected]", | ||
| Email: "[email protected]", | ||
| FirstName: ptr("name"), | ||
| LastName: ptr("surname"), | ||
| Profile: map[string]interface{}{ | ||
| "login": "[email protected]", | ||
| "email": "[email protected]", | ||
| "firstName": "name", | ||
| "lastName": "surname", | ||
| }, | ||
| Credentials: &okta.Credentials{ | ||
| Password: &struct{}{}, // Had a password: not retained. | ||
| Password: &struct{}{}, // Had a password: not retained. | ||
| RecoveryQuestion: &struct{}{}, // Had a question: not retained. | ||
| Provider: okta.Provider{ | ||
| Type: "OKTA", | ||
| Name: ptr("OKTA"), | ||
|
|
||