summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2023-05-09 17:22:01 +0100
committerRobert Newson <rnewson@apache.org>2023-05-09 18:17:39 +0100
commit6371cd0a027ba84800dd36a1a3a1b4e5823747d9 (patch)
tree63aad9f67a492f15c52103731cc141eb0b025778
parent4a8c8b52f0decb9f3f8254ccac232a0a5f224756 (diff)
downloadcouchdb-6371cd0a027ba84800dd36a1a3a1b4e5823747d9.tar.gz
Revert "fix(mango): GET invalid path under `_index` should not cause 500"
This reverts commit c1195e43c0b55f99892bb5d6b593de178499b969.
-rw-r--r--src/mango/src/mango_httpd.erl6
-rw-r--r--src/mango/test/01-index-crud-test.py4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/mango/src/mango_httpd.erl b/src/mango/src/mango_httpd.erl
index 935cf5890..3e58288da 100644
--- a/src/mango/src/mango_httpd.erl
+++ b/src/mango/src/mango_httpd.erl
@@ -107,6 +107,8 @@ handle_index_req(#httpd{method = 'POST', path_parts = [_, _]} = Req, Db) ->
end
end,
chttpd:send_json(Req, {[{result, Status}, {id, Id}, {name, Name}]});
+handle_index_req(#httpd{path_parts = [_, _]} = Req, _Db) ->
+ chttpd:send_method_not_allowed(Req, "GET,POST");
%% Essentially we just iterate through the list of ddoc ids passed in and
%% delete one by one. If an error occurs, all previous documents will be
%% deleted, but an error will be thrown for the current ddoc id.
@@ -187,9 +189,7 @@ handle_index_req(
?MANGO_ERROR({error_saving_ddoc, Error})
end;
handle_index_req(#httpd{path_parts = [_, _, _DDocId0, _Type, _Name]} = Req, _Db) ->
- chttpd:send_method_not_allowed(Req, "DELETE");
-handle_index_req(#httpd{path_parts = [_, _ | _]} = Req, _Db) ->
- chttpd:send_method_not_allowed(Req, "GET,POST").
+ chttpd:send_method_not_allowed(Req, "DELETE").
handle_explain_req(#httpd{method = 'POST'} = Req, Db) ->
chttpd:validate_ctype(Req, "application/json"),
diff --git a/src/mango/test/01-index-crud-test.py b/src/mango/test/01-index-crud-test.py
index e85e1d8ea..dd70e7eea 100644
--- a/src/mango/test/01-index-crud-test.py
+++ b/src/mango/test/01-index-crud-test.py
@@ -88,10 +88,6 @@ class IndexCrudTests(mango.DbPerClass):
else:
raise AssertionError("bad create index")
- def test_bad_url(self):
- r = self.db.sess.get(self.db.path("_index/foo"))
- self.assertEqual(r.status_code, 405)
-
def test_create_idx_01(self):
fields = ["foo", "bar"]
ret = self.db.create_index(fields, name="idx_01")