You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2022/03/16 02:07:25 UTC
[dolphinscheduler] branch 2.0.6-prepare updated: cheryy-pick [Fix-8913][Worker]fix roll view log null exception #8914 (#8918)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch 2.0.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.6-prepare by this push:
new e2b962e cheryy-pick [Fix-8913][Worker]fix roll view log null exception #8914 (#8918)
e2b962e is described below
commit e2b962e7759d1b7c305f6ab2e887a55d43735a74
Author: Kerwin <37...@users.noreply.github.com>
AuthorDate: Wed Mar 16 10:05:23 2022 +0800
cheryy-pick [Fix-8913][Worker]fix roll view log null exception #8914 (#8918)
---
.../org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
index b56037e..fb92849 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
@@ -142,6 +142,9 @@ public class LoggerRequestProcessor implements NettyRequestProcessor {
private boolean checkPathSecurity(String path) {
String dsHome = System.getProperty("DOLPHINSCHEDULER_HOME");
+ if (StringUtils.isBlank(dsHome)) {
+ dsHome = System.getProperty("user.dir");
+ }
if (!StringUtils.isBlank(path)) {
if (path.startsWith(dsHome) && !path.contains("../") && path.endsWith(".log")) {
return true;