Skip to content

[feat_1.5.x_1223][fix with DTStack Taier cross-tenant IDOR in the datasource manager API] #1224

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
zcswl7961 merged 1 commit into from
Nov 5, 2026
Merged

[feat_1.5.x_1223][fix with DTStack Taier cross-tenant IDOR in the datasource manager API] #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...p/src/main/java/com/dtstack/taier/develop/controller/datasource/DataSourceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public R<DsDetailVO> dsDetail(@RequestBody DsInfoIdParam dsInfoIdParam) {
@Override
protected DsDetailVO process() throws TaierDefineException {
Asserts.notNull(dsInfoIdParam.getDataInfoId(), "数据源Id不能为空");
DsInfo dsInfo = dsInfoService.dsInfoDetail(dsInfoIdParam.getDataInfoId());
DsInfo dsInfo = dsInfoService.dsInfoDetail(dsInfoIdParam.getDataInfoId(),dsInfoIdParam.getTenantId());
return DsDetailTransfer.INSTANCE.toInfoVO(dsInfo);
}
}.execute();
Expand All @@ -115,7 +115,7 @@ public R<Boolean> deleteById(@RequestBody DsInfoIdParam dsInfoIdParam) {
@Override
protected Boolean process() throws TaierDefineException {
Asserts.notNull(dsInfoIdParam.getDataInfoId(), "数据源Id不能为空");
return dsInfoService.delDsInfo(dsInfoIdParam.getDataInfoId());
return dsInfoService.delDsInfo(dsInfoIdParam.getDataInfoId(), dsInfoIdParam.getTenantId());
}
}.execute();
}
Expand Down
28 changes: 27 additions & 1 deletion ...evelop/src/main/java/com/dtstack/taier/develop/service/datasource/impl/DsInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,41 @@ public DsInfo dsInfoDetail(Long dataInfoId) {
return dsInfo;
}

public DsInfo dsInfoDetail(Long dataInfoId, Long tenantId) {
DsInfo dsInfo = lambdaQuery()
.eq(DsInfo::getId, dataInfoId)
.eq(DsInfo::getTenantId, tenantId)
.one();

if (dsInfo == null) {
throw new TaierDefineException(ErrorCode.PERMISSION_LIMIT);
}

String dataJson = dsInfo.getDataJson();
JSONObject dataSourceJson = DataSourceUtils.getDataSourceJson(dataJson);
if (DataSourceUtils.judgeOpenKerberos(dataJson) && null == dataSourceJson.getString(FormNames.PRINCIPAL)) {
JSONObject kerberosConfig = dataSourceJson.getJSONObject(FormNames.KERBEROS_CONFIG);
dataSourceJson.put(FormNames.PRINCIPAL, kerberosConfig.getString(FormNames.PRINCIPAL));
}
if (DataSourceUtils.judgeOpenKerberos(dsInfo.getDataJson()) && dsInfo.getDataType().equals(DataSourceTypeEnum.KAFKA.getDataType())) {
//kafka开启了kerberos认证
dataSourceJson.put(FormNames.AUTHENTICATION, FormNames.KERBROS);
}
return dsInfo;
}

/**
* 删除一条数据源信息
*
* @param dataInfoId
* @return
*/
@Transactional(rollbackFor = Exception.class)
public Boolean delDsInfo(Long dataInfoId) {
public Boolean delDsInfo(Long dataInfoId, Long tenantId) {
DsInfo dsInfo = this.getOneById(dataInfoId);
if (dsInfo == null || !Objects.equals(dsInfo.getTenantId(), tenantId)) {
throw new TaierDefineException(ErrorCode.PERMISSION_LIMIT);
}
if (Objects.equals(dsInfo.getIsMeta(), 1)) {
throw new TaierDefineException(ErrorCode.CAN_NOT_DEL_META_DS);
}
Expand Down
Loading