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 <[email protected]> Authored: Thu Mar 26 14:16:13 2015 -0700 Committer: Parth Brahmbhatt <[email protected]> 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)))))
