From 3e23ebf82cc7becd8421ab69454939e32862e519 Mon Sep 17 00:00:00 2001 From: Stuart Cam Date: Thu, 27 Jun 2019 15:18:08 +1000 Subject: [PATCH 1/2] Simplify SecurityApiKeyTests --- .../Security/ApiKey/SecurityApiKeyTests.cs | 90 +------------------ 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/Tests/Tests/XPack/Security/ApiKey/SecurityApiKeyTests.cs b/src/Tests/Tests/XPack/Security/ApiKey/SecurityApiKeyTests.cs index eda0cc36012..e8b73a5ffab 100644 --- a/src/Tests/Tests/XPack/Security/ApiKey/SecurityApiKeyTests.cs +++ b/src/Tests/Tests/XPack/Security/ApiKey/SecurityApiKeyTests.cs @@ -13,9 +13,7 @@ namespace Tests.XPack.Security.ApiKey [SkipVersion("<6.7.0", "Security Api Keys are modelled against 6.7.0")] public class SecurityApiKeyTests : CoordinatedIntegrationTestBase { - private const string PutRoleStep = nameof(PutRoleStep); private const string PutUserStep = nameof(PutUserStep); - private const string PutPrivilegesStep = nameof(PutPrivilegesStep); private const string CreateApiKeyWithRolesStep = nameof(CreateApiKeyWithRolesStep); private const string CreateApiKeyWithNoRolesStep = nameof(CreateApiKeyWithNoRolesStep); private const string GetApiKeyStep = nameof(GetApiKeyStep); @@ -23,55 +21,19 @@ public class SecurityApiKeyTests : CoordinatedIntegrationTestBase public SecurityApiKeyTests(XPackCluster cluster, EndpointUsage usage) : base(new CoordinatedUsage(cluster, usage) { - { - PutRoleStep, u => - u.Calls( - v => new PutRoleRequest($"role-{v}") - { - Cluster = new[] { "all" }, - Indices = new IIndicesPrivileges[] - { - new IndicesPrivileges - { - Names = "*", - Privileges = new [] { "all" } - } - }, - Applications = new IApplicationPrivileges[] - { - new ApplicationPrivileges - { - Application = $"app-{v}", - Privileges = new [] { "*" }, - Resources = new [] { "*" } - } - } - }, - (v, d) => d - .Cluster("all") - // ReSharper disable once PossiblyMistakenUseOfParamsMethod - .Indices(i => i.Add(p => p.Names("*").Privileges("all"))) - .Applications(i => i.Add(p => p.Application($"app-{v}").Privileges("*").Resources("*"))) - , - (v, c, f) => c.Security.PutRole($"role-{v}", f), - (v, c, f) => c.Security.PutRoleAsync($"role-{v}", f), - (v, c, r) => c.Security.PutRole(r), - (v, c, r) => c.Security.PutRoleAsync(r) - ) - }, { PutUserStep, u => u.Calls( v => new PutUserRequest($"user-{v}") { Password = "password", - Roles = new[] { $"role-{v}", "superuser" }, - FullName = "API key user" + Roles = new[] { "superuser" }, + FullName = "API key superuser" }, (v, d) => d .Password("password") - .Roles($"role-{v}", "superuser") - .FullName("API key user") + .Roles("superuser") + .FullName("API key superuser") , (v, c, f) => c.Security.PutUser($"user-{v}", f), (v, c, f) => c.Security.PutUserAsync($"user-{v}", f), @@ -79,50 +41,6 @@ public SecurityApiKeyTests(XPackCluster cluster, EndpointUsage usage) : base(new (v, c, r) => c.Security.PutUserAsync(r) ) }, - { - PutPrivilegesStep, u => - u.Calls( - v => new PutPrivilegesRequest - { - Applications = new AppPrivileges - { - { - $"app-{v}", new Nest.Privileges - { - { - $"read", new PrivilegesActions - { - Actions = new[] { "data:read/*" } - } - }, - { - $"write", new PrivilegesActions - { - Actions = new[] { "data:write/*" } - } - } - } - } - } - }, - (v, d) => d - .Applications(a => a - .Application($"app-{v}", pr => pr - .Privilege($"read", ac => ac - .Actions("data:read/*") - ) - .Privilege($"write", ac => ac - .Actions("data:write/*") - ) - ) - ) - , - (v, c, f) => c.Security.PutPrivileges(f), - (v, c, f) => c.Security.PutPrivilegesAsync(f), - (v, c, r) => c.Security.PutPrivileges(r), - (v, c, r) => c.Security.PutPrivilegesAsync(r) - ) - }, { CreateApiKeyWithRolesStep, u => u.Calls( From a8f25523016f7a311c3a6f5004dda37c41e9b43a Mon Sep 17 00:00:00 2001 From: Stuart Cam Date: Thu, 27 Jun 2019 15:52:02 +1000 Subject: [PATCH 2/2] Ensure unique username for ApplicationPrivileges integration test to avoid conflicts with users created in other tests. --- .../Privileges/ApplicationPrivilegesApiTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tests/Tests/XPack/Security/Privileges/ApplicationPrivilegesApiTests.cs b/src/Tests/Tests/XPack/Security/Privileges/ApplicationPrivilegesApiTests.cs index 662cccbe06b..f4474760c7b 100644 --- a/src/Tests/Tests/XPack/Security/Privileges/ApplicationPrivilegesApiTests.cs +++ b/src/Tests/Tests/XPack/Security/Privileges/ApplicationPrivilegesApiTests.cs @@ -84,7 +84,7 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage) )) }, { - PutUserStep, u => u.Call((v, c) => c.Security.PutUserAsync($"user-{v}", + PutUserStep, u => u.Call((v, c) => c.Security.PutUserAsync($"user-ap-{v}", r => r.Roles("admin", $"role-{v}").Password($"pass-{v}"))) }, { @@ -93,7 +93,7 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage) { RequestConfiguration = new RequestConfiguration { - BasicAuthenticationCredentials = new BasicAuthenticationCredentials($"user-{v}", $"pass-{v}") + BasicAuthenticationCredentials = new BasicAuthenticationCredentials($"user-ap-{v}", $"pass-{v}") }, Application = new[] { @@ -106,7 +106,7 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage) } }, (v, d) => d - .RequestConfiguration(r=>r.BasicAuthentication($"user-{v}", $"pass-{v}")) + .RequestConfiguration(r=>r.BasicAuthentication($"user-ap-{v}", $"pass-{v}")) .Applications(apps => apps .Application(a => a .Name($"app-{v}") @@ -127,10 +127,10 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage) { RequestConfiguration = new RequestConfiguration { - BasicAuthenticationCredentials = new BasicAuthenticationCredentials($"user-{v}", $"pass-{v}") + BasicAuthenticationCredentials = new BasicAuthenticationCredentials($"user-ap-{v}", $"pass-{v}") } }, - (v, d) => d.RequestConfiguration(r=>r.BasicAuthentication($"user-{v}", $"pass-{v}")), + (v, d) => d.RequestConfiguration(r=>r.BasicAuthentication($"user-ap-{v}", $"pass-{v}")), (v, c, f) => c.Security.GetUserPrivileges(f), (v, c, f) => c.Security.GetUserPrivilegesAsync(f), (v, c, r) => c.Security.GetUserPrivileges(r), @@ -201,7 +201,7 @@ [I] public async Task HasPrivilegesResponse() => await Assert