* 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.
- *
- * IRC operator commands
*/
#include "portab.h"
+/**
+ * @file
+ * IRC operator commands
+ */
+
#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <signal.h>
#include "ngircd.h"
-#include "resolve.h"
#include "conn-func.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"
+#include "op.h"
#include <exp.h>
#include "irc-oper.h"
} /* 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' ))
{
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
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 );
Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client ));
- NGIRCd_SignalRehash = true;
-
+ raise(SIGHUP);
+
return CONNECTED;
} /* IRC_REHASH */
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 );
GLOBAL bool
IRC_CONNECT(CLIENT * Client, REQUEST * Req)
{
+ CLIENT *from, *target;
+
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 != 5))
+ if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 &&
+ Req->argc != 5 && Req->argc != 6)
return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client), Req->command);
return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client), Req->command);
- IRC_SendWallops(Client_ThisServer(), Client_ThisServer(),
- "Received CONNECT %s from %s",
- Req->argv[0], Client_ID(Client));
+ from = Client;
+ target = Client_ThisServer();
+
+ if (Req->argc == 3 || Req->argc == 6) {
+ /* This CONNECT has a target parameter */
+ if (Client_Type(Client) == CLIENT_SERVER && Req->prefix)
+ from = Client_Search(Req->prefix);
+ if (! from)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+ Client_ID(Client), Req->prefix);
+
+ target = (Req->argc == 3) ? Client_Search(Req->argv[2])
+ : Client_Search(Req->argv[5]);
+ if (! target || Client_Type(target) != CLIENT_SERVER)
+ return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+ Client_ID(from), Req->argv[0]);
+ }
- Log(LOG_NOTICE | LOG_snotice,
- "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(Client),
- Req->argv[0]);
+ if (target != Client_ThisServer()) {
+ /* Forward CONNECT command ... */
+ if (Req->argc == 3)
+ IRC_WriteStrClientPrefix(target, from,
+ "CONNECT %s %s :%s", Req->argv[0],
+ Req->argv[1], Req->argv[2]);
+ else
+ IRC_WriteStrClientPrefix(target, from,
+ "CONNECT %s %s %s %s %s :%s", Req->argv[0],
+ Req->argv[1], Req->argv[2], Req->argv[3],
+ Req->argv[4], Req->argv[5]);
+ return CONNECTED;
+ }
+
+ if (!Op_Check(from, Req))
+ return Op_NoPrivileges(Client, Req);
switch (Req->argc) {
case 1:
if (!Conf_EnablePassiveServer(Req->argv[0]))
- return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
- Client_ID(Client),
+ return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+ Client_ID(from),
Req->argv[0]);
- break;
+ break;
case 2:
+ case 3:
/* Connect configured server */
if (!Conf_EnableServer
(Req->argv[0], (UINT16) atoi(Req->argv[1])))
- return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
- Client_ID(Client),
+ return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+ Client_ID(from),
Req->argv[0]);
- break;
+ 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),
+ return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+ Client_ID(from),
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 */
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)
projects / ngircd-alex.git / blobdiff