/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2023 Alexander Barton (alex@barton.de) and Contributors.
*
* 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
break;
default:
if (Client_Type(Client) != CLIENT_SERVER) {
- Log(LOG_DEBUG,
+ LogDebug(
"Unknown mode \"%c%c\" from \"%s\"!?",
set ? '+' : '-', *mode_ptr,
Client_ID(Origin));
*mode_ptr);
x[0] = '\0';
} else {
- Log(LOG_DEBUG,
+ LogDebug(
"Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...",
set ? '+' : '-', *mode_ptr,
Client_ID(Origin), Client_ID(Target));
Client_ID(Origin), Channel_Name(Channel));
goto chan_exit;
}
+ /* fall through */
case 'i': /* Invite only */
case 'V': /* Invite disallow */
case 'M': /* Only identified nicks can write */
case 'm': /* Moderated */
case 'n': /* Only members can write */
+ case 'N': /* Can't change nick while on this channel */
case 'Q': /* No kicks */
case 't': /* Topic locked */
if(is_oper || is_machine || is_owner ||
Channel_Name(Channel));
break;
}
- if (arg_arg > mode_arg) {
- if (is_oper || is_machine || is_owner ||
- is_admin || is_op || is_halfop) {
- Channel_ModeDel(Channel, 'k');
- Channel_SetKey(Channel,
- Req->argv[arg_arg]);
- strlcpy(argadd, Channel_Key(Channel),
- sizeof(argadd));
- x[0] = *mode_ptr;
- } else {
+ if (arg_arg <= mode_arg) {
+ if (is_machine)
+ Log(LOG_ERR,
+ "Got MODE +k without key for \"%s\" from \"%s\"! Ignored.",
+ Channel_Name(Channel), Client_ID(Origin));
+ else
connected = IRC_WriteErrClient(Origin,
- ERR_CHANOPRIVSNEEDED_MSG,
+ ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Origin), Req->command);
+ goto chan_exit;
+ }
+ if (!Req->argv[arg_arg][0] || strchr(Req->argv[arg_arg], ' ')) {
+ if (is_machine)
+ Log(LOG_ERR,
+ "Got invalid key on MODE +k for \"%s\" from \"%s\"! Ignored.",
+ Channel_Name(Channel), Client_ID(Origin));
+ else
+ connected = IRC_WriteErrClient(Origin,
+ ERR_INVALIDMODEPARAM_MSG,
Client_ID(Origin),
- Channel_Name(Channel));
- }
- Req->argv[arg_arg][0] = '\0';
- arg_arg++;
+ Channel_Name(Channel), 'k');
+ goto chan_exit;
+ }
+ if (is_oper || is_machine || is_owner ||
+ is_admin || is_op || is_halfop) {
+ Channel_ModeDel(Channel, 'k');
+ Channel_SetKey(Channel, Req->argv[arg_arg]);
+ strlcpy(argadd, Channel_Key(Channel), sizeof(argadd));
+ x[0] = *mode_ptr;
} else {
-#ifdef STRICT_RFC
- /* Only send error message in "strict" mode,
- * this is how ircd2.11 and others behave ... */
connected = IRC_WriteErrClient(Origin,
- ERR_NEEDMOREPARAMS_MSG,
- Client_ID(Origin), Req->command);
-#endif
- goto chan_exit;
+ ERR_CHANOPRIVSNEEDED_MSG,
+ Client_ID(Origin),
+ Channel_Name(Channel));
}
+ Req->argv[arg_arg][0] = '\0';
+ arg_arg++;
break;
case 'l': /* Member limit */
if (Mode_Limit_Reached(Client, mode_arg_count++))
Channel_Name(Channel));
break;
}
- if (arg_arg > mode_arg) {
- if (is_oper || is_machine || is_owner ||
- is_admin || is_op || is_halfop) {
- l = atol(Req->argv[arg_arg]);
- if (l > 0 && l < 0xFFFF) {
- Channel_ModeDel(Channel, 'l');
- Channel_SetMaxUsers(Channel, l);
- snprintf(argadd, sizeof(argadd),
- "%ld", l);
- x[0] = *mode_ptr;
- }
- } else {
+ if (arg_arg <= mode_arg) {
+ if (is_machine)
+ Log(LOG_ERR,
+ "Got MODE +l without limit for \"%s\" from \"%s\"! Ignored.",
+ Channel_Name(Channel), Client_ID(Origin));
+ else
connected = IRC_WriteErrClient(Origin,
- ERR_CHANOPRIVSNEEDED_MSG,
+ ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Origin), Req->command);
+ goto chan_exit;
+ }
+ l = atol(Req->argv[arg_arg]);
+ if (l <= 0 || l >= 0xFFFF) {
+ if (is_machine)
+ Log(LOG_ERR,
+ "Got MODE +l with invalid limit for \"%s\" from \"%s\"! Ignored.",
+ Channel_Name(Channel), Client_ID(Origin));
+ else
+ connected = IRC_WriteErrClient(Origin,
+ ERR_INVALIDMODEPARAM_MSG,
Client_ID(Origin),
- Channel_Name(Channel));
- }
- Req->argv[arg_arg][0] = '\0';
- arg_arg++;
+ Channel_Name(Channel), 'l');
+ goto chan_exit;
+ }
+ if (is_oper || is_machine || is_owner ||
+ is_admin || is_op || is_halfop) {
+ Channel_ModeDel(Channel, 'l');
+ Channel_SetMaxUsers(Channel, l);
+ snprintf(argadd, sizeof(argadd), "%ld", l);
+ x[0] = *mode_ptr;
} else {
-#ifdef STRICT_RFC
- /* Only send error message in "strict" mode,
- * this is how ircd2.11 and others behave ... */
connected = IRC_WriteErrClient(Origin,
- ERR_NEEDMOREPARAMS_MSG,
- Client_ID(Origin), Req->command);
-#endif
- goto chan_exit;
+ ERR_CHANOPRIVSNEEDED_MSG,
+ Client_ID(Origin),
+ Channel_Name(Channel));
}
+ Req->argv[arg_arg][0] = '\0';
+ arg_arg++;
break;
case 'O': /* IRC operators only */
if (set) {
break;
/* --- Channel user modes --- */
case 'q': /* Owner */
+ if(!is_oper && !is_machine && !is_owner) {
+ connected = IRC_WriteErrClient(Origin,
+ ERR_CHANOPPRIVTOOLOW_MSG,
+ Client_ID(Origin),
+ Channel_Name(Channel));
+ goto chan_exit;
+ }
+ /* fall through */
case 'a': /* Channel admin */
if(!is_oper && !is_machine && !is_owner && !is_admin) {
connected = IRC_WriteErrClient(Origin,
Channel_Name(Channel));
goto chan_exit;
}
+ /* fall through */
case 'o': /* Channel operator */
if(!is_oper && !is_machine && !is_owner &&
!is_admin && !is_op) {
Channel_Name(Channel));
goto chan_exit;
}
+ /* fall through */
case 'h': /* Half Op */
if(!is_oper && !is_machine && !is_owner &&
!is_admin && !is_op) {
Channel_Name(Channel));
goto chan_exit;
}
+ /* fall through */
case 'v': /* Voice */
if (arg_arg > mode_arg) {
if (is_oper || is_machine || is_owner ||
break;
default:
if (Client_Type(Client) != CLIENT_SERVER) {
- Log(LOG_DEBUG,
+ LogDebug(
"Unknown mode \"%c%c\" from \"%s\" on %s!?",
set ? '+' : '-', *mode_ptr,
Client_ID(Origin), Channel_Name(Channel));
Channel_Name(Channel));
x[0] = '\0';
} else {
- Log(LOG_DEBUG,
+ LogDebug(
"Handling unknown mode \"%c%c\" from \"%s\" on %s ...",
set ? '+' : '-', *mode_ptr,
Client_ID(Origin), Channel_Name(Channel));
if (Client_Type(Client) == CLIENT_SERVER) {
/* MODE requests for local channels from other servers
* are definitely invalid! */
- if (Channel_IsLocal(Channel)) {
+ if (Channel_IsLocal(Channel) && Client != Client_ThisServer()) {
Log(LOG_ALERT, "Got remote MODE command for local channel!? Ignored.");
return CONNECTED;
}
switch (what) {
case 'I':
- if (!Channel_AddInvite(Channel, mask, false))
+ if (!Channel_AddInvite(Channel, mask, false, Client_ID(Client)))
return CONNECTED;
break;
case 'b':
- if (!Channel_AddBan(Channel, mask))
+ if (!Channel_AddBan(Channel, mask, Client_ID(Client)))
return CONNECTED;
break;
case 'e':
- if (!Channel_AddExcept(Channel, mask))
+ if (!Channel_AddExcept(Channel, mask, Client_ID(Client)))
return CONNECTED;
break;
}
projects / ngircd-alex.git / blobdiff