Skip to content

[STORM-2093] Fix permissions in multi-tenant, secure mode #2032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ppoulosk wants to merge 2 commits into from
Closed

[STORM-2093] Fix permissions in multi-tenant, secure mode #2032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54d2a33
[STORM-2093] Fix permissions in multi-tenant, secure mode
Mar 28, 2017
961a5dc
Fix merge error
Apr 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,20 @@
(-> (resp/response "Page not found")
(resp/status 404)))))

(defnk set-log-file-permissions [fname root-dir]
(let [file (.getCanonicalFile (File. root-dir fname))
run-as-user (*STORM-CONF* SUPERVISOR-RUN-WORKER-AS-USER)
parent (.getParent (File. root-dir fname))
md-file (if (nil? parent) nil (get-metadata-file-for-wroker-logdir parent))
topo-owner (if (nil? md-file) nil (get-topo-owner-from-metadata-file md-file))]
(if (and run-as-user
(not-nil? topo-owner)
(.exists file)
(not (Files/isReadable (.toPath file))))
(do
(log-debug "Setting permissions on file " fname " with topo-owner " topo-owner)
(SupervisorUtils/processLauncherAndWait *STORM-CONF* topo-owner ["code-dir" (.getCanonicalPath file)] nil (str "setup group read permissions for file: " fname))))))

(defnk download-log-file [fname req resp user ^String root-dir :is-daemon false]
(let [file (.getCanonicalFile (File. root-dir fname))]
(if (.exists file)
Expand Down Expand Up @@ -1024,6 +1038,7 @@
start (if (:start m) (parse-long-from-map m :start))
length (if (:length m) (parse-long-from-map m :length))
file (URLDecoder/decode (:file m))]
(set-log-file-permissions file log-root)
(log-template (log-page file start length (:grep m) user log-root)
file user))
(catch InvalidRequestException ex
Expand Down Expand Up @@ -1102,6 +1117,7 @@
(.mark logviewer:num-download-log-file-http-requests)
(let [user (.getUserName http-creds-handler servlet-request)
file (URLDecoder/decode (:file m))]
(set-log-file-permissions file log-root)
(download-log-file file servlet-request servlet-response user log-root))
(catch InvalidRequestException ex
(log-error ex)
Expand Down