ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : RPL_ISUPPORT_MSG(005): add "EXCEPTS=e INVEX=I"
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: 3d27073d61ab52277a3237c9a2375e5deda9d690 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3d27073d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 22:07:40 2012 +0100 RPL_ISUPPORT_MSG(005): add "EXCEPTS=e INVEX=I" Thanks to Cahata for the idea! --- src/ngircd/messages.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index f059077..90e0fdc 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -22,7 +22,7 @@ #define RPL_CREATED_MSG "003 %s :This server has been started %s" #define RPL_MYINFO_MSG "004 %s %s ngircd-%s %s %s" #define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=beI,k,l,imnOPRstz CHANLIMIT=#&+:%d :are supported on this server" -#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d PENALTY :are supported on this server" +#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d EXCEPTS=e INVEX=I PENALTY :are supported on this server" #define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d" #define RPL_TRACEOPERATOR_MSG "204 %s Oper 2 :%s"

1 0

Alexander Barton : Fix "MAXLIST=beI:50": the limit is the sum of all lists
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: b6f19ea8feceeb2246995222f03790e6f00b0dfd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b6f19ea8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 21:51:38 2012 +0100 Fix "MAXLIST=beI:50": the limit is the sum of all lists "Modes which are specified in the same pair share the same maximum size", so "beI:50" means a total of 50 entries, regardless of the list. See <http://www.irc.org/tech_docs/draft-brocklesby-irc-isupport-03.txt>, thanks to Cahata for reporting this! --- src/ngircd/irc-mode.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ad83ae9..80b2949 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -857,6 +857,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, { const char *mask; struct list_head *list; + long int current_count; assert(Client != NULL); assert(Channel != NULL); @@ -864,6 +865,9 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, assert(what == 'I' || what == 'b' || what == 'e'); mask = Lists_MakeMask(Pattern); + current_count = Lists_Count(Channel_GetListInvites(Channel)) + + Lists_Count(Channel_GetListExcepts(Channel)) + + Lists_Count(Channel_GetListBans(Channel)); switch(what) { case 'I': @@ -880,7 +884,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, if (Lists_CheckDupeMask(list, mask)) return CONNECTED; if (Client_Type(Client) == CLIENT_USER && - Lists_Count(list) >= MAX_HNDL_CHANNEL_LISTS) + current_count >= MAX_HNDL_CHANNEL_LISTS) return IRC_WriteStrClient(Client, ERR_LISTFULL_MSG, Client_ID(Client), Channel_Name(Channel), mask,

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: 8c46067b34b71dac23b388c0acc28fdf8db111fa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8c46067b… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 12:30:16 2012 +0100 Update NEWS and ChangeLog files --- ChangeLog | 7 +++++++ NEWS | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca83f29..b7083db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ ngIRCd Release 19 + - New numeric RPL_WHOISHOST_MSG(378), which returns the DNS hostname + (if available) and the IP address of a client in the WHOIS reply. + Only the user itself and local IRC operators get this numeric. - Implement channel exception list (mode 'e'). This allows a channel operator to define exception masks that allow users to join the channel even when a "ban" would match and prevent them from joining: @@ -86,6 +89,10 @@ ngIRCd Release 19 - Log better error messages when rejecting clients. - Implement IRC commands "GLINE" and "KLINE" to ban users. G-Lines are synchronized between server on peering, K-Lines are local only. + If you use "*!<user>@<host>" or "*!*@<host>" masks, these connections + are blocked even before the user is fully logged in (before PASS, + NICK, and USER commands have been processed) and before the child + processes for authentication are forked, so resource usage is smaller. - Xcode: update project file for Xcode 4.2 and define HAVE_GAI_STRERROR for Mac OS X Xcode builds. - ./configure: Fix logic and quoting of poll() detection code: only use diff --git a/NEWS b/NEWS index 14bbe79..054780e 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,9 @@ ngIRCd Release 19 + - New numeric RPL_WHOISHOST_MSG(378), which returns the DNS hostname + (if available) and the IP address of a client in the WHOIS reply. + Only the user itself and local IRC operators get this numeric. - Implement channel exception list (mode 'e'). This allows a channel operator to define exception masks that allow users to join the channel even when a "ban" would match and prevent them from joining: @@ -50,6 +53,10 @@ ngIRCd Release 19 Reported by Cahata, thanks! - Implement IRC commands "GLINE" and "KLINE" to ban users. G-Lines are synchronized between server on peering, K-Lines are local only. + If you use "*!<user>@<host>" or "*!*@<host>" masks, these connections + are blocked even before the user is fully logged in (before PASS, + NICK, and USER commands have been processed) and before the child + processes for authentication are forked, so resource usage is smaller. - Added doc/Modes.txt: document modes supported by ngIRCd. - Implement user mode "R": indicates that the nick name of this user is "registered". This mode isn't handled by ngIRCd itself, but must

1 0

Alexander Barton : New function Conn_GetIPAInfo(): get IP address of a connection
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 6a308fcb42eae1de168699ed432b49b610073ede URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6a308fcb… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 22:35:27 2012 +0100 New function Conn_GetIPAInfo(): get IP address of a connection --- src/ngircd/conn.c | 14 ++++++++++++++ src/ngircd/conn.h | 2 ++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 40a2af6..35d7400 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1227,6 +1227,20 @@ Conn_SyncServerStruct(void) /** + * Get IP address string of a connection. + * + * @param Idx Connection index. + * @return Pointer to a global buffer containing the IP address as string. + */ +GLOBAL const char * +Conn_GetIPAInfo(CONN_ID Idx) +{ + assert(Idx > NONE); + return ng_ipaddr_tostr(&My_Connections[Idx].addr); +} + + +/** * Send out data of write buffer; connect new sockets. * * @param Idx Connection index. diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 251da2a..4752ec1 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -131,6 +131,8 @@ Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; } #endif +GLOBAL const char *Conn_GetIPAInfo PARAMS((CONN_ID Idx)); + GLOBAL long Conn_Count PARAMS((void)); GLOBAL long Conn_CountMax PARAMS((void)); GLOBAL long Conn_CountAccepted PARAMS((void));

1 0

Alexander Barton : New RPL_WHOISHOST_MSG(378): show hostname and IP address
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 594fdd02aaa482b8273a8d24aa48510ecf0981ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=594fdd02… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 22:41:39 2012 +0100 New RPL_WHOISHOST_MSG(378): show hostname and IP address The numeric RPL_WHOISHOST_MSG(378) returns the DNS hostname (if available) and the IP address of a client in the WHOIS reply. Only the user itself and local IRC operators get this numeric. --- src/ngircd/irc-info.c | 6 ++++++ src/ngircd/messages.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 93c43b7..841e6e6 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1114,6 +1114,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) Client_ID(from), Client_ID(c))) return DISCONNECTED; + if (Client_Conn(c) > NONE && (Client_OperByMe(from) || from == c) && + !IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, Client_ID(from), + Client_ID(c), Client_Hostname(c), + Conn_GetIPAInfo(Client_Conn(c)))) + return DISCONNECTED; + /* Idle and signon time (local clients only!) */ if (!Conf_MorePrivacy && Client_Conn(c) > NONE && !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 340f5f4..f059077 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -91,6 +91,7 @@ #define RPL_MOTD_MSG "372 %s :- %s" #define RPL_MOTDSTART_MSG "375 %s :- %s message of the day" #define RPL_ENDOFMOTD_MSG "376 %s :End of MOTD command" +#define RPL_WHOISHOST_MSG "378 %s %s :is connecting from *@%s %s" #define RPL_YOUREOPER_MSG "381 %s :You are now an IRC Operator" #define RPL_YOURESERVICE_MSG "383 %s :You are service %s" #define RPL_TIME_MSG "391 %s %s :%s"

1 0

Alexander Barton : G/K-Lines: only add and delete valid IRC masks
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 1537c791320086df83b8fbecb057e70c7120ea12 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1537c791… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:53:16 2012 +0100 G/K-Lines: only add and delete valid IRC masks --- src/ngircd/class.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 0a8ae24..0f617b8 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -112,7 +112,8 @@ Class_AddMask(const int Class, const char *Mask, time_t ValidUntil, assert(Mask != NULL); assert(Reason != NULL); - return Lists_Add(&My_Classes[Class], Mask, ValidUntil, Reason); + return Lists_Add(&My_Classes[Class], Lists_MakeMask(Mask), + ValidUntil, Reason); } GLOBAL void @@ -121,7 +122,7 @@ Class_DeleteMask(const int Class, const char *Mask) assert(Class < CLASS_COUNT); assert(Mask != NULL); - Lists_Del(&My_Classes[Class], Mask); + Lists_Del(&My_Classes[Class], Lists_MakeMask(Mask)); } GLOBAL struct list_head *

1 0

Alexander Barton : New function Client_Reject() to reject clients on connect
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 51a6a33056486c19da6b8d6e4809dde57be00ece URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51a6a330… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:17:28 2012 +0100 New function Client_Reject() to reject clients on connect --- src/ngircd/client.c | 33 +++++++++++++++++++++++++++++++++ src/ngircd/client.h | 3 +++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index d1f751d..1aaf687 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1097,6 +1097,39 @@ Client_StartTime(CLIENT *Client) } /* Client_Uptime */ +/** + * Reject a client when logging in. + * + * This function is called when a client isn't allowed to connect to this + * server. Possible reasons are bad server password, bad PAM password, + * or that the client is G/K-Line'd. + * + * After calling this function, the client isn't connected any more. + * + * @param Client The client to reject. + * @param Reason The reason why the client has been rejected. + * @param InformClient If true, send the exact reason to the client. + */ +GLOBAL void +Client_Reject(CLIENT *Client, const char *Reason, bool InformClient) +{ + char info[COMMAND_LEN]; + + assert(Client != NULL); + assert(Reason != NULL); + + if (InformClient) + snprintf(info, sizeof(info), "Access denied: %s", Reason); + else + strcpy(info, "Access denied: Bad password?"); + + Log(LOG_ERR, + "User \"%s\" rejected (connection %d): %s!", + Client_Mask(Client), Client_Conn(Client), Reason); + Conn_Close(Client_Conn(Client), Reason, info, true); +} + + static unsigned long Count( CLIENT_TYPE Type ) { diff --git a/src/ngircd/client.h b/src/ngircd/client.h index fecf5d9..7bb230b 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -163,6 +163,9 @@ GLOBAL void Client_RegisterWhowas PARAMS(( CLIENT *Client )); GLOBAL const char *Client_TypeText PARAMS((CLIENT *Client)); +GLOBAL void Client_Reject PARAMS((CLIENT *Client, const char *Reason, + bool InformClient)); + #ifdef DEBUG GLOBAL void Client_DebugDump PARAMS((void)); #endif

1 0

Alexander Barton : New function Lists_CheckReason() to get reason of list entries
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 6e28f4a7d13a81db99196da23958e81f2bb8418e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6e28f4a7… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:11:24 2012 +0100 New function Lists_CheckReason() to get reason of list entries --- src/ngircd/lists.c | 19 ++++++++++++++++--- src/ngircd/lists.h | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index c082f1c..4f57ca7 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -320,7 +320,20 @@ Lists_MakeMask(const char *Pattern) * @return true if client is listed, false if not. */ bool -Lists_Check( struct list_head *h, CLIENT *Client) +Lists_Check(struct list_head *h, CLIENT *Client) +{ + return Lists_CheckReason(h, Client) != NULL; +} + +/** + * Check if a client is listed in a list and return the "reason". + * + * @param h List head. + * @param Client Client to check. + * @return true if client is listed, false if not. + */ +char * +Lists_CheckReason(struct list_head *h, CLIENT *Client) { struct list_elem *e, *last, *next; @@ -338,13 +351,13 @@ Lists_Check( struct list_head *h, CLIENT *Client) e->mask); Lists_Unlink(h, last, e); } - return true; + return e->reason ? e->reason : ""; } last = e; e = next; } - return false; + return NULL; } /** diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index cb2e2c1..24504df 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -30,6 +30,7 @@ GLOBAL struct list_elem *Lists_GetFirst PARAMS((const struct list_head *)); GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *)); GLOBAL bool Lists_Check PARAMS((struct list_head *head, CLIENT *client)); +GLOBAL char *Lists_CheckReason PARAMS((struct list_head *head, CLIENT *client)); GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *head, const char *mask));

1 0

Alexander Barton : Check G/K-Lines before the client has been registered, too
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: e0c9931ad8db8a9bd7d6c030d856ccc28c6facc2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e0c9931a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:35:54 2012 +0100 Check G/K-Lines before the client has been registered, too This allows to use "*!<user>@<host>" or "*!*@<host>" masks to reject clients even before receiving PASS, NICK and USER commands and before forking authentication child processes which reduces resource usage. --- src/ngircd/conn.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 5f3c18a..40a2af6 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2225,6 +2225,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) "NOTICE AUTH :*** No ident response"); } #endif + Class_HandleServerBans(c); } #ifdef DEBUG else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );

1 0

Alexander Barton : Streamline handling of connection rejects (bad password, G/K-line)
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: eba95bb0d240aa3c8791cb6eb830ced5023db0b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eba95bb0… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:33:45 2012 +0100 Streamline handling of connection rejects (bad password, G/K-line) - Use Client_Reject(), get rid of Reject_Client(). - Refactor Class_IsMember() to Class_GetMemberReason(), - New function Class_HandleServerBans(). --- src/ngircd/class.c | 57 ++++++++++++++++++++++++++++++++++++++++++++--- src/ngircd/class.h | 5 ++- src/ngircd/irc-login.c | 38 ++++++-------------------------- 3 files changed, 63 insertions(+), 37 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index b7a5cbc..0a8ae24 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,12 +26,15 @@ #include "client.h" #include "lists.h" #include "match.h" +#include "stdio.h" #include "exp.h" #include "class.h" struct list_head My_Classes[CLASS_COUNT]; +char Reject_Reason[COMMAND_LEN]; + GLOBAL void Class_Init(void) { @@ -46,15 +49,61 @@ Class_Exit(void) for (i = 0; i < CLASS_COUNT; Lists_Free(&My_Classes[i++])); } -GLOBAL bool -Class_IsMember(const int Class, CLIENT *Client) +GLOBAL char * +Class_GetMemberReason(const int Class, CLIENT *Client) { + char *reason; + assert(Class < CLASS_COUNT); assert(Client != NULL); - return Lists_Check(&My_Classes[Class], Client); + reason = Lists_CheckReason(&My_Classes[Class], Client); + if (!reason) + return NULL; + + if (!*reason) + reason = "listed"; + + switch(Class) { + case CLASS_GLINE: + snprintf(Reject_Reason, sizeof(Reject_Reason), + "\"%s\" (G-Line)", reason); + return Reject_Reason; + case CLASS_KLINE: + snprintf(Reject_Reason, sizeof(Reject_Reason), + "\"%s\" (K-Line)", reason); + return Reject_Reason; + } + return reason; +} + +/** + * Check if a client is banned from this server: GLINE, KLINE. + * + * If a client isn't allowed to connect, it will be disconnected again. + * + * @param Client The client to check. + * @return CONNECTED if client is allowed to join, DISCONNECTED if not. + */ +GLOBAL bool +Class_HandleServerBans(CLIENT *Client) +{ + char *rejectptr; + + assert(Client != NULL); + + rejectptr = Class_GetMemberReason(CLASS_GLINE, Client); + if (!rejectptr) + rejectptr = Class_GetMemberReason(CLASS_KLINE, Client); + if (rejectptr) { + Client_Reject(Client, rejectptr, true); + return DISCONNECTED; + } + + return CONNECTED; } + GLOBAL bool Class_AddMask(const int Class, const char *Mask, time_t ValidUntil, const char *Reason) diff --git a/src/ngircd/class.h b/src/ngircd/class.h index 8c06c2e..2a9dbba 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +29,8 @@ GLOBAL bool Class_AddMask PARAMS((const int Class, const char *Mask, const time_t ValidUntil, const char *Reason)); GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); -GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); +GLOBAL char *Class_GetMemberReason PARAMS((const int Class, CLIENT *Client)); +GLOBAL bool Class_HandleServerBans PARAMS((CLIENT *Client)); GLOBAL struct list_head *Class_GetList PARAMS((const int Class)); diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index bbb2f0d..54818fe 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -47,7 +47,6 @@ static bool Hello_User PARAMS(( CLIENT *Client )); static bool Hello_User_PostAuth PARAMS(( CLIENT *Client )); static void Kill_Nick PARAMS(( char *Nick, char *Reason )); static void Introduce_Client PARAMS((CLIENT *To, CLIENT *Client, int Type)); -static void Reject_Client PARAMS((CLIENT *Client, const char *InternalReason)); static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, void *i)); @@ -945,7 +944,7 @@ Hello_User(CLIENT * Client) * passwords supplied are classified as "wrong". */ if(Client_Password(Client)[0] == '\0') return Hello_User_PostAuth(Client); - Reject_Client(Client, "non-empty password"); + Client_Reject(Client, "Non-empty password", false); return DISCONNECTED; } @@ -981,7 +980,7 @@ Hello_User(CLIENT * Client) /* Check global server password ... */ if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ - Reject_Client(Client, "bad server password"); + Client_Reject(Client, "Bad server password", false); return DISCONNECTED; } return Hello_User_PostAuth(Client); @@ -1026,7 +1025,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) if (len != sizeof(result)) { Log(LOG_CRIT, "Auth: Got malformed result!"); - Reject_Client(client, "internal error"); + Client_Reject(client, "Internal error", false); return; } @@ -1034,32 +1033,13 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) Client_SetUser(client, Client_OrigUser(client), true); (void)Hello_User_PostAuth(client); } else - Reject_Client(client, "bad password"); + Client_Reject(client, "Bad password", false); } #endif /** - * Reject a client because of wrong password. - * - * This function is called either when the global server password or a password - * checked using PAM has been wrong. - * - * @param Client The client to reject. - */ -static void -Reject_Client(CLIENT *Client, const char *InternalReason) -{ - Log(LOG_ERR, - "User \"%s\" rejected (connection %d): %s!", - Client_Mask(Client), Client_Conn(Client), InternalReason); - Conn_Close(Client_Conn(Client), InternalReason, - "Access denied! Bad password?", true); -} - - -/** * Finish client registration. * * Introduce the new client to the network and send all "hello messages" @@ -1071,14 +1051,10 @@ Reject_Client(CLIENT *Client, const char *InternalReason) static bool Hello_User_PostAuth(CLIENT *Client) { - if (Class_IsMember(CLASS_GLINE, Client)) { - Reject_Client(Client, "G-Line'd"); - return DISCONNECTED; - } - if (Class_IsMember(CLASS_KLINE, Client)) { - Reject_Client(Client, "K-Line'd"); + assert(Client != NULL); + + if (Class_HandleServerBans(Client) != CONNECTED) return DISCONNECTED; - } Introduce_Client(NULL, Client, CLIENT_USER);

1 0

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates