From 146d464f96228db6e61c3ca9bdff4990fea25343 Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Sat, 11 Oct 2003 17:39:36 +0000 Subject: * doc/guide.tex: Updated * src/ejabberd.cfg: Added "register" rule, added some comments, this file renamed to ejabberd.cfg.example * src/mod_register.erl (try_register): Fixed error reply, added check for "register" access rule * src/stringprep/Makefile.win32: Added Makefile for Win32 (thanks to Sergei Golovan) SVN Revision: 148 --- src/ejabberd.cfg | 77 --------------------------------------- src/ejabberd.cfg.example | 85 +++++++++++++++++++++++++++++++++++++++++++ src/ejabberd_listener.erl | 3 +- src/jlib.erl | 34 +++++++---------- src/mod_register.erl | 20 ++++++---- src/stringprep/Makefile.win32 | 40 ++++++++++++++++++++ 6 files changed, 153 insertions(+), 106 deletions(-) delete mode 100644 src/ejabberd.cfg create mode 100644 src/ejabberd.cfg.example create mode 100644 src/stringprep/Makefile.win32 (limited to 'src') diff --git a/src/ejabberd.cfg b/src/ejabberd.cfg deleted file mode 100644 index 7c4bf9cd2..000000000 --- a/src/ejabberd.cfg +++ /dev/null @@ -1,77 +0,0 @@ -% $Id$ - -%override_acls. - -{acl, admin, {user, "aleksey"}}. -{acl, admin, {user, "ermine"}}. -{acl, admin, {user, "test"}}. -{acl, admin, {user, "aleksey", "jabber.ru"}}. -{acl, admin, {user, "ermine", "jabber.ru"}}. - - -{acl, blocked, {user, "test2"}}. - -{acl, jabberorg, {server, "jabber.org"}}. -{acl, aleksey, {user, "aleksey", "jabber.ru"}}. - -%{acl, test, {user_regexp, "^test"}}. -%{acl, test2, {user_glob, "test*"}}. - - -{shaper, normal, {maxrate, 1000}}. - - -{access, disco_admin, [{allow, admin}, - {deny, all}]}. - -{access, configure, [{allow, admin}]}. - -{access, c2s, [{deny, blocked}, - {allow, all}]}. - - -{access, c2s_shaper, [{none, admin}, - {normal, all}]}. - -{access, muc_admin, [{allow, admin}]}. - - -{host, "e.localhost"}. - -{listen, [{5522, ejabberd_c2s, [{access, c2s}, - {shaper, c2s_shaper}]}, - {5523, ejabberd_c2s, [{access, c2s}, - {ssl, [{certfile, "./ssl.pem"}]}]}, - {5269, ejabberd_s2s_in, []}, - {8888, ejabberd_service, [{host, - "conference.e.localhost", - [{password, "asdqwe"}]}]} - ]}. - -% This value (5569) is only for debugging, must be 5269 -{outgoing_s2s_port, 5569}. - -{modules, [ - {mod_register, []}, - {mod_roster, []}, - {mod_privacy, []}, - {mod_configure, []}, - {mod_disco, []}, - {mod_stats, []}, - {mod_vcard, []}, - {mod_offline, []}, - {mod_echo, [{host, "echo.localhost"}]}, - {mod_private, []}, - {mod_irc, []}, - {mod_muc, []}, - {mod_pubsub, []}, - {mod_time, [{iqdisc, no_queue}]}, - {mod_version, []} - ]}. - - - - -% Local Variables: -% mode: erlang -% End: diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example new file mode 100644 index 000000000..2cc561b65 --- /dev/null +++ b/src/ejabberd.cfg.example @@ -0,0 +1,85 @@ +% $Id$ + +%override_acls. + + +% Users that have admin access. Add line like one of the following after you +% will be successfully registered on server to get admin access: +%{acl, admin, {user, "aleksey"}}. +%{acl, admin, {user, "ermine"}}. + +% Blocked users: +%{acl, blocked, {user, "test"}}. + +% Another examples of ACLs: +%{acl, jabberorg, {server, "jabber.org"}}. +%{acl, aleksey, {user, "aleksey", "jabber.ru"}}. +%{acl, test, {user_regexp, "^test"}}. +%{acl, test, {user_glob, "test*"}}. + + +% Only admins can use configuration interface: +{access, configure, [{allow, admin}]}. + +% Every username can be registered via in-band registration: +{access, register, [{allow, all}]}. + + +% Only non-blocked users can use c2s connections: +{access, c2s, [{deny, blocked}, + {allow, all}]}. + +% Set shaper with name "normal" to limit traffic speed to 1000B/s +{shaper, normal, {maxrate, 1000}}. + +% For all users except admins used "normal" shaper +{access, c2s_shaper, [{none, admin}, + {normal, all}]}. + +% Admins of this server are also admins of MUC service: +{access, muc_admin, [{allow, admin}]}. + +% Host name: +{host, "localhost"}. + + +% Listened ports: +{listen, [{5222, ejabberd_c2s, [{access, c2s}, + {shaper, c2s_shaper}]}, + {5223, ejabberd_c2s, [{access, c2s}, + {ssl, [{certfile, "./ssl.pem"}]}]}, + {5269, ejabberd_s2s_in, []}, + {8888, ejabberd_service, [{host, + "conference.e.localhost", + [{password, "asdqwe"}]}]} + ]}. + +% If SRV lookup fails, then port 5269 used to communicate with other servers +{outgoing_s2s_port, 5269}. + + +% Used modules: +{modules, [ + {mod_register, []}, + {mod_roster, []}, + {mod_privacy, []}, + {mod_configure, []}, + {mod_disco, []}, + {mod_stats, []}, + {mod_vcard, []}, + {mod_offline, []}, + {mod_echo, [{host, "echo.localhost"}]}, + {mod_private, []}, + {mod_irc, []}, + {mod_muc, []}, + {mod_pubsub, []}, + {mod_time, [{iqdisc, no_queue}]}, + {mod_version, []} + ]}. + + + + +% Local Variables: +% mode: erlang +% End: diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index 9de102be0..36dad2e13 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -52,7 +52,8 @@ init(Port, Module, Opts) -> {ok, ListenSocket} = gen_tcp:listen(Port, [binary, {packet, 0}, {active, false}, - {reuseaddr, true}]), + {reuseaddr, true}, + {nodelay, true}]), accept(ListenSocket, Module, Opts). accept(ListenSocket, Module, Opts) -> diff --git a/src/jlib.erl b/src/jlib.erl index ced408945..839d6739c 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -227,25 +227,7 @@ jid_to_string({Node, Server, Resource}) -> is_nodename([]) -> false; is_nodename(J) -> - is_nodename1(J). - -is_nodename1([C | J]) - when (C =< 32) or - (C == $") or - (C == $&) or - (C == $') or - (C == $:) or - (C == $<) or - (C == $>) or - (C == $@) or - (C == $/) or - (C == 127) - -> - false; -is_nodename1([C | J]) -> - is_nodename1(J); -is_nodename1([]) -> - true. + nodeprep(J). @@ -301,7 +283,19 @@ resourceprep(S) -> jid_tolower(#jid{luser = U, lserver = S, lresource = R}) -> {U, S, R}; jid_tolower({U, S, R}) -> - {tolower(U), tolower(S), R}. + case stringprep:nodeprep(U) of + error -> error; + LUser -> + case stringprep:nameprep(S) of + error -> error; + LServer -> + case stringprep:resourceprep(R) of + error -> error; + LResource -> + {LUser, LServer, LResource} + end + end + end. jid_remove_resource(#jid{} = JID) -> JID#jid{resource = "", lresource = ""}; diff --git a/src/mod_register.erl b/src/mod_register.erl index b480dace9..9bf89f05e 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -116,14 +116,18 @@ try_register(User, Password) -> false -> {error, ?ERR_BAD_REQUEST}; _ -> - case ejabberd_auth:try_register(User, Password) of - {atomic, ok} -> - ok; - {atomic, exists} -> - % TODO: replace to "username unavailable" - {error, ?ERR_NOT_ALLOWED}; - {error, Reason} -> - {error, ?ERR_INTERNAL_SERVER_ERROR} + case acl:match_rule(register, jlib:make_jid(User, ?MYNAME, "")) of + deny -> + {error, ?ERR_CONFLICT}; + allow -> + case ejabberd_auth:try_register(User, Password) of + {atomic, ok} -> + ok; + {atomic, exists} -> + {error, ?ERR_CONFLICT}; + {error, _Reason} -> + {error, ?ERR_INTERNAL_SERVER_ERROR} + end end end. diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32 new file mode 100644 index 000000000..5339e3d2e --- /dev/null +++ b/src/stringprep/Makefile.win32 @@ -0,0 +1,40 @@ + +include ..\Makefile.inc + +OUTDIR = .. +EFLAGS = -I .. -pz .. + +ALL : $(OUTDIR)\stringprep_drv.dll $(OUTDIR)\stringprep.beam + +CLEAN : + -@erase $(OUTDIR)\stringprep_drv.dll + -@erase $(OUTDIR)\stringprep_drv.exp + -@erase $(OUTDIR)\stringprep_drv.lib + -@erase stringprep_drv.obj + -@erase stringprep_drv.pch + -@erase vc60.idb + -@erase $(OUTDIR)\stringprep.beam + +$(OUTDIR)\stringprep.beam : stringprep.erl + erlc -W $(EFLAGS) -o $(OUTDIR) stringprep.erl + +CPP=cl.exe +CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "$(ERLANG_DIR)\usr\include" /I "$(EI_DIR)\include" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "_MBCS" /Fpstringprep_drv.pch /YX /FD /c + +.c.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib "$(ERLANG_DIR)\usr\lib\erl_dll.lib" "$(EI_DIR)\lib\ei.lib" "$(EI_DIR)\lib\erl_interface.lib" /nologo /subsystem:console /dll /pdb:none /machine:I386 /out:$(OUTDIR)\stringprep_drv.dll + +LINK32_OBJS=stringprep_drv.obj + +$(OUTDIR)\stringprep_drv.dll : $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +stringprep_drv.obj : stringprep_drv.c + -- cgit v1.2.3