Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
501c9360
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
704
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
501c9360
编写于
9月 08, 2021
作者:
L
lenboo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code style
上级
5d27e187
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
34 deletion
+37
-34
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
...inscheduler/api/service/ProcessDefinitionServiceTest.java
+20
-20
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/SensitiveDataConverter.java
...e/dolphinscheduler/server/log/SensitiveDataConverter.java
+2
-1
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/SensitiveDataConverterTest.java
...lphinscheduler/server/log/SensitiveDataConverterTest.java
+15
-13
未找到文件。
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
浏览文件 @
501c9360
...
...
@@ -78,8 +78,8 @@ import com.google.common.collect.Lists;
public
class
ProcessDefinitionServiceTest
{
private
static
final
String
taskRelationJson
=
"[{\"name\":\"\",\"preTaskCode\":0,\"preTaskVersion\":0,\"postTaskCode\":123456789,"
+
"\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"},{\"name\":\"\",\"preTaskCode\":123456789,"
+
"\"preTaskVersion\":1,\"postTaskCode\":123451234,\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"}]"
;
+
"\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"},{\"name\":\"\",\"preTaskCode\":123456789,"
+
"\"preTaskVersion\":1,\"postTaskCode\":123451234,\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"}]"
;
@InjectMocks
private
ProcessDefinitionServiceImpl
processDefinitionService
;
...
...
@@ -167,14 +167,14 @@ public class ProcessDefinitionServiceTest {
Page
<
ProcessDefinition
>
page
=
new
Page
<>(
1
,
10
);
page
.
setTotal
(
30
);
Mockito
.
when
(
processDefineMapper
.
queryDefineListPaging
(
Mockito
.
any
(
IPage
.
class
)
,
Mockito
.
eq
(
""
)
,
Mockito
.
eq
(
loginUser
.
getId
())
,
Mockito
.
eq
(
project
.
getCode
())
,
Mockito
.
anyBoolean
())).
thenReturn
(
page
);
Mockito
.
any
(
IPage
.
class
)
,
Mockito
.
eq
(
""
)
,
Mockito
.
eq
(
loginUser
.
getId
())
,
Mockito
.
eq
(
project
.
getCode
())
,
Mockito
.
anyBoolean
())).
thenReturn
(
page
);
Result
map1
=
processDefinitionService
.
queryProcessDefinitionListPaging
(
loginUser
,
1L
,
""
,
1
,
10
,
loginUser
.
getId
());
loginUser
,
1L
,
""
,
1
,
10
,
loginUser
.
getId
());
Assert
.
assertEquals
(
Status
.
SUCCESS
.
getMsg
(),
map1
.
getMsg
());
}
...
...
@@ -274,7 +274,7 @@ public class ProcessDefinitionServiceTest {
putMsg
(
result
,
Status
.
PROJECT_NOT_FOUNT
,
projectCode
);
Mockito
.
when
(
projectService
.
checkProjectAndAuth
(
loginUser
,
project
,
projectCode
)).
thenReturn
(
result
);
Map
<
String
,
Object
>
map1
=
processDefinitionService
.
batchCopyProcessDefinition
(
loginUser
,
projectCode
,
String
.
valueOf
(
project
.
getId
()),
2L
);
loginUser
,
projectCode
,
String
.
valueOf
(
project
.
getId
()),
2L
);
Assert
.
assertEquals
(
Status
.
PROJECT_NOT_FOUNT
,
map1
.
get
(
Constants
.
STATUS
));
// project check auth success, target project name not equal project name, check auth target project fail
...
...
@@ -291,7 +291,7 @@ public class ProcessDefinitionServiceTest {
Mockito
.
when
(
processDefineMapper
.
queryByCodes
(
definitionCodes
)).
thenReturn
(
processDefinitionList
);
Map
<
String
,
Object
>
map3
=
processDefinitionService
.
batchCopyProcessDefinition
(
loginUser
,
projectCode
,
"46"
,
1L
);
loginUser
,
projectCode
,
"46"
,
1L
);
Assert
.
assertEquals
(
Status
.
COPY_PROCESS_DEFINITION_ERROR
,
map3
.
get
(
Constants
.
STATUS
));
}
...
...
@@ -324,7 +324,7 @@ public class ProcessDefinitionServiceTest {
putMsg
(
result
,
Status
.
SUCCESS
);
Map
<
String
,
Object
>
successRes
=
processDefinitionService
.
batchMoveProcessDefinition
(
loginUser
,
projectCode
,
"46"
,
projectCode2
);
loginUser
,
projectCode
,
"46"
,
projectCode2
);
Assert
.
assertEquals
(
Status
.
MOVE_PROCESS_DEFINITION_ERROR
,
successRes
.
get
(
Constants
.
STATUS
));
}
...
...
@@ -428,26 +428,26 @@ public class ProcessDefinitionServiceTest {
putMsg
(
result
,
Status
.
PROJECT_NOT_FOUNT
,
projectCode
);
Mockito
.
when
(
projectService
.
checkProjectAndAuth
(
loginUser
,
project
,
projectCode
)).
thenReturn
(
result
);
Map
<
String
,
Object
>
map
=
processDefinitionService
.
releaseProcessDefinition
(
loginUser
,
projectCode
,
6
,
ReleaseState
.
OFFLINE
);
6
,
ReleaseState
.
OFFLINE
);
Assert
.
assertEquals
(
Status
.
PROJECT_NOT_FOUNT
,
map
.
get
(
Constants
.
STATUS
));
// project check auth success, processs definition online
putMsg
(
result
,
Status
.
SUCCESS
,
projectCode
);
Mockito
.
when
(
processDefineMapper
.
queryByCode
(
46L
)).
thenReturn
(
getProcessDefinition
());
Map
<
String
,
Object
>
onlineRes
=
processDefinitionService
.
releaseProcessDefinition
(
loginUser
,
projectCode
,
46
,
ReleaseState
.
ONLINE
);
loginUser
,
projectCode
,
46
,
ReleaseState
.
ONLINE
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
onlineRes
.
get
(
Constants
.
STATUS
));
// project check auth success, processs definition online
ProcessDefinition
processDefinition1
=
getProcessDefinition
();
processDefinition1
.
setResourceIds
(
"1,2"
);
Map
<
String
,
Object
>
onlineWithResourceRes
=
processDefinitionService
.
releaseProcessDefinition
(
loginUser
,
projectCode
,
46
,
ReleaseState
.
ONLINE
);
loginUser
,
projectCode
,
46
,
ReleaseState
.
ONLINE
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
onlineWithResourceRes
.
get
(
Constants
.
STATUS
));
// release error code
Map
<
String
,
Object
>
failRes
=
processDefinitionService
.
releaseProcessDefinition
(
loginUser
,
projectCode
,
46
,
ReleaseState
.
getEnum
(
2
));
loginUser
,
projectCode
,
46
,
ReleaseState
.
getEnum
(
2
));
Assert
.
assertEquals
(
Status
.
REQUEST_PARAMS_NOT_VALID_ERROR
,
failRes
.
get
(
Constants
.
STATUS
));
}
...
...
@@ -467,20 +467,20 @@ public class ProcessDefinitionServiceTest {
putMsg
(
result
,
Status
.
PROJECT_NOT_FOUNT
,
projectCode
);
Mockito
.
when
(
projectService
.
checkProjectAndAuth
(
loginUser
,
project
,
projectCode
)).
thenReturn
(
result
);
Map
<
String
,
Object
>
map
=
processDefinitionService
.
verifyProcessDefinitionName
(
loginUser
,
projectCode
,
"test_pdf"
);
projectCode
,
"test_pdf"
);
Assert
.
assertEquals
(
Status
.
PROJECT_NOT_FOUNT
,
map
.
get
(
Constants
.
STATUS
));
//project check auth success, process not exist
putMsg
(
result
,
Status
.
SUCCESS
,
projectCode
);
Mockito
.
when
(
processDefineMapper
.
verifyByDefineName
(
project
.
getCode
(),
"test_pdf"
)).
thenReturn
(
null
);
Map
<
String
,
Object
>
processNotExistRes
=
processDefinitionService
.
verifyProcessDefinitionName
(
loginUser
,
projectCode
,
"test_pdf"
);
projectCode
,
"test_pdf"
);
Assert
.
assertEquals
(
Status
.
SUCCESS
,
processNotExistRes
.
get
(
Constants
.
STATUS
));
//process exist
Mockito
.
when
(
processDefineMapper
.
verifyByDefineName
(
project
.
getCode
(),
"test_pdf"
)).
thenReturn
(
getProcessDefinition
());
Map
<
String
,
Object
>
processExistRes
=
processDefinitionService
.
verifyProcessDefinitionName
(
loginUser
,
projectCode
,
"test_pdf"
);
projectCode
,
"test_pdf"
);
Assert
.
assertEquals
(
Status
.
PROCESS_DEFINITION_NAME_EXIST
,
processExistRes
.
get
(
Constants
.
STATUS
));
}
...
...
@@ -614,7 +614,7 @@ public class ProcessDefinitionServiceTest {
Mockito
.
when
(
projectService
.
checkProjectAndAuth
(
loginUser
,
project
,
projectCode
)).
thenReturn
(
result
);
Map
<
String
,
Object
>
updateResult
=
processDefinitionService
.
updateProcessDefinition
(
loginUser
,
projectCode
,
"test"
,
1
,
""
,
""
,
""
,
0
,
"root"
,
null
,
null
);
""
,
""
,
""
,
0
,
"root"
,
null
,
null
);
Assert
.
assertEquals
(
Status
.
DATA_IS_NOT_VALID
,
updateResult
.
get
(
Constants
.
STATUS
));
}
...
...
@@ -635,7 +635,7 @@ public class ProcessDefinitionServiceTest {
Mockito
.
when
(
projectService
.
checkProjectAndAuth
(
loginUser
,
project
,
projectCode
)).
thenReturn
(
result
);
processDefinitionService
.
batchExportProcessDefinitionByCodes
(
loginUser
,
projectCode
,
"1"
,
null
);
loginUser
,
projectCode
,
"1"
,
null
);
ProcessDefinition
processDefinition
=
new
ProcessDefinition
();
processDefinition
.
setId
(
1
);
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/SensitiveDataConverter.java
浏览文件 @
501c9360
...
...
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.dolphinscheduler.server.log
;
package
org.apache.dolphinscheduler.server.log
;
import
ch.qos.logback.classic.pattern.MessageConverter
;
import
ch.qos.logback.classic.spi.ILoggingEvent
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.utils.SensitiveLogUtils
;
import
org.apache.dolphinscheduler.common.utils.StringUtils
;
...
...
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/SensitiveDataConverterTest.java
浏览文件 @
501c9360
...
...
@@ -14,15 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.dolphinscheduler.server.log
;
package
org.apache.dolphinscheduler.server.log
;
import
ch.qos.logback.classic.Level
;
import
ch.qos.logback.classic.spi.ILoggingEvent
;
import
ch.qos.logback.classic.spi.IThrowableProxy
;
import
ch.qos.logback.classic.spi.LoggerContextVO
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.utils.SensitiveLogUtils
;
import
org.junit.Assert
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
...
...
@@ -42,17 +44,18 @@ public class SensitiveDataConverterTest {
*/
private
final
Pattern
pwdPattern
=
Pattern
.
compile
(
Constants
.
DATASOURCE_PASSWORD_REGEX
);
private
final
String
logMsg
=
"{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\","
+
"\"database\":\"carbond\","
+
"\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\","
+
"\"user\":\"view\","
+
"\"password\":\"view1\"}"
;
private
final
String
maskLogMsg
=
"{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\","
+
"\"database\":\"carbond\","
+
"\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\","
+
"\"user\":\"view\","
+
"\"password\":\"******\"}"
;
private
final
String
logMsg
=
"{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\","
+
"\"database\":\"carbond\","
+
"\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\","
+
"\"user\":\"view\","
+
"\"password\":\"view1\"}"
;
private
final
String
maskLogMsg
=
"{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\","
+
"\"database\":\"carbond\","
+
"\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\","
+
"\"user\":\"view\","
+
"\"password\":\"******\"}"
;
@Test
public
void
convert
()
{
SensitiveDataConverter
sensitiveDataConverter
=
new
SensitiveDataConverter
();
...
...
@@ -175,5 +178,4 @@ public class SensitiveDataConverterTest {
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录