svn commit: r766505 - in /couchdb/trunk: share/www/script/couch_tests.js share/www/script/test/form_submit.js src/couchdb/couch_httpd.erl src/couchdb/couch_httpd_db.erl

[da...@apache.org]

Author: davisp
Date: Sun Apr 19 20:02:45 2009
New Revision: 766505

URL: http://svn.apache.org/viewvc?rev=766505&view=rev
Log:
COUCHDB-306 - Improving reported errors.

Case #3 turns out to be misusing the end-point for HTML forms that Futon uses.
For new people it would also be triggered by accidentally using POST when a PUT
to /db_name/docid is used.


Added:
    couchdb/trunk/share/www/script/test/form_submit.js
Modified:
    couchdb/trunk/share/www/script/couch_tests.js
    couchdb/trunk/src/couchdb/couch_httpd.erl
    couchdb/trunk/src/couchdb/couch_httpd_db.erl

Modified: couchdb/trunk/share/www/script/couch_tests.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/couch_tests.js?rev=766505&r1=766504&r2=766505&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/couch_tests.js [utf-8] Sun Apr 19 20:02:45 2009
@@ -67,6 +67,7 @@
 loadTest("compact.js");
 loadTest("purge.js");
 loadTest("config.js");
+loadTest("form_submit.js");
 loadTest("security_validation.js");
 loadTest("stats.js");
 loadTest("rev_stemming.js");

Added: couchdb/trunk/share/www/script/test/form_submit.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/form_submit.js?rev=766505&view=auto
==============================================================================
--- couchdb/trunk/share/www/script/test/form_submit.js (added)
+++ couchdb/trunk/share/www/script/test/form_submit.js Sun Apr 19 20:02:45 2009
@@ -0,0 +1,26 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License.  You may obtain a copy
+// of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+// License for the specific language governing permissions and limitations under
+// the License.
+
+// Do some basic tests.
+couchTests.form_upload = function(debug) {
+    var db = new CouchDB("test_suite_db");
+    db.deleteDb();
+    db.createDb();
+
+    // PUT on existing DB should return 412 instead of 500
+    var json = "{}";
+    var xhr = CouchDB.request("POST", "/test_suite_db/baz", {body: json});
+    T(xhr.status == 415);
+    result = JSON.parse(xhr.responseText);
+    T(result.error, "bad_content_type");
+    T(result.reason, "Invalid Content-Type header for form upload");
+};

Modified: couchdb/trunk/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=766505&r1=766504&r2=766505&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd.erl Sun Apr 19 20:02:45 2009
@@ -417,6 +417,8 @@
 error_info(file_exists) ->
     {412, <<"file_exists">>, <<"The database could not be "
         "created, the file already exists.">>};
+error_info({bad_ctype, Reason}) ->
+    {415, <<"bad_content_type">>, Reason};
 error_info({Error, Reason}) ->
     {500, couch_util:to_binary(Error), couch_util:to_binary(Reason)};
 error_info(Error) ->

Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=766505&r1=766504&r2=766505&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Sun Apr 19 20:02:45 2009
@@ -497,6 +497,12 @@
     end;
 
 db_doc_req(#httpd{method='POST'}=Req, Db, DocId) ->
+    case couch_httpd:header_value(Req, "content-type") of
+    "multipart/form-data" ++  _Rest ->
+        ok;
+    _Else ->
+        throw({bad_ctype, <<"Invalid Content-Type header for form upload">>})
+    end,
     Form = couch_httpd:parse_form(Req),
     Rev = couch_doc:parse_rev(list_to_binary(proplists:get_value("_rev", Form))),
     {ok, [{ok, Doc}]} = couch_db:open_doc_revs(Db, DocId, [Rev], []),