#include "modcmd.h"
#include "opserv.h" /* for opserv_bad_channel() */
#include "saxdb.h"
+#include "spamserv.h"
#include "timeq.h"
#define CHANSERV_CONF_NAME "services/chanserv"
#define KEY_EXPIRES "expires"
#define KEY_TRIGGERED "triggered"
+#define KEY_GOD_TIMEOUT "god_timeout"
+
#define CHANNEL_DEFAULT_FLAGS (CHANNEL_OFFCHANNEL)
#define CHANNEL_DEFAULT_OPTIONS "lmoooanpcnat"
{ "CSMSG_SET_TOYS", "$bToys $b %d - %s" },
{ "CSMSG_SET_CTCPREACTION", "$bCTCPReaction$b %d - %s" },
{ "CSMSG_SET_TOPICREFRESH", "$bTopicRefresh$b %d - %s" },
+ { "CSMSG_SET_RESYNC", "$bResync $b %d - %s" },
{ "CSMSG_SET_BANTIMEOUT", "$bBanTimeout $b %d - %s" },
{ "CSMSG_USET_AUTOOP", "$bAutoOp $b %s" },
{ "CSMSG_TOPICREFRESH_12_HOURS", "Refresh every 12 hours." },
{ "CSMSG_TOPICREFRESH_24_HOURS", "Refresh every 24 hours." },
+ { "CSMSG_RESYNC_NEVER", "Never automaticly resync userlist." },
+ { "CSMSG_RESYNC_3_HOURS", "Resync userlist every 3 hours." },
+ { "CSMSG_RESYNC_6_HOURS", "Resync userlist every 6 hours." },
+ { "CSMSG_RESYNC_12_HOURS", "Resync userlist every 12 hours." },
+ { "CSMSG_RESYNC_24_HOURS", "Resync userlist every 24 hours." },
+
{ "CSMSG_CTCPREACTION_NONE", "CTCPs are allowed" },
{ "CSMSG_CTCPREACTION_KICK", "Kick on disallowed CTCPs" },
{ "CSMSG_CTCPREACTION_KICKBAN", "Kickban on disallowed CTCPs" },
{ "CSMSG_INVITED_USER", "Invited $b%s$b to join %s." },
{ "CSMSG_INVITING_YOU_REASON", "$b%s$b invites you to join %s: %s" },
{ "CSMSG_INVITING_YOU", "$b%s$b invites you to join %s." },
+ { "CSMSG_CANNOT_INVITE", "You cannot invite %s to %s." },
{ "CSMSG_ALREADY_PRESENT", "%s is already in $b%s$b." },
{ "CSMSG_YOU_ALREADY_PRESENT", "You are already in $b%s$b." },
{ "CSMSG_LOW_CHANNEL_ACCESS", "You lack sufficient access in %s to use this command." },
struct userNode *chanserv;
dict_t note_types;
int off_channel;
+extern struct string_list *autojoin_channels;
static dict_t plain_dnrs, mask_dnrs, handle_dnrs;
static struct log_type *CS_LOG;
struct adduserPending* adduser_pendings = NULL;
unsigned int adduser_pendings_count = 0;
+unsigned long god_timeout;
static struct
{
{ '3', "CSMSG_BANTIMEOUT_4H" },
{ '4', "CSMSG_BANTIMEOUT_1D" },
{ '5', "CSMSG_BANTIMEOUT_1W" }
+},
+resyncValues[] = {
+ { 'n', "CSMSG_RESYNC_NEVER" },
+ { '1', "CSMSG_RESYNC_3_HOURS" },
+ { '2', "CSMSG_RESYNC_6_HOURS" },
+ { '3', "CSMSG_RESYNC_12_HOURS" },
+ { '4', "CSMSG_RESYNC_24_HOURS" }
};
static const struct {
{ "CSMSG_SET_TOYS", "toys", 'p', 6, ArrayLength(toysValues), toysValues },
{ "CSMSG_SET_TOPICREFRESH", "topicrefresh", 'n', 8, ArrayLength(topicRefreshValues), topicRefreshValues },
{ "CSMSG_SET_CTCPREACTION", "ctcpreaction", 'n', 10, ArrayLength(ctcpReactionValues), ctcpReactionValues },
- { "CSMSG_SET_BANTIMEOUT", "bantimeout", '0', 11, ArrayLength(banTimeoutValues), banTimeoutValues }
+ { "CSMSG_SET_BANTIMEOUT", "bantimeout", '0', 11, ArrayLength(banTimeoutValues), banTimeoutValues },
+ { "CSMSG_SET_RESYNC", "resync", 'n', 12, ArrayLength(resyncValues), resyncValues },
};
struct userData *helperList;
#define CHANSERV_DB_VERSION 2
-#define GetChannelUser(channel, handle) _GetChannelUser(channel, handle, 1, 0)
#define GetChannelAccess(channel, handle) _GetChannelUser(channel, handle, 0, 0)
#define GetTrueChannelAccess(channel, handle) _GetChannelUser(channel, handle, 0, 1)
free(user->info);
free(user);
- if(do_gc && !channel->users && !IsProtected(channel))
+ if(do_gc && !channel->users && !IsProtected(channel)) {
+ spamserv_cs_unregister(NULL, channel->channel, lost_all_users, NULL);
unregister_channel(channel, "lost all users.");
+ }
}
static struct adduserPending*
static void expire_ban(void *data);
-static struct banData*
+struct banData*
add_channel_ban(struct chanData *channel, const char *mask, char *owner, time_t set, time_t triggered, time_t expires, char *reason)
{
struct banData *bd;
/* Unregister the channel */
log_module(CS_LOG, LOG_INFO, "(%s) Channel registration expired.", channel->channel->name);
+ spamserv_cs_unregister(NULL, channel->channel, expire, NULL);
unregister_channel(channel, "registration expired.");
}
}
static int
-validate_op(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_op(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
struct chanData *cData = channel->channel_info;
struct userData *cs_victim;
|| (cs_victim->access < UL_OP /* cData->lvlOpts[lvlGiveOps]*/))
&& !check_user_level(channel, user, lvlEnfOps, 0, 0))
{
- send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
+ if(cmd)
+ reply("CSMSG_OPBY_LOCKED");
+ else
+ send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
return 0;
}
}
static int
-validate_halfop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_halfop(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
struct chanData *cData = channel->channel_info;
struct userData *cs_victim;
|| (cs_victim->access < UL_HALFOP /* cData->lvlOpts[lvlGiveHalfOps] */))
&& !check_user_level(channel, user, lvlEnfHalfOps, 0, 0))
{
- send_message(user, chanserv, "CSMSG_HOPBY_LOCKED");
+ reply("CSMSG_HOPBY_LOCKED");
return 0;
}
static int
-validate_deop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_deop(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
if(IsService(victim))
{
- send_message(user, chanserv, "MSG_SERVICE_IMMUNE", victim->nick);
+ reply("MSG_SERVICE_IMMUNE", victim->nick);
return 0;
}
if(protect_user(victim, user, channel->channel_info))
{
- send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
+ reply("CSMSG_USER_PROTECTED", victim->nick);
return 0;
}
}
static int
-validate_dehop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_dehop(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
if(IsService(victim))
{
- send_message(user, chanserv, "MSG_SERVICE_IMMUNE", victim->nick);
+ reply("MSG_SERVICE_IMMUNE", victim->nick);
return 0;
}
if(protect_user(victim, user, channel->channel_info))
{
- send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
+ reply("CSMSG_USER_PROTECTED", victim->nick);
return 0;
}
sprintf(reason, "unregistered by %s.", user->handle_info->handle);
name = strdup(channel->name);
unregister_channel(cData, reason);
+ spamserv_cs_unregister(user, channel, manually, "unregistered");
reply("CSMSG_UNREG_SUCCESS", name);
free(name);
return 1;
}
+static void
+ss_cs_join_channel(struct chanNode *channel, int spamserv_join)
+{
+ extern struct userNode *spamserv;
+ struct mod_chanmode *change;
+
+ if(spamserv && spamserv_join && get_chanInfo(channel->name))
+ {
+ change = mod_chanmode_alloc(2);
+ change->argc = 2;
+ change->args[0].mode = MODE_CHANOP;
+ change->args[0].u.member = AddChannelUser(chanserv, channel);
+ change->args[1].mode = MODE_CHANOP;
+ change->args[1].u.member = AddChannelUser(spamserv, channel);
+ }
+ else
+ {
+ change = mod_chanmode_alloc(1);
+ change->argc = 1;
+ change->args[0].mode = MODE_CHANOP;
+ change->args[0].u.member = AddChannelUser(chanserv, channel);
+ }
+
+ mod_chanmode_announce(chanserv, channel, change);
+ mod_chanmode_free(change);
+}
+
static CHANSERV_FUNC(cmd_move)
{
struct mod_chanmode change;
struct userData *uData;
char reason[MAXLEN];
struct do_not_register *dnr;
+ int chanserv_join = 0, spamserv_join;
REQUIRE_PARAMS(2);
{
target = AddChannel(argv[1], now, NULL, NULL, NULL);
if(!IsSuspended(channel->channel_info))
- AddChannelUser(chanserv, target);
+ chanserv_join = 1;
}
else if(target->channel_info)
{
return 0;
}
else if(!IsSuspended(channel->channel_info))
- {
- change.argc = 1;
- change.args[0].mode = MODE_CHANOP;
- change.args[0].u.member = AddChannelUser(chanserv, target);
- mod_chanmode_announce(chanserv, target, &change);
- }
+ chanserv_join = 1;
if(off_channel > 0)
{
target->channel_info->channel = target;
channel->channel_info = NULL;
- reply("CSMSG_MOVE_SUCCESS", target->name);
+ spamserv_join = spamserv_cs_move_merge(user, channel, target, 1);
+
+ if (chanserv_join)
+ ss_cs_join_channel(target, spamserv_join);
sprintf(reason, "%s moved to %s by %s.", channel->name, target->name, user->handle_info->handle);
if(!IsSuspended(target->channel_info))
UnlockChannel(channel);
LockChannel(target);
global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ reply("CSMSG_MOVE_SUCCESS", target->name);
return 1;
}
/* Merge the channel structures and associated data. */
merge_channel(channel->channel_info, target->channel_info);
+ spamserv_cs_move_merge(user, channel, target, 0);
sprintf(reason, "merged into %s by %s.", target->name, user->handle_info->handle);
unregister_channel(channel->channel_info, reason);
reply("CSMSG_MERGE_SUCCESS", target->name);
/* trim_lamers.. */
static int
-cmd_trim_bans(struct userNode *user, struct chanNode *channel, unsigned long duration)
+cmd_trim_bans(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, unsigned long duration)
{
struct banData *bData, *next;
char interval[INTERVALLEN];
}
intervalString(interval, duration, user->handle_info);
- send_message(user, chanserv, "CSMSG_TRIMMED_LAMERS", count, channel->name, interval);
+ reply("CSMSG_TRIMMED_LAMERS", count, channel->name, interval);
return 1;
}
static int
-cmd_trim_users(struct userNode *user, struct chanNode *channel, unsigned short min_access, unsigned short max_access, unsigned long duration, int vacation)
+cmd_trim_users(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, unsigned short min_access, unsigned short max_access, unsigned long duration, int vacation)
{
struct userData *actor, *uData, *next;
char interval[INTERVALLEN];
actor = GetChannelUser(channel->channel_info, user->handle_info);
if(min_access > max_access)
{
- send_message(user, chanserv, "CSMSG_BAD_RANGE", min_access, max_access);
+ reply("CSMSG_BAD_RANGE", min_access, max_access);
return 0;
}
if((actor->access <= max_access) && !IsHelping(user))
{
- send_message(user, chanserv, "CSMSG_NO_ACCESS");
+ reply("CSMSG_NO_ACCESS");
return 0;
}
min_access = 1;
max_access = (actor->access > UL_OWNER) ? UL_OWNER : (actor->access - 1);
}
- send_message(user, chanserv, "CSMSG_TRIMMED_USERS", count, min_access, max_access, channel->name, intervalString(interval, duration, user->handle_info));
+ reply("CSMSG_TRIMMED_USERS", count, min_access, max_access, channel->name, intervalString(interval, duration, user->handle_info));
return 1;
}
if(!irccasecmp(argv[1], "lamers"))
{
- cmd_trim_bans(user, channel, duration); /* trim_lamers.. */
+ cmd_trim_bans(cmd, user, channel, duration); /* trim_lamers.. */
return 1;
}
else if(!irccasecmp(argv[1], "users"))
{
- cmd_trim_users(user, channel, 0, 0, duration, vacation);
+ cmd_trim_users(cmd, user, channel, 0, 0, duration, vacation);
return 1;
}
else if(parse_level_range(&min_level, &max_level, argv[1]))
{
- cmd_trim_users(user, channel, min_level, max_level, duration, vacation);
+ cmd_trim_users(cmd, user, channel, min_level, max_level, duration, vacation);
return 1;
}
else if((min_level = user_level_from_name(argv[1], UL_OWNER)))
{
- cmd_trim_users(user, channel, min_level, min_level, duration, vacation);
+ cmd_trim_users(cmd, user, channel, min_level, min_level, duration, vacation);
return 1;
}
else
return cmd_all(CSFUNC_ARGS, cmd_down);
}
-typedef int validate_func_t(struct userNode *user, struct chanNode *channel, struct userNode *victim);
+typedef int validate_func_t(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim);
typedef void process_func_t(unsigned int num, struct userNode **newops, struct chanNode *channel, struct userNode *who, int announce);
static int
change->args[valid].u.member = GetUserMode(channel, victim);
if(!change->args[valid].u.member)
continue;
- if(validate && !validate(user, channel, victim))
+ if(validate && !validate(cmd, user, channel, victim))
continue;
valid++;
}
{
if(cData->topic)
{
+ /*XXX Why would we ever want to send chanserv as the setter? I dont understand -Rubin */
SetChannelTopic(channel, chanserv, p10 ? user : chanserv, cData->topic, 1);
reply("CSMSG_TOPIC_SET", cData->topic);
return 1;
else
send_message(invite, chanserv, "CSMSG_INVITING_YOU", user->nick, channel->name);
}
+
+ if (invite->handle_info && invite->handle_info->ignores->used && (argc > 1)) {
+ unsigned int i;
+ for (i=0; i < invite->handle_info->ignores->used; i++) {
+ if (user_matches_glob(user, invite->handle_info->ignores->list[i], MATCH_USENICK)) {
+ reply("CSMSG_CANNOT_INVITE", argv[1], channel->name);
+ return 0;
+ }
+ }
+ }
+
irc_invite(chanserv, invite, channel);
if(argc > 1)
reply("CSMSG_INVITED_USER", argv[1], channel->name);
return 1;
}
-static CHANSERV_FUNC(cmd_resync)
+static void
+resync_channel(struct chanNode *channel)
{
struct mod_chanmode *changes;
struct chanData *cData = channel->channel_info;
}
}
changes->argc = used;
- modcmd_chanmode_announce(changes);
+ mod_chanmode_announce(chanserv, channel, changes);
mod_chanmode_free(changes);
+}
+
+static CHANSERV_FUNC(cmd_resync)
+{
+ resync_channel(channel);
reply("CSMSG_RESYNCED_USERS", channel->name);
return 1;
}
suspended->cData->flags &= ~CHANNEL_SUSPENDED;
if(!IsOffChannel(suspended->cData))
{
- struct mod_chanmode change;
- mod_chanmode_init(&change);
- change.argc = 1;
- change.args[0].mode = MODE_CHANOP;
- change.args[0].u.member = AddChannelUser(chanserv, channel);
- mod_chanmode_announce(chanserv, channel, &change);
+ spamserv_cs_suspend(channel, 0, 0, NULL);
+ ss_cs_join_channel(channel, 1);
}
}
/* Mark the channel as suspended, then part. */
channel->channel_info->flags |= CHANNEL_SUSPENDED;
+ spamserv_cs_suspend(channel, expiry, 1, suspended->reason);
DelChannelUser(chanserv, channel, suspended->reason, 0);
reply("CSMSG_SUSPENDED", channel->name);
sprintf(reason, "%s suspended by %s.", channel->name, suspended->suspender);
typedef void (*channel_search_func)(struct chanData *channel, void *data);
static search_t
-chanserv_search_create(struct userNode *user, unsigned int argc, char *argv[])
+chanserv_search_create(struct svccmd *cmd, struct userNode *user, unsigned int argc, char *argv[])
{
search_t search;
unsigned int i;
/* Assume all criteria require arguments. */
if(i == (argc - 1))
{
- send_message(user, chanserv, "MSG_MISSING_PARAMS", argv[i]);
+ reply("MSG_MISSING_PARAMS", argv[i]);
goto fail;
}
search->flags |= CHANNEL_SUSPENDED;
else
{
- send_message(user, chanserv, "CSMSG_INVALID_CFLAG", argv[i]);
+ reply("CSMSG_INVALID_CFLAG", argv[i]);
goto fail;
}
}
search->limit = strtoul(argv[++i], NULL, 10);
else
{
- send_message(user, chanserv, "MSG_INVALID_CRITERIA", argv[i]);
+ reply("MSG_INVALID_CRITERIA", argv[i]);
goto fail;
}
}
return 0;
}
- search = chanserv_search_create(user, argc - 2, argv + 2);
+ search = chanserv_search_create(cmd, user, argc - 2, argv + 2);
if(!search)
return 0;
&& !match_ircglob(channel->channel_info->topic, channel->channel_info->topic_mask))
reply("CSMSG_TOPIC_MISMATCH", channel->name);
}
- SetChannelTopic(channel, chanserv, chanserv, topic ? topic : "", 1);
+ SetChannelTopic(channel, chanserv, user, topic ? topic : "", 1);
}
if(channel->channel_info->topic)
return channel_multiple_option(chTopicRefresh, CSFUNC_ARGS);
}
+static MODCMD_FUNC(chan_opt_resync)
+{
+ return channel_multiple_option(chResync, CSFUNC_ARGS);
+}
+
static struct svccmd_list set_shows_list;
static void
timeq_add(now + chanserv_conf.refresh_period, chanserv_refresh_topics, NULL);
}
+static void
+chanserv_auto_resync(UNUSED_ARG(void *data))
+{
+ unsigned int refresh_num = (now - self->link) / chanserv_conf.refresh_period;
+ struct chanData *cData;
+ char opt;
+
+ for(cData = channelList; cData; cData = cData->next)
+ {
+ if(IsSuspended(cData)) continue;
+ opt = cData->chOpts[chResync];
+ if(opt == 'n') continue;
+ if((refresh_num - cData->last_resync) < (unsigned int)(1 << (opt - '1'))) continue;
+ resync_channel(cData->channel);
+ cData->last_resync = refresh_num;
+ }
+ timeq_add(now + chanserv_conf.refresh_period, chanserv_auto_resync, NULL);
+}
+
static CHANSERV_FUNC(cmd_unf)
{
if(channel)
{
struct mod_chanmode change;
struct userData *channel;
- unsigned int ii, jj;
+ unsigned int ii, jj, i;
if(!user->handle_info)
return;
}
}
}
+
+ if (user->handle_info->ignores->used) {
+ for (i=0; i < user->handle_info->ignores->used; i++) {
+ irc_silence(user, user->handle_info->ignores->list[i], 1);
+ }
+ }
+
+ if (user->handle_info->epithet)
+ irc_swhois(chanserv, user, user->handle_info->epithet);
}
static void
conform_topic(cData->topic_mask, channel->topic, new_topic);
if(*new_topic)
{
- SetChannelTopic(channel, chanserv, chanserv, new_topic, 1);
+ SetChannelTopic(channel, chanserv, user, new_topic, 1);
/* and fall through to topicsnarf code below.. */
}
else /* Topic couldnt fit into mask, was too long */
{
- SetChannelTopic(channel, chanserv, chanserv, old_topic, 1);
+ SetChannelTopic(channel, chanserv, user, old_topic, 1);
send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT1", channel->name, cData->topic_mask);
send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT2", TOPICLEN);
return 1;
else if(change->args[ii].mode & MODE_CHANOP)
{
const struct userNode *victim = change->args[ii].u.member->user;
- if(IsService(victim) || validate_op(user, channel, (struct userNode*)victim))
+ if(IsService(victim) || validate_op(NULL, user, channel, (struct userNode*)victim))
continue;
if(!bounce)
bounce = mod_chanmode_alloc(change->argc + 1 - ii);
chanserv_conf.network_helper_epithet = str ? str : "a wannabe tyrant";
str = database_get_data(conf_node, KEY_SUPPORT_HELPER_EPITHET, RECDB_QSTRING);
chanserv_conf.support_helper_epithet = str ? str : "a wannabe tyrant";
+ str = database_get_data(conf_node, KEY_GOD_TIMEOUT, RECDB_QSTRING);
+ god_timeout = str ? ParseInterval(str) : 60*15;
str = database_get_data(conf_node, "default_modes", RECDB_QSTRING);
if(!str)
str = "+nt";
"PubCmd", "InviteMe", "UserInfo","EnfOps",
"EnfHalfOps", "EnfModes", "EnfTopic", "TopicSnarf", "Setters",
/* multiple choice options */
- "AutoMode", "CtcpReaction", "Protect", "Toys", "TopicRefresh",
+ "AutoMode", "CtcpReaction", "Protect", "Toys", "TopicRefresh", "Resync",
/* binary options */
"DynLimit", "NoDelete", "BanTimeout",
/* delimiter */
void
init_chanserv(const char *nick)
{
+ struct chanNode *chan;
+ unsigned int i;
CS_LOG = log_register_type("ChanServ", "file:chanserv.log");
conf_register_reload(chanserv_conf_read);
DEFINE_CHANNEL_OPTION(toys);
DEFINE_CHANNEL_OPTION(setters);
DEFINE_CHANNEL_OPTION(topicrefresh);
+ DEFINE_CHANNEL_OPTION(resync);
DEFINE_CHANNEL_OPTION(ctcpreaction);
DEFINE_CHANNEL_OPTION(bantimeout);
DEFINE_CHANNEL_OPTION(inviteme);
time_t next_refresh;
next_refresh = (now + chanserv_conf.refresh_period - 1) / chanserv_conf.refresh_period * chanserv_conf.refresh_period;
timeq_add(next_refresh, chanserv_refresh_topics, NULL);
+ timeq_add(next_refresh, chanserv_auto_resync, NULL);
+ }
+
+ if (autojoin_channels && chanserv) {
+ for (i = 0; i < autojoin_channels->used; i++) {
+ chan = AddChannel(autojoin_channels->list[i], now, "+nt", NULL, NULL);
+ AddChannelUser(chanserv, chan)->modes |= MODE_CHANOP;
+ }
}
reg_exit_func(chanserv_db_cleanup);