From 0a902eb4ad64ee86f8af9915efb26a46bbb84d50 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Tue, 18 Aug 2009 17:09:42 +0000 Subject: allow configurable X-Forwarded-Host header handling for work behind reverse proxies, patch by Benoit Chesneau, closes COUCHDB-466 git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@805500 13f79535-47bb-0310-9956-ffa450edef68 --- share/Makefile.am | 1 + share/www/script/couch_tests.js | 1 + share/www/script/test/http.js | 53 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 share/www/script/test/http.js (limited to 'share') diff --git a/share/Makefile.am b/share/Makefile.am index 58b24454..ec17686c 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -117,6 +117,7 @@ nobase_dist_localdata_DATA = \ www/script/test/etags_head.js \ www/script/test/etags_views.js \ www/script/test/form_submit.js \ + www/script/test/http.js \ www/script/test/invalid_docids.js \ www/script/test/jsonp.js \ www/script/test/large_docs.js \ diff --git a/share/www/script/couch_tests.js b/share/www/script/couch_tests.js index 255c0228..3640b5a5 100644 --- a/share/www/script/couch_tests.js +++ b/share/www/script/couch_tests.js @@ -81,6 +81,7 @@ loadTest("oauth.js"); loadTest("stats.js"); loadTest("rev_stemming.js"); loadTest("erlang_views.js"); +loadTest("http.js"); function makeDocs(start, end, templateDoc) { var templateDocSrc = templateDoc ? JSON.stringify(templateDoc) : "{}" diff --git a/share/www/script/test/http.js b/share/www/script/test/http.js new file mode 100644 index 00000000..05bd471e --- /dev/null +++ b/share/www/script/test/http.js @@ -0,0 +1,53 @@ +// 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. + +couchTests.http = function(debug) { + var db = new CouchDB("test_suite_db", {"X-Couch-Full-Commit":"false"}); + db.deleteDb(); + + // bug COUCHDB-100: DELETE on non-existent DB returns 500 instead of 404 + db.deleteDb(); + + db.createDb(); + + // PUT on existing DB should return 412 instead of 500 + if (debug) debugger; + + var xhr = CouchDB.request("PUT", "/test_suite_db/test", {body: "{}"}); + + TEquals("http://127.0.0.1:5984/test_suite_db/test", + xhr.getResponseHeader("Location"), + "should include ip address"); + + xhr = CouchDB.request("PUT", "/test_suite_db/test2", { + body: "{}", + headers: {"X-Forwarded-Host": "mysite.com"} + }); + + TEquals("http://mysite.com/test_suite_db/test2", + xhr.getResponseHeader("Location"), + "should include X-Forwarded-Host"); + + run_on_modified_server([{ + section:"httpd", + key:"x_forwarded_host", + value:"X-Host"}], + function() { + xhr = CouchDB.request("PUT", "/test_suite_db/test3", { + body: "{}", + headers: {"X-Host": "mysite2.com"} + }); + TEquals("http://mysite2.com/test_suite_db/test3", + xhr.getResponseHeader("Location"), + "should include X-Host"); + }); +} -- cgit v1.2.3