You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/08/05 15:27:55 UTC
[1/2] chttpd commit: updated refs/heads/master to a66b901
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master e691ec3bd -> a66b901e6
Call CouchDB's CSRF validation
COUCHDB-2762
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/37260c04
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/37260c04
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/37260c04
Branch: refs/heads/master
Commit: 37260c04a46ac25032bb45c5569457e69c4a5ac1
Parents: 89ca7e0
Author: Robert Newson <rn...@apache.org>
Authored: Fri Jul 31 16:29:08 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Aug 2 20:55:41 2015 +0100
----------------------------------------------------------------------
src/chttpd.erl | 45 ++++++++++++++++++++++++++++-----------------
src/chttpd_csrf.erl | 21 +++++++++++++++++++++
2 files changed, 49 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/37260c04/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 8f5a5bd..22d0656 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -211,6 +211,7 @@ handle_request_int(MochiReq) ->
Result =
try
couch_httpd:validate_host(HttpReq),
+ chttpd_csrf:validate(HttpReq),
check_request_uri_length(RawUri),
case chttpd_cors:maybe_handle_preflight_request(HttpReq) of
not_preflight ->
@@ -395,8 +396,9 @@ serve_file(#httpd{mochi_req=MochiReq}=Req, RelativePath, DocumentRoot,
Headers = server_header() ++
couch_httpd_auth:cookie_auth_header(Req, []) ++
ExtraHeaders,
- {ok, MochiReq:serve_file(RelativePath, DocumentRoot,
- chttpd_cors:headers(Req, Headers))}.
+ Headers1 = chttpd_cors:headers(Req, Headers),
+ Headers2 = chttpd_csrf:headers(Req, Headers1),
+ {ok, MochiReq:serve_file(RelativePath, DocumentRoot, Headers2)}.
qs_value(Req, Key) ->
qs_value(Req, Key, undefined).
@@ -524,8 +526,10 @@ etag_respond(Req, CurrentEtag, RespFun) ->
case etag_match(Req, CurrentEtag) of
true ->
% the client has this in their cache.
- Headers = chttpd_cors:headers(Req, [{"Etag", CurrentEtag}]),
- chttpd:send_response(Req, 304, Headers, <<>>);
+ Headers0 = [{"Etag", CurrentEtag}],
+ Headers1 = chttpd_cors:headers(Req, Headers0),
+ Headers2 = chttpd_csrf:headers(Req, Headers1),
+ chttpd:send_response(Req, 304, Headers2, <<>>);
false ->
% Run the function.
RespFun()
@@ -539,10 +543,11 @@ verify_is_server_admin(#httpd{user_ctx=#user_ctx{roles=Roles}}) ->
start_response_length(#httpd{mochi_req=MochiReq}=Req, Code, Headers0, Length) ->
couch_stats:increment_counter([couchdb, httpd_status_codes, Code]),
- Headers = Headers0 ++ server_header() ++
+ Headers1 = Headers0 ++ server_header() ++
couch_httpd_auth:cookie_auth_header(Req, Headers0),
- Resp = MochiReq:start_response_length({Code,
- chttpd_cors:headers(Req, Headers), Length}),
+ Headers2 = chttpd_cors:headers(Req, Headers1),
+ Headers3 = chttpd_csrf:headers(Req, Headers2),
+ Resp = MochiReq:start_response_length({Code, Headers3, Length}),
case MochiReq:get(method) of
'HEAD' -> throw({http_head_abort, Resp});
_ -> ok
@@ -555,10 +560,11 @@ send(Resp, Data) ->
start_chunked_response(#httpd{mochi_req=MochiReq}=Req, Code, Headers0) ->
couch_stats:increment_counter([couchdb, httpd_status_codes, Code]),
- Headers = Headers0 ++ server_header() ++
+ Headers1 = Headers0 ++ server_header() ++
couch_httpd_auth:cookie_auth_header(Req, Headers0),
- Resp = MochiReq:respond({Code, chttpd_cors:headers(Req, Headers),
- chunked}),
+ Headers2 = chttpd_cors:headers(Req, Headers1),
+ Headers3 = chttpd_csrf:headers(Req, Headers2),
+ Resp = MochiReq:respond({Code, Headers3, chunked}),
case MochiReq:get(method) of
'HEAD' -> throw({http_head_abort, Resp});
_ -> ok
@@ -587,15 +593,19 @@ send_json(Req, Code, Value) ->
send_json(Req, Code, [], Value).
send_json(Req, Code, Headers0, Value) ->
- Headers = chttpd_cors:headers(Req, Headers0),
- couch_httpd:send_json(Req, Code, [timing(), reqid() | Headers], Value).
+ Headers1 = [timing(), reqid() | Headers0],
+ Headers2 = chttpd_cors:headers(Req, Headers1),
+ Headers3 = chttpd_csrf:headers(Req, Headers2),
+ couch_httpd:send_json(Req, Code, Headers3, Value).
start_json_response(Req, Code) ->
start_json_response(Req, Code, []).
start_json_response(Req, Code, Headers0) ->
- Headers = chttpd_cors:headers(Req, Headers0),
- couch_httpd:start_json_response(Req, Code, [timing(), reqid() | Headers]).
+ Headers1 = [timing(), reqid() | Headers0],
+ Headers2 = chttpd_cors:headers(Req, Headers1),
+ Headers3 = chttpd_csrf:headers(Req, Headers2),
+ couch_httpd:start_json_response(Req, Code, Headers3).
end_json_response(Resp) ->
couch_httpd:end_json_response(Resp).
@@ -852,9 +862,10 @@ send_chunked_error(Resp, Error) ->
send_chunk(Resp, []).
send_redirect(Req, Path) ->
- Headers = chttpd_cors:headers(Req,
- [{"Location", chttpd:absolute_uri(Req, Path)}]),
- send_response(Req, 301, Headers, <<>>).
+ Headers0 = [{"Location", chttpd:absolute_uri(Req, Path)}],
+ Headers1 = chttpd_cors:headers(Req, Headers0),
+ Headers2 = chttpd_csrf:headers(Req, Headers1),
+ send_response(Req, 301, Headers2, <<>>).
server_header() ->
couch_httpd:server_header().
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/37260c04/src/chttpd_csrf.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_csrf.erl b/src/chttpd_csrf.erl
new file mode 100644
index 0000000..0f390a3
--- /dev/null
+++ b/src/chttpd_csrf.erl
@@ -0,0 +1,21 @@
+% 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.
+
+-module(chttpd_csrf).
+
+-export([validate/1, headers/2]).
+
+validate(Req) ->
+ couch_httpd_csrf:validate(Req).
+
+headers(Req, Headers) ->
+ couch_httpd_csrf:headers(Req, Headers).
[2/2] chttpd commit: updated refs/heads/master to a66b901
Posted by rn...@apache.org.
Merge remote-tracking branch 'cloudant/2762-csrf'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/a66b901e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/a66b901e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/a66b901e
Branch: refs/heads/master
Commit: a66b901e6004478891b2b92518845116c526e63a
Parents: e691ec3 37260c0
Author: Robert Newson <rn...@apache.org>
Authored: Wed Aug 5 14:27:38 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Aug 5 14:27:38 2015 +0100
----------------------------------------------------------------------
src/chttpd.erl | 45 ++++++++++++++++++++++++++++-----------------
src/chttpd_csrf.erl | 21 +++++++++++++++++++++
2 files changed, 49 insertions(+), 17 deletions(-)
----------------------------------------------------------------------