nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

revert new key management endpoints

Browse Source
This commit is contained in:
Maciej Zieniuk 2025-03-29 16:12:32 +00:00
parent aba05f7970
commit 210d06acb4
No known key found for this signature in database
GPG Key ID: 9CACE59F1272ACD9
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Api/KeyManagement/Controllers/AccountsKeyManagementController.cs
View File

@ -57,7 +57,8 @@ public class AccountsKeyManagementController : Controller
emergencyAccessValidator, emergencyAccessValidator,
IRotationValidator<IEnumerable<ResetPasswordWithOrgIdRequestModel>, IReadOnlyList<OrganizationUser>> IRotationValidator<IEnumerable<ResetPasswordWithOrgIdRequestModel>, IReadOnlyList<OrganizationUser>>
organizationUserValidator, organizationUserValidator,
IRotationValidator<IEnumerable<WebAuthnLoginRotateKeyRequestModel>, IEnumerable<WebAuthnLoginRotateKeyData>> webAuthnKeyValidator) IRotationValidator<IEnumerable<WebAuthnLoginRotateKeyRequestModel>, IEnumerable<WebAuthnLoginRotateKeyData>>
webAuthnKeyValidator)
{ {
_userService = userService; _userService = userService;
_featureService = featureService; _featureService = featureService;
@ -129,8 +130,6 @@ public class AccountsKeyManagementController : Controller
throw new BadRequestException(ModelState); throw new BadRequestException(ModelState);
} }
[HttpPost("key-management/set-key-connector-key")]
// Backwards compatibility, to be deleted in the future
[HttpPost("set-key-connector-key")] [HttpPost("set-key-connector-key")]
public async Task PostSetKeyConnectorKeyAsync([FromBody] SetKeyConnectorKeyRequestModel model) public async Task PostSetKeyConnectorKeyAsync([FromBody] SetKeyConnectorKeyRequestModel model)
{ {
@ -154,8 +153,6 @@ public class AccountsKeyManagementController : Controller
throw new BadRequestException(ModelState); throw new BadRequestException(ModelState);
} }
[HttpPost("key-management/convert-to-key-connector")]
// Backwards compatibility, to be deleted in the future
[HttpPost("convert-to-key-connector")] [HttpPost("convert-to-key-connector")]
public async Task PostConvertToKeyConnectorAsync() public async Task PostConvertToKeyConnectorAsync()
{ {

34
test/Api.IntegrationTest/KeyManagement/Controllers/AccountsKeyManagementControllerTests.cs
View File

@ -175,7 +175,8 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
[Theory] [Theory]
[BitAutoData] [BitAutoData]
public async Task RotateUserAccountKeysAsync_NotLoggedIn_Unauthorized(RotateUserAccountKeysAndDataRequestModel request) public async Task RotateUserAccountKeysAsync_NotLoggedIn_Unauthorized(
RotateUserAccountKeysAndDataRequestModel request)
{ {
var response = await _client.PostAsJsonAsync("/accounts/key-management/rotate-user-account-keys", request); var response = await _client.PostAsJsonAsync("/accounts/key-management/rotate-user-account-keys", request);
@ -257,20 +258,17 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
} }
[Theory] [Theory]
[BitAutoData("/accounts/key-management/set-key-connector-key")] [BitAutoData]
[BitAutoData("/accounts/set-key-connector-key")] public async Task PostSetKeyConnectorKeyAsync_NotLoggedIn_Unauthorized(SetKeyConnectorKeyRequestModel request)
public async Task PostSetKeyConnectorKeyAsync_NotLoggedIn_Unauthorized(string uri,
SetKeyConnectorKeyRequestModel request)
{ {
var response = await _client.PostAsJsonAsync(uri, request); var response = await _client.PostAsJsonAsync("/accounts/set-key-connector-key", request);
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
} }
[Theory] [Theory]
[BitAutoData("/accounts/key-management/set-key-connector-key")] [BitAutoData]
[BitAutoData("/accounts/set-key-connector-key")] public async Task PostSetKeyConnectorKeyAsync_Success(string organizationSsoIdentifier,
public async Task PostSetKeyConnectorKeyAsync_Success(string uri, string organizationSsoIdentifier,
SetKeyConnectorKeyRequestModel request) SetKeyConnectorKeyRequestModel request)
{ {
var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory, var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory,
@ -291,7 +289,7 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
request.Key = _mockEncryptedString; request.Key = _mockEncryptedString;
request.OrgIdentifier = organizationSsoIdentifier; request.OrgIdentifier = organizationSsoIdentifier;
var response = await _client.PostAsJsonAsync(uri, request); var response = await _client.PostAsJsonAsync("/accounts/set-key-connector-key", request);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
var user = await _userRepository.GetByEmailAsync(ssoUserEmail); var user = await _userRepository.GetByEmailAsync(ssoUserEmail);
@ -308,20 +306,16 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
Assert.Null(ssoOrganizationUser.Email); Assert.Null(ssoOrganizationUser.Email);
} }
[Theory] [Fact]
[BitAutoData("/accounts/key-management/convert-to-key-connector")] public async Task PostConvertToKeyConnectorAsync_NotLoggedIn_Unauthorized()
[BitAutoData("/accounts/convert-to-key-connector")]
public async Task PostConvertToKeyConnectorAsync_NotLoggedIn_Unauthorized(string uri)
{ {
var response = await _client.PostAsJsonAsync(uri, new { }); var response = await _client.PostAsJsonAsync("/accounts/convert-to-key-connector", new { });
Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
} }
[Theory] [Fact]
[BitAutoData("/accounts/key-management/convert-to-key-connector")] public async Task PostConvertToKeyConnectorAsync_Success()
[BitAutoData("/accounts/convert-to-key-connector")]
public async Task PostConvertToKeyConnectorAsync_Success(string uri)
{ {
var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory, var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory,
PlanType.EnterpriseAnnually, _ownerEmail, passwordManagerSeats: 10, PlanType.EnterpriseAnnually, _ownerEmail, passwordManagerSeats: 10,
@ -337,7 +331,7 @@ public class AccountsKeyManagementControllerTests : IClassFixture<ApiApplication
await OrganizationTestHelpers.CreateUserAsync(_factory, organization.Id, ssoUserEmail, await OrganizationTestHelpers.CreateUserAsync(_factory, organization.Id, ssoUserEmail,
OrganizationUserType.User, userStatusType: OrganizationUserStatusType.Accepted); OrganizationUserType.User, userStatusType: OrganizationUserStatusType.Accepted);
var response = await _client.PostAsJsonAsync(uri, new { }); var response = await _client.PostAsJsonAsync("/accounts/convert-to-key-connector", new { });
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
var user = await _userRepository.GetByEmailAsync(ssoUserEmail); var user = await _userRepository.GetByEmailAsync(ssoUserEmail);