GLOBAL void
Channel_Init( void )
{
- CHANNEL *sc;
-
My_Channels = NULL;
My_Cl2Chan = NULL;
-
- sc = Channel_Create("&SERVER");
- if (sc) {
- Channel_SetModes(sc, "mnPt");
- Channel_SetTopic(sc, Client_ThisServer(), "Server Messages");
- }
} /* Channel_Init */
}
+/**
+ * Generate predefined persistent channels and &SERVER
+ */
GLOBAL void
Channel_InitPredefined( void )
{
- /* Generate predefined persistent channels */
-
CHANNEL *new_chan;
const struct Conf_Channel *conf_chan;
const char *c;
new_chan = Channel_Create(conf_chan->name);
if (!new_chan) {
- Log(LOG_ERR, "Can't create pre-defined channel \"%s\"",
+ Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!",
conf_chan->name);
continue;
}
- Log(LOG_INFO, "Created pre-defined channel \"%s\"",
+ Log(LOG_INFO, "Created pre-defined channel \"%s\".",
conf_chan->name);
Channel_ModeAdd(new_chan, 'P');
}
if (channel_count)
array_free(&Conf_Channels);
+
+ /* Make sure the local &SERVER channel exists */
+ if (!Channel_Search("&SERVER")) {
+ new_chan = Channel_Create("&SERVER");
+ if (new_chan) {
+ Channel_SetModes(new_chan, "mnPt");
+ Channel_SetTopic(new_chan, Client_ThisServer(),
+ "Server Messages");
+ } else
+ Log(LOG_ERR, "Failed to create \"&SERVER\" channel!");
+ } else
+ LogDebug("Required channel \"&SERVER\" already exists, ok.");
} /* Channel_InitPredefined */
const char *Reason )
{
CHANNEL *chan;
+ char *ptr, *target_modes;
+ bool can_kick = false;
assert(Peer != NULL);
assert(Target != NULL);
/* Check that user is on the specified channel */
if (!Channel_IsMemberOf(chan, Origin)) {
IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG,
- Client_ID(Origin), Name);
- return;
- }
-
- /* Check if user has operator status */
- if (!strchr(Channel_UserModes(chan, Origin), 'o')) {
- IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG,
- Client_ID(Origin), Name);
+ Client_ID(Origin), Name);
return;
}
}
return;
}
+ if(Client_Type(Peer) == CLIENT_USER) {
+ /* Channel mode 'Q' and user mode 'q' on target: nobody but
+ * IRC Operators and servers can kick the target user */
+ if ((strchr(Channel_Modes(chan), 'Q')
+ || Client_HasMode(Target, 'q')
+ || Client_Type(Target) == CLIENT_SERVICE)
+ && !Client_HasMode(Origin, 'o')) {
+ IRC_WriteStrClient(Origin, ERR_KICKDENY_MSG,
+ Client_ID(Origin), Name,
+ Client_ID(Target));
+ return;
+ }
+
+ /* Check if client has the rights to kick target */
+ ptr = Channel_UserModes(chan, Peer);
+ target_modes = Channel_UserModes(chan, Target);
+ while(*ptr) {
+ /* Owner can kick everyone */
+ if ( *ptr == 'q') {
+ can_kick = true;
+ break;
+ }
+ /* Admin can't kick owner */
+ if ( *ptr == 'a' ) {
+ if (!strchr(target_modes, 'q')) {
+ can_kick = true;
+ break;
+ }
+ }
+ /* Op can't kick owner | admin */
+ if ( *ptr == 'o' ) {
+ if (!strchr(target_modes, 'q') &&
+ !strchr(target_modes, 'a')) {
+ can_kick = true;
+ break;
+ }
+ }
+ /* Half Op can't kick owner | admin | op */
+ if ( *ptr == 'h' ) {
+ if (!strchr(target_modes, 'q') &&
+ !strchr(target_modes, 'a') &&
+ !strchr(target_modes, 'o')) {
+ can_kick = true;
+ break;
+ }
+ }
+ ptr++;
+ }
+
+ if(!can_kick) {
+ IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG,
+ Client_ID(Origin), Name);
+ return;
+ }
+ }
+
/* Kick Client from channel */
Remove_Client( REMOVE_KICK, chan, Target, Origin, Reason, true);
} /* Channel_Kick */
static bool
Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
{
- bool is_member, has_voice, is_op;
+ bool is_member, has_voice, is_halfop, is_op, is_chanadmin, is_owner;
- is_member = has_voice = is_op = false;
+ is_member = has_voice = is_halfop = is_op = is_chanadmin = is_owner = false;
/* The server itself always can send messages :-) */
if (Client_ThisServer() == From)
is_member = true;
if (strchr(Channel_UserModes(Chan, From), 'v'))
has_voice = true;
+ if (strchr(Channel_UserModes(Chan, From), 'h'))
+ is_halfop = true;
if (strchr(Channel_UserModes(Chan, From), 'o'))
is_op = true;
+ if (strchr(Channel_UserModes(Chan, From), 'a'))
+ is_chanadmin = true;
+ if (strchr(Channel_UserModes(Chan, From), 'q'))
+ is_owner = true;
}
/*
if (strchr(Channel_Modes(Chan), 'n') && !is_member)
return false;
- if (is_op || has_voice)
- return true;
-
- if (strchr(Channel_Modes(Chan), 'm'))
+ if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R')
+ && !Client_HasMode(From, 'o'))
return false;
- if (Lists_Check(&Chan->list_excepts, From))
+ if (has_voice || is_halfop || is_op || is_chanadmin || is_owner)
return true;
- return !Lists_Check(&Chan->list_bans, From);
-}
-
-
-static bool
-Can_Send_To_Channel_Identified(CHANNEL *Chan, CLIENT *From)
-{
- if ((Client_ThisServer() == From) || Client_HasMode(From, 'o'))
- return true;
-
- if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R'))
+ if (strchr(Channel_Modes(Chan), 'm'))
return false;
if (Lists_Check(&Chan->list_excepts, From))
if (!Can_Send_To_Channel(Chan, From)) {
if (! SendErrors)
return CONNECTED; /* no error, see RFC 2812 */
- return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
- Client_ID(From), Channel_Name(Chan));
- }
-
- if (!Can_Send_To_Channel_Identified(Chan, From)) {
- if (! SendErrors)
- return CONNECTED;
- return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
+ if (strchr(Channel_Modes(Chan), 'M'))
+ return IRC_WriteStrClient(From, ERR_NEEDREGGEDNICK_MSG,
+ Client_ID(From), Channel_Name(Chan));
+ else
+ return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
Client_ID(From), Channel_Name(Chan));
}
} /* Channel_CheckKey */
-/**
- * Check wether a client is allowed to administer a channel or not.
- *
- * @param Chan The channel to test.
- * @param Client The client from which the command has been received.
- * @param Origin The originator of the command (or NULL).
- * @param OnChannel Set to true if the originator is member of the channel.
- * @param AdminOk Set to true if the client is allowed to do
- * administrative tasks on this channel.
- * @param UseServerMode Set to true if ngIRCd should emulate "server mode",
- * that is send commands as if originating from a server
- * and not the originator of the command.
- */
-GLOBAL void
-Channel_CheckAdminRights(CHANNEL *Chan, CLIENT *Client, CLIENT *Origin,
- bool *OnChannel, bool *AdminOk, bool *UseServerMode)
-{
- assert (Chan != NULL);
- assert (Client != NULL);
- assert (OnChannel != NULL);
- assert (AdminOk != NULL);
- assert (UseServerMode != NULL);
-
- /* Use the client as origin, if no origin has been given (no prefix?) */
- if (!Origin)
- Origin = Client;
-
- *OnChannel = false;
- *AdminOk = false;
- *UseServerMode = false;
-
- if (Client_Type(Client) != CLIENT_USER
- && Client_Type(Client) != CLIENT_SERVER
- && Client_Type(Client) != CLIENT_SERVICE)
- return;
-
- /* Allow channel administration if the client is a server or service */
- if (Client_Type(Client) != CLIENT_USER) {
- *AdminOk = true;
- return;
- }
-
- *OnChannel = Channel_IsMemberOf(Chan, Origin);
-
- if (*OnChannel && strchr(Channel_UserModes(Chan, Origin), 'o')) {
- /* User is a channel operator */
- *AdminOk = true;
- } else if (Conf_OperCanMode) {
- /* IRC operators are allowed to administer channels as well */
- if (Client_OperByMe(Origin)) {
- *AdminOk = true;
- if (Conf_OperServerMode)
- *UseServerMode = true;
- }
- }
-} /* Channel_CheckAdminRights */
-
-
static CL2CHAN *
Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
{
projects / ngircd.git / blobdiff