bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-02-11 14:03:24 +00:00
Code Issues Releases Wiki Activity

Require password when seeding a new user (#6978)

Browse Source
This commit is contained in:
Matt Gibson
2026-02-10 19:01:50 +00:00
committed by GitHub
parent 81e3044b91
commit 902be7dfb8
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/SeederApi.IntegrationTest/SeedControllerTests.cs
View File

@@ -1,4 +1,5 @@
using System.Net;
using Bit.Seeder.Scenes;
using Bit.SeederApi.Models.Request;
using Bit.SeederApi.Models.Response;
using Xunit;
@@ -37,7 +38,7 @@ public class SeedControllerTests : IClassFixture<SeederApiApplicationFactory>, I
var response = await _client.PostAsJsonAsync("/seed", new SeedRequestModel
{
Template = "SingleUserScene",
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new { email = testEmail })
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new SingleUserScene.Request() { Email = testEmail, Password = "asdfasdfasdf" })
}, playId);
response.EnsureSuccessStatusCode();
@@ -54,7 +55,7 @@ public class SeedControllerTests : IClassFixture<SeederApiApplicationFactory>, I
var response = await _client.PostAsJsonAsync("/seed", new SeedRequestModel
{
Template = "NonExistentScene",
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new { email = "test@example.com" })
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new SingleUserScene.Request() { Email = "test@example.com", Password = "asdfasdfasdf" })
});
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
@@ -82,7 +83,7 @@ public class SeedControllerTests : IClassFixture<SeederApiApplicationFactory>, I
var seedResponse = await _client.PostAsJsonAsync("/seed", new SeedRequestModel
{
Template = "SingleUserScene",
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new { email = testEmail })
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new SingleUserScene.Request() { Email = testEmail, Password = "asdfasdfasdf" })
}, playId);
seedResponse.EnsureSuccessStatusCode();
@@ -119,7 +120,7 @@ public class SeedControllerTests : IClassFixture<SeederApiApplicationFactory>, I
var seedResponse = await _client.PostAsJsonAsync("/seed", new SeedRequestModel
{
Template = "SingleUserScene",
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new { email = testEmail })
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new SingleUserScene.Request() { Email = testEmail, Password = "asdfasdfasdf" })
}, playId);
seedResponse.EnsureSuccessStatusCode();
@@ -151,7 +152,7 @@ public class SeedControllerTests : IClassFixture<SeederApiApplicationFactory>, I
var seedResponse = await _client.PostAsJsonAsync("/seed", new SeedRequestModel
{
Template = "SingleUserScene",
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new { email = testEmail })
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new SingleUserScene.Request() { Email = testEmail, Password = "asdfasdfasdf" })
}, validPlayId);
seedResponse.EnsureSuccessStatusCode();
@@ -184,7 +185,7 @@ public class SeedControllerTests : IClassFixture<SeederApiApplicationFactory>, I
var seedResponse = await _client.PostAsJsonAsync("/seed", new SeedRequestModel
{
Template = "SingleUserScene",
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new { email = testEmail })
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new SingleUserScene.Request() { Email = testEmail, Password = "asdfasdfasdf" })
}, playId);
seedResponse.EnsureSuccessStatusCode();
@@ -204,7 +205,7 @@ public class SeedControllerTests : IClassFixture<SeederApiApplicationFactory>, I
var response = await _client.PostAsJsonAsync("/seed", new SeedRequestModel
{
Template = "SingleUserScene",
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new { email = testEmail })
Arguments = System.Text.Json.JsonSerializer.SerializeToElement(new SingleUserScene.Request() { Email = testEmail, Password = "asdfasdfasdf" })
}, playId);
response.EnsureSuccessStatusCode();

5
util/Seeder/Factories/UserSeeder.cs
View File

@@ -17,12 +17,13 @@ internal static class UserSeeder
IManglerService manglerService,
bool emailVerified = true,
bool premium = false,
UserKeys? keys = null)
UserKeys? keys = null,
string? password = null)
{
// When keys are provided, caller owns email/key consistency - don't mangle
var mangledEmail = keys == null ? manglerService.Mangle(email) : email;
keys ??= RustSdkService.GenerateUserKeys(mangledEmail, DefaultPassword);
keys ??= RustSdkService.GenerateUserKeys(mangledEmail, password ?? DefaultPassword);
var user = new User
{

5
util/Seeder/Scenes/SingleUserScene.cs
View File

@@ -30,6 +30,8 @@ public class SingleUserScene(
{
[Required]
public required string Email { get; set; }
[Required]
public required string Password { get; set; }
public bool EmailVerified { get; set; } = false;
public bool Premium { get; set; } = false;
}
@@ -42,7 +44,8 @@ public class SingleUserScene(
passwordHasher,
manglerService,
request.EmailVerified,
request.Premium);
request.Premium,
password: request.Password);
await userRepository.CreateAsync(user);