diff options
author | Adam Kocoloski <kocolosk@apache.org> | 2022-01-18 23:02:32 -0500 |
---|---|---|
committer | Adam Kocoloski <kocolosk@apache.org> | 2022-01-19 21:44:11 -0500 |
commit | 86e628933afb5f53ba4c02197edd303acce9cb68 (patch) | |
tree | 316abd4212a25d52ae78428f7757d9cde204968c | |
parent | 6bc5c361a6a3feca1e7666993d2ae9e2d8ee58ac (diff) | |
download | couchdb-86e628933afb5f53ba4c02197edd303acce9cb68.tar.gz |
Apply new formatting from erlfmt
-rw-r--r-- | src/chttpd/src/chttpd_changes.erl | 1 | ||||
-rw-r--r-- | src/chttpd/src/chttpd_db.erl | 6 | ||||
-rw-r--r-- | src/chttpd/test/eunit/chttpd_cors_test.erl | 168 | ||||
-rw-r--r-- | src/couch/src/couch_httpd_auth.erl | 11 | ||||
-rw-r--r-- | src/couch_eval/src/couch_eval.erl | 3 | ||||
-rw-r--r-- | src/couch_replicator/src/couch_replicator_api_wrap.erl | 9 | ||||
-rw-r--r-- | src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl | 46 | ||||
-rw-r--r-- | src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl | 16 | ||||
-rw-r--r-- | src/couch_views/src/couch_views_batch_impl.erl | 13 | ||||
-rw-r--r-- | src/fabric/src/fabric2_db.erl | 4 | ||||
-rw-r--r-- | src/fabric/src/fabric2_fdb.erl | 4 | ||||
-rw-r--r-- | src/fabric/src/fabric2_server.erl | 23 |
12 files changed, 159 insertions, 145 deletions
diff --git a/src/chttpd/src/chttpd_changes.erl b/src/chttpd/src/chttpd_changes.erl index 56ad716b2..b4feda44f 100644 --- a/src/chttpd/src/chttpd_changes.erl +++ b/src/chttpd/src/chttpd_changes.erl @@ -638,7 +638,6 @@ keep_sending_changes(Args, Acc0, FirstRound, T0) -> end end. - changes_duration() -> %% preserving original (3.x) configuration segment; case config:get("fabric", "changes_duration", "infinity") of diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl index c9a843aae..7fa55f822 100644 --- a/src/chttpd/src/chttpd_db.erl +++ b/src/chttpd/src/chttpd_db.erl @@ -1684,11 +1684,11 @@ db_attachment_req(#httpd{method = 'GET', mochi_req = MochiReq} = Req, Db, DocId, ) ), #doc_query_args{ - rev=Rev, - options=Options + rev = Rev, + options = Options } = parse_doc_query(Req), #doc{ - atts=Atts + atts = Atts } = Doc = couch_doc_open(Db, DocId, Rev, Options), Att = get_existing_attachment(Atts, FileName), [Type, Enc, DiskLen, AttLen, Md5] = couch_att:fetch( diff --git a/src/chttpd/test/eunit/chttpd_cors_test.erl b/src/chttpd/test/eunit/chttpd_cors_test.erl index fd4a48745..7b52f98f8 100644 --- a/src/chttpd/test/eunit/chttpd_cors_test.erl +++ b/src/chttpd/test/eunit/chttpd_cors_test.erl @@ -135,85 +135,80 @@ assert_not_preflight_(Val) -> cors_disabled_test_() -> {"CORS disabled tests", [ - {"Empty user", - {setup, - fun chttpd_test_util:start_couch/0, - fun chttpd_test_util:stop_couch/1, - {foreach, fun empty_cors_config/0, [ - fun test_no_access_control_method_preflight_request_/1, - fun test_no_headers_/1, - fun test_no_headers_server_/1, - fun test_no_headers_db_/1 - ]} - } - } + {"Empty user", { + setup, + fun chttpd_test_util:start_couch/0, + fun chttpd_test_util:stop_couch/1, + {foreach, fun empty_cors_config/0, [ + fun test_no_access_control_method_preflight_request_/1, + fun test_no_headers_/1, + fun test_no_headers_server_/1, + fun test_no_headers_db_/1 + ]} + }} ]}. %% CORS enabled tests cors_enabled_minimal_config_test_() -> - {"Minimal CORS enabled, no Origins", - {setup, - fun chttpd_test_util:start_couch/0, - fun chttpd_test_util:stop_couch/1, - {foreach, fun minimal_cors_config/0, [ - fun test_no_access_control_method_preflight_request_/1, - fun test_incorrect_origin_simple_request_/1, - fun test_incorrect_origin_preflight_request_/1 - ]} - } - }. + {"Minimal CORS enabled, no Origins", { + setup, + fun chttpd_test_util:start_couch/0, + fun chttpd_test_util:stop_couch/1, + {foreach, fun minimal_cors_config/0, [ + fun test_no_access_control_method_preflight_request_/1, + fun test_incorrect_origin_simple_request_/1, + fun test_incorrect_origin_preflight_request_/1 + ]} + }}. cors_enabled_simple_config_test_() -> - {"Simple CORS config", - {setup, - fun chttpd_test_util:start_couch/0, - fun chttpd_test_util:stop_couch/1, - {foreach, fun simple_cors_config/0, [ - fun test_no_access_control_method_preflight_request_/1, - fun test_preflight_request_/1, - fun test_bad_headers_preflight_request_/1, - fun test_good_headers_preflight_request_/1, - fun test_db_request_/1, - fun test_db_preflight_request_/1, - fun test_db_host_origin_request_/1, - fun test_preflight_with_port_no_origin_/1, - fun test_preflight_with_scheme_no_origin_/1, - fun test_preflight_with_scheme_port_no_origin_/1, - fun test_case_sensitive_mismatch_of_allowed_origins_/1 - ]} - } - }. + {"Simple CORS config", { + setup, + fun chttpd_test_util:start_couch/0, + fun chttpd_test_util:stop_couch/1, + {foreach, fun simple_cors_config/0, [ + fun test_no_access_control_method_preflight_request_/1, + fun test_preflight_request_/1, + fun test_bad_headers_preflight_request_/1, + fun test_good_headers_preflight_request_/1, + fun test_db_request_/1, + fun test_db_preflight_request_/1, + fun test_db_host_origin_request_/1, + fun test_preflight_with_port_no_origin_/1, + fun test_preflight_with_scheme_no_origin_/1, + fun test_preflight_with_scheme_port_no_origin_/1, + fun test_case_sensitive_mismatch_of_allowed_origins_/1 + ]} + }}. cors_enabled_custom_config_test_() -> - {"Simple CORS config with custom allow_methods/allow_headers/exposed_headers", - {setup, - fun chttpd_test_util:start_couch/0, - fun chttpd_test_util:stop_couch/1, - {foreach, fun custom_cors_config/0, [ - fun test_good_headers_preflight_request_with_custom_config_/1, - fun test_db_request_with_custom_config_/1 - ]} - } - }. + {"Simple CORS config with custom allow_methods/allow_headers/exposed_headers", { + setup, + fun chttpd_test_util:start_couch/0, + fun chttpd_test_util:stop_couch/1, + {foreach, fun custom_cors_config/0, [ + fun test_good_headers_preflight_request_with_custom_config_/1, + fun test_db_request_with_custom_config_/1 + ]} + }}. cors_enabled_multiple_config_test_() -> - {"Multiple options CORS config", - {setup, - fun chttpd_test_util:start_couch/0, - fun chttpd_test_util:stop_couch/1, - {foreach, fun multiple_cors_config/0, [ - fun test_no_access_control_method_preflight_request_/1, - fun test_preflight_request_/1, - fun test_db_request_/1, - fun test_db_preflight_request_/1, - fun test_db_host_origin_request_/1, - fun test_preflight_with_port_with_origin_/1, - fun test_preflight_with_scheme_with_origin_/1, - fun test_preflight_with_scheme_port_with_origin_/1 - ]} - } - }. + {"Multiple options CORS config", { + setup, + fun chttpd_test_util:start_couch/0, + fun chttpd_test_util:stop_couch/1, + {foreach, fun multiple_cors_config/0, [ + fun test_no_access_control_method_preflight_request_/1, + fun test_preflight_request_/1, + fun test_db_request_/1, + fun test_db_preflight_request_/1, + fun test_db_host_origin_request_/1, + fun test_preflight_with_port_with_origin_/1, + fun test_preflight_with_scheme_with_origin_/1, + fun test_preflight_with_scheme_port_with_origin_/1 + ]} + }}. %% Access-Control-Allow-Credentials tests @@ -249,25 +244,24 @@ db_request_credentials_header_on_test_() -> %% CORS wildcard tests cors_enabled_wildcard_test_() -> - {"Wildcard CORS config", - {setup, - fun chttpd_test_util:start_couch/0, - fun chttpd_test_util:stop_couch/1, - {foreach, fun wildcard_cors_config/0, [ - fun test_no_access_control_method_preflight_request_/1, - fun test_preflight_request_/1, - fun test_preflight_request_no_allow_credentials_/1, - fun test_preflight_request_empty_request_headers_/1, - fun test_db_request_/1, - fun test_db_preflight_request_/1, - fun test_db_host_origin_request_/1, - fun test_preflight_with_port_with_origin_/1, - fun test_preflight_with_scheme_with_origin_/1, - fun test_preflight_with_scheme_port_with_origin_/1, - fun test_case_sensitive_mismatch_of_allowed_origins_/1 - ]} - } - }. + {"Wildcard CORS config", { + setup, + fun chttpd_test_util:start_couch/0, + fun chttpd_test_util:stop_couch/1, + {foreach, fun wildcard_cors_config/0, [ + fun test_no_access_control_method_preflight_request_/1, + fun test_preflight_request_/1, + fun test_preflight_request_no_allow_credentials_/1, + fun test_preflight_request_empty_request_headers_/1, + fun test_db_request_/1, + fun test_db_preflight_request_/1, + fun test_db_host_origin_request_/1, + fun test_preflight_with_port_with_origin_/1, + fun test_preflight_with_scheme_with_origin_/1, + fun test_preflight_with_scheme_port_with_origin_/1, + fun test_case_sensitive_mismatch_of_allowed_origins_/1 + ]} + }}. %% Test generators diff --git a/src/couch/src/couch_httpd_auth.erl b/src/couch/src/couch_httpd_auth.erl index 1bc787dde..802dcd9f5 100644 --- a/src/couch/src/couch_httpd_auth.erl +++ b/src/couch/src/couch_httpd_auth.erl @@ -103,8 +103,13 @@ basic_name_pw(Req) -> [Basic, Base64Value] = string:split(Header, " "), case string:casefold(Basic) of "basic" -> - try re:split(base64:decode(Base64Value), ":", - [{return, list}, {parts, 2}]) of + try + re:split( + base64:decode(Base64Value), + ":", + [{return, list}, {parts, 2}] + ) + of ["_", "_"] -> % special name and pass to be logged out nil; @@ -115,7 +120,7 @@ basic_name_pw(Req) -> catch error:function_clause -> throw({ - bad_request, + bad_request, "Authorization header has invalid base64 value" }) end; diff --git a/src/couch_eval/src/couch_eval.erl b/src/couch_eval/src/couch_eval.erl index e5dc210c3..2f7847761 100644 --- a/src/couch_eval/src/couch_eval.erl +++ b/src/couch_eval/src/couch_eval.erl @@ -67,7 +67,8 @@ -callback validate_doc_update(ddoc(), doc(), doc(), user_context(), sec_obj()) -> ok | {error, any()}. -callback filter_view(ddoc(), function_name(), [doc()]) -> {true, [result()]} | {error, any()}. --callback filter_docs(req(), db(), ddoc(), function_name(), [doc()]) -> {true, [result()]} | {error, any()}. +-callback filter_docs(req(), db(), ddoc(), function_name(), [doc()]) -> + {true, [result()]} | {error, any()}. -spec acquire_map_context( db_name(), diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl b/src/couch_replicator/src/couch_replicator_api_wrap.erl index 2fa9feb20..dd7d1ae8d 100644 --- a/src/couch_replicator/src/couch_replicator_api_wrap.erl +++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl @@ -1035,10 +1035,11 @@ db_from_json(#{} = DbMap) -> [], Headers0 ), - Socks5 = case maps:get(<<"proxy_protocol">>, IBrowseOptions0, undefined) of - <<"socks5">> -> true; - _ -> false - end, + Socks5 = + case maps:get(<<"proxy_protocol">>, IBrowseOptions0, undefined) of + <<"socks5">> -> true; + _ -> false + end, IBrowseOptions = maps:fold( fun (<<"socket_options">>, #{} = SockOpts, Acc) -> diff --git a/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl index 21a691cf4..cbc674619 100644 --- a/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl +++ b/src/couch_replicator/test/eunit/couch_replicator_filtered_tests.erl @@ -22,31 +22,37 @@ <<"_id">> => ?DDOC_ID, <<"filters">> => #{ <<"testfilter">> => - <<"\n" - " function(doc, req){if (doc.class == 'mammal') return true;}\n" - " ">>, + << + "\n" + " function(doc, req){if (doc.class == 'mammal') return true;}\n" + " " + >>, <<"queryfilter">> => - <<"\n" - " function(doc, req) {\n" - " if (doc.class && req.query.starts) {\n" - " return doc.class.indexOf(req.query.starts) === 0;\n" - " }\n" - " else {\n" - " return false;\n" - " }\n" - " }\n" - " ">> + << + "\n" + " function(doc, req) {\n" + " if (doc.class && req.query.starts) {\n" + " return doc.class.indexOf(req.query.starts) === 0;\n" + " }\n" + " else {\n" + " return false;\n" + " }\n" + " }\n" + " " + >> }, <<"views">> => #{ <<"mammals">> => #{ <<"map">> => - <<"\n" - " function(doc) {\n" - " if (doc.class == 'mammal') {\n" - " emit(doc._id, null);\n" - " }\n" - " }\n" - " ">> + << + "\n" + " function(doc) {\n" + " if (doc.class == 'mammal') {\n" + " emit(doc._id, null);\n" + " }\n" + " }\n" + " " + >> } } }). diff --git a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl index edc4c5bd3..2cdc5da4b 100644 --- a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl +++ b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl @@ -156,13 +156,15 @@ cancel(RepId, Pid) -> couch_replicator_test_helper:cancel(RepId, Pid). vdu() -> - <<"function(newDoc, oldDoc, userCtx) {\n" - " if(newDoc.nope === true) {\n" - " throw({forbidden: 'nope'});\n" - " } else {\n" - " return;\n" - " }\n" - " }">>. + << + "function(newDoc, oldDoc, userCtx) {\n" + " if(newDoc.nope === true) {\n" + " throw({forbidden: 'nope'});\n" + " } else {\n" + " return;\n" + " }\n" + " }" + >>. add_vdu(DbName) -> DocProps = [ diff --git a/src/couch_views/src/couch_views_batch_impl.erl b/src/couch_views/src/couch_views_batch_impl.erl index 858852843..d4eebdb5b 100644 --- a/src/couch_views/src/couch_views_batch_impl.erl +++ b/src/couch_views/src/couch_views_batch_impl.erl @@ -162,12 +162,13 @@ bad_config_test_() -> lists:map( fun({Field, Error}) -> FieldName = atom_to_list(Field), - {FieldName, ?_assertError( - {Error, {couch_views, Field, _}}, - with_bad_config(FieldName, fun() -> - start(#mrst{}, undefined) - end)) - } + {FieldName, + ?_assertError( + {Error, {couch_views, Field, _}}, + with_bad_config(FieldName, fun() -> + start(#mrst{}, undefined) + end) + )} end, FieldErrors ). diff --git a/src/fabric/src/fabric2_db.erl b/src/fabric/src/fabric2_db.erl index 7521fc438..b29aced0b 100644 --- a/src/fabric/src/fabric2_db.erl +++ b/src/fabric/src/fabric2_db.erl @@ -808,7 +808,9 @@ validate_docid(<<"_design/">>) -> validate_docid(<<"_local/">>) -> throw({illegal_docid, <<"Illegal document id `_local/`">>}); validate_docid(Id) when is_binary(Id) -> - ConfigDocIdLength = config:get_integer("couchdb", "max_document_id_length", ?DOC_ID_LIMIT_BYTES), + ConfigDocIdLength = config:get_integer( + "couchdb", "max_document_id_length", ?DOC_ID_LIMIT_BYTES + ), DocIdLength = min(ConfigDocIdLength, ?DOC_ID_LIMIT_BYTES), case DocIdLength > 0 andalso byte_size(Id) > DocIdLength of true -> throw({illegal_docid, <<"Document id is too long">>}); diff --git a/src/fabric/src/fabric2_fdb.erl b/src/fabric/src/fabric2_fdb.erl index 94ab19019..f68ac411e 100644 --- a/src/fabric/src/fabric2_fdb.erl +++ b/src/fabric/src/fabric2_fdb.erl @@ -2155,8 +2155,8 @@ get_info_wait_int(#info_future{} = InfoFuture) -> binary_chunk_size() -> ConfigBinaryChunkSize = config:get_integer( - "fabric", - "binary_chunk_size", + "fabric", + "binary_chunk_size", ?DEFAULT_BINARY_CHUNK_SIZE_BYTES ), min(ConfigBinaryChunkSize, ?DEFAULT_BINARY_CHUNK_SIZE_BYTES). diff --git a/src/fabric/src/fabric2_server.erl b/src/fabric/src/fabric2_server.erl index d0587ee4f..14c03294d 100644 --- a/src/fabric/src/fabric2_server.erl +++ b/src/fabric/src/fabric2_server.erl @@ -150,16 +150,19 @@ init(_) -> {ok, nil}. check_config_limits() -> - lists:foreach(fun({Sect, Key, Limit}) -> - ConfigVal = config:get_integer(Sect, Key, Limit), - case ConfigVal > Limit of - true -> - LogMsg = "Config value of ~p for [~s] ~s is greater than the limit: ~p", - couch_log:warning(LogMsg, [ConfigVal, Sect, Key, Limit]); - false -> - ok - end - end, ?CONFIG_LIMITS). + lists:foreach( + fun({Sect, Key, Limit}) -> + ConfigVal = config:get_integer(Sect, Key, Limit), + case ConfigVal > Limit of + true -> + LogMsg = "Config value of ~p for [~s] ~s is greater than the limit: ~p", + couch_log:warning(LogMsg, [ConfigVal, Sect, Key, Limit]); + false -> + ok + end + end, + ?CONFIG_LIMITS + ). terminate(_, _St) -> ok. |