- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : IRC_xLINE(): output an error message for unexpected " lines"
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 8a8e8a3a23576ccdf06aec7d0a2e6a0d8584a9d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8a8e8a3a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 20:11:43 2011 +0100 IRC_xLINE(): output an error message for unexpected "lines" This fixes: irc-oper.c: In function ‘IRC_xLINE’: irc-oper.c:429: warning: ‘class’ may be used uninitialized in this function irc-oper.c:430: warning: ‘class_c’ may be used uninitialized in this function --- src/ngircd/irc-oper.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 1b269e3..21577f0 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -450,6 +450,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) case 'K': class = CLASS_KLINE; class_c = 'K'; break; + default: + Log(LOG_CRIT, + "IRC_xLINE() called for unknown line: %c!? Ignored.", + Req->command[0]); + return CONNECTED; } if (Req->argc == 1) {

1 0

Alexander Barton : README: Update list of implemented commands
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 65befdafaa53843eacf5abf9c079cf8f0d2597b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=65befdaf… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 20:01:28 2011 +0100 README: Update list of implemented commands --- README | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 3c39cad..888385c 100644 --- a/README +++ b/README @@ -33,12 +33,12 @@ used in real IRC networks. Implemented IRC-commands are: -ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, HELP, INFO, INVITE, -ISON, JOIN, KICK, KILL, LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, -NOTICE, OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, REHASH, RESTART, SERVER, -SERVICE, SERVLIST, SQUERY, SQUIT, STATS, SUMMON, TIME, TOPIC, TRACE, USER, -USERHOST, USERS, VERSION, WALLOPS, WEBIRC, WHO, WHOIS, WHOWAS. - +ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, GLINE, HELP, INFO, +INVITE, ISON, JOIN, KICK, KILL, KLINE, LINKS, LIST, LUSERS, MODE, MOTD, +NAMES, NICK, NJOIN, NOTICE, OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, +REHASH, RESTART, SERVER, SERVICE, SERVLIST, SQUERY, SQUIT, STATS, SUMMON, +TIME, TOPIC, TRACE, USER, USERHOST, USERS, VERSION, WALLOPS, WEBIRC, WHO, +WHOIS, WHOWAS. III. Features (or: why use ngIRCd?) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

Alexander Barton : Update list item, if it already exists
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 15fec92ed75c3de0b32c40d005e93e3f61aef77e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=15fec92e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:43:00 2011 +0100 Update list item, if it already exists This updates the "validity" (timeout) as well as the "reason" text, if given. --- src/ngircd/lists.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 11f8e88..27a51dc 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -126,8 +126,19 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil, assert(h != NULL); assert(Mask != NULL); - if (Lists_CheckDupeMask(h, Mask)) + e = Lists_CheckDupeMask(h, Mask); + if (e) { + e->valid_until = ValidUntil; + if (e->reason) + free(e->reason); + e->reason = malloc(strlen(Reason) + 1); + if (e->reason) + strlcpy(e->reason, Reason, strlen(Reason) + 1); + else + Log(LOG_EMERG, + "Can't allocate memory for new list reason text!"); return true; + } e = Lists_GetFirst(h);

1 0

Alexander Barton : Synchronize G-Lines on server login
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 164e15b8c6eb86d4ae640d64a849945e0b4395b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=164e15b8… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:12:40 2011 +0100 Synchronize G-Lines on server login --- src/ngircd/numeric.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index ba6c025..0440768 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -28,6 +28,7 @@ #include "conn.h" #include "conn-func.h" #include "channel.h" +#include "class.h" #include "irc-write.h" #include "lists.h" #include "log.h" @@ -194,8 +195,10 @@ Announce_User(CLIENT * Client, CLIENT * User) #ifdef IRCPLUS /** - * Synchronize invite and ban lists between servers - * @param Client New server + * Synchronize invite, ban, G- and K-Line lists between servers. + * + * @param Client New server. + * @return CONNECTED or DISCONNECTED. */ static bool Synchronize_Lists(CLIENT * Client) @@ -206,6 +209,18 @@ Synchronize_Lists(CLIENT * Client) assert(Client != NULL); + /* g-lines */ + head = Class_GetList(CLASS_GLINE); + elem = Lists_GetFirst(head); + while (elem) { + if (!IRC_WriteStrClient(Client, "GLINE %s %ld :%s", + Lists_GetMask(elem), + Lists_GetValidity(elem) - time(NULL), + Lists_GetReason(elem))) + return DISCONNECTED; + elem = Lists_GetNext(elem); + } + c = Channel_First(); while (c) { /* ban list */

1 0

Alexander Barton : Log better error messages when rejecting clients
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 338758799d601a4f70c379d2d692b0178cea882f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33875879… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:27:06 2011 +0100 Log better error messages when rejecting clients --- src/ngircd/irc-login.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 140d68e..8d82160 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -47,7 +47,7 @@ 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)); +static void Reject_Client PARAMS((CLIENT *Client, const char *InternalReason)); static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, void *i)); @@ -945,7 +945,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); + Reject_Client(Client, "non-empty password"); return DISCONNECTED; } @@ -972,7 +972,7 @@ Hello_User(CLIENT * Client) /* Check global server password ... */ if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ - Reject_Client(Client); + Reject_Client(Client, "bad server password"); return DISCONNECTED; } return Hello_User_PostAuth(Client); @@ -1017,7 +1017,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); + Reject_Client(client, "internal error"); return; } @@ -1025,7 +1025,7 @@ 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); + Reject_Client(client, "bad password"); } #endif @@ -1040,12 +1040,12 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) * @param Client The client to reject. */ static void -Reject_Client(CLIENT *Client) +Reject_Client(CLIENT *Client, const char *InternalReason) { Log(LOG_ERR, - "User \"%s\" rejected (connection %d): Access denied!", - Client_Mask(Client), Client_Conn(Client)); - Conn_Close(Client_Conn(Client), NULL, + "User \"%s\" rejected (connection %d): %s!", + Client_Mask(Client), Client_Conn(Client), InternalReason); + Conn_Close(Client_Conn(Client), InternalReason, "Access denied! Bad password?", true); } @@ -1062,9 +1062,12 @@ Reject_Client(CLIENT *Client) static bool Hello_User_PostAuth(CLIENT *Client) { - if (Class_IsMember(CLASS_GLINE, Client) || - Class_IsMember(CLASS_KLINE, Client)) { - Reject_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"); return DISCONNECTED; }

1 0

Alexander Barton : Lists_CheckDupeMask(): return pointer to already existing item
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 1e4a00f94f32edf5c2240864b7e56f69636312f4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e4a00f9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:42:03 2011 +0100 Lists_CheckDupeMask(): return pointer to already existing item The old behavior of returning true/false is compatible to this change, so there are no other code changes required. --- src/ngircd/lists.c | 6 +++--- src/ngircd/lists.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 63c16b0..11f8e88 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -240,17 +240,17 @@ Lists_Free(struct list_head *head) * @param Mask IRC mask to test. * @return true if mask is already stored in the list, false otherwise. */ -GLOBAL bool +GLOBAL struct list_elem * Lists_CheckDupeMask(const struct list_head *h, const char *Mask ) { struct list_elem *e; e = h->first; while (e) { if (strcasecmp(e->mask, Mask) == 0) - return true; + return e; e = e->next; } - return false; + return NULL; } /** diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index f9a4c91..f709f3f 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -30,7 +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 bool Lists_CheckDupeMask PARAMS((const struct list_head *head, +GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *head, const char *mask)); GLOBAL bool Lists_Add PARAMS((struct list_head *h, const char *Mask,

1 0

Alexander Barton : New functions Lists_Expire() and Class_Expire()
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: ae5ebfb9f0dc1b628a5eebbb39615b3483fe05db URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ae5ebfb9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 17:44:20 2011 +0100 New functions Lists_Expire() and Class_Expire() GLINE and KLINE lists are cleared automatically now, not when they are checked. So "STATS g" and "STATS k" no longer show expired entries :-) --- src/ngircd/class.c | 7 +++++++ src/ngircd/class.h | 2 ++ src/ngircd/conn.c | 4 ++++ src/ngircd/lists.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- src/ngircd/lists.h | 2 ++ 5 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index dd10ac8..1a4d4c0 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -83,4 +83,11 @@ Class_GetList(const int Class) return My_Classes[Class]; } +GLOBAL void +Class_Expire(void) +{ + Lists_Expire(&My_Classes[CLASS_GLINE], "G-Line"); + Lists_Expire(&My_Classes[CLASS_KLINE], "K-Line"); +} + /* -eof- */ diff --git a/src/ngircd/class.h b/src/ngircd/class.h index b93c3b6..3507836 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -33,6 +33,8 @@ GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); GLOBAL struct list_head Class_GetList PARAMS((const int Class)); +GLOBAL void Class_Expire PARAMS((void)); + #endif /* __class_h__ */ /* -eof- */ diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index aa754eb..4d5c223 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -65,6 +65,7 @@ #include "ngircd.h" #include "array.h" #include "client.h" +#include "class.h" #include "conf.h" #include "conn-ssl.h" #include "conn-zip.h" @@ -742,6 +743,9 @@ Conn_Handler(void) Check_Servers(); Check_Connections(); + /* Expire outdated class/list items */ + Class_Expire(); + /* Look for non-empty read buffers ... */ for (i = 0; i < Pool_Size; i++) { if ((My_Connections[i].sock > NONE) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 8e120bf..63c16b0 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -316,22 +316,16 @@ bool Lists_Check( struct list_head *h, CLIENT *Client) { struct list_elem *e, *last, *next; + time_t now; assert(h != NULL); e = h->first; last = NULL; + now = time(NULL); while (e) { next = e->next; - if (e->valid_until > 1 && e->valid_until < time(NULL)) { - /* Entry is expired, delete it */ - LogDebug("Deleted \"%s\" from list (expired).", - e->mask); - Lists_Unlink(h, last, e); - e = next; - continue; - } if (Match(e->mask, Client_Mask(Client))) { if (e->valid_until == 1) { /* Entry is valid only once, delete it */ @@ -348,4 +342,42 @@ Lists_Check( struct list_head *h, CLIENT *Client) return false; } +/** + * Check list and purge expired entries. + * + * @param h List head. + */ +GLOBAL void +Lists_Expire(struct list_head *h, const char *ListName) +{ + struct list_elem *e, *last, *next; + time_t now; + + assert(h != NULL); + + e = h->first; + last = NULL; + now = time(NULL); + + while (e) { + next = e->next; + if (e->valid_until > 1 && e->valid_until < now) { + /* Entry is expired, delete it */ + if (e->reason) + Log(LOG_INFO, + "Deleted \"%s\" (\"%s\") from %s list (expired).", + e->mask, e->reason, ListName); + else + Log(LOG_INFO, + "Deleted \"%s\" from %s list (expired).", + e->mask, ListName); + Lists_Unlink(h, last, e); + e = next; + continue; + } + last = e; + e = next; + } +} + /* -eof- */ diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 316b134..f9a4c91 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -47,6 +47,8 @@ GLOBAL const char *Lists_GetMask PARAMS((const struct list_elem *e)); GLOBAL const char *Lists_GetReason PARAMS((const struct list_elem *e)); GLOBAL time_t Lists_GetValidity PARAMS((const struct list_elem *e)); +GLOBAL void Lists_Expire PARAMS((struct list_head *h, const char *ListName)); + #endif /* -eof- */

1 0

Alexander Barton : Check G-Line and K-Line lists after authenticating clients
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: e86e193e010b44bc567c0fb2dfbebd81b9735358 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e86e193e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 18:03:35 2011 +0100 Check G-Line and K-Line lists after authenticating clients --- src/ngircd/irc-login.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index eeecf96..140d68e 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -937,12 +937,6 @@ Hello_User(CLIENT * Client) } #endif - if (Class_IsMember(CLASS_GLINE, Client) || - Class_IsMember(CLASS_KLINE, Client)) { - Reject_Client(Client); - return DISCONNECTED; - } - #ifdef PAM if (!Conf_PAM) { /* Don't do any PAM authentication at all, instead emulate @@ -1068,6 +1062,12 @@ Reject_Client(CLIENT *Client) static bool Hello_User_PostAuth(CLIENT *Client) { + if (Class_IsMember(CLASS_GLINE, Client) || + Class_IsMember(CLASS_KLINE, Client)) { + Reject_Client(Client); + return DISCONNECTED; + } + Introduce_Client(NULL, Client, CLIENT_USER); if (!IRC_WriteStrClient

1 0

Alexander Barton : Class_GetList() now retuns a pointer to list_head structure
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 6ef20e0f9a6c6f82fbb82b6c60f98b8e8b401b8d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6ef20e0f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:11:07 2011 +0100 Class_GetList() now retuns a pointer to list_head structure --- src/ngircd/class.c | 4 ++-- src/ngircd/class.h | 2 +- src/ngircd/irc-info.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 1a4d4c0..b7a5cbc 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -75,12 +75,12 @@ Class_DeleteMask(const int Class, const char *Mask) Lists_Del(&My_Classes[Class], Mask); } -GLOBAL struct list_head +GLOBAL struct list_head * Class_GetList(const int Class) { assert(Class < CLASS_COUNT); - return My_Classes[Class]; + return &My_Classes[Class]; } GLOBAL void diff --git a/src/ngircd/class.h b/src/ngircd/class.h index 3507836..8c06c2e 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -31,7 +31,7 @@ GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); -GLOBAL struct list_head Class_GetList PARAMS((const int Class)); +GLOBAL struct list_head *Class_GetList PARAMS((const int Class)); GLOBAL void Class_Expire PARAMS((void)); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 736412f..1d91609 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -480,7 +480,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) COMMAND *cmd; time_t time_now; unsigned int days, hrs, mins; - struct list_head list; + struct list_head *list; struct list_elem *list_item; assert(Client != NULL); @@ -531,7 +531,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) list = Class_GetList(CLASS_GLINE); else list = Class_GetList(CLASS_KLINE); - list_item = Lists_GetFirst(&list); + list_item = Lists_GetFirst(list); while (list_item) { if (!IRC_WriteStrClient(from, RPL_STATSXLINE_MSG, Client_ID(from), query,

1 0

Alexander Barton : Op_Check(): always accept commands from a remote server itself
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 32bfafafd9e90f9e224bf95e4f2512cea729aac1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=32bfafaf… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:11:43 2011 +0100 Op_Check(): always accept commands from a remote server itself --- src/ngircd/op.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/ngircd/op.c b/src/ngircd/op.c index c93133c..588513d 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -81,6 +81,9 @@ Op_Check(CLIENT * Client, REQUEST * Req) if (!c) return NULL; + if (Client_Type(Client) == CLIENT_SERVER + && Client_Type(c) == CLIENT_SERVER) + return c; if (!Client_HasMode(c, 'o')) return NULL; if (!Client_OperByMe(c) && !Conf_AllowRemoteOper)

1 0