Skip to content

Fix SecurityApiKey and ApplicationPrivilegesApi integration tests #3881

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 27, 2019
Merged

Fix SecurityApiKey and ApplicationPrivilegesApi integration tests #3881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e23ebf
Simplify SecurityApiKeyTests
codebrain Jun 27, 2019
a8f2552
Ensure unique username for ApplicationPrivileges integration test to …
codebrain Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 4 additions & 86 deletions src/Tests/Tests/XPack/Security/ApiKey/SecurityApiKeyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,116 +13,34 @@ namespace Tests.XPack.Security.ApiKey
[SkipVersion("<6.7.0", "Security Api Keys are modelled against 6.7.0")]
public class SecurityApiKeyTests : CoordinatedIntegrationTestBase<XPackCluster>
{
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);
private const string InvalidateApiKeyStep = nameof(InvalidateApiKeyStep);

public SecurityApiKeyTests(XPackCluster cluster, EndpointUsage usage) : base(new CoordinatedUsage(cluster, usage)
{
{
PutRoleStep, u =>
u.Calls<PutRoleDescriptor, PutRoleRequest, IPutRoleRequest, PutRoleResponse>(
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<object>(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<PutUserDescriptor, PutUserRequest, IPutUserRequest, PutUserResponse>(
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),
(v, c, r) => c.Security.PutUser(r),
(v, c, r) => c.Security.PutUserAsync(r)
)
},
{
PutPrivilegesStep, u =>
u.Calls<PutPrivilegesDescriptor, PutPrivilegesRequest, IPutPrivilegesRequest, PutPrivilegesResponse>(
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<CreateApiKeyDescriptor, CreateApiKeyRequest, ICreateApiKeyRequest, CreateApiKeyResponse>(
Expand Down
12 changes: 6 additions & 6 deletions src/Tests/Tests/XPack/Security/Privileges/ApplicationPrivilegesApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")))
},
{
Expand All @@ -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[]
{
Expand All @@ -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}")
Expand All @@ -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),
Expand Down Expand Up @@ -201,7 +201,7 @@ [I] public async Task HasPrivilegesResponse() => await Assert<HasPrivilegesRespo
{
r.IsValid.Should().BeTrue();
r.ApiCall.HttpStatusCode.Should().Be(200);
r.Username.Should().Be($"user-{v}");
r.Username.Should().Be($"user-ap-{v}");
r.HasAllRequested.Should().Be(true);
r.Applications.Should().NotBeEmpty();
var app = $"app-{v}";
Expand Down