X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-oper.c;h=c9286d7015e4598d1d0c09ef7694160cb39bc22d;hp=2a753f3a25fe52be52a5ccfe2758a68b08f4c8aa;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=a5c92290844a8b6988948cec530da09ae4561d22 diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 2a753f3a..c9286d70 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -2,33 +2,34 @@ * ngIRCd -- The Next Generation IRC Daemon * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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. * - * $Id: irc-oper.c,v 1.9 2002/11/22 17:58:41 alex Exp $ - * - * irc-oper.c: IRC-Operator-Befehle + * IRC operator commands */ #include "portab.h" +static char UNUSED id[] = "$Id: irc-oper.c,v 1.29 2007/08/02 10:14:26 fw Exp $"; + #include "imp.h" #include +#include #include #include "ngircd.h" #include "resolve.h" +#include "conn-func.h" #include "conf.h" -#include "conn.h" #include "client.h" #include "channel.h" #include "irc-write.h" #include "log.h" +#include "match.h" #include "messages.h" #include "parse.h" @@ -36,16 +37,24 @@ #include "irc-oper.h" -GLOBAL BOOLEAN +static bool +Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) +{ + Log( LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", Client_Mask( Client ), + errtoken, errmsg); + IRC_SetPenalty(Client, 3); + return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client )); +} + + +GLOBAL bool IRC_OPER( CLIENT *Client, REQUEST *Req ) { - INT i; + unsigned int i; assert( Client != NULL ); assert( Req != NULL ); - if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -55,17 +64,15 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break; } if( i >= Conf_Oper_Count ) - { - Log( LOG_WARNING, "Got invalid OPER from \"%s\": Name \"%s\" not configured!", Client_Mask( Client ), Req->argv[0] ); - return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client )); - } + return Bad_OperPass(Client, Req->argv[0], "not configured"); /* Stimmt das Passwort? */ if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 ) - { - Log( LOG_WARNING, "Got invalid OPER from \"%s\": Bad password for \"%s\"!", Client_Mask( Client ), Conf_Oper[i].name ); - return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client )); - } + return Bad_OperPass(Client, Conf_Oper[i].name, "Bad password"); + + /* Authorized Mask? */ + if( Conf_Oper[i].mask && (! Match( Conf_Oper[i].mask, Client_Mask( Client ) ))) + return Bad_OperPass(Client, Conf_Oper[i].mask, "hostmask check failed" ); if( ! Client_HasMode( Client, 'o' )) { @@ -77,88 +84,233 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) 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 ); + Client_SetOperByMe( Client, true); return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client )); } /* IRC_OPER */ -GLOBAL BOOLEAN -IRC_DIE( CLIENT *Client, REQUEST *Req ) +GLOBAL bool +IRC_DIE(CLIENT * Client, REQUEST * Req) { - assert( Client != NULL ); - assert( Req != NULL ); - - if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - - /* Falsche Anzahl Parameter? */ - if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Shut down server */ + + CONN_ID c; + CLIENT *cl; + + assert(Client != NULL); + assert(Req != NULL); + + /* Not a local IRC operator? */ + if ((!Client_HasMode(Client, 'o')) || (!Client_OperByMe(Client))) + return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, + Client_ID(Client)); + + /* Bad number of parameters? */ +#ifdef STRICT_RFC + if (Req->argc != 0) +#else + if (Req->argc > 1) +#endif + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + /* Is a message given? */ + if (Req->argc > 0) { + c = Conn_First(); + while (c != NONE) { + cl = Conn_GetClient(c); + if (Client_Type(cl) == CLIENT_USER) + IRC_WriteStrClient(cl, "NOTICE %s :%s", + Client_ID(cl), Req->argv[0]); + c = Conn_Next(c); + } + } - if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); + Log(LOG_NOTICE | LOG_snotice, "Got DIE command from \"%s\" ...", + Client_Mask(Client)); + NGIRCd_SignalQuit = true; - Log( LOG_NOTICE|LOG_snotice, "Got DIE command from \"%s\", going down!", Client_Mask( Client )); - NGIRCd_Quit = TRUE; return CONNECTED; } /* IRC_DIE */ -GLOBAL BOOLEAN -IRC_RELOAD( CLIENT *Client, REQUEST *Req ) +GLOBAL bool +IRC_REHASH( CLIENT *Client, REQUEST *Req ) { + /* Reload configuration file */ + assert( Client != NULL ); assert( Req != NULL ); - if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + /* Not a local IRC operator? */ + if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ + /* Bad number of parameters? */ if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - - Log( LOG_NOTICE|LOG_snotice, "Got RELOAD command from \"%s\", re-reading configuration ...", Client_Mask( Client )); - NGIRCd_Reload( ); + Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client )); + NGIRCd_SignalRehash = true; return CONNECTED; -} /* IRC_RELOAD */ +} /* IRC_REHASH */ -GLOBAL BOOLEAN +GLOBAL bool IRC_RESTART( CLIENT *Client, REQUEST *Req ) { + /* Restart IRC server (fork a new process) */ + assert( Client != NULL ); assert( Req != NULL ); - if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + /* Not a local IRC operator? */ + if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ + /* Bad number of parameters? */ if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - - Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\", going down!", Client_Mask( Client )); - NGIRCd_Restart = TRUE; + Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", Client_Mask( Client )); + NGIRCd_SignalRestart = true; return CONNECTED; } /* IRC_RESTART */ -GLOBAL BOOLEAN -IRC_CONNECT(CLIENT *Client, REQUEST *Req ) +/** + * Connect configured or new server. + */ +GLOBAL bool +IRC_CONNECT(CLIENT * Client, REQUEST * Req) { - /* Vorlaeufige Version zu Debug-Zwecken: es wird einfach - * der "passive mode" aufgehoben, mehr passiert nicht ... */ + + assert(Client != NULL); + assert(Req != NULL); + + /* Not a local IRC operator? */ + if ((!Client_HasMode(Client, 'o')) || (!Client_OperByMe(Client))) + return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, + Client_ID(Client)); + + /* Bad number of parameters? */ + if ((Req->argc != 1) && (Req->argc != 2) && (Req->argc != 5)) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + /* Invalid port number? */ + if ((Req->argc > 1) && atoi(Req->argv[1]) < 1) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + Log(LOG_NOTICE | LOG_snotice, + "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(Client), + Req->argv[0]); + + switch (Req->argc) { + case 1: + if (!Conf_EnablePassiveServer(Req->argv[0])) + return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG, + Client_ID(Client), + Req->argv[0]); + break; + case 2: + /* Connect configured server */ + if (!Conf_EnableServer + (Req->argv[0], (UINT16) atoi(Req->argv[1]))) + return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG, + Client_ID(Client), + Req->argv[0]); + break; + default: + /* Add server */ + if (!Conf_AddServer + (Req->argv[0], (UINT16) atoi(Req->argv[1]), Req->argv[2], + Req->argv[3], Req->argv[4])) + return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG, + Client_ID(Client), + Req->argv[0]); + } + + return CONNECTED; +} /* IRC_CONNECT */ + + +GLOBAL bool +IRC_DISCONNECT(CLIENT *Client, REQUEST *Req ) +{ + /* Disconnect and disable configured server */ + + CONN_ID my_conn; assert( Client != NULL ); assert( Req != NULL ); - if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - - /* Falsche Anzahl Parameter? */ - if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Not a local IRC operator? */ if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - Log( LOG_NOTICE|LOG_snotice, "Got CONNECT command from \"%s\".", Client_Mask( Client )); - NGIRCd_Passive = FALSE; - return CONNECTED; + /* Bad number of parameters? */ + if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + Log( LOG_NOTICE|LOG_snotice, "Got DISCONNECT command from \"%s\" for0 \"%s\".", Client_Mask( Client ), Req->argv[0]); + + /* Save ID of this connection */ + my_conn = Client_Conn( Client ); + + /* Connect configured server */ + if( ! Conf_DisableServer( Req->argv[0] )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] ); + + /* Are we still connected or were we killed, too? */ + if( Conn_GetClient( my_conn )) return CONNECTED; + else return DISCONNECTED; } /* IRC_CONNECT */ +GLOBAL bool +IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) +{ + CLIENT *to, *from; + int client_type; + + assert( Client != NULL ); + assert( Req != NULL ); + + if (Req->argc != 1) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + + client_type = Client_Type(Client); + switch (client_type) { + case CLIENT_USER: + if (!Client_OperByMe(Client)) + return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, Client_ID(Client)); + from = Client; + break; + case CLIENT_SERVER: + from = Client_Search(Req->prefix); + break; + default: + return CONNECTED; + } + + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); + + for (to=Client_First(); to != NULL; to=Client_Next(to)) { + if (Client_Conn(to) < 0) /* no local connection or WALLOPS origin */ + continue; + + client_type = Client_Type(to); + switch (client_type) { + case CLIENT_USER: + if (Client_HasMode(to, 'w')) + IRC_WriteStrClientPrefix(to, from, "WALLOPS :%s", Req->argv[0]); + break; + case CLIENT_SERVER: + if (to != Client) + IRC_WriteStrClientPrefix(to, from, "WALLOPS :%s", Req->argv[0]); + break; + } + } + return CONNECTED; +} + + + /* -eof- */