ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

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

Alexander Barton : Op_Check(): return client that initiated the request or NULL
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: e23f025dd6006eec2fe854ca0eaa623f0feb18ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e23f025d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 16:52:31 2011 +0100 Op_Check(): return client that initiated the request or NULL The old behavior of returning true/false is compatible to this change, so there are no other code changes required. --- src/ngircd/op.c | 20 ++++++++++++++------ src/ngircd/op.h | 4 ++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ngircd/op.c b/src/ngircd/op.c index 7c0737f..c93133c 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -58,9 +58,15 @@ Op_NoPrivileges(CLIENT * Client, REQUEST * Req) /** - * Check that the client is an IRC operator allowed to administer this server. + * Check that the originator of a request is an IRC operator and allowed + * to administer this server. + * + * @param CLient Client from which the command has been received. + * @param Req Request structure. + * @return CLIENT structure of the client that initiated the command or + * NULL if client is not allowed to execute operator commands. */ -GLOBAL bool +GLOBAL CLIENT * Op_Check(CLIENT * Client, REQUEST * Req) { CLIENT *c; @@ -72,15 +78,17 @@ Op_Check(CLIENT * Client, REQUEST * Req) c = Client_Search(Req->prefix); else c = Client; + if (!c) - return false; + return NULL; if (!Client_HasMode(c, 'o')) - return false; + return NULL; if (!Client_OperByMe(c) && !Conf_AllowRemoteOper) - return false; + return NULL; + /* The client is an local IRC operator, or this server is configured * to trust remote operators. */ - return true; + return c; } /* Op_Check */ diff --git a/src/ngircd/op.h b/src/ngircd/op.h index a1a84a3..71748eb 100644 --- a/src/ngircd/op.h +++ b/src/ngircd/op.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 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 @@ -18,7 +18,7 @@ */ GLOBAL bool Op_NoPrivileges PARAMS((CLIENT * Client, REQUEST * Req)); -GLOBAL bool Op_Check PARAMS((CLIENT * Client, REQUEST * Req)); +GLOBAL CLIENT *Op_Check PARAMS((CLIENT * Client, REQUEST * Req)); #endif

1 0

Alexander Barton : Implement IRC_xLINE(): handler for "GLINE" and "KLINE" commands
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: e9e6224aaeac6aab825caa12172bc207a00a86f9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e9e6224a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 16:57:36 2011 +0100 Implement IRC_xLINE(): handler for "GLINE" and "KLINE" commands --- src/ngircd/irc-oper.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ src/ngircd/irc-oper.h | 4 ++- src/ngircd/parse.c | 2 + 3 files changed, 76 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 6945fbb..1b269e3 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -27,6 +27,7 @@ #include "conn-func.h" #include "conf.h" #include "channel.h" +#include "class.h" #include "irc-write.h" #include "log.h" #include "match.h" @@ -414,5 +415,75 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) return CONNECTED; } /* IRC_WALLOPS */ +/** + * Handle <?>LINE commands (GLINE, KLINE). + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ +GLOBAL bool +IRC_xLINE(CLIENT *Client, REQUEST *Req) +{ + CLIENT *from; + int class; + char class_c; + + assert(Client != NULL); + assert(Req != NULL); + + from = Op_Check(Client, Req); + if (!from) + return Op_NoPrivileges(Client, Req); + + /* Bad number of parameters? */ + if (Req->argc != 1 && Req->argc != 3) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + switch(Req->command[0]) { + case 'g': + case 'G': + class = CLASS_GLINE; class_c = 'G'; + break; + case 'k': + case 'K': + class = CLASS_KLINE; class_c = 'K'; + break; + } + + if (Req->argc == 1) { + /* Delete mask from list */ + Class_DeleteMask(class, Req->argv[0]); + Log(LOG_NOTICE|LOG_snotice, + "\"%s\" deleted \"%s\" from %c-Line list.", + Client_Mask(from), Req->argv[0], class_c); + if (class == CLASS_GLINE) { + /* Inform other servers */ + IRC_WriteStrServersPrefix(Client, from, "%s %s", + Req->command, Req->argv[0]); + + } + } else { + /* Add new mask to list */ + if (Class_AddMask(class, Req->argv[0], + time(NULL) + atol(Req->argv[1]), + Req->argv[2])) { + Log(LOG_NOTICE|LOG_snotice, + "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).", + Client_Mask(from), Req->argv[0], class_c, + Req->argv[2], atol(Req->argv[1])); + if (class == CLASS_GLINE) { + /* Inform other servers */ + IRC_WriteStrServersPrefix(Client, from, + "%s %s %s :%s", Req->command, + Req->argv[0], Req->argv[1], + Req->argv[2]); + } + } + } + + return CONNECTED; +} /* -eof- */ diff --git a/src/ngircd/irc-oper.h b/src/ngircd/irc-oper.h index 7d67a0b..bd68d4f 100644 --- a/src/ngircd/irc-oper.h +++ b/src/ngircd/irc-oper.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 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 @@ -25,6 +25,8 @@ GLOBAL bool IRC_CONNECT PARAMS((CLIENT *Client, REQUEST *Req )); GLOBAL bool IRC_DISCONNECT PARAMS((CLIENT *Client, REQUEST *Req )); GLOBAL bool IRC_WALLOPS PARAMS(( CLIENT *Client, REQUEST *Req )); +GLOBAL bool IRC_xLINE PARAMS((CLIENT *Client, REQUEST *Req)); + #endif /* -eof- */ diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index be3c864..02ab893 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -63,6 +63,7 @@ static COMMAND My_Commands[] = { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 }, { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 }, { "ERROR", IRC_ERROR, 0xFFFF, 0, 0, 0 }, + { "GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "HELP", IRC_HELP, CLIENT_USER, 0, 0, 0 }, { "INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, @@ -70,6 +71,7 @@ static COMMAND My_Commands[] = { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : New function Class_GetList()
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: dc9fcb0fb2716757ef336e60febeb58f59325388 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dc9fcb0f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:49:52 2011 +0100 New function Class_GetList() --- src/ngircd/class.c | 8 ++++++++ src/ngircd/class.h | 2 ++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index aeecaae..dd10ac8 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -75,4 +75,12 @@ Class_DeleteMask(const int Class, const char *Mask) Lists_Del(&My_Classes[Class], Mask); } +GLOBAL struct list_head +Class_GetList(const int Class) +{ + assert(Class < CLASS_COUNT); + + return My_Classes[Class]; +} + /* -eof- */ diff --git a/src/ngircd/class.h b/src/ngircd/class.h index deb60f4..b93c3b6 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -31,6 +31,8 @@ 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)); + #endif /* __class_h__ */ /* -eof- */

1 0

Alexander Barton : Implement IRC "STATS g" and "STATS k" command
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: fc82efc3e8931e1670972e594140e03671370c1f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fc82efc3… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:50:19 2011 +0100 Implement IRC "STATS g" and "STATS k" command --- src/ngircd/irc-info.c | 26 ++++++++++++++++++++++++++ src/ngircd/messages.h | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 301da53..736412f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -28,8 +28,10 @@ #include "conn-func.h" #include "conn-zip.h" #include "channel.h" +#include "class.h" #include "conf.h" #include "defines.h" +#include "lists.h" #include "log.h" #include "messages.h" #include "match.h" @@ -478,6 +480,8 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) COMMAND *cmd; time_t time_now; unsigned int days, hrs, mins; + struct list_head list; + struct list_elem *list_item; assert(Client != NULL); assert(Req != NULL); @@ -516,6 +520,28 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) query = '*'; switch (query) { + case 'g': /* Network-wide bans ("G-Lines") */ + case 'G': + case 'k': /* Server-local bans ("K-Lines") */ + case 'K': + if (!Client_HasMode(from, 'o')) + return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG, + Client_ID(from)); + if (query == 'g' || query == 'G') + list = Class_GetList(CLASS_GLINE); + else + list = Class_GetList(CLASS_KLINE); + list_item = Lists_GetFirst(&list); + while (list_item) { + if (!IRC_WriteStrClient(from, RPL_STATSXLINE_MSG, + Client_ID(from), query, + Lists_GetMask(list_item), + Lists_GetValidity(list_item), + Lists_GetReason(list_item))) + return DISCONNECTED; + list_item = Lists_GetNext(list_item); + } + break; case 'l': /* Link status (servers and own link) */ case 'L': time_now = time(NULL); diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 78ac068..7bf7367 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -29,6 +29,7 @@ #define RPL_TRACESERVER_MSG "206 %s Serv 1 0S 0C %s[%s@%s] *!*@%s :V%s" #define RPL_STATSLINKINFO_MSG "211 %s %s %d %ld %ld %ld %ld :%ld" #define RPL_STATSCOMMANDS_MSG "212 %s %s %ld %ld %ld" +#define RPL_STATSXLINE_MSG "216 %s %c %s %ld :%s" #define RPL_ENDOFSTATS_MSG "219 %s %c :End of STATS report" #define RPL_UMODEIS_MSG "221 %s +%s" #define RPL_SERVLIST_MSG "234 %s %s %s %s %d %d :%s"

1 0

Alexander Barton : irc-oper.c: code cleanup; more documentation
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 3ca87033099f4bcf3f51a8ee53abeee218e4505b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3ca87033… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 16:08:00 2011 +0100 irc-oper.c: code cleanup; more documentation --- src/ngircd/irc-oper.c | 121 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 94 insertions(+), 27 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index e8b8d26..6945fbb 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 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 @@ -37,7 +37,6 @@ #include <exp.h> #include "irc-oper.h" - /** * Handle invalid received OPER command. * Log OPER attempt and send error message to client. @@ -52,7 +51,15 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) Client_ID(Client)); } /* Bad_OperPass */ - +/** + * Handler for the IRC "OPER" command. + * + * See RFC 2812, 3.1.4 "Oper message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_OPER( CLIENT *Client, REQUEST *Req ) { @@ -62,7 +69,9 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc != 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); len = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); @@ -77,20 +86,33 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) if (op[i].mask && (!Match(op[i].mask, Client_Mask(Client)))) return Bad_OperPass(Client, op[i].mask, "hostmask check failed"); - if( ! Client_HasMode( Client, 'o' )) - { - Client_ModeAdd( Client, 'o' ); - if( ! IRC_WriteStrClient( Client, "MODE %s :+o", Client_ID( Client ))) return DISCONNECTED; - IRC_WriteStrServersPrefix( NULL, Client, "MODE %s :+o", Client_ID( Client )); + if (!Client_HasMode(Client, 'o')) { + Client_ModeAdd(Client, 'o'); + if (!IRC_WriteStrClient(Client, "MODE %s :+o", + Client_ID(Client))) + return DISCONNECTED; + IRC_WriteStrServersPrefix(NULL, Client, "MODE %s :+o", + Client_ID(Client)); } - if( ! Client_OperByMe( Client )) Log( LOG_NOTICE|LOG_snotice, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client )); + if (!Client_OperByMe(Client)) + Log(LOG_NOTICE|LOG_snotice, + "Got valid OPER from \"%s\", user is an IRC operator now.", + Client_Mask(Client)); - Client_SetOperByMe( Client, true); - return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client )); + Client_SetOperByMe(Client, true); + return IRC_WriteStrClient(Client, RPL_YOUREOPER_MSG, Client_ID(Client)); } /* IRC_OPER */ - +/** + * Handler for the IRC "DIE" command. + * + * See RFC 2812, 4.3 "Die message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_DIE(CLIENT * Client, REQUEST * Req) { @@ -133,7 +155,15 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) return CONNECTED; } /* IRC_DIE */ - +/** + * Handler for the IRC "REHASH" command. + * + * See RFC 2812, 4.2 "Rehash message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_REHASH( CLIENT *Client, REQUEST *Req ) { @@ -146,15 +176,26 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ - if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc != 0) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command ); - Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client )); + Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", + Client_Mask(Client)); raise(SIGHUP); return CONNECTED; } /* IRC_REHASH */ - +/** + * Handler for the IRC "RESTART" command. + * + * See RFC 2812, 4.4 "Restart message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_RESTART( CLIENT *Client, REQUEST *Req ) { @@ -167,16 +208,25 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ - if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc != 0) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", Client_Mask( Client )); + Log(LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", + Client_Mask(Client)); NGIRCd_SignalRestart = true; + return CONNECTED; } /* IRC_RESTART */ - /** - * Connect configured or new server. + * Handler for the IRC "CONNECT" command. + * + * See RFC 2812, 3.4.7 "Connect message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_CONNECT(CLIENT * Client, REQUEST * Req) @@ -272,9 +322,15 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) return CONNECTED; } /* IRC_CONNECT */ - /** - * Disconnect (and disable) configured server. + * Handler for the IRC "DISCONNECT" command. + * + * This command is not specified in the IRC RFCs, it is an extension + * of ngIRCd: it shuts down and disables a configured server connection. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) @@ -315,7 +371,15 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) return DISCONNECTED; } /* IRC_DISCONNECT */ - +/** + * Handler for the IRC "WALLOPS" command. + * + * See RFC 2812, 4.7 "Operwall message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) { @@ -325,12 +389,14 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); if (Req->argc != 1) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); switch (Client_Type(Client)) { case CLIENT_USER: if (!Client_OperByMe(Client)) - return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, Client_ID(Client)); + return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, + Client_ID(Client)); from = Client; break; case CLIENT_SERVER: @@ -341,7 +407,8 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) } if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); IRC_SendWallops(Client, from, "%s", Req->argv[0]); return CONNECTED;

1 0

Alexander Barton : Add new class.{c|h} to project
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 06a20b87c464c67b288daf8bff841ce21e9105f3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=06a20b87… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 13:40:27 2011 +0100 Add new class.{c|h} to project Implement Class_{AddMask|DeleteMask|IsMember}() functions. --- src/ngircd/Makefile.am | 19 ++++++------ src/ngircd/class.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ src/ngircd/class.h | 36 ++++++++++++++++++++++ src/ngircd/irc-login.c | 7 ++++ src/ngircd/ngircd.c | 3 ++ 5 files changed, 132 insertions(+), 9 deletions(-) diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am index c617665..450547e 100644 --- a/src/ngircd/Makefile.am +++ b/src/ngircd/Makefile.am @@ -18,20 +18,21 @@ LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN \ sbin_PROGRAMS = ngircd -ngircd_SOURCES = ngircd.c array.c channel.c client.c conf.c conn.c conn-func.c \ - conn-ssl.c conn-zip.c hash.c io.c irc.c irc-channel.c irc-info.c irc-login.c \ - irc-mode.c irc-op.c irc-oper.c irc-server.c irc-write.c lists.c log.c \ - match.c op.c numeric.c pam.c parse.c proc.c resolve.c sighandlers.c +ngircd_SOURCES = ngircd.c array.c channel.c class.c client.c conf.c conn.c \ + conn-func.c conn-ssl.c conn-zip.c hash.c io.c irc.c irc-channel.c \ + irc-info.c irc-login.c irc-mode.c irc-op.c irc-oper.c irc-server.c \ + irc-write.c lists.c log.c match.c op.c numeric.c pam.c parse.c \ + proc.c resolve.c sighandlers.c ngircd_LDFLAGS = -L../portab -L../tool -L../ipaddr ngircd_LDADD = -lngportab -lngtool -lngipaddr -noinst_HEADERS = ngircd.h array.h channel.h client.h conf.h conf-ssl.h conn.h \ - conn-func.h conn-ssl.h conn-zip.h hash.h io.h irc.h irc-channel.h \ - irc-info.h irc-login.h irc-mode.h irc-op.h irc-oper.h irc-server.h \ - irc-write.h lists.h log.h match.h numeric.h op.h pam.h parse.h proc.h \ - resolve.h sighandlers.h defines.h messages.h +noinst_HEADERS = ngircd.h array.h channel.h class.h client.h conf.h \ + conf-ssl.h conn.h conn-func.h conn-ssl.h conn-zip.h hash.h io.h \ + irc.h irc-channel.h irc-info.h irc-login.h irc-mode.h irc-op.h \ + irc-oper.h irc-server.h irc-write.h lists.h log.h match.h numeric.h \ + op.h pam.h parse.h proc.h resolve.h sighandlers.h defines.h messages.h clean-local: rm -f check-version check-help lint.out diff --git a/src/ngircd/class.c b/src/ngircd/class.c new file mode 100644 index 0000000..ee034f2 --- /dev/null +++ b/src/ngircd/class.c @@ -0,0 +1,76 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001-2011 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + */ + +#include "portab.h" + +/** + * @file + * User class management. + */ + +#include "imp.h" +#include <assert.h> +#include <string.h> + +#include "defines.h" +#include "array.h" +#include "conn.h" +#include "client.h" +#include "lists.h" +#include "match.h" + +#include "exp.h" +#include "class.h" + +struct list_head My_Classes[CLASS_COUNT]; + +GLOBAL void +Class_Init(void) +{ + memset(My_Classes, 0, sizeof(My_Classes)); +} + +GLOBAL void +Class_Exit(void) +{ + int i; + + for (i = 0; i < CLASS_COUNT; Lists_Free(&My_Classes[i++])); +} + +GLOBAL bool +Class_IsMember(const int Class, CLIENT *Client) +{ + assert(Class < CLASS_COUNT); + assert(Client != NULL); + + return Lists_Check(&My_Classes[Class], Client); +} + +GLOBAL bool +Class_AddMask(const int Class, const char *Mask, time_t ValidUntil) +{ + assert(Class < CLASS_COUNT); + assert(Mask != NULL); + + return Lists_Add(&My_Classes[Class], Mask, ValidUntil); +} + +GLOBAL void +Class_DeleteMask(const int Class, const char *Mask) +{ + assert(Class < CLASS_COUNT); + assert(Mask != NULL); + + Lists_Del(&My_Classes[Class], Mask); +} + +/* -eof- */ diff --git a/src/ngircd/class.h b/src/ngircd/class.h new file mode 100644 index 0000000..5b04eea --- /dev/null +++ b/src/ngircd/class.h @@ -0,0 +1,36 @@ +/* + * ngIRCd -- The Next Generation IRC Daemon + * Copyright (c)2001-2011 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. + */ + +#ifndef __class_h__ +#define __class_h__ + +/** + * @file + * User class management. + */ + +#define CLASS_KLINE 0 +#define CLASS_GLINE 1 + +#define CLASS_COUNT 2 + +GLOBAL void Class_Init PARAMS((void)); +GLOBAL void Class_Exit PARAMS((void)); + +GLOBAL bool Class_AddMask PARAMS((const int Class, const char *Mask, + const time_t ValidUntil)); +GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); + +GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); + +#endif /* __class_h__ */ + +/* -eof- */ diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 884a06b..eeecf96 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -27,6 +27,7 @@ #include "ngircd.h" #include "conn-func.h" +#include "class.h" #include "conf.h" #include "channel.h" #include "io.h" @@ -936,6 +937,12 @@ 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 diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 2135ec4..3e64f35 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -38,6 +38,7 @@ #include "defines.h" #include "conn.h" +#include "class.h" #include "conf-ssl.h" #include "channel.h" #include "conf.h" @@ -282,6 +283,7 @@ main( int argc, const char *argv[] ) Channel_Init( ); Client_Init( ); Conn_Init( ); + Class_Init( ); if (!io_library_init(CONNECTION_POOL)) { Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); @@ -327,6 +329,7 @@ main( int argc, const char *argv[] ) Conn_Exit( ); Client_Exit( ); Channel_Exit( ); + Class_Exit( ); Log_Exit( ); } Pidfile_Delete( );

1 0

Alexander Barton : Add new class.{c|h} module to Xcode project
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 1e054e0b82f2d3037365bc212b917e3434dc1733 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e054e0b… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 14:24:07 2011 +0100 Add new class.{c|h} module to Xcode project --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 6ebe171..695eeee 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ FA99428C10E82A27007F27ED /* proc.c in Sources */ = {isa = PBXBuildFile; fileRef = FA99428B10E82A27007F27ED /* proc.c */; }; FAA3D27B0F139CDC00B2447E /* conn-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA3D2790F139CDC00B2447E /* conn-ssl.c */; }; FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA97C55124A271400D5BBA9 /* sighandlers.c */; }; + FAACD5F514A6099C006ED74F /* class.c in Sources */ = {isa = PBXBuildFile; fileRef = FAACD5F314A6099C006ED74F /* class.c */; }; FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */ = {isa = PBXBuildFile; fileRef = FAE5CC2D0CF2308A007D69B6 /* numeric.c */; }; /* End PBXBuildFile section */ @@ -228,6 +229,8 @@ FAA3D28B0F139D2E00B2447E /* preinstall.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = preinstall.sh; sourceTree = "<group>"; }; FAA97C55124A271400D5BBA9 /* sighandlers.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = sighandlers.c; sourceTree = "<group>"; }; FAA97C56124A271400D5BBA9 /* sighandlers.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = sighandlers.h; sourceTree = "<group>"; }; + FAACD5F314A6099C006ED74F /* class.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = class.c; sourceTree = "<group>"; }; + FAACD5F414A6099C006ED74F /* class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = class.h; sourceTree = "<group>"; }; FAE5CC2C0CF2308A007D69B6 /* numeric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = numeric.h; sourceTree = "<group>"; }; FAE5CC2D0CF2308A007D69B6 /* numeric.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = numeric.c; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -295,17 +298,19 @@ FA322CD70CEF74B1001761B3 /* ngircd */ = { isa = PBXGroup; children = ( - FAA3D2780F139CDC00B2447E /* conf-ssl.h */, FAA3D2790F139CDC00B2447E /* conn-ssl.c */, FAA3D27A0F139CDC00B2447E /* conn-ssl.h */, FA322CD90CEF74B1001761B3 /* array.c */, FA322CDA0CEF74B1001761B3 /* array.h */, FA322CDB0CEF74B1001761B3 /* channel.c */, FA322CDC0CEF74B1001761B3 /* channel.h */, + FAACD5F314A6099C006ED74F /* class.c */, + FAACD5F414A6099C006ED74F /* class.h */, FA322CDD0CEF74B1001761B3 /* client.c */, FA322CDE0CEF74B1001761B3 /* client.h */, FA322CDF0CEF74B1001761B3 /* conf.c */, FA322CE00CEF74B1001761B3 /* conf.h */, + FAA3D2780F139CDC00B2447E /* conf-ssl.h */, FA322CE10CEF74B1001761B3 /* conn-func.c */, FA322CE20CEF74B1001761B3 /* conn-func.h */, FA322CE30CEF74B1001761B3 /* conn-zip.c */, @@ -712,6 +717,7 @@ FA99428C10E82A27007F27ED /* proc.c in Sources */, FA2D564A11EA158B00D37A35 /* pam.c in Sources */, FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */, + FAACD5F514A6099C006ED74F /* class.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };

1 0

Alexander Barton : List and class handling: add optional "reason" text
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: af70c3dbc927c77167a26c1f4d8ed6bf2b97e3c5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=af70c3db… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:19:45 2011 +0100 List and class handling: add optional "reason" text Adjust Lists_Add() and Class_AddMask() accordingly, implement Lists_GetReason() and Lists_GetValidity(). --- src/ngircd/channel.c | 4 ++-- src/ngircd/class.c | 6 ++++-- src/ngircd/class.h | 2 +- src/ngircd/lists.c | 45 +++++++++++++++++++++++++++++++++++++++++---- src/ngircd/lists.h | 7 +++++-- 5 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 74c97a0..2dbf53a 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1003,7 +1003,7 @@ Channel_AddBan(CHANNEL *c, const char *mask ) { struct list_head *h = Channel_GetListBans(c); LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "ban"); - return Lists_Add(h, mask, false); + return Lists_Add(h, mask, false, NULL); } @@ -1012,7 +1012,7 @@ Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) { struct list_head *h = Channel_GetListInvites(c); LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "invite"); - return Lists_Add(h, mask, onlyonce); + return Lists_Add(h, mask, onlyonce, NULL); } diff --git a/src/ngircd/class.c b/src/ngircd/class.c index ee034f2..aeecaae 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -56,12 +56,14 @@ Class_IsMember(const int Class, CLIENT *Client) } GLOBAL bool -Class_AddMask(const int Class, const char *Mask, time_t ValidUntil) +Class_AddMask(const int Class, const char *Mask, time_t ValidUntil, + const char *Reason) { assert(Class < CLASS_COUNT); assert(Mask != NULL); + assert(Reason != NULL); - return Lists_Add(&My_Classes[Class], Mask, ValidUntil); + return Lists_Add(&My_Classes[Class], Mask, ValidUntil, Reason); } GLOBAL void diff --git a/src/ngircd/class.h b/src/ngircd/class.h index 5b04eea..deb60f4 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -26,7 +26,7 @@ GLOBAL void Class_Init PARAMS((void)); GLOBAL void Class_Exit PARAMS((void)); GLOBAL bool Class_AddMask PARAMS((const int Class, const char *Mask, - const time_t ValidUntil)); + 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)); diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 1101ea0..9a10ac7 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -39,6 +39,7 @@ struct list_elem { struct list_elem *next; char mask[MASK_LEN]; + char *reason; time_t valid_until; /** 0: unlimited; 1: once; t(>1): until t */ }; @@ -49,6 +50,19 @@ Lists_GetMask(const struct list_elem *e) return e->mask; } +GLOBAL const char * +Lists_GetReason(const struct list_elem *e) +{ + assert(e != NULL); + return e->reason; +} + +GLOBAL time_t +Lists_GetValidity(const struct list_elem *e) +{ + assert(e != NULL); + return e->valid_until; +} GLOBAL struct list_elem* Lists_GetFirst(const struct list_head *h) @@ -63,9 +77,18 @@ Lists_GetNext(const struct list_elem *e) return e->next; } - +/** + * Add a new mask to a list. + * + * @param header List head. + * @param Mask The IRC mask to add to the list. + * @param ValidUntil 0: unlimited, 1: only once, t>1: until given time_t. + * @param Reason Reason string or NULL, if no reason should be saved. + * @return true on success, false otherwise. + */ bool -Lists_Add(struct list_head *header, const char *Mask, time_t ValidUntil ) +Lists_Add(struct list_head *header, const char *Mask, time_t ValidUntil, + const char *Reason) { struct list_elem *e, *newelem; @@ -82,7 +105,17 @@ Lists_Add(struct list_head *header, const char *Mask, time_t ValidUntil ) return false; } - strlcpy( newelem->mask, Mask, sizeof( newelem->mask )); + strlcpy(newelem->mask, Mask, sizeof(newelem->mask)); + if (Reason) { + newelem->reason = malloc(strlen(Reason) + 1); + if (newelem->reason) + strlcpy(newelem->reason, Reason, strlen(Reason) + 1); + else + Log(LOG_EMERG, + "Can't allocate memory for new list reason text!"); + } + else + newelem->reason = NULL; newelem->valid_until = ValidUntil; newelem->next = e; header->first = newelem; @@ -100,6 +133,8 @@ Lists_Unlink(struct list_head *header, struct list_elem *p, struct list_elem *vi if (p) p->next = victim->next; else header->first = victim->next; + if (victim->reason) + free(victim->reason); free(victim); } @@ -141,7 +176,9 @@ Lists_Free(struct list_head *head) LogDebug("Deleted \"%s\" from invite list" , e->mask); victim = e; e = e->next; - free( victim ); + if (victim->reason) + free(victim->reason); + free(victim); } } diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 7422d60..5dd1a68 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -32,7 +32,8 @@ 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, const char *mask )); -GLOBAL bool Lists_Add PARAMS((struct list_head *header, const char *Mask, time_t ValidUntil )); +GLOBAL bool Lists_Add PARAMS((struct list_head *header, const char *Mask, + time_t ValidUntil, const char *Reason)); GLOBAL void Lists_Del PARAMS((struct list_head *head, const char *Mask )); GLOBAL bool Lists_AlreadyRegistered PARAMS(( const struct list_head *head, const char *Mask)); @@ -40,7 +41,9 @@ GLOBAL bool Lists_AlreadyRegistered PARAMS(( const struct list_head *head, const GLOBAL void Lists_Free PARAMS(( struct list_head *head )); GLOBAL const char *Lists_MakeMask PARAMS((const char *Pattern)); -GLOBAL const char *Lists_GetMask PARAMS(( const struct list_elem *e )); +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)); #endif

1 0

Alexander Barton : lists.{c|h}: code cleanup; more documentation
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 2b95c69ea19c6711bb98ee048ee71cee94c5dde9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2b95c69e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:48:13 2011 +0100 lists.{c|h}: code cleanup; more documentation --- src/ngircd/lists.c | 189 +++++++++++++++++++++++++++++++++++----------------- src/ngircd/lists.h | 14 ++-- 2 files changed, 135 insertions(+), 68 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=2b95…

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