storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [26/50] storm git commit: Merge remote-tracking branch 'upstream/security' into STORM-406
Date Thu, 13 Nov 2014 19:37:21 GMT
Merge remote-tracking branch 'upstream/security' into STORM-406

Conflicts:
	STORM-UI-REST-API.md


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c7fe9ef9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c7fe9ef9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c7fe9ef9

Branch: refs/heads/master
Commit: c7fe9ef97962b7cd0eae11754d2bfbdd473139a9
Parents: b62d71d b19fdbb
Author: Parth Brahmbhatt <brahmbhatt.parth@gmail.com>
Authored: Fri Aug 29 09:52:23 2014 -0700
Committer: Parth Brahmbhatt <brahmbhatt.parth@gmail.com>
Committed: Fri Aug 29 09:52:23 2014 -0700

----------------------------------------------------------------------
 CHANGELOG.md                                    |  15 +++
 README.markdown                                 |   7 ++
 STORM-UI-REST-API.md                            |   3 +-
 bin/storm.cmd                                   |  10 +-
 conf/defaults.yaml                              |   1 +
 .../jvm/storm/starter/PrintSampleStream.java    |   4 +-
 pom.xml                                         |  13 +-
 storm-core/pom.xml                              |   4 +
 .../src/clj/backtype/storm/LocalCluster.clj     |   4 +-
 .../src/clj/backtype/storm/daemon/common.clj    |   3 +
 .../src/clj/backtype/storm/daemon/logviewer.clj |   4 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  32 +++--
 .../src/clj/backtype/storm/daemon/worker.clj    |   1 -
 storm-core/src/clj/backtype/storm/event.clj     |   3 +
 .../backtype/storm/scheduler/EvenScheduler.clj  |   2 +-
 storm-core/src/clj/backtype/storm/testing.clj   |   9 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  40 ++++---
 storm-core/src/jvm/backtype/storm/Config.java   |  42 +++++--
 .../storm/multilang/JsonSerializer.java         |  14 ++-
 .../DefaultSerializationDelegate.java           |  61 ++++++++++
 .../GzipBridgeSerializationDelegate.java        |  64 ++++++++++
 .../GzipSerializationDelegate.java              |  68 +++++++++++
 .../serialization/SerializationDelegate.java    |  35 ++++++
 .../src/jvm/backtype/storm/task/ShellBolt.java  |   9 +-
 .../src/jvm/backtype/storm/utils/Utils.java     |  60 ++++++----
 .../public/templates/index-page-template.html   |   2 +-
 .../templates/topology-page-template.html       |   2 -
 .../test/clj/backtype/storm/scheduler_test.clj  |  21 ++++
 .../test/clj/backtype/storm/supervisor_test.clj | 118 ++++++++-----------
 .../GzipBridgeSerializationDelegateTest.java    |  82 +++++++++++++
 30 files changed, 567 insertions(+), 166 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/c7fe9ef9/STORM-UI-REST-API.md
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/c7fe9ef9/storm-core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/c7fe9ef9/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/ui/core.clj
index 3c90715,d0d71c3..2181b48
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@@ -947,18 -953,12 +955,18 @@@
      (try
        (handler request)
        (catch Exception ex
-         (json-response (exception->json ex) 500)))))
+         (json-response (exception->json ex) ((:query-params request) "callback") :status
500)))))
  
 +
 +(def csrf-error-response
 +  (json-response {"error" "Forbidden action."
 +                  "errorMessage" "missing CSRF token."} 403))
 +
  (def app
    (handler/site (-> main-routes
 -                    (wrap-reload '[backtype.storm.ui.core])
 -                    catch-errors)))
 +                  (wrap-reload '[backtype.storm.ui.core])
 +                  (wrap-anti-forgery {:error-response csrf-error-response})
 +                  catch-errors)))
  
  (defn start-server!
    []


Mime
View raw message