[dolphinscheduler] branch dev updated: fix roll view log null exception (#8914)

[gaojun2048]

This is an automated email from the ASF dual-hosted git repository.

gaojun2048 pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 5ad73f8  fix roll view log null exception (#8914)
5ad73f8 is described below

commit 5ad73f8352ae74d2f8804d75e00eb2712c6be879
Author: Kerwin <37063904+zhuangch...@users.noreply.github.com>
AuthorDate: Wed Mar 16 10:09:29 2022 +0800

    fix roll view log null exception (#8914)
---
 .../apache/dolphinscheduler/server/log/LoggerRequestProcessor.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
 
b/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
index 5160c86..46e6e48 100644
--- 
a/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
+++ 
b/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
@@ -32,6 +32,8 @@ import 
org.apache.dolphinscheduler.remote.command.log.ViewLogResponseCommand;
 import org.apache.dolphinscheduler.remote.processor.NettyRequestProcessor;
 import org.apache.dolphinscheduler.remote.utils.Constants;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -146,6 +148,9 @@ public class LoggerRequestProcessor implements 
NettyRequestProcessor {
      */
     private boolean checkPathSecurity(String path) {
         String dsHome = System.getProperty("DOLPHINSCHEDULER_WORKER_HOME");
+        if (StringUtils.isBlank(dsHome)) {
+            dsHome = System.getProperty("user.dir");
+        }
         if (path.startsWith(dsHome) && !path.contains("../") && 
path.endsWith(".log")) {
             return true;
         }