Skip to content

Commit 1a6eb4b

Browse files
anuragawyadvr
authored andcommitted
server: use resource UUID instead of resource ID in API response (#2527) (#3099)
List resourcedetails was adding DB ID instead of UUID. This is a security risk and needs fix. Fixes: #2527
1 parent 1725130 commit 1a6eb4b

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
import com.cloud.api.query.vo.UserVmJoinVO;
154154
import com.cloud.api.query.vo.VolumeJoinVO;
155155
import com.cloud.dc.DedicatedResourceVO;
156-
import com.cloud.dc.dao.DataCenterDetailsDao;
157156
import com.cloud.dc.dao.DedicatedResourceDao;
158157
import com.cloud.domain.Domain;
159158
import com.cloud.domain.DomainVO;
@@ -205,6 +204,7 @@
205204
import com.cloud.utils.Pair;
206205
import com.cloud.utils.StringUtils;
207206
import com.cloud.utils.Ternary;
207+
import com.cloud.utils.db.EntityManager;
208208
import com.cloud.utils.db.Filter;
209209
import com.cloud.utils.db.JoinBuilder;
210210
import com.cloud.utils.db.SearchBuilder;
@@ -330,7 +330,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
330330
private DomainRouterDao _routerDao;
331331

332332
@Inject
333-
UserVmDetailsDao _userVmDetailDao;
333+
private UserVmDetailsDao _userVmDetailDao;
334334

335335
@Inject
336336
private HighAvailabilityManager _haMgr;
@@ -342,15 +342,15 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
342342
private TemplateJoinDao _templateJoinDao;
343343

344344
@Inject
345-
ResourceManager _resourceMgr;
345+
private ResourceManager _resourceMgr;
346346
@Inject
347347
private ResourceMetaDataService _resourceMetaDataMgr;
348348

349349
@Inject
350350
private TaggedResourceService _taggedResourceMgr;
351351

352352
@Inject
353-
AffinityGroupVMMapDao _affinityGroupVMMapDao;
353+
private AffinityGroupVMMapDao _affinityGroupVMMapDao;
354354

355355
@Inject
356356
private AffinityGroupJoinDao _affinityGroupJoinDao;
@@ -359,22 +359,22 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
359359
private DedicatedResourceDao _dedicatedDao;
360360

361361
@Inject
362-
DataCenterDetailsDao _dcDetailsDao;
362+
private DomainManager _domainMgr;
363363

364364
@Inject
365-
DomainManager _domainMgr;
365+
private AffinityGroupDomainMapDao _affinityGroupDomainMapDao;
366366

367367
@Inject
368-
AffinityGroupDomainMapDao _affinityGroupDomainMapDao;
368+
private NetworkDetailsDao _networkDetailsDao;
369369

370370
@Inject
371-
NetworkDetailsDao _networkDetailsDao;
371+
private ResourceTagDao _resourceTagDao;
372372

373373
@Inject
374-
ResourceTagDao _resourceTagDao;
374+
private DataStoreManager dataStoreManager;
375375

376376
@Inject
377-
DataStoreManager dataStoreManager;
377+
private EntityManager _entityMgr;
378378

379379
/*
380380
* (non-Javadoc)
@@ -3674,7 +3674,7 @@ public List<ResourceDetailResponse> listResourceDetails(ListResourceDetailsCmd c
36743674

36753675
protected ResourceDetailResponse createResourceDetailsResponse(ResourceDetail requestedDetail, ResourceTag.ResourceObjectType resourceType) {
36763676
ResourceDetailResponse resourceDetailResponse = new ResourceDetailResponse();
3677-
resourceDetailResponse.setResourceId(String.valueOf(requestedDetail.getResourceId()));
3677+
resourceDetailResponse.setResourceId(_taggedResourceMgr.getUuid(String.valueOf(requestedDetail.getResourceId()), resourceType));
36783678
resourceDetailResponse.setName(requestedDetail.getName());
36793679
resourceDetailResponse.setValue(requestedDetail.getValue());
36803680
resourceDetailResponse.setForDisplay(requestedDetail.isDisplay());

0 commit comments

Comments
 (0)