You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/09 23:39:34 UTC
[1/4] git commit: Bolt with whitespace in name can be viewed in ui
Repository: incubator-storm
Updated Branches:
refs/heads/master 253eac7fb -> 3cf3f55e4
Bolt with whitespace in name can be viewed in ui
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/813952a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/813952a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/813952a8
Branch: refs/heads/master
Commit: 813952a8b1345586e53da62d1d65546c15d9e120
Parents: d5dee0e
Author: Niels Basjes <nb...@bol.com>
Authored: Mon Mar 24 20:06:51 2014 +0100
Committer: Niels Basjes <nb...@bol.com>
Committed: Mon Mar 24 20:06:51 2014 +0100
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/813952a8/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 63a3053..27e3b15 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -1024,7 +1024,7 @@
(catch Exception e (resp/redirect "/")))))
(GET "/topology/:id/component/:component" [:as {cookies :cookies} id component & m]
(let [include-sys? (get-include-sys? cookies)]
- (-> (component-page id component (:window m) include-sys?)
+ (-> (component-page id (java.net.URLDecoder/decode component) (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
ui-template)))
(POST "/topology/:id/activate" [id]
[2/4] git commit: Ensure that no evil chars can be put into the HTML
via the the name of a component
Posted by pt...@apache.org.
Ensure that no evil chars can be put into the HTML via the the name of a component
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/df687cb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/df687cb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/df687cb7
Branch: refs/heads/master
Commit: df687cb71ba174e408a6cf68011053ff18b16f71
Parents: 813952a
Author: Niels Basjes <nb...@bol.com>
Authored: Mon Mar 24 22:06:32 2014 +0100
Committer: Niels Basjes <nb...@bol.com>
Committed: Mon Mar 24 22:06:32 2014 +0100
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/df687cb7/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 27e3b15..3b975c5 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -485,7 +485,7 @@
:let [disp ((display-map k) k)]]
[(link-to (if (= k window) {:class "red"} {})
(url-format "/topology/%s?window=%s" id k)
- disp)
+ (escape-html disp))
(get-in stats [:emitted k])
(get-in stats [:transferred k])
(float-str (get-in stats [:complete-latencies k]))
@@ -717,7 +717,7 @@
:let [disp ((display-map k) k)]]
[(link-to (if (= k window) {:class "red"} {})
(url-format "/topology/%s/component/%s?window=%s" topology-id id k)
- disp)
+ (escape-html disp))
(get-in stats [:emitted k])
(get-in stats [:transferred k])
(float-str (get-in stats [:complete-latencies k]))
@@ -935,7 +935,7 @@
:let [disp ((display-map k) k)]]
[(link-to (if (= k window) {:class "red"} {})
(url-format "/topology/%s/component/%s?window=%s" topology-id id k)
- disp)
+ (escape-html disp))
(get-in stats [:emitted k])
(get-in stats [:transferred k])
(float-str (get-in stats [:execute-latencies k]))
[3/4] git commit: Ensure that also the topology id is encoded/decoded
correctly
Posted by pt...@apache.org.
Ensure that also the topology id is encoded/decoded correctly
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/2c636ba0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/2c636ba0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/2c636ba0
Branch: refs/heads/master
Commit: 2c636ba017a8b67eceb11a8b09caf081812752b0
Parents: df687cb
Author: Niels Basjes <nb...@bol.com>
Authored: Mon Mar 24 22:07:27 2014 +0100
Committer: Niels Basjes <nb...@bol.com>
Committed: Mon Mar 24 22:07:27 2014 +0100
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2c636ba0/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 3b975c5..ad4b97f 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -1016,34 +1016,40 @@
(-> (main-page)
ui-template))
(GET "/topology/:id" [:as {cookies :cookies} id & m]
- (let [include-sys? (get-include-sys? cookies)]
+ (let [include-sys? (get-include-sys? cookies)
+ id (java.net.URLDecoder/decode id)]
(try
(-> (topology-page id (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
ui-template)
(catch Exception e (resp/redirect "/")))))
(GET "/topology/:id/component/:component" [:as {cookies :cookies} id component & m]
- (let [include-sys? (get-include-sys? cookies)]
- (-> (component-page id (java.net.URLDecoder/decode component) (:window m) include-sys?)
+ (let [include-sys? (get-include-sys? cookies)
+ id (java.net.URLDecoder/decode id)
+ component (java.net.URLDecoder/decode component)]
+ (-> (component-page id component (:window m) include-sys?)
(concat [(mk-system-toggle-button include-sys?)])
ui-template)))
(POST "/topology/:id/activate" [id]
(with-nimbus nimbus
- (let [tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ (let [id (java.net.URLDecoder/decode id)
+ tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)]
(.activate nimbus name)
(log-message "Activating topology '" name "'")))
(resp/redirect (str "/topology/" id)))
(POST "/topology/:id/deactivate" [id]
(with-nimbus nimbus
- (let [tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ (let [id (java.net.URLDecoder/decode id)
+ tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)]
(.deactivate nimbus name)
(log-message "Deactivating topology '" name "'")))
(resp/redirect (str "/topology/" id)))
(POST "/topology/:id/rebalance/:wait-time" [id wait-time]
(with-nimbus nimbus
- (let [tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ (let [id (java.net.URLDecoder/decode id)
+ tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)
options (RebalanceOptions.)]
(.set_wait_secs options (Integer/parseInt wait-time))
@@ -1052,7 +1058,8 @@
(resp/redirect (str "/topology/" id)))
(POST "/topology/:id/kill/:wait-time" [id wait-time]
(with-nimbus nimbus
- (let [tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ (let [id (java.net.URLDecoder/decode id)
+ tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
name (.get_name tplg)
options (KillOptions.)]
(.set_wait_secs options (Integer/parseInt wait-time))
[4/4] git commit: Merge branch 'master' of
github.com:nielsbasjes/incubator-storm
Posted by pt...@apache.org.
Merge branch 'master' of github.com:nielsbasjes/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/3cf3f55e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/3cf3f55e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/3cf3f55e
Branch: refs/heads/master
Commit: 3cf3f55e41b65d00ff5b5e3231e519b9cfc2c012
Parents: 253eac7 2c636ba
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 9 15:49:15 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 9 15:49:15 2014 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 25 ++++++++++++++--------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------