Skip to content

Commit ea893b0

Browse files
author
Xin LI
committed
throw error if tenantId and osisTenant don't match
1 parent d4ff634 commit ea893b0

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ sourceSets {
101101
}
102102

103103
configure(allprojects) {
104-
version = '1.4.4'
104+
version = '1.4.5'
105105
if (!project.hasProperty('release')) {
106106
project.setVersion(project.getVersion() + '-SNAPSHOT')
107107
}

osis-core/src/main/java/com/scality/osis/service/impl/ScalityOsisServiceImpl.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,15 @@ public void deleteTenant(String tenantId, Boolean purgeData) {
563563
@Override
564564
public OsisTenant updateTenant(String tenantId, OsisTenant osisTenant) {
565565
try {
566-
logger.info("Update Tenant request received:{}", new Gson().toJson(osisTenant));
566+
logger.info("Update Tenant request received, tenantId:{}, osisTenant:{}", tenantId, new Gson().toJson(osisTenant));
567+
568+
//check tenantId and osisTenant consistency
569+
OsisTenant osisTenantOfTenantId = getTenant(tenantId);
570+
if (!Objects.equals(osisTenant.getName(), osisTenantOfTenantId.getName()) ||
571+
!Objects.equals(osisTenant.getTenantId(), osisTenantOfTenantId.getTenantId())) {
572+
throw new VaultServiceException(HttpStatus.BAD_REQUEST, "Body param osisTenant doesn't match tenantId provided in path param");
573+
}
574+
567575
UpdateAccountAttributesRequestDTO updateAccountAttributesRequest = ScalityModelConverter
568576
.toUpdateAccountAttributesRequestDTO(osisTenant);
569577

0 commit comments

Comments
 (0)