Merge branch 'ia/inets/name-spaces/OTP-12674'

* ia/inets/name-spaces/OTP-12674:
  inets: Modernize code
  inets: Add profile option

1 files changed, 295 insertions, 375 deletions

diff --git a/lib/inets/src/http_server/mod_auth.erl b/lib/inets/src/http_server/mod_auth.erl
index 85a87ab884..1f4470622d 100644
--- a/lib/inets/src/http_server/mod_auth.erl
+++ b/lib/inets/src/http_server/mod_auth.erl
@@ -38,15 +38,16 @@
 -include("httpd.hrl").
 -include("mod_auth.hrl").
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
 
 -define(VMODULE,"AUTH").
 
 -define(NOPASSWORD,"NoPassword").
 
-%% do
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
+
 do(Info) ->
-    ?hdrt("do", [{info, Info}]),
     case proplists:get_value(status,Info#mod.data) of
 	%% A status code has been generated!
 	{_StatusCode, _PhraseArgs, _Reason} ->
@@ -61,22 +62,15 @@ do(Info) ->
 		    %% Is it a secret area?
 		    case secretp(Path,Info#mod.config_db) of
 			{yes, {Directory, DirectoryData}} ->
-			    ?hdrt("secret area", 
-				  [{directory, Directory},
-				   {directory_data, DirectoryData}]),
-
-			    %% Authenticate (allow)
 			    case allow((Info#mod.init_data)#init_data.peername,
 				       Info#mod.socket_type,Info#mod.socket,
 				       DirectoryData) of
 				allowed ->
-				    ?hdrt("allowed", []),
 				    case deny((Info#mod.init_data)#init_data.peername,
 					      Info#mod.socket_type, 
 					      Info#mod.socket,
 					      DirectoryData) of
 					not_denied ->
-					    ?hdrt("not denied", []),
 					    case proplists:get_value(auth_type,
 								     DirectoryData) of
 						undefined ->
@@ -90,15 +84,13 @@ do(Info) ->
 							    AuthType)
 					    end;
 					{denied, Reason} ->
-					    ?hdrt("denied", [{reason, Reason}]),
 					    {proceed,
 					     [{status, {403,
-						       Info#mod.request_uri,
-						       Reason}}|
+							Info#mod.request_uri,
+							Reason}}|
 					      Info#mod.data]}
 				    end;
 				{not_allowed, Reason} ->
-				    ?hdrt("not allowed", [{reason, Reason}]),
 				    {proceed,[{status,{403,
 						       Info#mod.request_uri,
 						       Reason}} |
@@ -114,18 +106,299 @@ do(Info) ->
     end.
 
 
-do_auth(Info, Directory, DirectoryData, AuthType) ->
+%% mod_auth recognizes the following Configuration Directives:
+%% <Directory /path/to/directory>
+%%  AuthDBType
+%%  AuthName
+%%  AuthUserFile
+%%  AuthGroupFile
+%%  AuthAccessPassword
+%%  require
+%%  allow
+%% </Directory>
+
+%% When a <Directory> directive is found, a new context is set to
+%% [{directory, Directory, DirData}|OtherContext]
+%% DirData in this case is a key-value list of data belonging to the
+%% directory in question.
+%%
+%% When the </Directory> statement is found, the Context created earlier
+%% will be returned as a ConfigList and the context will return to the
+%% state it was previously.
+
+load("<Directory " ++ Directory,[]) ->
+    Dir = httpd_conf:custom_clean(Directory,"",">"),
+    {ok,[{directory, {Dir, [{path, Dir}]}}]};
+load(eof,[{directory, {Directory, _DirData}}|_]) ->
+    {error, ?NICE("Premature end-of-file in "++ Directory)};
+
+load("AuthName " ++ AuthName, [{directory, {Directory, DirData}}|Rest]) ->
+    {ok, [{directory, {Directory,
+		       [{auth_name, httpd_conf:clean(AuthName)} | DirData]}} 
+	  | Rest ]};
+load("AuthUserFile " ++ AuthUserFile0,
+     [{directory, {Directory, DirData}}|Rest]) ->
+    AuthUserFile = httpd_conf:clean(AuthUserFile0),
+    {ok, [{directory, {Directory,
+		      [{auth_user_file, AuthUserFile}|DirData]}} | Rest ]};
+load("AuthGroupFile " ++ AuthGroupFile0,
+	 [{directory, {Directory, DirData}}|Rest]) ->
+    AuthGroupFile = httpd_conf:clean(AuthGroupFile0),
+    {ok,[{directory, {Directory,
+	  [{auth_group_file, AuthGroupFile}|DirData]}} | Rest]};
+
+load("AuthAccessPassword " ++ AuthAccessPassword0,
+	 [{directory, {Directory, DirData}}|Rest]) ->
+    AuthAccessPassword = httpd_conf:clean(AuthAccessPassword0),
+    {ok,[{directory, {Directory,
+	  [{auth_access_password, AuthAccessPassword}|DirData]}} | Rest]};
+
+load("AuthDBType " ++ Type,
+	 [{directory, {Dir, DirData}}|Rest]) ->
+    case httpd_conf:clean(Type) of
+	"plain" ->
+	    {ok, [{directory, {Dir, [{auth_type, plain}|DirData]}} | Rest ]};
+	"mnesia" ->
+	    {ok, [{directory, {Dir, [{auth_type, mnesia}|DirData]}} | Rest ]};
+	"dets" ->
+	    {ok, [{directory, {Dir, [{auth_type, dets}|DirData]}} | Rest ]};
+	_ ->
+	    {error, ?NICE(httpd_conf:clean(Type)++" is an invalid AuthDBType")}
+    end;
+
+load("require " ++ Require,[{directory, {Directory, DirData}}|Rest]) ->
+    case inets_regexp:split(Require," ") of
+	{ok,["user"|Users]} ->
+	    {ok,[{directory, {Directory,
+		  [{require_user,Users}|DirData]}} | Rest]};
+	{ok,["group"|Groups]} ->
+	    {ok,[{directory, {Directory,
+		  [{require_group,Groups}|DirData]}} | Rest]};
+	{ok,_} ->
+	    {error,?NICE(httpd_conf:clean(Require) ++" is an invalid require")}
+    end;
+
+load("allow " ++ Allow,[{directory, {Directory, DirData}}|Rest]) ->
+    case inets_regexp:split(Allow," ") of
+	{ok,["from","all"]} ->
+	    {ok,[{directory, {Directory,
+		  [{allow_from,all}|DirData]}} | Rest]};
+	{ok,["from"|Hosts]} ->
+	    {ok,[{directory, {Directory,
+		  [{allow_from,Hosts}|DirData]}} | Rest]};
+	{ok,_} ->
+	    {error,?NICE(httpd_conf:clean(Allow) ++" is an invalid allow")}
+    end;
+
+load("deny " ++ Deny,[{directory, {Directory, DirData}}|Rest]) ->
+    case inets_regexp:split(Deny," ") of
+	{ok, ["from", "all"]} ->
+	    {ok,[{{directory, Directory,
+		  [{deny_from, all}|DirData]}} | Rest]};
+	{ok, ["from"|Hosts]} ->
+	    {ok,[{{directory, Directory,
+		   [{deny_from, Hosts}|DirData]}} | Rest]};
+	{ok, _} ->
+	    {error,?NICE(httpd_conf:clean(Deny) ++" is an invalid deny")}
+    end;
+
+load("</Directory>",[{directory, {Directory, DirData}}|Rest]) -> 
+    {ok, Rest, {directory, {Directory, DirData}}};
+
+load("AuthMnesiaDB " ++ AuthMnesiaDB,
+      [{directory, {Dir, DirData}}|Rest]) ->
+    case httpd_conf:clean(AuthMnesiaDB) of
+	"On" ->
+	    {ok,[{directory, {Dir,[{auth_type,mnesia}|DirData]}}|Rest]};
+	"Off" ->
+	    {ok,[{directory, {Dir,[{auth_type,plain}|DirData]}}|Rest]};
+	_ ->
+	    {error, ?NICE(httpd_conf:clean(AuthMnesiaDB) ++
+			  " is an invalid AuthMnesiaDB")}
+    end.
+
+store({directory, {Directory, DirData}}, ConfigList) 
+  when is_list(Directory) andalso is_list(DirData) ->
+    try directory_config_check(Directory, DirData) of
+	ok ->
+	    store_directory(Directory, DirData, ConfigList) 
+    catch
+	throw:Error ->
+	    {error, Error, {directory, Directory, DirData}}
+    end;
+store({directory, {Directory, DirData}}, _) ->
+    {error, {wrong_type, {directory, {Directory, DirData}}}}.
+
+remove(ConfigDB) ->
+    lists:foreach(fun({directory, {_Dir, DirData}}) -> 
+			  AuthMod = auth_mod_name(DirData),
+			  (catch apply(AuthMod, remove, [DirData]))
+		  end,
+		  ets:match_object(ConfigDB,{directory,{'_','_'}})),
+
+    Addr = httpd_util:lookup(ConfigDB, bind_address, undefined),
+    Port = httpd_util:lookup(ConfigDB, port),
+    Profile = httpd_util:lookup(ConfigDB, profile, ?DEFAULT_PROFILE),
+    mod_auth_server:stop(Addr, Port, Profile),
+    ok.
+
+add_user(UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd}->
+	    case get_options(Opt, userData) of
+		{error, Reason}->
+		    {error, Reason};
+		{UserData, Password}->
+		    User = [#httpd_user{username  = UserName, 
+					password  = Password,
+					user_data = UserData}],
+		    mod_auth_server:add_user(Addr, Port, Dir, User, AuthPwd)
+	    end
+    end.
+
+
+add_user(UserName, Password, UserData, Port, Dir) ->
+    add_user(UserName, Password, UserData, undefined, Port, Dir).
+add_user(UserName, Password, UserData, Addr, Port, Dir) ->
+    User = [#httpd_user{username  = UserName, 
+			password  = Password,
+			user_data = UserData}],
+    mod_auth_server:add_user(Addr, Port, Dir, User, ?NOPASSWORD).
+
+get_user(UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:get_user(Addr, Port, Dir, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+get_user(UserName, Port, Dir) ->
+    get_user(UserName, undefined, Port, Dir).
+get_user(UserName, Addr, Port, Dir) ->
+    mod_auth_server:get_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
+
+add_group_member(GroupName, UserName, Opt)->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd}->
+	    mod_auth_server:add_group_member(Addr, Port, Dir, 
+					     GroupName, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+add_group_member(GroupName, UserName, Port, Dir) ->
+    add_group_member(GroupName, UserName, undefined, Port, Dir).
+
+add_group_member(GroupName, UserName, Addr, Port, Dir) ->
+    mod_auth_server:add_group_member(Addr, Port, Dir, 
+				     GroupName, UserName, ?NOPASSWORD).
+
+delete_group_member(GroupName, UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:delete_group_member(Addr, Port, Dir, 
+						GroupName, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+delete_group_member(GroupName, UserName, Port, Dir) ->
+    delete_group_member(GroupName, UserName, undefined, Port, Dir).
+delete_group_member(GroupName, UserName, Addr, Port, Dir) ->
+    mod_auth_server:delete_group_member(Addr, Port, Dir, 
+					GroupName, UserName, ?NOPASSWORD).
+
+list_users(Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:list_users(Addr, Port, Dir, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+list_users(Port, Dir) ->
+    list_users(undefined, Port, Dir).
+list_users(Addr, Port, Dir) ->
+    mod_auth_server:list_users(Addr, Port, Dir, ?NOPASSWORD).
+
+delete_user(UserName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:delete_user(Addr, Port, Dir, UserName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+delete_user(UserName, Port, Dir) ->
+    delete_user(UserName, undefined, Port, Dir).
+delete_user(UserName, Addr, Port, Dir) ->
+    mod_auth_server:delete_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
+
+delete_group(GroupName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+delete_group(GroupName, Port, Dir) ->
+    delete_group(GroupName, undefined, Port, Dir).
+delete_group(GroupName, Addr, Port, Dir) ->
+    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, ?NOPASSWORD).
+
+list_groups(Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:list_groups(Addr, Port, Dir, AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+list_groups(Port, Dir) ->
+    list_groups(undefined, Port, Dir).
+list_groups(Addr, Port, Dir) ->
+    mod_auth_server:list_groups(Addr, Port, Dir, ?NOPASSWORD).
+
+list_group_members(GroupName, Opt) ->
+    case get_options(Opt, mandatory) of
+	{Addr, Port, Dir, AuthPwd} ->
+	    mod_auth_server:list_group_members(Addr, Port, Dir, GroupName, 
+					       AuthPwd);
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+list_group_members(GroupName, Port, Dir) ->
+    list_group_members(GroupName, undefined, Port, Dir).
+list_group_members(GroupName, Addr, Port, Dir) ->
+    mod_auth_server:list_group_members(Addr, Port, Dir, 
+				       GroupName, ?NOPASSWORD).
+
+update_password(Port, Dir, Old, New, New)->
+    update_password(undefined, Port, Dir, Old, New, New).
+
+update_password(Addr, Port, Dir, Old, New, New) when is_list(New) ->
+    mod_auth_server:update_password(Addr, Port, Dir, Old, New);
+
+update_password(_Addr, _Port, _Dir, _Old, _New, _New) ->
+    {error, badtype};
+update_password(_Addr, _Port, _Dir, _Old, _New, _New1) ->
+    {error, notqeual}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+do_auth(Info, Directory, DirectoryData, _AuthType) ->
     %% Authenticate (require)
-    ?hdrt("authenticate", [{auth_type, AuthType}]),
     case require(Info, Directory, DirectoryData) of
 	authorized ->
-	    ?hdrt("authorized", []),
 	    {proceed,Info#mod.data};
 	{authorized, User} ->
-	    ?hdrt("authorized", [{user, User}]),
 	    {proceed, [{remote_user,User}|Info#mod.data]};
 	{authorization_required, Realm} ->
-	    ?hdrt("authorization required", [{realm, Realm}]),
 	    ReasonPhrase = httpd_util:reason_phrase(401),
 	    Message = httpd_util:message(401,none,Info#mod.config_db),
 	    {proceed,
@@ -142,8 +415,6 @@ do_auth(Info, Directory, DirectoryData, AuthType) ->
 		       Info#mod.data]}
     end.
 
-%% require
-
 require(Info, Directory, DirectoryData) ->
     ParsedHeader = Info#mod.parsed_header,
     ValidUsers   = proplists:get_value(require_user, DirectoryData),
@@ -270,13 +541,6 @@ auth_mod_name(DirData) ->
 	dets ->	  mod_auth_dets
     end.
 
-    
-%%
-%% Is it a secret area?
-%%
-
-%% secretp
-
 secretp(Path,ConfigDB) ->
     Directories = ets:match(ConfigDB,{directory, {'$1','_'}}),
     case secret_path(Path, Directories) of
@@ -307,12 +571,6 @@ secret_path(Path, [[NewDirectory] | Rest], Directory) ->
 	    secret_path(Path, Rest, Directory)
     end.
 
-%%
-%% Authenticate
-%%
-
-%% allow
-
 allow({_,RemoteAddr}, _SocketType, _Socket, DirectoryData) ->
     Hosts = proplists:get_value(allow_from, DirectoryData, all),
     case validate_addr(RemoteAddr, Hosts) of
@@ -336,8 +594,6 @@ validate_addr(RemoteAddr, [HostRegExp | Rest]) ->
 	    validate_addr(RemoteAddr,Rest)
     end.
 
-%% deny
-
 deny({_,RemoteAddr}, _SocketType, _Socket,DirectoryData) ->
     Hosts = proplists:get_value(deny_from, DirectoryData, none),
     case validate_addr(RemoteAddr,Hosts) of
@@ -347,124 +603,6 @@ deny({_,RemoteAddr}, _SocketType, _Socket,DirectoryData) ->
 	    not_denied
     end.    
 
-%%
-%% Configuration
-%%
-
-%% load/2
-%%
-
-%% mod_auth recognizes the following Configuration Directives:
-%% <Directory /path/to/directory>
-%%  AuthDBType
-%%  AuthName
-%%  AuthUserFile
-%%  AuthGroupFile
-%%  AuthAccessPassword
-%%  require
-%%  allow
-%% </Directory>
-
-%% When a <Directory> directive is found, a new context is set to
-%% [{directory, Directory, DirData}|OtherContext]
-%% DirData in this case is a key-value list of data belonging to the
-%% directory in question.
-%%
-%% When the </Directory> statement is found, the Context created earlier
-%% will be returned as a ConfigList and the context will return to the
-%% state it was previously.
-
-load("<Directory " ++ Directory,[]) ->
-    Dir = httpd_conf:custom_clean(Directory,"",">"),
-    {ok,[{directory, {Dir, [{path, Dir}]}}]};
-load(eof,[{directory, {Directory, _DirData}}|_]) ->
-    {error, ?NICE("Premature end-of-file in "++ Directory)};
-
-load("AuthName " ++ AuthName, [{directory, {Directory, DirData}}|Rest]) ->
-    {ok, [{directory, {Directory,
-		       [{auth_name, httpd_conf:clean(AuthName)} | DirData]}} 
-	  | Rest ]};
-load("AuthUserFile " ++ AuthUserFile0,
-     [{directory, {Directory, DirData}}|Rest]) ->
-    AuthUserFile = httpd_conf:clean(AuthUserFile0),
-    {ok, [{directory, {Directory,
-		      [{auth_user_file, AuthUserFile}|DirData]}} | Rest ]};
-load("AuthGroupFile " ++ AuthGroupFile0,
-	 [{directory, {Directory, DirData}}|Rest]) ->
-    AuthGroupFile = httpd_conf:clean(AuthGroupFile0),
-    {ok,[{directory, {Directory,
-	  [{auth_group_file, AuthGroupFile}|DirData]}} | Rest]};
-
-%AuthAccessPassword
-load("AuthAccessPassword " ++ AuthAccessPassword0,
-	 [{directory, {Directory, DirData}}|Rest]) ->
-    AuthAccessPassword = httpd_conf:clean(AuthAccessPassword0),
-    {ok,[{directory, {Directory,
-	  [{auth_access_password, AuthAccessPassword}|DirData]}} | Rest]};
-
-load("AuthDBType " ++ Type,
-	 [{directory, {Dir, DirData}}|Rest]) ->
-    case httpd_conf:clean(Type) of
-	"plain" ->
-	    {ok, [{directory, {Dir, [{auth_type, plain}|DirData]}} | Rest ]};
-	"mnesia" ->
-	    {ok, [{directory, {Dir, [{auth_type, mnesia}|DirData]}} | Rest ]};
-	"dets" ->
-	    {ok, [{directory, {Dir, [{auth_type, dets}|DirData]}} | Rest ]};
-	_ ->
-	    {error, ?NICE(httpd_conf:clean(Type)++" is an invalid AuthDBType")}
-    end;
-
-load("require " ++ Require,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Require," ") of
-	{ok,["user"|Users]} ->
-	    {ok,[{directory, {Directory,
-		  [{require_user,Users}|DirData]}} | Rest]};
-	{ok,["group"|Groups]} ->
-	    {ok,[{directory, {Directory,
-		  [{require_group,Groups}|DirData]}} | Rest]};
-	{ok,_} ->
-	    {error,?NICE(httpd_conf:clean(Require) ++" is an invalid require")}
-    end;
-
-load("allow " ++ Allow,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Allow," ") of
-	{ok,["from","all"]} ->
-	    {ok,[{directory, {Directory,
-		  [{allow_from,all}|DirData]}} | Rest]};
-	{ok,["from"|Hosts]} ->
-	    {ok,[{directory, {Directory,
-		  [{allow_from,Hosts}|DirData]}} | Rest]};
-	{ok,_} ->
-	    {error,?NICE(httpd_conf:clean(Allow) ++" is an invalid allow")}
-    end;
-
-load("deny " ++ Deny,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Deny," ") of
-	{ok, ["from", "all"]} ->
-	    {ok,[{{directory, Directory,
-		  [{deny_from, all}|DirData]}} | Rest]};
-	{ok, ["from"|Hosts]} ->
-	    {ok,[{{directory, Directory,
-		   [{deny_from, Hosts}|DirData]}} | Rest]};
-	{ok, _} ->
-	    {error,?NICE(httpd_conf:clean(Deny) ++" is an invalid deny")}
-    end;
-
-load("</Directory>",[{directory, {Directory, DirData}}|Rest]) -> 
-    {ok, Rest, {directory, {Directory, DirData}}};
-
-load("AuthMnesiaDB " ++ AuthMnesiaDB,
-      [{directory, {Dir, DirData}}|Rest]) ->
-    case httpd_conf:clean(AuthMnesiaDB) of
-	"On" ->
-	    {ok,[{directory, {Dir,[{auth_type,mnesia}|DirData]}}|Rest]};
-	"Off" ->
-	    {ok,[{directory, {Dir,[{auth_type,plain}|DirData]}}|Rest]};
-	_ ->
-	    {error, ?NICE(httpd_conf:clean(AuthMnesiaDB) ++
-			  " is an invalid AuthMnesiaDB")}
-    end.
 
 directory_config_check(Directory, DirData) ->
     case proplists:get_value(auth_type, DirData) of
@@ -482,25 +620,7 @@ check_filename_present(Dir,AuthFile,DirData) ->
 	    throw({missing_auth_file, AuthFile, {directory, {Dir, DirData}}})
     end.
 
-%% store
-
-store({directory, {Directory, DirData}}, ConfigList) 
-  when is_list(Directory) andalso is_list(DirData) ->
-    ?hdrt("store", 
-	  [{directory, Directory}, {dir_data, DirData}]),
-    try directory_config_check(Directory, DirData) of
-	ok ->
-	    store_directory(Directory, DirData, ConfigList) 
-    catch
-	throw:Error ->
-	    {error, Error, {directory, Directory, DirData}}
-    end;
-store({directory, {Directory, DirData}}, _) ->
-    {error, {wrong_type, {directory, {Directory, DirData}}}}.
-
 store_directory(Directory0, DirData0, ConfigList) ->
-    ?hdrt("store directory - entry", 
-	  [{directory, Directory0}, {dir_data, DirData0}]),
     Port = proplists:get_value(port, ConfigList),
     DirData = case proplists:get_value(bind_address, ConfigList) of
 		  undefined ->
@@ -522,9 +642,7 @@ store_directory(Directory0, DirData0, ConfigList) ->
 	    dets ->   mod_auth_dets;
 	    plain ->  mod_auth_plain;
 	    _ ->      no_module_at_all
-	end,
-    ?hdrt("store directory", 
-	  [{directory, Directory}, {dir_data, DirData}, {auth_mod, AuthMod}]),
+	end,  
     case AuthMod of
 	no_module_at_all ->
 	    {ok, {directory, {Directory, DirData}}};
@@ -560,204 +678,10 @@ store_directory(Directory0, DirData0, ConfigList) ->
 add_auth_password(Dir, Pwd0, ConfigList) ->    
     Addr = proplists:get_value(bind_address, ConfigList),
     Port = proplists:get_value(port, ConfigList),
-    mod_auth_server:start(Addr, Port),
+    Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
+    mod_auth_server:start(Addr, Port, Profile),
     mod_auth_server:add_password(Addr, Port, Dir, Pwd0).
     
-%% remove
-
-
-remove(ConfigDB) ->
-    lists:foreach(fun({directory, {_Dir, DirData}}) -> 
-			  AuthMod = auth_mod_name(DirData),
-			  (catch apply(AuthMod, remove, [DirData]))
-		  end,
-		  ets:match_object(ConfigDB,{directory,{'_','_'}})),
-    Addr = case lookup(ConfigDB, bind_address) of
-	       [] -> 
-		   undefined;
-	       [{bind_address, Address}] ->
-		   Address
-	   end,
-    [{port, Port}] = lookup(ConfigDB, port),
-    mod_auth_server:stop(Addr, Port),
-    ok.
-
-%% --------------------------------------------------------------------
-
-%% update_password
-
-update_password(Port, Dir, Old, New, New)->
-    update_password(undefined, Port, Dir, Old, New, New).
-
-update_password(Addr, Port, Dir, Old, New, New) when is_list(New) ->
-    mod_auth_server:update_password(Addr, Port, Dir, Old, New);
-
-update_password(_Addr, _Port, _Dir, _Old, _New, _New) ->
-    {error, badtype};
-update_password(_Addr, _Port, _Dir, _Old, _New, _New1) ->
-    {error, notqeual}.
-
-
-%% add_user
-
-add_user(UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd}->
-	    case get_options(Opt, userData) of
-		{error, Reason}->
-		    {error, Reason};
-		{UserData, Password}->
-		    User = [#httpd_user{username  = UserName, 
-					password  = Password,
-					user_data = UserData}],
-		    mod_auth_server:add_user(Addr, Port, Dir, User, AuthPwd)
-	    end
-    end.
-
-
-add_user(UserName, Password, UserData, Port, Dir) ->
-    add_user(UserName, Password, UserData, undefined, Port, Dir).
-add_user(UserName, Password, UserData, Addr, Port, Dir) ->
-    User = [#httpd_user{username  = UserName, 
-			password  = Password,
-			user_data = UserData}],
-    mod_auth_server:add_user(Addr, Port, Dir, User, ?NOPASSWORD).
-
-
-%% get_user
-
-get_user(UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:get_user(Addr, Port, Dir, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-get_user(UserName, Port, Dir) ->
-    get_user(UserName, undefined, Port, Dir).
-get_user(UserName, Addr, Port, Dir) ->
-    mod_auth_server:get_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
-
-
-%% add_group_member
-
-add_group_member(GroupName, UserName, Opt)->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd}->
-	    mod_auth_server:add_group_member(Addr, Port, Dir, 
-					     GroupName, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-add_group_member(GroupName, UserName, Port, Dir) ->
-    add_group_member(GroupName, UserName, undefined, Port, Dir).
-
-add_group_member(GroupName, UserName, Addr, Port, Dir) ->
-    mod_auth_server:add_group_member(Addr, Port, Dir, 
-				     GroupName, UserName, ?NOPASSWORD).
-
-
-%% delete_group_member
-
-delete_group_member(GroupName, UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:delete_group_member(Addr, Port, Dir, 
-						GroupName, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-delete_group_member(GroupName, UserName, Port, Dir) ->
-    delete_group_member(GroupName, UserName, undefined, Port, Dir).
-delete_group_member(GroupName, UserName, Addr, Port, Dir) ->
-    mod_auth_server:delete_group_member(Addr, Port, Dir, 
-					GroupName, UserName, ?NOPASSWORD).
-
-
-%% list_users
-
-list_users(Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:list_users(Addr, Port, Dir, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-list_users(Port, Dir) ->
-    list_users(undefined, Port, Dir).
-list_users(Addr, Port, Dir) ->
-    mod_auth_server:list_users(Addr, Port, Dir, ?NOPASSWORD).
-
-    
-%% delete_user
-
-delete_user(UserName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:delete_user(Addr, Port, Dir, UserName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-delete_user(UserName, Port, Dir) ->
-    delete_user(UserName, undefined, Port, Dir).
-delete_user(UserName, Addr, Port, Dir) ->
-    mod_auth_server:delete_user(Addr, Port, Dir, UserName, ?NOPASSWORD).
-	  
-
-%% delete_group
-
-delete_group(GroupName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-delete_group(GroupName, Port, Dir) ->
-    delete_group(GroupName, undefined, Port, Dir).
-delete_group(GroupName, Addr, Port, Dir) ->
-    mod_auth_server:delete_group(Addr, Port, Dir, GroupName, ?NOPASSWORD).
-
-
-%% list_groups
-
-list_groups(Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:list_groups(Addr, Port, Dir, AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-list_groups(Port, Dir) ->
-    list_groups(undefined, Port, Dir).
-list_groups(Addr, Port, Dir) ->
-    mod_auth_server:list_groups(Addr, Port, Dir, ?NOPASSWORD).
-
-
-%% list_group_members
-
-list_group_members(GroupName, Opt) ->
-    case get_options(Opt, mandatory) of
-	{Addr, Port, Dir, AuthPwd} ->
-	    mod_auth_server:list_group_members(Addr, Port, Dir, GroupName, 
-					       AuthPwd);
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-list_group_members(GroupName, Port, Dir) ->
-    list_group_members(GroupName, undefined, Port, Dir).
-list_group_members(GroupName, Addr, Port, Dir) ->
-    mod_auth_server:list_group_members(Addr, Port, Dir, 
-				       GroupName, ?NOPASSWORD).
-
 %% Opt = [{port, Port},
 %%        {addr, Addr},
 %%        {dir,  Dir},
@@ -792,7 +716,3 @@ get_options(Opt, userData)->
 		    {UserData, Pwd}
 	    end
     end.
-
-
-lookup(Db, Key) ->
-    ets:lookup(Db, Key).