COUCHDB-1060 - Prevent _admin appearing twice

rcouch · May 5, 2012 · aef088b · aef088b
1 parent c21a740
commit aef088b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/apps/couch_httpd/src/couch_auth_cache.erl b/apps/couch_httpd/src/couch_auth_cache.erl
@@ -49,15 +49,15 @@ get_user_creds(UserName) ->
         [HashedPwd, Salt] = string:tokens(HashedPwdAndSalt, ","),
         case get_from_cache(UserName) of
         nil ->
-            make_admin_doc(HashedPwd, Salt, [<<"_admin">>]);
+            make_admin_doc(HashedPwd, Salt, []);
         UserProps when is_list(UserProps) ->
             make_admin_doc(HashedPwd, Salt, couch_util:get_value(<<"roles">>, UserProps))
         end;
     "-pbkdf2-" ++ HashedPwdSaltAndIterations ->
         [HashedPwd, Salt, Iterations] = string:tokens(HashedPwdSaltAndIterations, ","),
         case get_from_cache(UserName) of
         nil ->
-            make_admin_doc(HashedPwd, Salt, Iterations, [<<"_admin">>]);
+            make_admin_doc(HashedPwd, Salt, Iterations, []);
         UserProps when is_list(UserProps) ->
             make_admin_doc(HashedPwd, Salt, Iterations, couch_util:get_value(<<"roles">>, UserProps))
     end;
@@ -66,14 +66,14 @@ get_user_creds(UserName) ->
     end,
     validate_user_creds(UserCreds).
 
-make_admin_doc(HashedPwd, Salt, Roles) ->
-    [{<<"roles">>, Roles},
+make_admin_doc(HashedPwd, Salt, ExtraRoles) ->
+    [{<<"roles">>, [<<"_admin">>|ExtraRoles]},
      {<<"salt">>, ?l2b(Salt)},
      {<<"password_scheme">>, <<"simple">>},
      {<<"password_sha">>, ?l2b(HashedPwd)}].
 
-make_admin_doc(DerivedKey, Salt, Iterations, Roles) ->
-    [{<<"roles">>, [<<"_admin">>|Roles]},
+make_admin_doc(DerivedKey, Salt, Iterations, ExtraRoles) ->
+    [{<<"roles">>, [<<"_admin">>|ExtraRoles]},
      {<<"salt">>, ?l2b(Salt)},
      {<<"iterations">>, list_to_integer(Iterations)},
      {<<"password_scheme">>, <<"pbkdf2">>},