From commits-return-6650-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Thu Jul 7 18:59:27 2011 Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B57774AE6 for ; Thu, 7 Jul 2011 18:59:27 +0000 (UTC) Received: (qmail 64481 invoked by uid 500); 7 Jul 2011 18:59:27 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 64351 invoked by uid 500); 7 Jul 2011 18:59:26 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 64335 invoked by uid 99); 7 Jul 2011 18:59:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jul 2011 18:59:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jul 2011 18:59:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A63F323888CF for ; Thu, 7 Jul 2011 18:59:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1143975 - in /couchdb/trunk: share/www/script/test/copy_doc.js src/couchdb/couch_httpd_db.erl Date: Thu, 07 Jul 2011 18:59:04 -0000 To: commits@couchdb.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110707185904.A63F323888CF@eris.apache.org> Author: jan Date: Thu Jul 7 18:59:04 2011 New Revision: 1143975 URL: http://svn.apache.org/viewvc?rev=1143975&view=rev Log: Add error response for absolute Destination headers with COPY reuqests. Modified: couchdb/trunk/share/www/script/test/copy_doc.js couchdb/trunk/src/couchdb/couch_httpd_db.erl Modified: couchdb/trunk/share/www/script/test/copy_doc.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/copy_doc.js?rev=1143975&r1=1143974&r2=1143975&view=diff ============================================================================== --- couchdb/trunk/share/www/script/test/copy_doc.js (original) +++ couchdb/trunk/share/www/script/test/copy_doc.js Thu Jul 7 18:59:04 2011 @@ -40,6 +40,16 @@ couchTests.copy_doc = function(debug) { var xhr = CouchDB.request("COPY", "/test_suite_db/doc_to_be_copied2"); T(xhr.status == 400); // bad request (no Destination header) + TEquals("Destination header is mandatory for COPY.", JSON.parse(xhr.responseText).reason, + "should report missing destination header"); + + var xhr = CouchDB.request("COPY", "/test_suite_db/doc_to_be_copied2", { + headers: { + "Destination": "http://localhost:5984/test_suite_db/doc_to_be_written" + }}); + TEquals(400, xhr.status, "should throw a 400 error"); // bad request (invalid destination header) + TEquals("Destination URL must be relative.", JSON.parse(xhr.responseText).reason, + "should report invalid destination header"); var rev = db.open("doc_to_be_overwritten")._rev; var xhr = CouchDB.request("COPY", "/test_suite_db/doc_to_be_copied2", { Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=1143975&r1=1143974&r2=1143975&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original) +++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Thu Jul 7 18:59:04 2011 @@ -1285,16 +1285,22 @@ extract_header_rev(Req, ExplicitRev) -> parse_copy_destination_header(Req) -> case couch_httpd:header_value(Req, "Destination") of undefined -> - throw({bad_request, "Destination header in mandatory for COPY."}); + throw({bad_request, "Destination header is mandatory for COPY."}); Destination -> - case re:run(Destination, "\\?", [{capture, none}]) of - nomatch -> - {list_to_binary(Destination), {0, []}}; - match -> - [DocId, RevQs] = re:split(Destination, "\\?", [{return, list}]), - [_RevQueryKey, Rev] = re:split(RevQs, "=", [{return, list}]), - {Pos, RevId} = couch_doc:parse_rev(Rev), - {list_to_binary(DocId), {Pos, [RevId]}} + case Destination of + "http://" ++ _Rest -> + throw({bad_request, "Destination URL must be relative."}); + _Else -> + % see if ?rev=revid got appended to the Destination header + case re:run(Destination, "\\?", [{capture, none}]) of + nomatch -> + {list_to_binary(Destination), {0, []}}; + match -> + [DocId, RevQs] = re:split(Destination, "\\?", [{return, list}]), + [_RevQueryKey, Rev] = re:split(RevQs, "=", [{return, list}]), + {Pos, RevId} = couch_doc:parse_rev(Rev), + {list_to_binary(DocId), {Pos, [RevId]}} + end end end.