From 5ad73f8352ae74d2f8804d75e00eb2712c6be879 Mon Sep 17 00:00:00 2001 From: Kerwin <37063904+zhuangchong@users.noreply.github.com> Date: Wed, 16 Mar 2022 10:09:29 +0800 Subject: [PATCH] fix roll view log null exception (#8914) --- .../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 5160c86043..46e6e48c23 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; }