X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-oper.c;h=8492603dcbc42b710b5c10771e3021787e893484;hb=6dc80bd195ad0760bb560177d6f91c86b7698758;hp=f67e947ce17be37a6f8e81a5254dd3352e0219f6;hpb=113bd34878c17f730d8fb878157b0dbba9380326;p=ngircd-alex.git diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index f67e947c..8492603d 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -31,6 +31,7 @@ #include "match.h" #include "messages.h" #include "parse.h" +#include "op.h" #include #include "irc-oper.h" @@ -51,80 +52,29 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) } /* Bad_OperPass */ -/** - * Check that the client is an IRC operator allowed to administer this server. - */ -static bool -Check_Oper(CLIENT * Client, REQUEST * Req) -{ - CLIENT *c; - - assert(Client != NULL); - assert(Req != NULL); - - if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) - c = Client_Search(Req->prefix); - else - c = Client; - if (!c) - return false; - if (!Client_HasMode(c, 'o')) - return false; - if (!Client_OperByMe(c) && !Conf_AllowRemoteOper) - return false; - /* The client is an local IRC operator, or this server is configured - * to trust remote operators. */ - return true; -} /* CheckOper */ - - -/** - * Return and log a "no privileges" message. - */ -static bool -No_Privileges(CLIENT * Client, REQUEST * Req) -{ - CLIENT *from = NULL; - - if (Req->prefix) - from = Client_Search(Req->prefix); - - if (from) { - Log(LOG_NOTICE, "No privileges: client \"%s\" (%s), command \"%s\"", - Req->prefix, Client_Mask(Client), Req->command); - return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG, - Client_ID(from)); - } else { - Log(LOG_NOTICE, "No privileges: client \"%s\", command \"%s\"", - Client_Mask(Client), Req->command); - return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, - Client_ID(Client)); - } -} /* PermissionDenied */ - - GLOBAL bool IRC_OPER( CLIENT *Client, REQUEST *Req ) { - unsigned int i; + struct Conf_Oper *op; + size_t len, i; assert( Client != NULL ); assert( Req != NULL ); if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - for( i = 0; i < Conf_Oper_Count; i++) - { - 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 ) + len = array_length(&Conf_Opers, sizeof(*op)); + op = array_start(&Conf_Opers); + for (i = 0; i < len && strcmp(op[i].name, Req->argv[0]); i++) + ; + if (i >= len) return Bad_OperPass(Client, Req->argv[0], "not configured"); - if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 ) - return Bad_OperPass(Client, Conf_Oper[i].name, "bad password"); + if (strcmp(op[i].pwd, Req->argv[1]) != 0) + return Bad_OperPass(Client, op[i].name, "bad password"); - 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 (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' )) { @@ -151,8 +101,8 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ #ifdef STRICT_RFC @@ -191,8 +141,8 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, 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 ); @@ -212,8 +162,8 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, 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 ); @@ -235,8 +185,9 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (Client_Type(Client) != CLIENT_SERVER + && !Client_HasMode(Client, 'o')) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 && @@ -254,7 +205,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) if (Req->argc == 3 || Req->argc == 6) { /* This CONNECT has a target parameter */ - if (Client_Type(Client) == CLIENT_SERVER) + if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) from = Client_Search(Req->prefix); if (! from) return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, @@ -281,12 +232,8 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) return CONNECTED; } - Log(LOG_NOTICE | LOG_snotice, - "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(from), - Req->argv[0]); - IRC_SendWallops(Client_ThisServer(), Client_ThisServer(), - "Received CONNECT %s from %s", - Req->argv[0], Client_ID(from)); + if (!Op_Check(from, Req)) + return Op_NoPrivileges(Client, Req); switch (Req->argc) { case 1: @@ -314,6 +261,13 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) Req->argv[0]); } + Log(LOG_NOTICE | LOG_snotice, + "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(from), + Req->argv[0]); + IRC_SendWallops(Client_ThisServer(), Client_ThisServer(), + "Received CONNECT %s from %s", + Req->argv[0], Client_ID(from)); + return CONNECTED; } /* IRC_CONNECT */ @@ -329,8 +283,8 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Check_Oper(Client, Req)) - return No_Privileges(Client, Req); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ if (Req->argc != 1)