[couchdb] 06/08: Merge pull request #2714 from atrauzzi/jwt-couchdb-specific-roles-claim

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch backport-jwt-3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit af3c6211ac4c19c9ba0adf46f2f2c9050140ccc8
Author: Robert Newson <rn...@apache.org>
AuthorDate: Tue Mar 24 20:41:50 2020 +0000

    Merge pull request #2714 from atrauzzi/jwt-couchdb-specific-roles-claim
    
    Make the JWT roles claim more CouchDB specific
---
 src/couch/src/couch_httpd_auth.erl | 3 ++-
 test/elixir/test/jwtauth_test.exs  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/couch/src/couch_httpd_auth.erl b/src/couch/src/couch_httpd_auth.erl
index 383cd66..5cabda3 100644
--- a/src/couch/src/couch_httpd_auth.erl
+++ b/src/couch/src/couch_httpd_auth.erl
@@ -198,7 +198,8 @@ jwt_authentication_handler(Req) ->
                     case lists:keyfind(<<"sub">>, 1, Claims) of
                         false -> throw({unauthorized, <<"Token missing sub claim.">>});
                         {_, User} -> Req#httpd{user_ctx=#user_ctx{
-                            name=User
+                            name = User,
+                            roles = couch_util:get_value(<<"_couchdb.roles">>, Claims, [])
                         }}
                     end;
                 {error, Reason} ->
diff --git a/test/elixir/test/jwtauth_test.exs b/test/elixir/test/jwtauth_test.exs
index 3f26e1e..0c13404 100644
--- a/test/elixir/test/jwtauth_test.exs
+++ b/test/elixir/test/jwtauth_test.exs
@@ -103,7 +103,7 @@ defmodule JwtAuthTest do
   end
 
   def test_fun(alg, key) do
-    {:ok, token} = :jwtf.encode({[{"alg", alg}, {"typ", "JWT"}]}, {[{"sub", "couch@apache.org"}]}, key)
+    {:ok, token} = :jwtf.encode({[{"alg", alg}, {"typ", "JWT"}]}, {[{"sub", "couch@apache.org"}, {"_couchdb.roles", ["testing"]}]}, key)
 
     resp = Couch.get("/_session",
       headers: [authorization: "Bearer #{token}"]