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=2baa6d3d5f811e6fe003f56b9be5023878ba9118;hp=2a1c09c299d610e1de49c60863066648a12997a6;hb=87f4b1c6f64f85556533f01d95da1cf83a91d4c6;hpb=15e4f674021ce2070a94c376d9a87acf0c824ae2 diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 2a1c09c2..2baa6d3d 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -14,20 +14,22 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-oper.c,v 1.15 2002/12/27 13:17:32 alex Exp $"; +static char UNUSED id[] = "$Id: irc-oper.c,v 1.25 2006/04/23 10:37:27 fw Exp $"; #include "imp.h" #include +#include #include #include "ngircd.h" #include "resolve.h" -#include "conf.h" #include "conn.h" +#include "conf.h" #include "client.h" #include "channel.h" #include "irc-write.h" #include "log.h" +#include "match.h" #include "messages.h" #include "parse.h" @@ -35,10 +37,20 @@ static char UNUSED id[] = "$Id: irc-oper.c,v 1.15 2002/12/27 13:17:32 alex Exp $ #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 ); @@ -52,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' )) { @@ -74,80 +84,133 @@ 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 +GLOBAL bool IRC_DIE( CLIENT *Client, REQUEST *Req ) { + /* Shut down server */ + assert( Client != NULL ); assert( Req != NULL ); - /* 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 )); + + /* Bad number of parameters? */ + if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); Log( LOG_NOTICE|LOG_snotice, "Got DIE command from \"%s\" ...", Client_Mask( Client )); - NGIRCd_SignalQuit = TRUE; + NGIRCd_SignalQuit = true; return CONNECTED; } /* IRC_DIE */ -GLOBAL BOOLEAN +GLOBAL bool IRC_REHASH( CLIENT *Client, REQUEST *Req ) { + /* Reload configuration file */ + assert( Client != NULL ); assert( Req != NULL ); - /* 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 )); + /* Bad number of parameters? */ + 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 )); - NGIRCd_SignalRehash = TRUE; + NGIRCd_SignalRehash = true; return CONNECTED; } /* 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 ); - /* 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 )); + /* Bad number of parameters? */ + 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 )); - NGIRCd_SignalRestart = TRUE; + NGIRCd_SignalRestart = true; return CONNECTED; } /* IRC_RESTART */ -GLOBAL BOOLEAN +GLOBAL bool IRC_CONNECT(CLIENT *Client, REQUEST *Req ) { - /* Vorlaeufige Version zu Debug-Zwecken: es wird einfach - * der "passive mode" aufgehoben, mehr passiert nicht ... */ + /* Connect configured or new server */ assert( Client != NULL ); assert( Req != NULL ); - /* 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; + /* Bad number of parameters? */ + if(( Req->argc != 2 ) && ( Req->argc != 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + /* Invalid port number? */ + if( 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]); + + if( Req->argc == 2 ) + { + /* Connect configured server */ + if( ! Conf_EnableServer( Req->argv[0], atoi( Req->argv[1] ))) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] ); + } + else + { + /* Add server */ + if( ! Conf_AddServer( Req->argv[0], 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 ); + + /* 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 ) 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 */ + + /* -eof- */