STORM-1280 port backtype.storm.daemon.logviewer to java * fix a bug: parameter swapped (address another missing places) * swap parameter sequence to make it consistent with other method
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8b4a1ce3 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8b4a1ce3 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8b4a1ce3 Branch: refs/heads/master Commit: 8b4a1ce3a13bc1c51297cc80625c51e55c7790a0 Parents: 35ca265 Author: Jungtaek Lim <[email protected]> Authored: Mon Jul 24 13:38:07 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Jul 24 13:38:07 2017 +0900 ---------------------------------------------------------------------- .../storm/daemon/logviewer/handler/LogviewerLogPageHandler.java | 2 +- .../storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java | 2 +- .../org/apache/storm/daemon/logviewer/utils/LogFileDownloader.java | 2 +- .../apache/storm/daemon/logviewer/utils/ResourceAuthorizer.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/8b4a1ce3/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java index c6e9828..5c883d9 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java @@ -176,7 +176,7 @@ public class LogviewerLogPageHandler { public Response logPage(String fileName, Integer start, Integer length, String grep, String user) throws IOException, InvalidRequestException { String rootDir = logRoot; - if (resourceAuthorizer.isUserAllowedToAccessFile(fileName, user)) { + if (resourceAuthorizer.isUserAllowedToAccessFile(user, fileName)) { workerLogs.setLogFilePermission(fileName); File file = new File(rootDir, fileName).getCanonicalFile(); http://git-wip-us.apache.org/repos/asf/storm/blob/8b4a1ce3/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java index 117cb86..76f1683 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java @@ -119,7 +119,7 @@ public class LogviewerLogSearchHandler { File file = new File(rootDir, fileName).getCanonicalFile(); Response response; if (file.exists()) { - if (isDaemon || resourceAuthorizer.isUserAllowedToAccessFile(fileName, user)) { + if (isDaemon || resourceAuthorizer.isUserAllowedToAccessFile(user, fileName)) { Integer numMatchesInt = numMatchesStr != null ? tryParseIntParam("num-matches", numMatchesStr) : null; Integer offsetInt = offsetStr != null ? tryParseIntParam("start-byte-offset", offsetStr) : null; http://git-wip-us.apache.org/repos/asf/storm/blob/8b4a1ce3/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/LogFileDownloader.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/LogFileDownloader.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/LogFileDownloader.java index 62c08da..3984f03 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/LogFileDownloader.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/LogFileDownloader.java @@ -54,7 +54,7 @@ public class LogFileDownloader { String rootDir = isDaemon ? daemonLogRoot : logRoot; File file = new File(rootDir, fileName).getCanonicalFile(); if (file.exists()) { - if (isDaemon || resourceAuthorizer.isUserAllowedToAccessFile(fileName, user)) { + if (isDaemon || resourceAuthorizer.isUserAllowedToAccessFile(user, fileName)) { return LogviewerResponseBuilder.buildDownloadFile(file); } else { return LogviewerResponseBuilder.buildResponseUnautohrizedUser(user); http://git-wip-us.apache.org/repos/asf/storm/blob/8b4a1ce3/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/ResourceAuthorizer.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/ResourceAuthorizer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/ResourceAuthorizer.java index 16f408a..286c176 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/ResourceAuthorizer.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/ResourceAuthorizer.java @@ -61,7 +61,7 @@ public class ResourceAuthorizer { * @param fileName file name to access * @param user username */ - public boolean isUserAllowedToAccessFile(String fileName, String user) { + public boolean isUserAllowedToAccessFile(String user, String fileName) { return isUiFilterNotSet() || isAuthorizedLogUser(user, fileName); }
