pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 06:56:39 +02:00
Code Activity

Adds check for using commands on non-registered channels before the

Browse Source 
commands are called


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2336 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
adam-
2009-06-23 16:56:38 +00:00
parent 59c1a509b4
commit dc8f7923f4
39 changed files with 107 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/modules.h
+2 -1
View File
@@ -219,7 +219,8 @@ enum CommandFlags
{
CFLAG_ALLOW_UNREGISTERED = 1,
CFLAG_ALLOW_FORBIDDEN = 2,
CFLAG_ALLOW_SUSPENDED = 4
CFLAG_ALLOW_SUSPENDED = 4,
CFLAG_ALLOW_UNREGISTEREDCHANNEL = 8
};
/** Every services command is a class, inheriting from Command.
include/services.h
+1 -1
View File
@@ -1340,7 +1340,7 @@ class CoreExport IRCDProto
virtual void SendServer(Server *) = 0;
virtual void ProcessUsermodes(User *, int, const char **) = 0;
virtual int IsNickValid(const char *) { return 1; }
virtual int IsChannelValid(const char *) { return 1; }
virtual int IsChannelValid(const char *);
virtual int IsFloodModeParamValid(const char *) { return 0; }
virtual void SendNumeric(const char *source, int numeric, const char *dest, const char *fmt, ...);
src/commands.c
+5
View File
@@ -144,6 +144,11 @@ void mod_run_cmd(char *service, User * u, CommandHash * cmdTable[], const char *
return;
}
}
else if (!c->HasFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL))
{
notice_lang(service, u, CHAN_X_NOT_REGISTERED, params[0].c_str());
return;
}
}
// If the command requires a permission, and they aren't registered or don't have the required perm, DENIED
src/core/bs_act.c
+1 -7
View File
@@ -25,13 +25,7 @@ class CommandBSAct : public Command
CommandReturn Execute(User *u, std::vector<std::string> &params)
{
ChannelInfo *ci;
if (!(ci = cs_findchan(params[0].c_str())))
{
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, params[0].c_str());
return MOD_CONT;
}
ChannelInfo *ci = cs_findchan(params[0].c_str());
if (!check_access(u, ci, CA_SAY))
{
src/core/bs_assign.c
+1 -5
View File
@@ -41,11 +41,7 @@ class CommandBSAssign : public Command
return MOD_CONT;
}
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->nc->HasPriv("botserv/administration")))
{
src/core/bs_badwords.c
+1 -5
View File
@@ -248,11 +248,7 @@ class CommandBSBadwords : public Command
return MOD_CONT;
}
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->nc->HasPriv("botserv/administration")))
{
src/core/bs_kick.c
+1 -3
View File
@@ -31,7 +31,7 @@ class CommandBSKick : public Command
const char *value = params[2].c_str();
const char *ttb = params.size() > 3 ? params[3].c_str() : NULL;
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
if (readonly)
notice_lang(s_BotServ, u, BOT_KICK_DISABLED);
@@ -39,8 +39,6 @@ class CommandBSKick : public Command
syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX);
else if (stricmp(value, "ON") && stricmp(value, "OFF"))
syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX);
else if (!(ci = cs_findchan(chan)))
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
else if (!check_access(u, ci, CA_SET) && !u->nc->HasPriv("botserv/administration"))
notice_lang(s_BotServ, u, ACCESS_DENIED);
else if (!ci->bi)
src/core/bs_say.c
+1 -5
View File
@@ -29,11 +29,7 @@ class CommandBSSay : public Command
const char *chan = params[0].c_str();
const char *text = params[1].c_str();
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if (!check_access(u, ci, CA_SAY))
{
src/core/bs_set.c
+3 -3
View File
@@ -35,6 +35,8 @@ class CommandBSSet : public Command
return MOD_CONT;
}
ci = cs_findchan(chan);
if (u->nc->HasCommand("botserv/set/private") && !stricmp(option, "PRIVATE"))
{
BotInfo *bi;
@@ -60,9 +62,7 @@ class CommandBSSet : public Command
syntax_error(s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX);
}
return MOD_CONT;
} else if (!(ci = cs_findchan(chan)))
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET))
} else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET))
notice_lang(s_BotServ, u, ACCESS_DENIED);
else {
if (!stricmp(option, "DONTKICKOPS")) {
src/core/bs_unassign.c
+1 -3
View File
@@ -27,12 +27,10 @@ class CommandBSUnassign : public Command
CommandReturn Execute(User *u, std::vector<std::string> &params)
{
const char *chan = params[0].c_str();
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
if (readonly)
notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
else if (!(ci = cs_findchan(chan)))
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_ASSIGN))
notice_lang(s_BotServ, u, ACCESS_DENIED);
else if (!ci->bi)
src/core/cs_access.c
+2 -6
View File
@@ -95,7 +95,7 @@ class CommandCSAccess : public Command
const char *nick = params.size() > 2 ? params[2].c_str() : NULL;
const char *s = params.size() > 3 ? params[3].c_str() : NULL;
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
NickAlias *na = NULL;
NickCore *nc;
ChanAccess *access;
@@ -109,8 +109,6 @@ class CommandCSAccess : public Command
* Else (ADD), we require a level (which implies a nick). */
if (!cmd || ((is_list || !stricmp(cmd, "CLEAR")) ? 0 : (!stricmp(cmd, "DEL")) ? (!nick || s) : !s))
this->OnSyntaxError(u);
else if (!(ci = cs_findchan(chan)))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
/* We still allow LIST in xOP mode, but not others */
else if ((ci->flags & CI_XOP) && !is_list)
{
@@ -367,7 +365,7 @@ class CommandCSLevels : public Command
const char *s = params.size() > 3 ? params[3].c_str() : NULL;
char *error;
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
int level;
int i;
@@ -378,8 +376,6 @@ class CommandCSLevels : public Command
|| ((stricmp(cmd, "SET") == 0) ? !s
: ((strnicmp(cmd, "DIS", 3) == 0)) ? (!what || s) : !!what)) {
this->OnSyntaxError(u);
} else if (!(ci = cs_findchan(chan))) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
} else if (ci->flags & CI_XOP) {
notice_lang(s_ChanServ, u, CHAN_LEVELS_XOP);
} else if (!is_founder(u, ci) && !u->nc->HasPriv("chanserv/access/change")) {
src/core/cs_akick.c
+1 -3
View File
@@ -186,7 +186,7 @@ class CommandCSAKick : public Command
reason = params[3].c_str();
}
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
AutoKick *akick;
int i;
Channel *c;
@@ -201,8 +201,6 @@ class CommandCSAKick : public Command
|| !stricmp(cmd, "DEL")))) {
syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX);
} else if (!(ci = cs_findchan(chan))) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
} else if (!check_access(u, ci, CA_AKICK) && !u->nc->HasPriv("chanserv/access/change"))
{
notice_lang(s_ChanServ, u, ACCESS_DENIED);
src/core/cs_ban.c
+6 -9
View File
@@ -36,7 +36,7 @@ class CommandCSBan : public Command
}
Channel *c;
Channel *c = findchan(chan);
ChannelInfo *ci;
User *u2;
@@ -47,10 +47,11 @@ class CommandCSBan : public Command
is_same = (stricmp(target, u->nick) == 0);
if (!(c = findchan(chan))) {
if (c)
ci = c->ci;
if (!c) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
} else if (!(ci = c->ci)) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
} else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) {
notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target);
} else if (!is_same ? !check_access(u, ci, CA_BAN) :
@@ -133,11 +134,7 @@ class CommandCSUnban : public Command
return MOD_CONT;
}
if (!(ci = c->ci))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = c->ci;
if (!check_access(u, ci, CA_UNBAN))
{
src/core/cs_clear.c
+5 -4
View File
@@ -27,13 +27,14 @@ class CommandCSClear : public Command
{
const char *chan = params[0].c_str();
const char *what = params[1].c_str();
Channel *c;
Channel *c = findchan(chan);
ChannelInfo *ci;
if (!(c = findchan(chan))) {
if (c)
ci = c->ci;
if (!c) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
} else if (!(ci = c->ci)) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
} else if (!u || !check_access(u, ci, CA_CLEAR)) {
notice_lang(s_ChanServ, u, ACCESS_DENIED);
} else if (stricmp(what, "bans") == 0) {
src/core/cs_drop.c
+1 -5
View File
@@ -35,11 +35,7 @@ class CommandCSDrop : public Command
return MOD_CONT;
}
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if ((ci->flags & CI_FORBIDDEN) && !u->nc->HasCommand("chanserv/drop"))
{
src/core/cs_getkey.c
+1 -5
View File
@@ -34,11 +34,7 @@ class CommandCSGetKey : public Command
return MOD_CONT;
}
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if (!check_access(u, ci, CA_GETKEY))
{
src/core/cs_getpass.c
+2 -5
View File
@@ -29,11 +29,8 @@ class CommandCSGetPass : public Command
char tmp_pass[PASSMAX];
ChannelInfo *ci;
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if (!enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1))
{
notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);
src/core/cs_identify.c
+1 -5
View File
@@ -30,11 +30,7 @@ class CommandCSIdentify : public Command
ChannelInfo *ci;
struct u_chaninfolist *uc;
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if (is_founder(u, ci))
{
src/core/cs_info.c
+1 -5
View File
@@ -48,11 +48,7 @@ class CommandCSInfo : public Command
int show_all = 0;
time_t expt;
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
ci = cs_findchan(chan);
if (ci->flags & CI_FORBIDDEN)
{
src/core/cs_invite.c
+4 -6
View File
@@ -33,12 +33,10 @@ class CommandCSInvite : public Command
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
return MOD_CONT;
}
else if (!(ci = c->ci))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
else if (!u || !check_access(u, ci, CA_INVITE))
ci = c->ci;
if (!u || !check_access(u, ci, CA_INVITE))
{
notice_lang(s_ChanServ, u, ACCESS_DENIED);
return MOD_CONT;
src/core/cs_kick.c
+5 -4
View File
@@ -35,7 +35,7 @@ class CommandCSKick : public Command
reason = params[2].c_str();
}
Channel *c;
Channel *c = findchan(chan);
ChannelInfo *ci;
User *u2;
@@ -47,10 +47,11 @@ class CommandCSKick : public Command
is_same = (target == u->nick) ? 1 : (stricmp(target, u->nick) == 0);
if (!(c = findchan(chan))) {
if (c)
ci = c->ci;
if (!c) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
} else if (!(ci = c->ci)) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
} else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) {
notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target);
} else if (!is_on_chan(c, u2)) {
src/core/cs_logout.c
+1 -3
View File
@@ -54,14 +54,12 @@ class CommandCSLogout : public Command
{
const char *chan = params[0].c_str();
const char *nick = params.size() > 1 ? params[1].c_str() : NULL;
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
User *u2 = NULL;
int is_admin = u->nc->HasCommand("chanserv/logout");
if (!is_admin && !nick)
this->OnSyntaxError(u);
else if (!(ci = cs_findchan(chan)))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
else if (nick && !(u2 = finduser(nick)))
notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
else if (u2 != u && !is_real_founder(u, ci) && !is_admin)
src/core/cs_modes.c
+5 -4
View File
@@ -20,7 +20,7 @@
static CommandReturn do_util(User *u, CSModeUtil *util, const char *chan, const char *nick)
{
const char *av[2];
Channel *c;
Channel *c = findchan(chan);
ChannelInfo *ci;
User *u2;
@@ -32,10 +32,11 @@ static CommandReturn do_util(User *u, CSModeUtil *util, const char *chan, const
is_same = (nick == u->nick) ? 1 : (stricmp(nick, u->nick) == 0);
if (!(c = findchan(chan))) {
if (c)
ci = c->ci;
if (!c) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
} else if (!(ci = c->ci)) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
} else if (is_same ? !(u2 = u) : !(u2 = finduser(nick))) {
notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
} else if (!is_on_chan(c, u2)) {
src/core/cs_register.c
+1 -1
View File
@@ -20,7 +20,7 @@ class CommandCSRegister : public Command
public:
CommandCSRegister() : Command("REGISTER", 3, 3)
{
this->SetFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL);
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
src/core/cs_sendpass.c
+2 -4
View File
@@ -25,13 +25,11 @@ class CommandCSSendPass : public Command
CommandReturn Execute(User *u, std::vector<std::string> &params)
{
const char *chan = params[0].c_str();
ChannelInfo *ci;
NickCore *founder;
ChannelInfo *ci = cs_findchan(chan);
NickCore *founder = ci->founder;;
if (RestrictMail && !u->nc->HasCommand("chanserv/sendpass"))
notice_lang(s_ChanServ, u, ACCESS_DENIED);
else if (!(ci = cs_findchan(chan)) || !(founder = ci->founder))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
else
{
char buf[BUFSIZE];
src/core/cs_set.c
+1 -3
View File
@@ -558,7 +558,7 @@ class CommandCSSet : public Command
const char *chan = params[0].c_str();
const char *cmd = params[1].c_str();
const char *param = params.size() > 2 ? params[2].c_str() : NULL;
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
bool is_servadmin = u->nc->HasPriv("chanserv/set");
if (readonly) {
@@ -572,8 +572,6 @@ class CommandCSSet : public Command
stricmp(cmd, "ENTRYMSG") != 0) &&
stricmp(cmd, "MLOCK") != 0)) {
syntax_error(s_ChanServ, u, "SET", CHAN_SET_SYNTAX);
} else if (!(ci = cs_findchan(chan))) {
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
} else if (!is_servadmin && !check_access(u, ci, CA_SET)) {
notice_lang(s_ChanServ, u, ACCESS_DENIED);
} else if (stricmp(cmd, "FOUNDER") == 0) {
src/core/cs_suspend.c
+2 -15
View File
@@ -24,9 +24,9 @@ class CommandCSSuspend : public Command
CommandReturn Execute(User *u, std::vector<std::string> &params)
{
ChannelInfo *ci;
const char *chan = params[0].c_str();
const char *reason = params.size() > 1 ? params[1].c_str() : NULL;
ChannelInfo *ci = cs_findchan(chan);
Channel *c;
@@ -43,13 +43,6 @@ class CommandCSSuspend : public Command
return MOD_CONT;
}
/* Only SUSPEND existing channels, otherwise use FORBID (bug #54) */
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
/* You should not SUSPEND a FORBIDEN channel */
if (ci->flags & CI_FORBIDDEN)
{
@@ -125,8 +118,8 @@ class CommandCSUnSuspend : public Command
CommandReturn Execute(User *u, std::vector<std::string> &params)
{
ChannelInfo *ci;
const char *chan = params[0].c_str();
ChannelInfo *ci = cs_findchan(chan);
if (chan[0] != '#')
{
@@ -137,12 +130,6 @@ class CommandCSUnSuspend : public Command
notice_lang(s_ChanServ, u, READ_ONLY_MODE);
/* Only UNSUSPEND already suspended channels */
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
if (!(ci->flags & CI_SUSPENDED))
{
notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan);
src/core/cs_topic.c
+4 -3
View File
@@ -30,10 +30,11 @@ class CommandCSTopic : public Command
Channel *c;
ChannelInfo *ci;
if (!(c = findchan(chan)))
if ((c = findchan(chan)))
ci = c->ci;
if (!c)
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
else if (!(ci = c->ci))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
else if (!check_access(u, ci, CA_TOPIC) && !u->nc->HasCommand("chanserv/topic"))
notice_lang(s_ChanServ, u, ACCESS_DENIED);
else
src/core/cs_xop.c
+2 -4
View File
@@ -360,11 +360,9 @@ class XOPBase : public Command
const char *chan = params[0].c_str();
const char *cmd = params[1].c_str();
ChannelInfo *ci;
ChannelInfo *ci = cs_findchan(chan);
if (!(ci = cs_findchan(chan)))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
else if (!(ci->flags & CI_XOP))
if (!(ci->flags & CI_XOP))
notice_lang(s_ChanServ, u, CHAN_XOP_ACCESS, s_ChanServ);
else if (!stricmp(cmd, "ADD"))
return this->DoAdd(u, params, ci, level, messages);
src/core/ms_del.c
+2 -6
View File
@@ -37,12 +37,8 @@ class CommandMSDel : public Command
{
chan = numstr;
numstr = params.size() > 1 ? params[1].c_str() : NULL;
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
else if (readonly)
ci = cs_findchan(chan);
if (readonly)
{
notice_lang(s_MemoServ, u, READ_ONLY_MODE);
return MOD_CONT;
src/core/ms_info.c
+1 -6
View File
@@ -49,12 +49,7 @@ class CommandMSInfo : public Command
else if (name && *name == '#')
{
ci = cs_findchan(name);
if (!ci)
{
notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, name);
return MOD_CONT;
}
else if (!check_access(u, ci, CA_MEMO))
if (!check_access(u, ci, CA_MEMO))
{
notice_lang(s_MemoServ, u, ACCESS_DENIED);
return MOD_CONT;
src/core/ms_list.c
+3 -6
View File
@@ -37,12 +37,9 @@ class CommandMSList : public Command
{
chan = param;
param = params.size() > 1 ? params[1].c_str() : NULL;
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
else if (!check_access(u, ci, CA_MEMO))
ci = cs_findchan(chan);
if (!check_access(u, ci, CA_MEMO))
{
notice_lang(s_MemoServ, u, ACCESS_DENIED);
return MOD_CONT;
src/core/ms_read.c
+3 -6
View File
@@ -37,12 +37,9 @@ class CommandMSRead : public Command
{
chan = numstr;
numstr = params.size() > 1 ? params[1].c_str() : NULL;
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
else if (!check_access(u, ci, CA_MEMO))
ci = cs_findchan(chan);
if (!check_access(u, ci, CA_MEMO))
{
notice_lang(s_MemoServ, u, ACCESS_DENIED);
return MOD_CONT;
src/modules/cs_appendtopic.c
+5 -4
View File
@@ -62,13 +62,14 @@ class CommandCSAppendTopic : public Command
const char *chan = params[0].c_str();
const char *newtopic = params[1].c_str();
char topic[1024];
Channel *c;
Channel *c = findchan(chan);
ChannelInfo *ci;
if (!(c = findchan(chan)))
if (c)
ci = c->ci;
if (!c)
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
else if (!(ci = c->ci))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
else if (ci->flags & CI_FORBIDDEN)
notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
else if (!check_access(u, ci, CA_TOPIC))
src/modules/cs_enforce.c
+5 -4
View File
@@ -182,13 +182,14 @@ class CommandCSEnforce : public Command
{
const char *chan = params[0].c_str();
const char *what = params.size() > 1 ? params[1].c_str() : NULL;
Channel *c;
Channel *c = findchan(chan);
ChannelInfo *ci;
if (!(c = findchan(chan)))
if (c)
ci = c->ci;
if (!c)
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
else if (!(ci = c->ci))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
else if (ci->flags & CI_FORBIDDEN)
notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
else if (!check_access(u, ci, CA_AKICK))
src/modules/cs_tban.c
+2 -6
View File
@@ -203,13 +203,9 @@ int delBan(int argc, char **argv)
int canBanUser(Channel * c, User * u, User * u2)
{
ChannelInfo *ci;
ChannelInfo *ci = c->ci;
int ok = 0;
if (!(ci = c->ci))
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
else if (ci->flags & CI_FORBIDDEN)
notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, c->name);
else if (!check_access(u, ci, CA_BAN))
if (!check_access(u, ci, CA_BAN))
notice_lang(s_ChanServ, u, ACCESS_DENIED);
else if (ircd->except && is_excepted(ci, u2))
notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name);
src/modules/os_info.c
+14 -24
View File
@@ -146,7 +146,7 @@ class CommandCSOInfo : public Command
const char *chan = params[1].c_str();
const char *info = params.size() > 2 ? params[2].c_str() : NULL;
char *c;
ChannelInfo *ci = NULL;
ChannelInfo *ci = cs_findchan(chan);
if (!info)
{
@@ -154,19 +154,14 @@ class CommandCSOInfo : public Command
return MOD_CONT;
}
if ((ci = cs_findchan(chan)))
if (ci->GetExt("os_info", c))
{
if (ci->GetExt("os_info", c))
{
delete [] c;
ci->Shrink("os_info");
}
/* Add the module data to the channel */
ci->Extend("os_info", sstrdup(info));
me->NoticeLang(s_ChanServ, u, OCINFO_ADD_SUCCESS, chan);
delete [] c;
ci->Shrink("os_info");
}
else
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
/* Add the module data to the channel */
ci->Extend("os_info", sstrdup(info));
me->NoticeLang(s_ChanServ, u, OCINFO_ADD_SUCCESS, chan);
return MOD_CONT;
}
@@ -174,21 +169,16 @@ class CommandCSOInfo : public Command
CommandReturn DoDel(User *u, std::vector<std::string> &params)
{
const char *chan = params[1].c_str();
ChannelInfo *ci = NULL;
ChannelInfo *ci = cs_findchan(chan);
if ((ci = cs_findchan(chan)))
/* Del the module data from the channel */
char *c;
if (ci->GetExt("os_info", c))
{
/* Del the module data from the channel */
char *c;
if (ci->GetExt("os_info", c))
{
delete [] c;
ci->Shrink("os_info");
}
me->NoticeLang(s_ChanServ, u, OCINFO_DEL_SUCCESS, chan);
delete [] c;
ci->Shrink("os_info");
}
else
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
me->NoticeLang(s_ChanServ, u, OCINFO_DEL_SUCCESS, chan);
return MOD_CONT;
}
src/protocol.cpp
+7
View File
@@ -228,3 +228,10 @@ void IRCDProto::SendNumeric(const char *source, int numeric, const char *dest, c
SendNumericInternal(source, numeric, dest, buf);
}
int IRCDProto::IsChannelValid(const char *chan)
{
if (*chan != '#')
return 0;
return 1;
}
src/protocol/unreal32.c
+1 -1
View File
@@ -899,7 +899,7 @@ class UnrealIRCdProto : public IRCDProto
int IsChannelValid(const char *chan)
{
if (strchr(chan, ':')) return 0;
if (strchr(chan, ':') || *chan != '#') return 0;
return 1;
}