You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2022/09/01 22:13:08 UTC

[couchdb] branch main updated (e674fd513 -> 82dca90a5)

This is an automated email from the ASF dual-hosted git repository.

jaydoane pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


    from e674fd513 Merge pull request #4160 from apache/bulk_get_input_validation
     new df8f7b5f1 Fix 'Bound variable in pattern' warnings
     new 82dca90a5 Maybe return bad_content_type on _session POST

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/couch/src/couch_httpd_auth.erl          | 10 ++++++++--
 src/couch/src/couch_util.erl                |  2 +-
 src/couch/test/eunit/couchdb_auth_tests.erl | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)


[couchdb] 02/02: Maybe return bad_content_type on _session POST

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jaydoane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 82dca90a56c9fc6ba9ac8fea6c7c2b6306afe032
Author: Jay Doane <ja...@apache.org>
AuthorDate: Thu Sep 1 13:38:44 2022 -0700

    Maybe return bad_content_type on _session POST
    
    Currently, when POSTing to `/_session` with a Content-Type header
    other than either `application/x-www-form-urlencoded` or
    `application/json`, the error response can be surprising.
    
    This changes the response to 415 `bad_content_type` when it's not one
    of the above.
---
 src/couch/src/couch_httpd_auth.erl          |  8 +++++++-
 src/couch/test/eunit/couchdb_auth_tests.erl | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/couch/src/couch_httpd_auth.erl b/src/couch/src/couch_httpd_auth.erl
index cc02a1e9d..c30854986 100644
--- a/src/couch/src/couch_httpd_auth.erl
+++ b/src/couch/src/couch_httpd_auth.erl
@@ -459,7 +459,13 @@ handle_session_req(#httpd{method = 'POST', mochi_req = MochiReq} = Req, AuthModu
                     Pairs
                 );
             _ ->
-                []
+                throw(
+                    {bad_ctype, <<
+                        "Content-Type must be "
+                        "'application/x-www-form-urlencoded' or "
+                        "'application/json'"
+                    >>}
+                )
         end,
     UserName = ?l2b(extract_username(Form)),
     Password = ?l2b(couch_util:get_value("password", Form, "")),
diff --git a/src/couch/test/eunit/couchdb_auth_tests.erl b/src/couch/test/eunit/couchdb_auth_tests.erl
index dfb22dc25..bc5caabe5 100644
--- a/src/couch/test/eunit/couchdb_auth_tests.erl
+++ b/src/couch/test/eunit/couchdb_auth_tests.erl
@@ -34,6 +34,7 @@ auth_test_() ->
     Tests = [
         fun should_return_username_on_post_to_session/2,
         fun should_not_return_authenticated_field/2,
+        fun should_return_bad_content_type_appropriately/2,
         fun should_return_list_of_handlers/2
     ],
     RequireValidUserTests = [
@@ -85,6 +86,20 @@ should_return_username_on_post_to_session(_PortType, Url) ->
         end
     ).
 
+should_return_bad_content_type_appropriately(_PortType, Url) ->
+    ?_assertEqual(
+        <<"bad_content_type">>,
+        begin
+            {ok, 415, _, Body} = test_request:post(
+                Url,
+                [{"Content-Type", ""}],
+                []
+            ),
+            #{<<"error">> := Error} = jiffy:decode(Body, [return_maps]),
+            Error
+        end
+    ).
+
 should_not_return_authenticated_field(_PortType, Url) ->
     ?_assertThrow(
         {not_found, _},


[couchdb] 01/02: Fix 'Bound variable in pattern' warnings

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jaydoane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit df8f7b5f19084f5dc0a32e237ba4b554afdeb885
Author: Jay Doane <ja...@apache.org>
AuthorDate: Thu Sep 1 11:52:48 2022 -0700

    Fix 'Bound variable in pattern' warnings
---
 src/couch/src/couch_httpd_auth.erl | 2 +-
 src/couch/src/couch_util.erl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/couch/src/couch_httpd_auth.erl b/src/couch/src/couch_httpd_auth.erl
index cdb790f57..cc02a1e9d 100644
--- a/src/couch/src/couch_httpd_auth.erl
+++ b/src/couch/src/couch_httpd_auth.erl
@@ -574,7 +574,7 @@ extract_username(Form) ->
     case couch_util:get_value("username", Form, CouchFormat) of
         undefined ->
             throw({bad_request, <<"request body must contain a username">>});
-        CouchFormat ->
+        Format when Format =:= CouchFormat ->
             CouchFormat;
         Else1 when CouchFormat == undefined ->
             Else1;
diff --git a/src/couch/src/couch_util.erl b/src/couch/src/couch_util.erl
index e916bbc69..afce1e0a5 100644
--- a/src/couch/src/couch_util.erl
+++ b/src/couch/src/couch_util.erl
@@ -256,7 +256,7 @@ get_value(Key, List) ->
 
 get_value(Key, List, Default) ->
     case lists:keysearch(Key, 1, List) of
-        {value, {Key, Value}} ->
+        {value, {K, Value}} when K =:= Key ->
             Value;
         false ->
             Default