diff options
author | iilyak <iilyak@ca.ibm.com> | 2017-05-25 15:24:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-25 15:24:39 -0700 |
commit | 26d3d9a5dc70ea37100d129b41128cb3f3265f83 (patch) | |
tree | eb901ca3522a68ca6ff2b799d62e17d5e8da6c7a | |
parent | 0d09ab3378a5286f81604524fb703459d681a135 (diff) | |
parent | ed1609ba337c0eca42774e59dac69bd0b31729d5 (diff) | |
download | couchdb-26d3d9a5dc70ea37100d129b41128cb3f3265f83.tar.gz |
Merge pull request #540 from cloudant/hash-admin-password-in-tests
Make sure we cache admin pass prior to test run
-rw-r--r-- | src/chttpd/test/chttpd_db_doc_size_tests.erl | 3 | ||||
-rw-r--r-- | src/chttpd/test/chttpd_db_test.erl | 3 | ||||
-rw-r--r-- | src/chttpd/test/chttpd_open_revs_error_test.erl | 3 | ||||
-rw-r--r-- | src/chttpd/test/chttpd_welcome_test.erl | 3 | ||||
-rw-r--r-- | src/couch/test/couch_db_mpr_tests.erl | 3 | ||||
-rw-r--r-- | src/couch/test/couchdb_auth_tests.erl | 6 | ||||
-rw-r--r-- | src/couch/test/couchdb_mrview_cors_tests.erl | 3 | ||||
-rw-r--r-- | src/couch/test/couchdb_mrview_tests.erl | 3 | ||||
-rw-r--r-- | src/couch/test/global_changes_tests.erl | 3 | ||||
-rw-r--r-- | src/couch_peruser/test/couch_peruser_test.erl | 3 |
10 files changed, 22 insertions, 11 deletions
diff --git a/src/chttpd/test/chttpd_db_doc_size_tests.erl b/src/chttpd/test/chttpd_db_doc_size_tests.erl index cdd2936c8..c4706af4a 100644 --- a/src/chttpd/test/chttpd_db_doc_size_tests.erl +++ b/src/chttpd/test/chttpd_db_doc_size_tests.erl @@ -26,7 +26,8 @@ setup() -> - ok = config:set("admins", ?USER, ?PASS, _Persist=false), + Hashed = couch_passwords:hash_admin_password(?PASS), + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false), ok = config:set("couchdb", "max_document_size", "50"), TmpDb = ?tempdb(), Addr = config:get("chttpd", "bind_address", "127.0.0.1"), diff --git a/src/chttpd/test/chttpd_db_test.erl b/src/chttpd/test/chttpd_db_test.erl index 02d74ad94..e2bc05654 100644 --- a/src/chttpd/test/chttpd_db_test.erl +++ b/src/chttpd/test/chttpd_db_test.erl @@ -22,7 +22,8 @@ -define(FIXTURE_TXT, ?ABS_PATH(?FILE)). setup() -> - ok = config:set("admins", ?USER, ?PASS, _Persist=false), + Hashed = couch_passwords:hash_admin_password(?PASS), + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false), TmpDb = ?tempdb(), Addr = config:get("chttpd", "bind_address", "127.0.0.1"), Port = mochiweb_socket_server:get(chttpd, port), diff --git a/src/chttpd/test/chttpd_open_revs_error_test.erl b/src/chttpd/test/chttpd_open_revs_error_test.erl index 5b26b5cf9..72b45f741 100644 --- a/src/chttpd/test/chttpd_open_revs_error_test.erl +++ b/src/chttpd/test/chttpd_open_revs_error_test.erl @@ -23,7 +23,8 @@ "multipart/form-data;boundary=\"bound\""}). setup() -> - ok = config:set("admins", ?USER, ?PASS, _Persist=false), + Hashed = couch_passwords:hash_admin_password(?PASS), + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false), TmpDb = ?tempdb(), Addr = config:get("chttpd", "bind_address", "127.0.0.1"), Port = mochiweb_socket_server:get(chttpd, port), diff --git a/src/chttpd/test/chttpd_welcome_test.erl b/src/chttpd/test/chttpd_welcome_test.erl index 55713ecc1..af9732f57 100644 --- a/src/chttpd/test/chttpd_welcome_test.erl +++ b/src/chttpd/test/chttpd_welcome_test.erl @@ -22,7 +22,8 @@ setup() -> - ok = config:set("admins", ?USER, ?PASS, _Persist=false), + Hashed = couch_passwords:hash_admin_password(?PASS), + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false), Addr = config:get("chttpd", "bind_address", "127.0.0.1"), Port = mochiweb_socket_server:get(chttpd, port), Url = lists:concat(["http://", Addr, ":", Port, "/"]), diff --git a/src/couch/test/couch_db_mpr_tests.erl b/src/couch/test/couch_db_mpr_tests.erl index e42a351c3..792901bf2 100644 --- a/src/couch/test/couch_db_mpr_tests.erl +++ b/src/couch/test/couch_db_mpr_tests.erl @@ -27,7 +27,8 @@ setup() -> - ok = config:set("admins", ?USER, ?PASS, _Persist=false), + Hashed = couch_passwords:hash_admin_password(?PASS), + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false), TmpDb = ?tempdb(), Addr = config:get("httpd", "bind_address", "127.0.0.1"), Port = mochiweb_socket_server:get(couch_httpd, port), diff --git a/src/couch/test/couchdb_auth_tests.erl b/src/couch/test/couchdb_auth_tests.erl index 0d3cb7955..b2a490fed 100644 --- a/src/couch/test/couchdb_auth_tests.erl +++ b/src/couch/test/couchdb_auth_tests.erl @@ -16,7 +16,8 @@ setup(PortType) -> - ok = config:set("admins", "rocko", "artischocko", false), + Hashed = couch_passwords:hash_admin_password("artischocko"), + ok = config:set("admins", "rocko", binary_to_list(Hashed), _Persist=false), Addr = config:get("httpd", "bind_address", "127.0.0.1"), lists:concat(["http://", Addr, ":", port(PortType), "/_session"]). @@ -51,7 +52,8 @@ make_test_cases(Mod, Funs) -> should_return_username_on_post_to_session(_PortType, Url) -> ?_assertEqual(<<"rocko">>, begin - ok = config:set("admins", "rocko", "artischocko", false), + Hashed = couch_passwords:hash_admin_password(<<"artischocko">>), + ok = config:set("admins", "rocko", binary_to_list(Hashed), false), {ok, _, _, Body} = test_request:post(Url, [{"Content-Type", "application/json"}], "{\"name\":\"rocko\", \"password\":\"artischocko\"}"), {Json} = jiffy:decode(Body), diff --git a/src/couch/test/couchdb_mrview_cors_tests.erl b/src/couch/test/couchdb_mrview_cors_tests.erl index f9155ce5e..0f69048a0 100644 --- a/src/couch/test/couchdb_mrview_cors_tests.erl +++ b/src/couch/test/couchdb_mrview_cors_tests.erl @@ -31,7 +31,8 @@ start() -> Ctx = test_util:start_couch([chttpd]), - ok = config:set("admins", ?USER, ?PASS, _Persist=false), + Hashed = couch_passwords:hash_admin_password(?PASS), + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false), ok = config:set("httpd", "enable_cors", "true", false), ok = config:set("vhosts", "example.com", "/", false), Ctx. diff --git a/src/couch/test/couchdb_mrview_tests.erl b/src/couch/test/couchdb_mrview_tests.erl index 9a4cc03f1..402df02a6 100644 --- a/src/couch/test/couchdb_mrview_tests.erl +++ b/src/couch/test/couchdb_mrview_tests.erl @@ -42,7 +42,8 @@ start() -> Ctx = test_util:start_couch([chttpd]), - ok = config:set("admins", ?USER, ?PASS, _Persist=false), + Hashed = couch_passwords:hash_admin_password(?PASS), + ok = config:set("admins", ?USER, ?b2l(Hashed), _Persist=false), Ctx. setup(PortType) -> diff --git a/src/couch/test/global_changes_tests.erl b/src/couch/test/global_changes_tests.erl index 930b985bc..864a6a0ec 100644 --- a/src/couch/test/global_changes_tests.erl +++ b/src/couch/test/global_changes_tests.erl @@ -144,7 +144,8 @@ decode_response(BinBody, ToDecode) -> [couch_util:get_value(Key, Body) || Key <- ToDecode]. add_admin(User, Pass) -> - config:set("admins", User, Pass, false). + Hashed = couch_passwords:hash_admin_password(Pass), + config:set("admins", User, ?b2l(Hashed), _Persist=false). delete_admin(User) -> config:delete("admins", User, false). diff --git a/src/couch_peruser/test/couch_peruser_test.erl b/src/couch_peruser/test/couch_peruser_test.erl index 30e6d448d..55308e6d7 100644 --- a/src/couch_peruser/test/couch_peruser_test.erl +++ b/src/couch_peruser/test/couch_peruser_test.erl @@ -20,7 +20,8 @@ setup_all() -> TestCtx = test_util:start_couch([chttpd]), - config:set("admins", ?ADMIN_USERNAME, ?ADMIN_PASSWORD), + Hashed = couch_passwords:hash_admin_password(?ADMIN_PASSWORD), + ok = config:set("admins", ?ADMIN_USERNAME, ?b2l(Hashed), _Persist=false), TestCtx. teardown_all(TestCtx) -> |