You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2016/02/02 16:23:26 UTC
[4/6] chttpd commit: updated refs/heads/master to 41ac33a
Introduce cors/exposed_headers config setting
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/a634e220
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/a634e220
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/a634e220
Branch: refs/heads/master
Commit: a634e22040a80ad597857fb896ab7eb03f3eb30d
Parents: 63af933
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Mon Jan 25 13:06:39 2016 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Fri Jan 29 11:45:03 2016 -0800
----------------------------------------------------------------------
src/chttpd_cors.erl | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/a634e220/src/chttpd_cors.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_cors.erl b/src/chttpd_cors.erl
index 81cd475..2af3166 100644
--- a/src/chttpd_cors.erl
+++ b/src/chttpd_cors.erl
@@ -180,15 +180,17 @@ headers(Req, RequestHeaders, Origin, Config) ->
true ->
AcceptedOrigins = get_accepted_origins(Req, Config),
CorsHeaders = handle_headers(Config, Origin, AcceptedOrigins),
- maybe_apply_headers(CorsHeaders, RequestHeaders);
+ ExposedCouchHeaders = couch_util:get_value(
+ <<"exposed_headers">>, Config, ?COUCH_HEADERS),
+ maybe_apply_headers(CorsHeaders, RequestHeaders, ExposedCouchHeaders);
false ->
RequestHeaders
end.
-maybe_apply_headers([], RequestHeaders) ->
+maybe_apply_headers([], RequestHeaders, _ExposedCouchHeaders) ->
RequestHeaders;
-maybe_apply_headers(CorsHeaders, RequestHeaders) ->
+maybe_apply_headers(CorsHeaders, RequestHeaders, ExposedCouchHeaders) ->
%% Find all non ?SIMPLE_HEADERS and and non ?SIMPLE_CONTENT_TYPE_VALUES,
%% expose those through Access-Control-Expose-Headers, allowing
%% the client to access them in the browser. Also append in
@@ -214,9 +216,10 @@ maybe_apply_headers(CorsHeaders, RequestHeaders) ->
true ->
ExposedHeaders0
end,
- %% ?COUCH_HEADERS may get added later, so expose them by default
+
+ %% ExposedCouchHeaders may get added later, so expose them by default
ACEH = [{"Access-Control-Expose-Headers",
- string:join(ExposedHeaders ++ ?COUCH_HEADERS, ", ")}],
+ string:join(ExposedHeaders ++ ExposedCouchHeaders, ", ")}],
CorsHeaders ++ RequestHeaders ++ ACEH.
@@ -284,6 +287,12 @@ get_cors_config(#httpd{cors_config = undefined}) ->
AllowMethods0 ->
split_list(AllowMethods0)
end,
+ ExposedHeaders = case config:get("cors", "exposed_headers", undefined) of
+ undefined ->
+ ?COUCH_HEADERS;
+ ExposedHeaders0 ->
+ split_list(ExposedHeaders0)
+ end,
Origins0 = binary_split_list(config:get("cors", "origins", [])),
Origins = [{O, {[]}} || O <- Origins0],
[
@@ -291,6 +300,7 @@ get_cors_config(#httpd{cors_config = undefined}) ->
{<<"allow_credentials">>, AllowCredentials},
{<<"allow_methods">>, AllowMethods},
{<<"allow_headers">>, AllowHeaders},
+ {<<"exposed_headers">>, ExposedHeaders},
{<<"origins">>, {Origins}}
];
get_cors_config(#httpd{cors_config = Config}) ->