center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4072 from dataease/pr@dev@datasource

Browse Source 
feat(数据源): 数据源敏感信息加密
This commit is contained in:
taojinlong 2022-12-12 17:38:27 +08:00 committed by GitHub
commit 513ae189a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
View File

@ -19,7 +19,6 @@ import io.dataease.plugins.common.base.domain.Datasource;
import io.dataease.service.datasource.DatasourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.*;

1
backend/src/main/java/io/dataease/dto/DatasourceDTO.java
View File

@ -19,6 +19,7 @@ public class DatasourceDTO extends Datasource {
@ApiModelProperty("权限")
private String privileges;
private List<ApiDefinition> apiConfiguration;
private String apiConfigurationStr;
private String typeDesc;
private DatasourceCalculationMode calculationMode;
}

2
backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
View File

@ -1014,7 +1014,7 @@ public class ChartDataBuild {
if (StringUtils.isEmpty(originStr) || originStr.length() <= columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) {
desensitizationStr = String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getM(), "X")) + "***" + String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getN(), "X"));
} else {
desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM() - 1) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN(), originStr.length() - 1);
desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM()) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN() - 1, originStr.length() - 1);
}
break;
case RetainMToN:

13
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -108,7 +108,7 @@ public class DatasourceService {
if (!types().stream().map(DataSourceType::getType).collect(Collectors.toList()).contains(datasource.getType())) {
throw new Exception("Datasource type not supported.");
}
datasource.setConfiguration(new String(java.util.Base64.getDecoder().decode(datasource.getConfiguration())));
Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
datasourceProvider.checkConfiguration(datasource);
@ -212,6 +212,14 @@ public class DatasourceService {
}
}
}
if(StringUtils.isNotEmpty(datasourceDTO.getConfiguration())){
datasourceDTO.setConfiguration(new String(java.util.Base64.getEncoder().encode(datasourceDTO.getConfiguration().getBytes())));
}
if(CollectionUtils.isNotEmpty(datasourceDTO.getApiConfiguration())){
String config = new Gson().toJson(datasourceDTO.getApiConfiguration());
datasourceDTO.setApiConfigurationStr(new String(java.util.Base64.getEncoder().encode(config.getBytes())));
datasourceDTO.setApiConfiguration(null);
}
}
public DatasourceDTO getDataSourceDetails(String datasourceId){
@ -253,6 +261,7 @@ public class DatasourceService {
if (!types().stream().map(DataSourceType::getType).collect(Collectors.toList()).contains(updataDsRequest.getType())) {
throw new Exception("Datasource type not supported.");
}
updataDsRequest.setConfiguration(new String(java.util.Base64.getDecoder().decode(updataDsRequest.getConfiguration())));
checkName(updataDsRequest.getName(), updataDsRequest.getType(), updataDsRequest.getId());
Datasource datasource = new Datasource();
datasource.setName(updataDsRequest.getName());
@ -284,6 +293,7 @@ public class DatasourceService {
}
public ResultHolder validate(Datasource datasource) throws Exception {
datasource.setConfiguration(new String(java.util.Base64.getDecoder().decode(datasource.getConfiguration())));
DatasourceDTO datasourceDTO = new DatasourceDTO();
BeanUtils.copyBean(datasourceDTO, datasource);
try {
@ -372,6 +382,7 @@ public class DatasourceService {
}
public List<String> getSchema(Datasource datasource) throws Exception {
datasource.setConfiguration(new String(java.util.Base64.getDecoder().decode(datasource.getConfiguration())));
Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);

5
frontend/src/views/system/datasource/DsAppForm.vue
View File

@ -216,6 +216,7 @@ import PluginCom from '@/views/system/plugin/PluginCom'
import { groupTree, appApply } from '@/api/panel/panel'
import { dsGroupTree } from '@/api/dataset/dataset'
import { deepCopy } from '@/components/canvas/utils/utils'
import { Base64 } from 'js-base64'
export default {
name: 'DsForm',
components: {
@ -707,9 +708,9 @@ export default {
if (valid) {
const data = JSON.parse(JSON.stringify(this.form))
if (data.type === 'api') {
data.configuration = JSON.stringify(data.apiConfiguration)
data.configuration = Base64.encode(JSON.stringify(data.apiConfiguration))
} else {
data.configuration = JSON.stringify(data.configuration)
data.configuration = Base64.encode(JSON.stringify(data.configuration))
}
if (data.showModel === 'show' && !this.canEdit) {
validateDsById(data.id).then(res => {

28
frontend/src/views/system/datasource/DsFormContent.vue
View File

@ -226,10 +226,7 @@
>{{ $t('commons.cancel') }}
</deBtn>
<deBtn
v-if="
formType === 'add' ||
hasDataPermission('manage', params.privileges)
"
v-if="formType === 'add' || hasDataPermission('manage', params.privileges)"
secondary
@click="validaDatasource"
>{{ $t('commons.validate') }}
@ -307,6 +304,7 @@ import { dsGroupTree } from '@/api/dataset/dataset'
import { appApply, appEdit, groupTree } from '@/api/panel/panel'
import { deepCopy } from '@/components/canvas/utils/utils'
import { hasDataPermission } from '@/utils/permission'
import { Base64 } from 'js-base64'
export default {
name: 'DsForm',
@ -710,6 +708,12 @@ export default {
getDatasourceDetail(id, showModel) {
this.$emit('update:formLoading', true)
return getDatasourceDetail(id).then((res) => {
if(res.data.configuration){
res.data.configuration = Base64.decode(res.data.configuration)
}
if(res.data.apiConfigurationStr){
res.data.apiConfiguration = JSON.parse(Base64.decode(res.data.apiConfigurationStr))
}
this.params = { ...res.data, showModel }
this.$emit('setParams', { ...this.params })
}).finally(() => {
@ -729,6 +733,12 @@ export default {
const newArr = []
for (let index = 0; index < array.length; index++) {
const element = array[index]
if(element.configuration){
element.configuration = Base64.decode(element.configuration)
}
if(element.apiConfigurationStr){
element.apiConfiguration = Base64.decode(element.apiConfigurationStr)
}
if (this.msgNodeId) {
if (element.id === this.msgNodeId) {
element.msgNode = true
@ -967,9 +977,9 @@ export default {
form.apiConfiguration.forEach((item) => {
delete item.status
})
form.configuration = JSON.stringify(form.apiConfiguration)
form.configuration = Base64.encode(JSON.stringify(form.apiConfiguration))
} else {
form.configuration = JSON.stringify(form.configuration)
form.configuration = Base64.encode(JSON.stringify(form.configuration))
}
const isAppMarket = this.positionCheck('appMarket')
let appApplyForm
@ -1051,7 +1061,7 @@ export default {
this.$refs.dsForm.validate((valid) => {
if (valid) {
const data = JSON.parse(JSON.stringify(this.form))
data.configuration = JSON.stringify(data.configuration)
data.configuration = Base64.encode(JSON.stringify(data.configuration))
getSchema(data).then((res) => {
this.schemas = res.data
this.openMessageSuccess('commons.success')
@ -1102,9 +1112,9 @@ export default {
if (valid) {
const data = JSON.parse(JSON.stringify(this.form))
if (data.type === 'api') {
data.configuration = JSON.stringify(data.apiConfiguration)
data.configuration = Base64.encode(JSON.stringify(data.apiConfiguration))
} else {
data.configuration = JSON.stringify(data.configuration)
data.configuration = Base64.encode(JSON.stringify(data.configuration))
}
if (data.showModel === 'show' && !this.canEdit) {
validateDsById(data.id).then((res) => {

10
frontend/src/views/system/datasource/DsTree.vue
View File

@ -316,6 +316,7 @@
<script>
import { mapGetters } from 'vuex'
import i18n from '@/lang'
import { Base64 } from 'js-base64'
import {
listDatasource,
listDatasourceByType,
@ -502,8 +503,7 @@ export default {
})
},
refreshType(datasource) {
const method =
this.showView === 'Datasource' ? listDatasourceByType : listDriverByType
const method = this.showView === 'Datasource' ? listDatasourceByType : listDriverByType
let typeData = []
method(datasource.type).then((res) => {
typeData = this.buildTree(res.data)
@ -538,6 +538,12 @@ export default {
const newArr = []
for (let index = 0; index < array.length; index++) {
const element = array[index]
if(element.configuration){
element.configuration = Base64.decode(element.configuration)
}
if(element.apiConfigurationStr){
element.apiConfiguration = JSON.parse(Base64.decode(element.apiConfigurationStr))
}
if (this.msgNodeId) {
if (element.id === this.msgNodeId) {
element.msgNode = true