void ModeHandler::ChangeCount(int modifier)
{
count += modifier;
- ServerInstance->Log(DEBUG,"Change count for mode %c is now %d", mode, count);
+ ServerInstance->Logs->Log("MODE", DEBUG,"Change count for mode %c is now %d", mode, count);
}
ModeType ModeHandler::GetModeType()
return mode;
}
-ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
+ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool)
{
return MODEACTION_DENY;
}
return m_type;
}
-bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
+bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType, bool)
{
return true;
}
-void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
+void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType, bool)
{
}
return;
}
-void ModeParser::Process(const char** parameters, int pcnt, User *user, bool servermode)
+void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bool servermode)
{
std::string target = parameters[0];
ModeType type = MODETYPE_USER;
}
else if (pcnt > 1)
{
+ bool SkipAccessChecks = false;
+
if (targetchannel)
{
type = MODETYPE_CHANNEL;
FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE));
if (MOD_RESULT == ACR_DENY)
return;
+ SkipAccessChecks = (MOD_RESULT == ACR_ALLOW);
}
}
else if (targetuser)
if (modehandlers[handler_id]->GetModeType() == type)
{
+ int MOD_RESULT = 0;
+
if (modehandlers[handler_id]->GetNumParams(adding))
{
/* This mode expects a parameter, do we have any parameters left in our list to use? */
continue;
}
+ FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1, servermode));
+ }
+ else
+ {
+ FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0, servermode));
+ }
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1));
- if (MOD_RESULT == ACR_DENY)
- continue;
+ if (IS_LOCAL(user) && (MOD_RESULT == ACR_DENY))
+ continue;
- if (MOD_RESULT != ACR_ALLOW)
+ if (!SkipAccessChecks && IS_LOCAL(user) && (MOD_RESULT != ACR_ALLOW))
+ {
+ ServerInstance->Logs->Log("MODE", DEBUG,"Enter minimum prefix check");
+ /* Check access to this mode character */
+ if ((type == MODETYPE_CHANNEL) && (modehandlers[handler_id]->GetNeededPrefix()))
{
- /* Check access to this mode character */
- if ((type == MODETYPE_CHANNEL) && (modehandlers[handler_id]->GetNeededPrefix()))
+ char needed = modehandlers[handler_id]->GetNeededPrefix();
+ ModeHandler* prefixmode = FindPrefix(needed);
+ ServerInstance->Logs->Log("MODE", DEBUG,"Needed prefix: %c", needed);
+
+ /* If the mode defined by the handler is not '\0', but the handler for it
+ * cannot be found, they probably dont have the right module loaded to implement
+ * the prefix they want to compare the mode against, e.g. '&' for m_chanprotect.
+ * Revert to checking against the minimum core prefix, '%'.
+ */
+ if (needed && !prefixmode)
+ prefixmode = FindPrefix('%');
+
+ unsigned int neededrank = prefixmode->GetPrefixRank();
+ /* Compare our rank on the channel against the rank of the required prefix,
+ * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown
+ * in NAMES(X) are not in rank order, we know the most powerful mode is listed
+ * first, so we don't need to iterate, we just look up the first instead.
+ */
+ std::string modestring = targetchannel->GetAllPrefixChars(user);
+ char ml = (modestring.empty() ? '\0' : modestring[0]);
+ ModeHandler* ourmode = FindPrefix(ml);
+ if (!ourmode || ourmode->GetPrefixRank() < neededrank)
{
- bool allowed = false;
- char needed = modehandlers[handler_id]->GetNeededPrefix();
- ModeHandler* prefixmode = FindPrefix(needed);
- if (prefixmode)
- {
- unsigned int neededrank = prefixmode->GetPrefixRank();
-
- /* Compare our rank on the channel against the rank of the required prefix,
- * allow if >= ours
- */
-
- std::string modestring = ModeString(user, targetchannel);
- for (std::string::iterator v = modestring.begin(); v != modestring.end(); ++v)
- {
- ModeHandler* ourmode = FindPrefix(*v);
- if (ourmode && (ourmode->GetPrefixRank() >= neededrank))
- {
- /* Yay, allowed */
- allowed = true;
- break;
- }
- }
- }
-
- if (!allowed)
- {
- user->WriteServ("482 %s %s :You require channel privilege '%c' or above to execute channel mode '%c'",user->nick,
- targetchannel->name, needed, modechar);
- }
+ /* Bog off */
+ user->WriteServ("482 %s %s :You must have channel privilege %c or above to %sset channel mode %c",
+ user->nick, targetchannel->name, needed, adding ? "" : "un", modechar);
+ continue;
}
}
+ }
- bool had_parameter = !parameter.empty();
+ bool had_parameter = !parameter.empty();
- for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+ for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+ {
+ if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type, servermode) == false)
{
- if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
- {
- abort = true;
- break;
- }
- /* A module whacked the parameter completely, and there was one. abort. */
- if ((had_parameter) && (parameter.empty()))
- {
- abort = true;
- break;
- }
+ abort = true;
+ break;
}
-
- if (abort)
- continue;
- }
- else
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0));
- if (MOD_RESULT == ACR_DENY)
- continue;
-
- /* Fix by brain: mode watchers not being called for parameterless modes */
- for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+ /* A module whacked the parameter completely, and there was one. abort. */
+ if ((had_parameter) && (parameter.empty()))
{
- if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
- {
- abort = true;
- break;
- }
+ abort = true;
+ break;
}
-
- if (abort)
- continue;
}
+ if (abort)
+ continue;
+
/* It's an oper only mode, check if theyre an oper. If they arent,
* eat any parameter that came with the mode, and continue to next
*/
}
/* Call the handler for the mode */
- ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
+ ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding, servermode);
if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter.empty()))
{
/* Call all the AfterMode events in the mode watchers for this mode */
for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
- (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type);
+ (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type, servermode);
/* Reset the state change flag */
state_change = false;
projects / user / henk / code / inspircd.git / blobdiff