Skip to content

[STORM-2311]A browser which is outside the cluster cant's access stor… #1890

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
liu-zhaokun wants to merge 1 commit into from
Closed

[STORM-2311]A browser which is outside the cluster cant's access stor… #1890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions storm-core/src/clj/org/apache/storm/ui/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,29 +1140,25 @@
(GET "/api/v1/cluster/summary" [:as {:keys [cookies servlet-request]} & m]
(.mark ui:num-cluster-summary-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getClusterInfo")
(let [user (get-user-name servlet-request)]
(json-response (assoc (cluster-summary user)
"bugtracker-url" (*STORM-CONF* UI-PROJECT-BUGTRACKER-URL)
"central-log-url" (*STORM-CONF* UI-CENTRAL-LOGGING-URL)) (:callback m))))
(GET "/api/v1/nimbus/summary" [:as {:keys [cookies servlet-request]} & m]
(.mark ui:num-nimbus-summary-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getClusterInfo")
(json-response (nimbus-summary) (:callback m)))
(GET "/api/v1/history/summary" [:as {:keys [cookies servlet-request]} & m]
(let [user (.getUserName http-creds-handler servlet-request)]
(json-response (topology-history-info user) (:callback m))))
(GET "/api/v1/supervisor/summary" [:as {:keys [cookies servlet-request]} & m]
(.mark ui:num-supervisor-summary-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getClusterInfo")
(json-response (assoc (supervisor-summary)
"logviewerPort" (*STORM-CONF* LOGVIEWER-PORT)) (:callback m)))
(GET "/api/v1/supervisor" [:as {:keys [cookies servlet-request scheme]} & m]
(.mark ui:num-supervisor-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getSupervisorPageInfo")
;; supervisor takes either an id or a host query parameter, and technically both
;; that said, if both the id and host are provided, the id wins
(let [id (:id m)
Expand All @@ -1172,7 +1168,6 @@
(GET "/api/v1/topology/summary" [:as {:keys [cookies servlet-request]} & m]
(.mark ui:num-all-topologies-summary-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getClusterInfo")
(json-response (all-topologies-summary) (:callback m)))
(GET "/api/v1/topology-workers/:id" [:as {:keys [cookies servlet-request]} id & m]
(let [id (URLDecoder/decode id)]
Expand All @@ -1181,42 +1176,35 @@
(GET "/api/v1/topology/:id" [:as {:keys [cookies servlet-request scheme]} id & m]
(.mark ui:num-topology-page-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getTopology" (topology-config id))
(let [user (get-user-name servlet-request)]
(json-response (topology-page id (:window m) (check-include-sys? (:sys m)) user (= scheme :https)) (:callback m))))
(GET "/api/v1/topology/:id/metrics" [:as {:keys [cookies servlet-request]} id & m]
(.mark ui:num-topology-metric-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getTopology" (topology-config id))
(json-response (topology-metrics-page id (:window m) (check-include-sys? (:sys m))) (:callback m)))
(GET "/api/v1/topology/:id/lag" [:as {:keys [cookies servlet-request scheme]} id & m]
(.mark ui:num-topology-lag-http-requests)
(populate-context! servlet-request)
(let [topology-conf (topology-config id)]
(assert-authorized-user "getUserTopology" topology-conf)
(json-response (topology-lag id topology-conf) nil)))
(GET "/api/v1/topology/:id/visualization-init" [:as {:keys [cookies servlet-request]} id & m]
(.mark ui:num-build-visualization-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getTopology" (topology-config id))
(json-response (build-visualization id (:window m) (check-include-sys? (:sys m))) (:callback m)))
(GET "/api/v1/topology/:id/visualization" [:as {:keys [cookies servlet-request]} id & m]
(.mark ui:num-mk-visualization-data-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getTopology" (topology-config id))
(json-response (mk-visualization-data id (:window m) (check-include-sys? (:sys m))) (:callback m)))
(GET "/api/v1/topology/:id/component/:component" [:as {:keys [cookies servlet-request scheme]} id component & m]
(.mark ui:num-component-page-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getTopology" (topology-config id))
(let [user (get-user-name servlet-request)]
(json-response
(component-page id component (:window m) (check-include-sys? (:sys m)) user (= scheme :https))
(:callback m))))
(GET "/api/v1/topology/:id/logconfig" [:as {:keys [cookies servlet-request]} id & m]
(.mark ui:num-log-config-http-requests)
(populate-context! servlet-request)
(assert-authorized-user "getTopology" (topology-config id))
(json-response (log-config id) (:callback m)))
(POST "/api/v1/topology/:id/activate" [:as {:keys [cookies servlet-request]} id & m]
(.mark ui:num-activate-topology-http-requests)
Expand Down