You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/03/30 16:51:54 UTC
[1/3] storm git commit: STORM-727: nimbus_auth_test should not use
default nimbus port.
Repository: storm
Updated Branches:
refs/heads/master d063a1ac3 -> 36e99fa2d
STORM-727: nimbus_auth_test should not use default nimbus port.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fda68601
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fda68601
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fda68601
Branch: refs/heads/master
Commit: fda686013f90e6bd575af1673ea92d092e3321a4
Parents: 6a0ebad
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Thu Mar 26 14:16:13 2015 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Sun Mar 29 10:36:06 2015 -0700
----------------------------------------------------------------------
.../storm/security/auth/nimbus_auth_test.clj | 231 ++++++++++---------
1 file changed, 118 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fda68601/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
index 549256b..0a9c280 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
@@ -57,121 +57,126 @@
(.stop nimbus-server#)))
(deftest Simple-authentication-test
- (with-test-cluster [6627 nil nil "backtype.storm.security.auth.SimpleTransportPlugin"]
- (let [storm-conf (merge (read-storm-config)
- {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.SimpleTransportPlugin"
- STORM-NIMBUS-RETRY-TIMES 0})
- client (NimbusClient. storm-conf "localhost" 6627 nimbus-timeout)
- nimbus_client (.getClient client)]
- (testing "(Positive authorization) Simple protocol w/o authentication/authorization enforcement"
- (is (thrown-cause? NotAliveException
- (.activate nimbus_client "topo-name"))))
- (.close client))))
+ (let [port (available-port)]
+ (with-test-cluster [port nil nil "backtype.storm.security.auth.SimpleTransportPlugin"]
+ (let [storm-conf (merge (read-storm-config)
+ {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.SimpleTransportPlugin"
+ STORM-NIMBUS-RETRY-TIMES 0})
+ client (NimbusClient. storm-conf "localhost" port nimbus-timeout)
+ nimbus_client (.getClient client)]
+ (testing "(Positive authorization) Simple protocol w/o authentication/authorization enforcement"
+ (is (thrown-cause? NotAliveException
+ (.activate nimbus_client "topo-name"))))
+ (.close client)))))
-(deftest test-noop-authorization-w-simple-transport
- (with-test-cluster [6628 nil
- "backtype.storm.security.auth.authorizer.NoopAuthorizer"
- "backtype.storm.security.auth.SimpleTransportPlugin"]
- (let [storm-conf (merge (read-storm-config)
- {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.SimpleTransportPlugin"
- STORM-NIMBUS-RETRY-TIMES 0})
- client (NimbusClient. storm-conf "localhost" 6628 nimbus-timeout)
- nimbus_client (.getClient client)]
- (testing "(Positive authorization) Authorization plugin should accept client request"
- (is (thrown-cause? NotAliveException
- (.activate nimbus_client "topo-name"))))
- (.close client))))
+(deftest test-noop-authorization-w-simple-transport
+ (let [port (available-port)]
+ (with-test-cluster [port nil
+ "backtype.storm.security.auth.authorizer.NoopAuthorizer"
+ "backtype.storm.security.auth.SimpleTransportPlugin"]
+ (let [storm-conf (merge (read-storm-config)
+ {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.SimpleTransportPlugin"
+ STORM-NIMBUS-RETRY-TIMES 0})
+ client (NimbusClient. storm-conf "localhost" port nimbus-timeout)
+ nimbus_client (.getClient client)]
+ (testing "(Positive authorization) Authorization plugin should accept client request"
+ (is (thrown-cause? NotAliveException
+ (.activate nimbus_client "topo-name"))))
+ (.close client)))))
-(deftest test-deny-authorization-w-simple-transport
- (with-test-cluster [6629 nil
- "backtype.storm.security.auth.authorizer.DenyAuthorizer"
- "backtype.storm.security.auth.SimpleTransportPlugin"]
- (let [storm-conf (merge (read-storm-config)
- {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.SimpleTransportPlugin"
- Config/NIMBUS_HOST "localhost"
- Config/NIMBUS_THRIFT_PORT 6629
- STORM-NIMBUS-RETRY-TIMES 0})
- client (NimbusClient/getConfiguredClient storm-conf)
- nimbus_client (.getClient client)
- topologyInitialStatus (TopologyInitialStatus/findByValue 2)
- submitOptions (SubmitOptions. topologyInitialStatus)]
- (is (thrown-cause? AuthorizationException (.submitTopology nimbus_client "topo-name" nil nil nil)))
- (is (thrown-cause? AuthorizationException (.submitTopologyWithOpts nimbus_client "topo-name" nil nil nil submitOptions)))
- (is (thrown-cause? AuthorizationException (.beginFileUpload nimbus_client)))
- (is (thrown-cause? AuthorizationException (.uploadChunk nimbus_client nil nil)))
- (is (thrown-cause? AuthorizationException (.finishFileUpload nimbus_client nil)))
- (is (thrown-cause? AuthorizationException (.beginFileDownload nimbus_client nil)))
- (is (thrown-cause? AuthorizationException (.downloadChunk nimbus_client nil)))
- (is (thrown-cause? AuthorizationException (.getNimbusConf nimbus_client)))
- (is (thrown-cause? AuthorizationException (.getClusterInfo nimbus_client)))
- (stubbing [nimbus/check-storm-active! nil
- nimbus/try-read-storm-conf-from-name {}]
- (is (thrown-cause? AuthorizationException (.killTopology nimbus_client "topo-name")))
- (is (thrown-cause? AuthorizationException (.killTopologyWithOpts nimbus_client "topo-name" (KillOptions.))))
- (is (thrown-cause? AuthorizationException (.activate nimbus_client "topo-name")))
- (is (thrown-cause? AuthorizationException (.deactivate nimbus_client "topo-name")))
- (is (thrown-cause? AuthorizationException (.rebalance nimbus_client "topo-name" nil)))
- )
- (stubbing [nimbus/try-read-storm-conf {}]
- (is (thrown-cause? AuthorizationException (.getTopologyConf nimbus_client "topo-ID")))
- (is (thrown-cause? AuthorizationException (.getTopology nimbus_client "topo-ID")))
- (is (thrown-cause? AuthorizationException (.getUserTopology nimbus_client "topo-ID")))
- (is (thrown-cause? AuthorizationException (.getTopologyInfo nimbus_client "topo-ID"))))
- (.close client))))
+(deftest test-deny-authorization-w-simple-transport
+ (let [port (available-port)]
+ (with-test-cluster [port nil
+ "backtype.storm.security.auth.authorizer.DenyAuthorizer"
+ "backtype.storm.security.auth.SimpleTransportPlugin"]
+ (let [storm-conf (merge (read-storm-config)
+ {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.SimpleTransportPlugin"
+ Config/NIMBUS_HOST "localhost"
+ Config/NIMBUS_THRIFT_PORT port
+ STORM-NIMBUS-RETRY-TIMES 0})
+ client (NimbusClient/getConfiguredClient storm-conf)
+ nimbus_client (.getClient client)
+ topologyInitialStatus (TopologyInitialStatus/findByValue 2)
+ submitOptions (SubmitOptions. topologyInitialStatus)]
+ (is (thrown-cause? AuthorizationException (.submitTopology nimbus_client "topo-name" nil nil nil)))
+ (is (thrown-cause? AuthorizationException (.submitTopologyWithOpts nimbus_client "topo-name" nil nil nil submitOptions)))
+ (is (thrown-cause? AuthorizationException (.beginFileUpload nimbus_client)))
+ (is (thrown-cause? AuthorizationException (.uploadChunk nimbus_client nil nil)))
+ (is (thrown-cause? AuthorizationException (.finishFileUpload nimbus_client nil)))
+ (is (thrown-cause? AuthorizationException (.beginFileDownload nimbus_client nil)))
+ (is (thrown-cause? AuthorizationException (.downloadChunk nimbus_client nil)))
+ (is (thrown-cause? AuthorizationException (.getNimbusConf nimbus_client)))
+ (is (thrown-cause? AuthorizationException (.getClusterInfo nimbus_client)))
+ (stubbing [nimbus/check-storm-active! nil
+ nimbus/try-read-storm-conf-from-name {}]
+ (is (thrown-cause? AuthorizationException (.killTopology nimbus_client "topo-name")))
+ (is (thrown-cause? AuthorizationException (.killTopologyWithOpts nimbus_client "topo-name" (KillOptions.))))
+ (is (thrown-cause? AuthorizationException (.activate nimbus_client "topo-name")))
+ (is (thrown-cause? AuthorizationException (.deactivate nimbus_client "topo-name")))
+ (is (thrown-cause? AuthorizationException (.rebalance nimbus_client "topo-name" nil)))
+ )
+ (stubbing [nimbus/try-read-storm-conf {}]
+ (is (thrown-cause? AuthorizationException (.getTopologyConf nimbus_client "topo-ID")))
+ (is (thrown-cause? AuthorizationException (.getTopology nimbus_client "topo-ID")))
+ (is (thrown-cause? AuthorizationException (.getUserTopology nimbus_client "topo-ID")))
+ (is (thrown-cause? AuthorizationException (.getTopologyInfo nimbus_client "topo-ID"))))
+ (.close client)))))
-(deftest test-noop-authorization-w-sasl-digest
- (with-test-cluster [6630
- "test/clj/backtype/storm/security/auth/jaas_digest.conf"
- "backtype.storm.security.auth.authorizer.NoopAuthorizer"
- "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"]
- (let [storm-conf (merge (read-storm-config)
- {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"
- "java.security.auth.login.config" "test/clj/backtype/storm/security/auth/jaas_digest.conf"
- Config/NIMBUS_HOST "localhost"
- Config/NIMBUS_THRIFT_PORT 6630
- STORM-NIMBUS-RETRY-TIMES 0})
- client (NimbusClient/getConfiguredClient storm-conf)
- nimbus_client (.getClient client)]
- (testing "(Positive authorization) Authorization plugin should accept client request"
- (is (thrown-cause? NotAliveException
- (.activate nimbus_client "topo-name"))))
- (.close client))))
+(deftest test-noop-authorization-w-sasl-digest
+ (let [port (available-port)]
+ (with-test-cluster [port
+ "test/clj/backtype/storm/security/auth/jaas_digest.conf"
+ "backtype.storm.security.auth.authorizer.NoopAuthorizer"
+ "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"]
+ (let [storm-conf (merge (read-storm-config)
+ {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"
+ "java.security.auth.login.config" "test/clj/backtype/storm/security/auth/jaas_digest.conf"
+ Config/NIMBUS_HOST "localhost"
+ Config/NIMBUS_THRIFT_PORT port
+ STORM-NIMBUS-RETRY-TIMES 0})
+ client (NimbusClient/getConfiguredClient storm-conf)
+ nimbus_client (.getClient client)]
+ (testing "(Positive authorization) Authorization plugin should accept client request"
+ (is (thrown-cause? NotAliveException
+ (.activate nimbus_client "topo-name"))))
+ (.close client)))))
-(deftest test-deny-authorization-w-sasl-digest
- (with-test-cluster [6631
- "test/clj/backtype/storm/security/auth/jaas_digest.conf"
- "backtype.storm.security.auth.authorizer.DenyAuthorizer"
- "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"]
- (let [storm-conf (merge (read-storm-config)
- {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"
- "java.security.auth.login.config" "test/clj/backtype/storm/security/auth/jaas_digest.conf"
- Config/NIMBUS_HOST "localhost"
- Config/NIMBUS_THRIFT_PORT 6631
- STORM-NIMBUS-RETRY-TIMES 0})
- client (NimbusClient/getConfiguredClient storm-conf)
- nimbus_client (.getClient client)
- topologyInitialStatus (TopologyInitialStatus/findByValue 2)
- submitOptions (SubmitOptions. topologyInitialStatus)]
- (is (thrown-cause? AuthorizationException (.submitTopology nimbus_client "topo-name" nil nil nil)))
- (is (thrown-cause? AuthorizationException (.submitTopologyWithOpts nimbus_client "topo-name" nil nil nil submitOptions)))
- (is (thrown-cause? AuthorizationException (.beginFileUpload nimbus_client)))
- (is (thrown-cause? AuthorizationException (.uploadChunk nimbus_client nil nil)))
- (is (thrown-cause? AuthorizationException (.finishFileUpload nimbus_client nil)))
- (is (thrown-cause? AuthorizationException (.beginFileDownload nimbus_client nil)))
- (is (thrown-cause? AuthorizationException (.downloadChunk nimbus_client nil)))
- (is (thrown-cause? AuthorizationException (.getNimbusConf nimbus_client)))
- (is (thrown-cause? AuthorizationException (.getClusterInfo nimbus_client)))
- (stubbing [nimbus/check-storm-active! nil
- nimbus/try-read-storm-conf-from-name {}]
- (is (thrown-cause? AuthorizationException (.killTopology nimbus_client "topo-name")))
- (is (thrown-cause? AuthorizationException (.killTopologyWithOpts nimbus_client "topo-name" (KillOptions.))))
- (is (thrown-cause? AuthorizationException (.activate nimbus_client "topo-name")))
- (is (thrown-cause? AuthorizationException (.deactivate nimbus_client "topo-name")))
- (is (thrown-cause? AuthorizationException (.rebalance nimbus_client "topo-name" nil))))
- (stubbing [nimbus/try-read-storm-conf {}]
- (is (thrown-cause? AuthorizationException (.getTopologyConf nimbus_client "topo-ID")))
- (is (thrown-cause? AuthorizationException (.getTopology nimbus_client "topo-ID")))
- (is (thrown-cause? AuthorizationException (.getUserTopology nimbus_client "topo-ID")))
- (is (thrown-cause? AuthorizationException (.getTopologyInfo nimbus_client "topo-ID"))))
- (.close client))))
+(deftest test-deny-authorization-w-sasl-digest
+ (let [port (available-port)]
+ (with-test-cluster [port
+ "test/clj/backtype/storm/security/auth/jaas_digest.conf"
+ "backtype.storm.security.auth.authorizer.DenyAuthorizer"
+ "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"]
+ (let [storm-conf (merge (read-storm-config)
+ {STORM-THRIFT-TRANSPORT-PLUGIN "backtype.storm.security.auth.digest.DigestSaslTransportPlugin"
+ "java.security.auth.login.config" "test/clj/backtype/storm/security/auth/jaas_digest.conf"
+ Config/NIMBUS_HOST "localhost"
+ Config/NIMBUS_THRIFT_PORT port
+ STORM-NIMBUS-RETRY-TIMES 0})
+ client (NimbusClient/getConfiguredClient storm-conf)
+ nimbus_client (.getClient client)
+ topologyInitialStatus (TopologyInitialStatus/findByValue 2)
+ submitOptions (SubmitOptions. topologyInitialStatus)]
+ (is (thrown-cause? AuthorizationException (.submitTopology nimbus_client "topo-name" nil nil nil)))
+ (is (thrown-cause? AuthorizationException (.submitTopologyWithOpts nimbus_client "topo-name" nil nil nil submitOptions)))
+ (is (thrown-cause? AuthorizationException (.beginFileUpload nimbus_client)))
+ (is (thrown-cause? AuthorizationException (.uploadChunk nimbus_client nil nil)))
+ (is (thrown-cause? AuthorizationException (.finishFileUpload nimbus_client nil)))
+ (is (thrown-cause? AuthorizationException (.beginFileDownload nimbus_client nil)))
+ (is (thrown-cause? AuthorizationException (.downloadChunk nimbus_client nil)))
+ (is (thrown-cause? AuthorizationException (.getNimbusConf nimbus_client)))
+ (is (thrown-cause? AuthorizationException (.getClusterInfo nimbus_client)))
+ (stubbing [nimbus/check-storm-active! nil
+ nimbus/try-read-storm-conf-from-name {}]
+ (is (thrown-cause? AuthorizationException (.killTopology nimbus_client "topo-name")))
+ (is (thrown-cause? AuthorizationException (.killTopologyWithOpts nimbus_client "topo-name" (KillOptions.))))
+ (is (thrown-cause? AuthorizationException (.activate nimbus_client "topo-name")))
+ (is (thrown-cause? AuthorizationException (.deactivate nimbus_client "topo-name")))
+ (is (thrown-cause? AuthorizationException (.rebalance nimbus_client "topo-name" nil))))
+ (stubbing [nimbus/try-read-storm-conf {}]
+ (is (thrown-cause? AuthorizationException (.getTopologyConf nimbus_client "topo-ID")))
+ (is (thrown-cause? AuthorizationException (.getTopology nimbus_client "topo-ID")))
+ (is (thrown-cause? AuthorizationException (.getUserTopology nimbus_client "topo-ID")))
+ (is (thrown-cause? AuthorizationException (.getTopologyInfo nimbus_client "topo-ID"))))
+ (.close client)))))
[3/3] storm git commit: Update CHANGELOG for STORM-727
Posted by da...@apache.org.
Update CHANGELOG for STORM-727
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/36e99fa2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/36e99fa2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/36e99fa2
Branch: refs/heads/master
Commit: 36e99fa2dfdd13cd43d8fa8c558c670cd7750ed0
Parents: 480b63a
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Mar 30 09:51:28 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Mar 30 09:51:28 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/36e99fa2/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc2b5dc..c0de063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
* STORM-714: Make CSS more consistent with self, prev release
* STORM-703: With hash key option for RedisMapState, only get values for keys in batch
* STORM-691: Add basic lookup / persist bolts
+ * STORM-727: Storm tests should succeed even if a storm process is running locally.
## 0.10.0
* STORM-681: Auto insert license header with genthrift.sh
[2/3] storm git commit: Merge branch 'STORM-727' of
https://github.com/Parth-Brahmbhatt/incubator-storm
Posted by da...@apache.org.
Merge branch 'STORM-727' of https://github.com/Parth-Brahmbhatt/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/480b63a4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/480b63a4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/480b63a4
Branch: refs/heads/master
Commit: 480b63a4b608daf7e5b86c83492af598bb62ff1c
Parents: d063a1a fda6860
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Mar 30 09:48:10 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Mar 30 09:48:10 2015 -0500
----------------------------------------------------------------------
.../storm/security/auth/nimbus_auth_test.clj | 231 ++++++++++---------
1 file changed, 118 insertions(+), 113 deletions(-)
----------------------------------------------------------------------