From a666c0a3ea2fe0b65e8fb9b5034c8d9a64f5a905 Mon Sep 17 00:00:00 2001
From: Paul Joseph Davis <davisp@apache.org>
Date: Fri, 28 Jan 2011 01:52:47 +0000
Subject: Validate doc ids that come from a PUT to a URL.

Backprot of 1064417 from trunk.



git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1064421 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_doc.erl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/couchdb/couch_doc.erl')

diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl
index 7c64b8a9..e3d66145 100644
--- a/src/couchdb/couch_doc.erl
+++ b/src/couchdb/couch_doc.erl
@@ -165,6 +165,10 @@ parse_revs([Rev | Rest]) ->
 
 
 validate_docid(Id) when is_binary(Id) ->
+    case couch_util:validate_utf8(Id) of
+        false -> throw({bad_request, <<"Document id must be valid UTF-8">>});
+        true -> ok
+    end,
     case Id of
     <<"_design/", _/binary>> -> ok;
     <<"_local/", _/binary>> -> ok;
-- 
cgit v1.2.3