github/DataX
5
0
Fork 0
mirror of https://github.com/alibaba/DataX.git synced 2025-05-02 17:22:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改加密key名称，取消默认值

Browse Source
This commit is contained in:
weizhao1 2023-03-23 16:28:37 +08:00
parent e51eb2e996
commit 6ed98bf09a
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/conf/.secret.properties
View File

@ -6,4 +6,4 @@ current.publicKey=
current.privateKey= current.privateKey=
current.service.username= current.service.username=
current.service.password= current.service.password=
dp.public.k= db.encrypt.key=

2
core/src/main/java/com/alibaba/datax/core/Engine.java
View File

@ -52,7 +52,7 @@ public class Engine {
long instanceId; long instanceId;
int taskGroupId = -1; int taskGroupId = -1;
if (isJob) { if (isJob) {
JobPwdDescryptUtil.decrypt(allConf); JobDataBasePwdDecryptUtil.decrypt(allConf);
allConf.set(CoreConstant.DATAX_CORE_CONTAINER_JOB_MODE, RUNTIME_MODE); allConf.set(CoreConstant.DATAX_CORE_CONTAINER_JOB_MODE, RUNTIME_MODE);
container = new JobContainer(allConf); container = new JobContainer(allConf);
instanceId = allConf.getLong( instanceId = allConf.getLong(

14
core/src/main/java/com/alibaba/datax/core/util/JobPwdDescryptUtil.java → core/src/main/java/com/alibaba/datax/core/util/JobDataBasePwdDecryptUtil.java
View File

@ -3,22 +3,28 @@ package com.alibaba.datax.core.util;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.core.util.container.CoreConstant; import com.alibaba.datax.core.util.container.CoreConstant;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**job数据库密码解密 /**
* 数据库密码解密
*
* @Author weizhao.dong * @Author weizhao.dong
* @Date 2023/3/23 14:37 * @Date 2023/3/23 14:37
* @Version 1.0 * @Version 1.0
*/ */
public class JobPwdDescryptUtil { public class JobDataBasePwdDecryptUtil {
private static final Logger LOG = LoggerFactory.getLogger(JobDataBasePwdDecryptUtil.class);
public static void decrypt(Configuration configuration) { public static void decrypt(Configuration configuration) {
if (configuration.getBool(CoreConstant.DATAX_JOB_SETTING_PASSWD_ENCRYPT, false)) { if (configuration.getBool(CoreConstant.DATAX_JOB_SETTING_PASSWD_ENCRYPT, false)) {
String readerPwd = configuration.getString(CoreConstant.DATA_JOB_READER_PARAMETER_PASSWORD); String readerPwd = configuration.getString(CoreConstant.DATA_JOB_READER_PARAMETER_PASSWORD);
String writePwd = configuration.getString(CoreConstant.DATA_JOB_WRITER_PARAMETER_PASSWORD); String writePwd = configuration.getString(CoreConstant.DATA_JOB_WRITER_PARAMETER_PASSWORD);
//加密key //加密key
String key = SecretUtil.getSecurityProperties().getProperty(CoreConstant.PASSWD_KEY); String key = SecretUtil.getSecurityProperties().getProperty(CoreConstant.DB_ENCRYPT_KEY);
if (StringUtils.isEmpty(key)) { if (StringUtils.isEmpty(key)) {
key = CoreConstant.PASSWD_KEY_DEFAULT; LOG.warn("{} is empty，use original password,", CoreConstant.DB_ENCRYPT_KEY);
return;
} }
if (StringUtils.isNotEmpty(readerPwd)) { if (StringUtils.isNotEmpty(readerPwd)) {
configuration.set(CoreConstant.DATA_JOB_READER_PARAMETER_PASSWORD, SecretUtil.decrypt3DES(readerPwd, key)); configuration.set(CoreConstant.DATA_JOB_READER_PARAMETER_PASSWORD, SecretUtil.decrypt3DES(readerPwd, key));

4
core/src/main/java/com/alibaba/datax/core/util/container/CoreConstant.java
View File

@ -157,8 +157,8 @@ public class CoreConstant {
public static final String CURRENT_SERVICE_USERNAME = "current.service.username"; public static final String CURRENT_SERVICE_USERNAME = "current.service.username";
public static final String CURRENT_SERVICE_PASSWORD = "current.service.password"; public static final String CURRENT_SERVICE_PASSWORD = "current.service.password";
public static final String PASSWD_KEY="dp.public.k";
public static final String PASSWD_KEY_DEFAULT="dwz1qaz2wsx"; public static final String DB_ENCRYPT_KEY = "db.encrypt.key";
// ----------------------------- 环境变量 --------------------------------- // ----------------------------- 环境变量 ---------------------------------