#define KEY_MAX "max"
#define KEY_TIME "time"
#define KEY_LAST "last"
+#define KEY_EXPIRE "expire"
#define KEY_MAX_CLIENTS "max_clients"
#define KEY_LIMIT "limit"
#define KEY_EXPIRES "expires"
{ "OSMSG_NEED_CHANNEL", "You must specify a channel for $b%s$b." },
{ "OSMSG_INVALID_IRCMASK", "$b%s$b is an invalid IRC hostmask." },
{ "OSMSG_ADDED_BAN", "I have banned $b%s$b from $b%s$b." },
+ { "OSMSG_BLOCK_TRUSTED", "$b%s$b is on a trusted ip. If you really want to G-line him, use the GLINE command." },
+ { "OSMSG_BLOCK_OPER" , "G-lining $b%s$b (*@%s) would also hit the IRC operator $b%s$b." },
+ { "OSMSG_SBLOCK_OPER" , "Shuning $b%s$b (*@%s) would also hit the IRC operator $b%s$b." },
+ { "OSMSG_NO_GLINE_CMD", "The GLINE command is not bound so you can only block with the default duration." },
+ { "OSMSG_NO_SHUN_CMD", "The SHUN command is not bound so you can only block with the default duration." },
{ "OSMSG_SHUN_ISSUED", "Shun issued for $b%s$b." },
{ "OSMSG_SHUN_REMOVED", "Shun removed for $b%s$b." },
{ "OSMSG_SHUN_FORCE_REMOVED", "Unknown/expired Shun removed for $b%s$b." },
{ "OSMSG_KICKALL_DONE", "I have cleared out %s." },
{ "OSMSG_LEAVING", "Leaving $b%s$b." },
{ "OSMSG_MARK_INVALID", "Sorry, marks must contain only letters, numbers, and dashes ('-')." },
+ { "OSMSG_MARK_NOTMARKED", "Action not mark but mark supplied. (Did you mean marked?)" },
{ "OSMSG_MODE_SET", "I have set the modes for $b%s$b." },
{ "OSMSG_OP_DONE", "Opped the requested lusers." },
{ "OSMSG_OPALL_DONE", "Opped everyone on $b%s$b." },
{ "OSMSG_WHOIS_CHANNELS", "Channels : %s" },
{ "OSMSG_WHOIS_HIDECHANS", "Channel list omitted for your sanity." },
{ "OSMSG_WHOIS_VERSION", "Version : %s" },
- { "OSMSG_WHOIS_MARK", "Mark : %s" },
+ { "OSMSG_WHOIS_SSLFP", "SSL f/print : %s" },
+ { "OSMSG_WHOIS_MARK", "Mark : %s" },
+ { "OSMSG_WHOIS_MARKS", "Marks : %s" },
{ "OSMSG_WHOIS_NO_NOTICE", "No_notices : %s" },
{ "OSMSG_UNBAN_DONE", "Ban(s) removed from channel %s." },
{ "OSMSG_CHANNEL_VOICED", "All users on %s voiced." },
{ "OSMSG_EXEMPTED_LIST", "Exempted channels: %s" },
{ "OSMSG_GLINE_COUNT", "There are %d glines active on the network." },
{ "OSMSG_SHUN_COUNT", "There are %d shuns active on the network." },
+ { "OSMSG_NO_GLINE", "$b%s$b is not a known G-line." },
+ { "OSMSG_NO_SHUN", "$b%s$b is not a known Shun" },
{ "OSMSG_LINKS_SERVER", "%s%s (%u clients; %s)" },
{ "OSMSG_MAX_CLIENTS", "Max clients: %d at %s" },
{ "OSMSG_NETWORK_INFO", "Total users: %d (%d invisible, %d opers)" },
{ "OSMSG_ALERTS_DESC", " $uCriteria$u: %s" },
{ "OSMSG_ALERTS_LAST", " $uTriggered$u: %s" },
{ "OSMSG_ALERT_IS", "$b%-20s$b %-6s (by %s)" },
+ { "OSMSG_ALERT_EXPIRE", " $uExpires:$u: %s" },
{ "OSMSG_ALERT_END", "----------------End of Alerts-----------------" },
/* routing messages */
{ "OSMSG_ROUTINGPLAN", "$bRouting Plan(s)$b" },
{ "OSMSG_CHANINFO_MANY_USERS", "%d users (\"/msg $S %s %s users\" for the list)" },
{ "OSMSG_CHANINFO_USER_COUNT", "Users (%d):" },
{ "OSMSG_CSEARCH_CHANNEL_INFO", "%s [%d users] %s %s" },
+ { "OSMSG_TRACE_MAX_CHANNELS", "You may not use the 'channel' criterion more than %d times." },
{ "OSMSG_INVALID_REGEX", "Invalid regex: %s: %s (%d)" },
{ "OSMSG_TRACK_DISABLED", "Tracking is not currently compiled into X3" },
{ "OSMSG_MAXUSERS_RESET", "Max clients has been reset to $b%d$b" },
+ { "OSMSG_FORCEKICK_LOCAL", "You cannot kick $b%s$b forcefully." },
{ "OSMSG_DEFCON_INVALID", "DefCon level %d is invalid, please choose a value between 1 and 5" },
{ "OSMSG_DEFCON_ALLOWING_ALL", "DefCon is at level 5 and allowing everything" },
free(wc);
}
+#define DISCRIM_MAX_CHANS 20
+
typedef struct opservDiscrim {
- struct chanNode *channel;
- char *mask_nick, *mask_ident, *mask_host, *mask_info, *mask_version, *server, *reason, *accountmask, *chantarget, *mark, *mask_mark, *modes;
+ struct chanNode *channels[DISCRIM_MAX_CHANS];
+ unsigned int channel_count;
+ char *mask_nick, *mask_ident, *mask_host, *mask_info, *mask_version, *server, *reason, *accountmask, *chantarget, *mark, *mask_mark, *modes, *notice_target;
irc_in_addr_t ip_mask;
unsigned long limit;
time_t min_ts, max_ts;
unsigned int has_regex_nick : 1, has_regex_ident : 1, has_regex_host : 1, has_regex_info : 1, has_regex_version : 1;
unsigned int min_level, max_level, domain_depth, duration, min_clones, min_channels, max_channels;
unsigned char ip_mask_bits;
- unsigned int match_opers : 1, option_log : 1;
- unsigned int chan_req_modes : 2, chan_no_modes : 2;
+ unsigned int match_opers : 1, match_trusted : 1, option_log : 1;
+ unsigned int chan_req_modes[DISCRIM_MAX_CHANS], chan_no_modes[DISCRIM_MAX_CHANS];
int authed : 2, info_space : 2;
unsigned int intra_scmp : 2, intra_dcmp : 2;
unsigned int use_regex : 1;
unsigned int disp_limit;
};
-static discrim_t opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel);
+static discrim_t opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel, const char *action);
static unsigned int opserv_discrim_search(discrim_t discrim, discrim_search_func dsf, void *data);
static int gag_helper_func(struct userNode *match, void *extra);
static int ungag_helper_func(struct userNode *match, void *extra);
+static void alert_expire(void* name);
typedef enum {
REACT_NOTICE,
REACT_SVSJOIN,
REACT_SVSPART,
REACT_VERSION,
- REACT_MARK
+ REACT_MARK,
+ REACT_NOTICEUSER,
+ REACT_MSGUSER
} opserv_alert_reaction;
struct opserv_user_alert {
discrim_t discrim;
opserv_alert_reaction reaction;
int last;
+ time_t expire;
};
/* funny type to make it acceptible to dict_set_free_data, far below */
opserv_free_user_alert(void *data)
{
struct opserv_user_alert *alert = data;
- if (alert->discrim->channel)
- UnlockChannel(alert->discrim->channel);
+ unsigned int i;
+ for(i = 0; i < alert->discrim->channel_count; i++)
+ UnlockChannel(alert->discrim->channels[i]);
free(alert->owner);
free(alert->text_discrim);
free(alert->split_discrim);
free(alert);
}
-#define opserv_debug(format...) do { if (opserv_conf.debug_channel) send_channel_notice(opserv_conf.debug_channel , opserv , ## format); } while (0)
-#define opserv_alert(format...) do { if (opserv_conf.alert_channel) send_channel_notice(opserv_conf.alert_channel , opserv , ## format); } while (0)
-
+#if defined(GCC_VARMACROS)
+# define opserv_debug(ARGS...) do { if (opserv_conf.debug_channel) send_channel_notice(opserv_conf.debug_channel, opserv, ARGS); } while (0)
+# define opserv_alert(ARGS...) do { if (opserv_conf.alert_channel) send_channel_notice(opserv_conf.alert_channel, opserv, ARGS); } while (0)
+# define opserv_custom_alert(CHAN, ARGS...) do { if (CHAN) send_target_message(4, (CHAN), opserv, ARGS); else if (opserv_conf.alert_channel) send_channel_notice(opserv_conf.alert_channel, opserv, ARGS); } while (0)
+#elif defined(C99_VARMACROS)
+# define opserv_debug(...) do { if (opserv_conf.debug_channel) send_channel_notice(opserv_conf.debug_channel, opserv, __VA_ARGS__); } while (0)
+# define opserv_alert(...) do { if (opserv_conf.alert_channel) send_channel_notice(opserv_conf.alert_channel, opserv, __VA_ARGS__); } while (0)
+# define opserv_custom_alert(chan, ...) do { if (chan) send_target_message(4, chan, opserv, __VA_ARGS__); else if (opserv_conf.alert_channel) send_channel_notice(opserv_conf.alert_channel, opserv, __VA_ARGS__); } while (0)
+#endif
char *defconReverseModes(const char *modes)
{
struct userNode *target;
struct gline *gline;
char *reason;
+ unsigned long duration = 0;
+ unsigned int offset = 2;
+ unsigned int nn;
+ struct svccmd *gline_cmd;
target = GetUserH(argv[1]);
if (!target) {
reply("MSG_SERVICE_IMMUNE", target->nick);
return 0;
}
- reason = (argc > 2) ? unsplit_string(argv+2, argc-2, NULL) : NULL;
- gline = opserv_block(target, user->handle_info->handle, reason, 0, 0);
+ if (dict_find(opserv_trusted_hosts, irc_ntoa(&target->ip), NULL)) {
+ reply("OSMSG_BLOCK_TRUSTED", target->nick);
+ return 0;
+ }
+ for(nn = 0; nn < curr_opers.used; nn++) {
+ if(memcmp(&curr_opers.list[nn]->ip, &target->ip, sizeof(irc_in_addr_t)) == 0) {
+ reply("OSMSG_BLOCK_OPER", target->nick, irc_ntoa(&target->ip), curr_opers.list[nn]->nick);
+ return 0;
+ }
+ }
+ if(argc > 2 && (duration = ParseInterval(argv[2]))) {
+ offset = 3;
+ }
+ if(duration && duration != opserv_conf.block_gline_duration) {
+ /* We require more access when the duration is not the default block duration. */
+ gline_cmd = dict_find(cmd->parent->commands, "gline", NULL);
+ if(!gline_cmd)
+ {
+ reply("OSMSG_NO_GLINE_CMD");
+ return 0;
+ }
+ if(!svccmd_can_invoke(user, cmd->parent->bot, gline_cmd, channel, SVCCMD_NOISY))
+ return 0;
+ }
+ reason = (argc > offset) ? unsplit_string(argv+offset, argc-offset, NULL) : NULL;
+ gline = opserv_block(target, user->handle_info->handle, reason, duration, 0);
reply("OSMSG_GLINE_ISSUED", gline->target);
return 1;
}
return; /* channel is invite only */
}
+ if (!IsOper(target) && (channel->modes & MODE_OPERSONLY)) {
+ return; /* user is not oper and channel is opers only */
+ }
+
+ if (!IsAdmin(target) && (channel->modes & MODE_ADMINSONLY)) {
+ return; /* user is not admin and channel is admin only */
+ }
+
+ if (target->handle_info && (channel->modes & MODE_REGONLY)) {
+ return; /* user is not authed and channel is authed only users */
+ }
+
+ if (!IsSSL(target) && (channel->modes & MODE_SSLONLY)) {
+ return; /* user is not SSL and channel is SSL only */
+ }
+
if (channel->limit > 0) {
if (channel->members.used >= channel->limit) {
return; /* channel is invite on */
struct userNode *target;
struct shun *shun;
char *reason;
+ unsigned long duration = 0;
+ unsigned int offset = 2;
+ unsigned int nn;
+ struct svccmd *shun_cmd;
target = GetUserH(argv[1]);
if (!target) {
reply("MSG_SERVICE_IMMUNE", target->nick);
return 0;
}
+ if (dict_find(opserv_trusted_hosts, irc_ntoa(&target->ip), NULL)) {
+ reply("OSMSG_BLOCK_TRUSTED", target->nick);
+ return 0;
+ }
+ for(nn = 0; nn < curr_opers.used; nn++) {
+ if(memcmp(&curr_opers.list[nn]->ip, &target->ip, sizeof(irc_in_addr_t)) == 0) {
+ reply("OSMSG_SBLOCK_OPER", target->nick, irc_ntoa(&target->ip), curr_opers.list[nn]->nick);
+ return 0;
+ }
+ }
+ if(argc > 2 && (duration = ParseInterval(argv[2]))) {
+ offset = 3;
+ }
+ if(duration && duration != opserv_conf.block_shun_duration) {
+ // We require more access when the duration is not the default block duration.
+ shun_cmd = dict_find(cmd->parent->commands, "shun", NULL);
+ if(!shun_cmd)
+ {
+ reply("OSMSG_NO_SHUN_CMD");
+ return 0;
+ }
+ if(!svccmd_can_invoke(user, cmd->parent->bot, shun_cmd, channel, SVCCMD_NOISY))
+ return 0;
+ }
reason = (argc > 2) ? unsplit_string(argv+2, argc-2, NULL) : NULL;
- shun = opserv_shun(target, user->handle_info->handle, reason, 0);
+ shun = opserv_shun(target, user->handle_info->handle, reason, duration);
reply("OSMSG_SHUN_ISSUED", shun->target);
return 1;
}
struct shun *shun;
reason = unsplit_string(argv+3, argc-3, NULL);
- if (!is_shun(argv[1]) && !IsChannelName(argv[1]) && (argv[1][0] != '&')) {
+ if (!is_shun(argv[1])) {
reply("MSG_INVALID_SHUN", argv[1]);
return 0;
}
{
struct userNode *bot = cmd->parent->bot;
- if (!IsChannelName(argv[1])) {
- reply("MSG_NOT_CHANNEL_NAME");
- return 0;
- } else if (!(channel = GetChannel(argv[1]))) {
+ if (!channel) {
+ if((argc < 2) || !IsChannelName(argv[1]))
+ {
+ reply("MSG_NOT_CHANNEL_NAME");
+ return 0;
+ }
+
channel = AddChannel(argv[1], now, NULL, NULL, NULL);
AddChannelUser(bot, channel)->modes |= MODE_CHANOP;
} else if (GetUserMode(channel, bot)) {
return 1;
}
+static MODCMD_FUNC(cmd_forcekick)
+{
+ struct userNode *target;
+ char *reason;
+
+ if (argc < 3) {
+ reason = alloca(strlen(OSMSG_KICK_REQUESTED)+strlen(user->nick)+1);
+ sprintf(reason, OSMSG_KICK_REQUESTED, user->nick);
+ } else {
+ reason = unsplit_string(argv+2, argc-2, NULL);
+ }
+ target = GetUserH(argv[1]);
+ if (!target) {
+ reply("MSG_NICK_UNKNOWN", argv[1]);
+ return 0;
+ }
+ if (!GetUserMode(channel, target)) {
+ reply("OSMSG_NOT_ON_CHANNEL", target->nick, channel->name);
+ return 0;
+ }
+ if (IsLocal(target)) {
+ reply("OSMSG_FORCEKICK_LOCAL", target->nick);
+ return 0;
+ }
+ irc_kick(cmd->parent->bot, target, channel, reason);
+ return 1;
+}
+
static MODCMD_FUNC(cmd_kickall)
{
unsigned int limit, n, inchan;
{
char *reason;
- if (!IsChannelName(argv[1])) {
- reply("MSG_NOT_CHANNEL_NAME");
+ if (!GetUserMode(channel, cmd->parent->bot)) {
+ reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name);
return 0;
}
- if ((channel = GetChannel(argv[1]))) {
- if (!GetUserMode(channel, cmd->parent->bot)) {
- reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name);
- return 0;
- }
- reason = (argc < 3) ? "Leaving." : unsplit_string(argv+2, argc-2, NULL);
- reply("OSMSG_LEAVING", channel->name);
- DelChannelUser(cmd->parent->bot, channel, reason, 0);
- }
+ reason = (argc < 2) ? "Leaving." : unsplit_string(argv+1, argc-1, NULL);
+ reply("OSMSG_LEAVING", channel->name);
+ DelChannelUser(cmd->parent->bot, channel, reason, 0);
return 1;
}
if(target->version_reply) {
reply("OSMSG_WHOIS_VERSION", target->version_reply);
}
+ if(target->sslfp) {
+ reply("OSMSG_WHOIS_SSLFP", target->sslfp);
+ }
if(target->mark) {
reply("OSMSG_WHOIS_MARK", target->mark);
}
+ if(target->marks) {
+ char markbuf[MAXLEN] = "";
+ unsigned int ii = 0;
+
+ string_list_sort(user->marks);
+
+ for (ii=0; ii<user->marks->used; ii++)
+ {
+ if (markbuf[0] && strlen(markbuf) + strlen(user->marks->list[ii]) + 4 > 70) {
+ reply("OSMSG_WHOIS_MARKS", markbuf);
+ memset(&markbuf, 0, MAXLEN);
+ }
+
+ if (markbuf[0])
+ strcat(markbuf, ", ");
+ strcat(markbuf, user->marks->list[ii]);
+ }
+
+ if (markbuf[0])
+ reply("OSMSG_WHOIS_MARKS", markbuf);
+ }
+
reply("OSMSG_WHOIS_NO_NOTICE", target->no_notice ? "YES":"NO");
if (target->modes) {
- bpos = 0;
+ bpos = irc_user_modes(target, buffer, sizeof(buffer));
#define buffer_cat(str) (herelen = strlen(str), memcpy(buffer+bpos, str, herelen), bpos += herelen)
- if (IsInvisible(target)) buffer[bpos++] = 'i';
- if (IsWallOp(target)) buffer[bpos++] = 'w';
- if (IsOper(target)) buffer[bpos++] = 'o';
- if (IsGlobal(target)) buffer[bpos++] = 'g';
- if (IsServNotice(target)) buffer[bpos++] = 's';
-
- // sethost - reed/apples
- // if (IsHelperIrcu(target)) buffer[bpos++] = 'h';
- if (IsSetHost(target)) buffer[bpos++] = 'h';
-
- if (IsService(target)) buffer[bpos++] = 'k';
- if (IsDeaf(target)) buffer[bpos++] = 'd';
- if (target->handle_info) buffer[bpos++] = 'r';
- if (IsHiddenHost(target)) buffer[bpos++] = 'x';
- if (IsBotM(target)) buffer[bpos++] = 'B';
- if (IsHideChans(target)) buffer[bpos++] = 'n';
- if (IsHideIdle(target)) buffer[bpos++] = 'I';
- if (IsXtraOp(target)) buffer[bpos++] = 'X';
if (IsGagged(target)) buffer_cat(" (gagged)");
if (IsRegistering(target)) buffer_cat(" (registered account)");
buffer[bpos] = 0;
return 1;
}
-static MODCMD_FUNC(cmd_stats_glines) {
- reply("OSMSG_GLINE_COUNT", gline_count());
- return 1;
-}
-
-static MODCMD_FUNC(cmd_stats_shuns) {
- reply("OSMSG_SHUN_COUNT", shun_count());
- return 1;
-}
-
static void
trace_links(struct userNode *bot, struct userNode *user, struct server *server, unsigned int depth) {
unsigned int nn, pos;
#endif
tbl.contents[nn][1] = buffer;
ofs = strlen(buffer) + 1;
- intervalString(buffer + ofs, now - server->link, user->handle_info);
+ intervalString(buffer + ofs, now - server->link_time, user->handle_info);
if (server->self_burst)
strcat(buffer + ofs, " Bursting");
tbl.contents[nn][2] = buffer + ofs;
struct opserv_user_alert *alert;
const char *reaction;
char t_buffer[INTERVALLEN];
+ char expire_buffer[30];
char *m = NULL;
if(argc > 1)
case REACT_SVSPART: reaction = "svspart"; break;
case REACT_VERSION: reaction = "version"; break;
case REACT_MARK: reaction = "mark"; break;
+ case REACT_NOTICEUSER: reaction = "noticeuser"; break;
+ case REACT_MSGUSER: reaction = "msguser"; break;
default: reaction = "<unknown>"; break;
}
reply("OSMSG_ALERT_IS", iter_key(it), reaction, alert->owner);
+ if (alert->expire) {
+ strftime(expire_buffer, sizeof(expire_buffer), "%Y-%m-%d %H:%M:%S %z", localtime(&alert->expire));
+ reply("OSMSG_ALERT_EXPIRE", expire_buffer);
+ }
reply("OSMSG_ALERTS_DESC", alert->text_discrim);
if (alert->last > 0)
reply("OSMSG_ALERTS_LAST", intervalString(t_buffer, now - alert->last, user->handle_info));
return NULL;
}
}
- if ((resv = AddClone(nick, ident, host, desc))) {
+ if ((resv = AddLocalUser(nick, ident, host, desc, "+i"))) {
dict_insert(opserv_reserved_nick_dict, resv->nick, resv);
}
return resv;
static int alert_check_user(const char *key, void *data, void *extra);
static int
-opserv_new_user_check(struct userNode *user)
+opserv_new_user_check(struct userNode *user, UNUSED_ARG(void *extra))
{
struct opserv_hostinfo *ohi;
struct gag_entry *gag;
/* Check for alerts, and stop if we find one that kills them. */
if (dict_foreach(opserv_user_alerts, alert_check_user, user))
- return 1;
+ return 0;
/* Gag them if appropriate. */
for (gag = gagList; gag; gag = gag->next) {
- if (user_matches_glob(user, gag->mask, MATCH_USENICK)) {
+ if (user_matches_glob(user, gag->mask, MATCH_USENICK, 0)) {
gag_helper_func(user, NULL);
break;
}
}
static void
-opserv_user_cleanup(struct userNode *user, UNUSED_ARG(struct userNode *killer), UNUSED_ARG(const char *why))
+opserv_user_cleanup(struct userNode *user, UNUSED_ARG(struct userNode *killer), UNUSED_ARG(const char *why), UNUSED_ARG(void *extra))
{
struct opserv_hostinfo *ohi;
char addr[IRC_NTOP_MAX_SIZE];
}
static void
-opserv_channel_check(struct chanNode *newchan)
+opserv_channel_check(struct chanNode *newchan, UNUSED_ARG(void *extra))
{
/*char *warning; */
}
static void
-opserv_channel_delete(struct chanNode *chan)
+opserv_channel_delete(struct chanNode *chan, UNUSED_ARG(void *extra))
{
timeq_del(0, opserv_part_channel, chan, TIMEQ_IGNORE_WHEN);
}
static void
-opserv_notice_handler(struct userNode *user, struct userNode *bot, char *text, UNUSED_ARG(int server_qualified))
+opserv_notice_handler(struct userNode *user, struct userNode *bot, const char *text, UNUSED_ARG(int server_qualified))
{
char *cmd;
+ char *textb;
+
+ textb = strdup(text);
+
/* if its a version reply, do an alert check (only alerts with version=something) */
if(bot == opserv) {
if(text[0] == '\001') {
- text++;
- cmd = mysep(&text, " ");
+ textb++;
+ cmd = mysep(&textb, " ");
if(cmd && !irccasecmp(cmd, "VERSION")) {
- char *version = mysep(&text, "\n");
+ char *version = mysep(&textb, "\n");
if(!version)
version = "";
/* opserv_debug("Opserv got CTCP VERSION Notice from %s: %s", user->nick, version); */
}
static int
-opserv_join_check(struct modeNode *mNode)
+opserv_join_check(struct modeNode *mNode, UNUSED_ARG(void *extra))
{
struct userNode *user = mNode->user;
struct chanNode *channel = mNode->channel;
if (IsService(user))
return 0;
- dict_foreach(opserv_channel_alerts, alert_check_user, user);
+ /* Check for alerts, and stop if we find one that kills them. */
+ if (dict_foreach(opserv_user_alerts, alert_check_user, user))
+ return 1;
- if (channel->bad_channel) {
+ if (opserv && channel->bad_channel) {
opserv_debug("Found $b%s$b in bad-word channel $b%s$b; removing the user.", user->nick, channel->name);
if (channel->name[0] != '#')
DelUser(user, opserv, 1, "OSMSG_ILLEGAL_KILL_REASON");
struct mod_chanmode change;
mod_chanmode_init(&change);
channel->join_flooded = 1;
- if (opserv_conf.join_flood_moderate && (channel->members.used > opserv_conf.join_flood_moderate_threshold)) {
+ if (opserv && opserv_conf.join_flood_moderate && (channel->members.used > opserv_conf.join_flood_moderate_threshold)) {
if (!GetUserMode(channel, opserv)) {
/* If we aren't in the channel, join it. */
change.args[0].mode = MODE_CHANOP;
reply("OSMSG_BAD_NUKING", orig_bad);
string_list_delete(opserv_bad_words, bad_idx);
bad_idx--;
- free(orig_bad);
}
return 1;
}
routing_change_karma(rps, iter_key(it), KARMA_ENTROPE);
/* give an additonal +KARMA_RELIABLE to servers that
* have been linked at least KARMA_TIMER seconds. */
- if(server && (server->link < (now - KARMA_TIMER) ) ) {
+ if(server && (server->link_time < (now - KARMA_TIMER) ) ) {
routing_change_karma(rps, iter_key(it), KARMA_RELIABLE);
}
}
/* Scan for existing channels that match the new bad word. */
if (!bad_found) {
for (it = dict_first(channels); it; it = iter_next(it)) {
- struct chanNode *channel = iter_data(it);
+ struct chanNode *chan = iter_data(it);
- if (!opserv_bad_channel(channel->name))
+ if (!opserv_bad_channel(chan->name))
continue;
- channel->bad_channel = 1;
- if (channel->name[0] == '#')
- opserv_shutdown_channel(channel, "OSMSG_ILLEGAL_REASON");
+ chan->bad_channel = 1;
+ if (chan->name[0] == '#')
+ opserv_shutdown_channel(chan, "OSMSG_ILLEGAL_REASON");
else {
unsigned int nn;
- for (nn=0; nn<channel->members.used; nn++) {
- struct userNode *user = channel->members.list[nn]->user;
+ for (nn=0; nn<chan->members.used; nn++) {
+ struct userNode *user = chan->members.list[nn]->user;
DelUser(user, cmd->parent->bot, 1, "OSMSG_ILLEGAL_KILL_REASON");
}
}
return 0;
}
count = strtoul(argv[2], &tmp, 10);
- if (!count || *tmp) {
+ if (*tmp != '\0') {
reply("OSMSG_BAD_NUMBER", argv[2]);
return 0;
}
reply("OSMSG_NOT_A_HOSTMASK");
return 0;
}
- if (!(clone = AddClone(argv[2], ident, argv[3]+i, userinfo))) {
+ if (!(clone = AddLocalUser(argv[2], ident, argv[3]+i, userinfo, "+i"))) {
reply("OSMSG_CLONE_FAILED", argv[2]);
return 0;
}
log_module(OS_LOG, LOG_ERROR, "Missing description for reserve of %s", key);
return 0;
}
- if ((reserve = AddClone(key, ident, hostname, desc))) {
+ if ((reserve = AddLocalUser(key, ident, hostname, desc, "+i"))) {
reserve->modes |= FLAGS_PERSISTENT;
dict_insert(extra, reserve->nick, reserve);
}
}
static struct opserv_user_alert *
-opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_reaction reaction, const char *text_discrim, int last)
+opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_reaction reaction, const char *text_discrim, int last, int expire, const char *action)
{
unsigned int wordc;
char *wordv[MAXNUMPARAMS], *discrim_copy;
alert->last = last;
discrim_copy = strdup(text_discrim); /* save a copy of the discrim */
wordc = split_line(discrim_copy, false, ArrayLength(wordv), wordv);
- alert->discrim = opserv_discrim_create(req, opserv, wordc, wordv, 0);
+ alert->discrim = opserv_discrim_create(req, opserv, wordc, wordv, 0, action);
+ alert->expire = expire;
/* Check for missing required criteria or broken records */
if (!alert->discrim || (reaction==REACT_SVSJOIN && !alert->discrim->chantarget) ||
(reaction==REACT_SVSPART && !alert->discrim->chantarget) ||
* max_channels would have to be checked on /part, which we do not
* yet do, and which seems of questionable value.
*/
- if (alert->discrim->channel || alert->discrim->min_channels)
+ if (alert->discrim->channel_count || alert->discrim->min_channels)
dict_insert(opserv_channel_alerts, name_dup, alert);
if (alert->discrim->mask_nick)
dict_insert(opserv_nick_based_alerts, name_dup, alert);
if (alert->discrim->accountmask)
dict_insert(opserv_account_based_alerts, name_dup, alert);
+
+ if (alert->expire)
+ timeq_add(alert->expire, alert_expire, (void*)name_dup);
return alert;
}
{
dict_t alert_dict;
char *str;
- int last = 0;
+ int last = 0, expire = 0;
const char *discrim, *react, *owner;
opserv_alert_reaction reaction;
struct opserv_user_alert *alert;
str = database_get_data(alert_dict, KEY_LAST, RECDB_QSTRING);
if (str)
last = atoi(str);
+ str = database_get_data(alert_dict, KEY_EXPIRE, RECDB_QSTRING);
+ if (str)
+ expire = atoi(str);
if (!react || !irccasecmp(react, "notice"))
reaction = REACT_NOTICE;
reaction = REACT_VERSION;
else if (!irccasecmp(react, "mark"))
reaction = REACT_MARK;
+ else if (!irccasecmp(react, "noticeuser"))
+ reaction = REACT_NOTICEUSER;
+ else if (!irccasecmp(react, "msguser"))
+ reaction = REACT_MSGUSER;
else {
log_module(OS_LOG, LOG_ERROR, "Invalid reaction %s for alert %s.", react, key);
return 0;
}
- alert = opserv_add_user_alert(opserv, key, reaction, discrim, last);
+ alert = opserv_add_user_alert(opserv, key, reaction, discrim, last, expire, react);
if (!alert) {
log_module(OS_LOG, LOG_ERROR, "Unable to create alert %s from database.", key);
return 0;
saxdb_write_string(ctx, KEY_DISCRIM, alert->text_discrim);
saxdb_write_string(ctx, KEY_OWNER, alert->owner);
saxdb_write_int(ctx, KEY_LAST, alert->last);
+ saxdb_write_int(ctx, KEY_EXPIRE, alert->expire);
switch (alert->reaction) {
case REACT_NOTICE: reaction = "notice"; break;
case REACT_KILL: reaction = "kill"; break;
case REACT_SVSPART: reaction = "svspart"; break;
case REACT_VERSION: reaction = "version"; break;
case REACT_MARK: reaction = "mark"; break;
+ case REACT_NOTICEUSER: reaction = "noticeuser"; break;
+ case REACT_MSGUSER: reaction = "msguser"; break;
default:
reaction = NULL;
log_module(OS_LOG, LOG_ERROR, "Invalid reaction type %d for alert %s (while writing database).", alert->reaction, iter_key(it));
}
static discrim_t
-opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel)
+opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel, const char *action)
{
unsigned int i, j;
discrim_t discrim;
goto fail;
}
} else if (irccasecmp(argv[i], "mark") == 0) {
+ if (irccasecmp(action, "mark")) {
+ send_message(user, bot, "OSMSG_MARK_NOTMARKED");
+ goto fail;
+ }
if(!is_valid_mark(argv[i+1])) {
send_message(user, bot, "OSMSG_MARK_INVALID");
goto fail;
}
} else if (irccasecmp(argv[i], "duration") == 0) {
discrim->duration = ParseInterval(argv[++i]);
- } else if (irccasecmp(argv[i], "channel") == 0) {
- for (j=0, i++; ; j++) {
- switch (argv[i][j]) {
- case '#':
- goto find_channel;
- case '-':
- discrim->chan_no_modes |= MODE_CHANOP | MODE_HALFOP | MODE_VOICE;
- break;
- case '+':
- discrim->chan_req_modes |= MODE_VOICE;
- discrim->chan_no_modes |= MODE_CHANOP;
- discrim->chan_no_modes |= MODE_HALFOP;
- break;
- case '%':
- discrim->chan_req_modes |= MODE_HALFOP;
- discrim->chan_no_modes |= MODE_CHANOP;
- discrim->chan_no_modes |= MODE_VOICE;
- break;
- case '@':
- discrim->chan_req_modes |= MODE_CHANOP;
- break;
- case '\0':
- send_message(user, bot, "MSG_NOT_CHANNEL_NAME");
- goto fail;
- }
+ } else if (irccasecmp(argv[i], "channel") == 0) {
+ if(discrim->channel_count == DISCRIM_MAX_CHANS)
+ {
+ send_message(user, opserv, "OSMSG_TRACE_MAX_CHANNELS", DISCRIM_MAX_CHANS);
+ goto fail;
+ }
+
+ for (j=0, i++; ; j++) {
+ switch (argv[i][j]) {
+ case '#':
+ goto find_channel;
+ case '-':
+ discrim->chan_no_modes[discrim->channel_count] |= MODE_CHANOP | MODE_VOICE;
+ break;
+ case '+':
+ discrim->chan_req_modes[discrim->channel_count] |= MODE_VOICE;
+ discrim->chan_no_modes[discrim->channel_count] |= MODE_CHANOP;
+ discrim->chan_no_modes[discrim->channel_count] |= MODE_HALFOP;
+ break;
+ case '%':
+ discrim->chan_req_modes[discrim->channel_count] |= MODE_HALFOP;
+ discrim->chan_no_modes[discrim->channel_count] |= MODE_CHANOP;
+ discrim->chan_no_modes[discrim->channel_count] |= MODE_VOICE;
+ break;
+ case '@':
+ discrim->chan_req_modes[discrim->channel_count] |= MODE_CHANOP;
+ break;
+ case '\0':
+ send_message(user, opserv, "MSG_NOT_CHANNEL_NAME");
+ goto fail;
}
- find_channel:
- discrim->chan_no_modes &= ~discrim->chan_req_modes;
- if (!(discrim->channel = GetChannel(argv[i]+j))) {
- /* secretly "allow_channel" now means "if a channel name is
- * specified, require that it currently exist" */
- if (allow_channel) {
- send_message(user, bot, "MSG_CHANNEL_UNKNOWN", argv[i]);
- goto fail;
- } else {
- discrim->channel = AddChannel(argv[i]+j, now, NULL, NULL, NULL);
- }
+ }
+ find_channel:
+ discrim->chan_no_modes[discrim->channel_count] &= ~discrim->chan_req_modes[discrim->channel_count];
+ if (!(discrim->channels[discrim->channel_count] = GetChannel(argv[i]+j))) {
+ /* secretly "allow_channel" now means "if a channel name is
+ * specified, require that it currently exist" */
+ if (allow_channel) {
+ send_message(user, opserv, "MSG_CHANNEL_UNKNOWN", argv[i]);
+ goto fail;
+ } else {
+ discrim->channels[discrim->channel_count] = AddChannel(argv[i]+j, now, NULL, NULL, NULL);
}
- LockChannel(discrim->channel);
- } else if (irccasecmp(argv[i], "numchannels") == 0) {
- discrim->min_channels = discrim->max_channels = strtoul(argv[++i], NULL, 10);
- } else if (irccasecmp(argv[i], "limit") == 0) {
- discrim->limit = strtoul(argv[++i], NULL, 10);
+ }
+ LockChannel(discrim->channels[discrim->channel_count]);
+ discrim->channel_count++;
+ } else if (irccasecmp(argv[i], "numchannels") == 0) {
+ discrim->min_channels = discrim->max_channels = strtoul(argv[++i], NULL, 10);
+ } else if (irccasecmp(argv[i], "limit") == 0) {
+ discrim->limit = strtoul(argv[++i], NULL, 10);
} else if (irccasecmp(argv[i], "reason") == 0) {
discrim->reason = strdup(unsplit_string(argv+i+1, argc-i-1, NULL));
i = argc;
+ } else if (irccasecmp(argv[i], "notice_target") == 0 || irccasecmp(argv[i], "target") == 0) {
+ if (!IsChannelName(argv[i + 1])) {
+ send_message(user, opserv, "MSG_NOT_CHANNEL_NAME");
+ goto fail;
+ }
+ discrim->notice_target = argv[++i];
} else if (irccasecmp(argv[i], "last") == 0) {
discrim->min_ts = now - ParseInterval(argv[++i]);
} else if ((irccasecmp(argv[i], "linked") == 0)
discrim->max_ts = now - (ParseInterval(cmp+1) - 1);
}
} else {
- discrim->min_ts = now - ParseInterval(cmp+2);
+ discrim->min_ts = now - ParseInterval(cmp);
}
} else if (irccasecmp(argv[i], "access") == 0) {
const char *cmp = argv[++i];
discrim->min_level = strtoul(cmp+1, NULL, 0) + 1;
}
} else {
- discrim->min_level = strtoul(cmp+2, NULL, 0);
+ discrim->min_level = strtoul(cmp, NULL, 0);
+ }
+ } else if (irccasecmp(argv[i], "abuse") == 0) {
+ const char *abuse_what = argv[++i];
+ if (irccasecmp(abuse_what, "opers") == 0) {
+ discrim->match_opers = 1;
+ } else if (irccasecmp(abuse_what, "trusted") == 0) {
+ discrim->match_trusted = 1;
}
- } else if ((irccasecmp(argv[i], "abuse") == 0)
- && (irccasecmp(argv[++i], "opers") == 0)) {
- discrim->match_opers = 1;
} else if (irccasecmp(argv[i], "depth") == 0) {
discrim->domain_depth = strtoul(argv[++i], NULL, 0);
} else if (irccasecmp(argv[i], "clones") == 0) {
static int
discrim_match(discrim_t discrim, struct userNode *user)
{
- unsigned int access;
+ unsigned int level, i;
char *scmp=NULL, *dcmp=NULL;
+ int markmatched = 0;
+
+ if (discrim->mask_mark)
+ {
+ unsigned int ii = 0;
+
+ if (user->mark && match_ircglob(user->mark, discrim->mask_mark))
+ markmatched = 1;
+
+ if (user->marks)
+ for (ii=0; ii<user->marks->used; ii++)
+ if (match_ircglob(user->marks->list[ii], discrim->mask_mark))
+ markmatched = 1;
+ }
if ((user->timestamp < discrim->min_ts)
|| (user->timestamp > discrim->max_ts)
|| (discrim->info_space == 0 && user->info[0] == ' ')
|| (discrim->info_space == 1 && user->info[0] != ' ')
|| (discrim->server && !match_ircglob(user->uplink->name, discrim->server))
- || (discrim->mask_mark && (!user->mark || !match_ircglob(user->mark, discrim->mask_mark)))
+ || (discrim->mask_mark && !markmatched)
|| (discrim->accountmask && (!user->handle_info || !match_ircglob(user->handle_info->handle, discrim->accountmask)))
|| (discrim->ip_mask_bits && !irc_check_mask(&user->ip, &discrim->ip_mask, discrim->ip_mask_bits))
)
return 0;
- if (discrim->channel && !GetUserMode(discrim->channel, user))
- return 0;
+ for(i = 0; i < discrim->channel_count; i++)
+ if (!GetUserMode(discrim->channels[i], user))
+ return 0;
if(discrim->use_regex)
{
case 'w':
if(IsWallOp(user)) matches++;
break;
- case 's':
- if(IsServNotice(user)) matches++;
- break;
case 'd':
if(IsDeaf(user)) matches++;
break;
case 'x':
if(IsHiddenHost(user)) matches++;
break;
+ case 'a':
+ if(IsAdmin(user)) matches++;
+ break;
+ case 'z':
+ if(IsSSL(user)) matches++;
+ break;
+ case 'D':
+ if(IsPrivDeaf(user)) matches++;
+ break;
+ case 'R':
+ if(IsAccountOnly(user)) matches++;
+ break;
+ case 'W':
+ if(IsWhoisNotice(user)) matches++;
+ break;
+ case 'H':
+ if(IsHideOper(user)) matches++;
+ break;
+ case 'L':
+ if(IsHideOper(user)) matches++;
+ break;
+ case 'q':
+ if(IsCommonChansOnly(user)) matches++;
+ break;
}
}
if (matches != strlen(discrim->modes)) return 0;
}
- access = user->handle_info ? user->handle_info->opserv_level : 0;
- if ((access < discrim->min_level)
- || (access > discrim->max_level)) {
+ level = user->handle_info ? user->handle_info->opserv_level : 0;
+ if ((level < discrim->min_level)
+ || (level > discrim->max_level)) {
return 0;
}
if (discrim->min_clones > 1) {
static unsigned int
opserv_discrim_search(discrim_t discrim, discrim_search_func dsf, void *data)
{
- unsigned int nn, count;
+ unsigned int nn, count, match;
struct userList matched;
userList_init(&matched);
/* Try most optimized search methods first */
- if (discrim->channel) {
- for (nn=0;
- (nn < discrim->channel->members.used)
- && (matched.used < discrim->limit);
- nn++) {
- struct modeNode *mn = discrim->channel->members.list[nn];
- if (((mn->modes & discrim->chan_req_modes) != discrim->chan_req_modes)
- || ((mn->modes & discrim->chan_no_modes) != 0)) {
+ if (discrim->channel_count)
+ {
+ for (nn=0; (nn < discrim->channels[0]->members.used)
+ && (matched.used < discrim->limit);
+ nn++) {
+ struct modeNode *mn = discrim->channels[0]->members.list[nn];
+
+ if (((mn->modes & discrim->chan_req_modes[0]) != discrim->chan_req_modes[0])
+ || ((mn->modes & discrim->chan_no_modes[0]) != 0)) {
continue;
}
- if (discrim_match(discrim, mn->user)) {
- userList_append(&matched, mn->user);
+ if ((match = discrim_match(discrim, mn->user)))
+ {
+ unsigned int i;
+
+ for (i = 1; i < discrim->channel_count; i++) {
+ struct modeNode *mn2 = GetUserMode(discrim->channels[i], mn->user);
+
+ if (((mn2->modes & discrim->chan_req_modes[i]) != discrim->chan_req_modes[i])
+ || ((mn2->modes & discrim->chan_no_modes[i]) != 0)) {
+ match = 0;
+ break;
+ }
+ }
+
+ if (match)
+ userList_append(&matched, mn->user);
}
}
} else if (discrim->ip_mask_bits == 128) {
return 0;
}
+static int
+trace_privmsg_func(struct userNode *match, void *extra)
+{
+ struct discrim_and_source *das = extra;
+ char *reason;
+ if (das->discrim->reason) {
+ reason = das->discrim->reason;
+ irc_privmsg_user(opserv, match, reason);
+ }
+ return 0;
+}
+
+static int
+trace_notice_func(struct userNode *match, void *extra)
+{
+ struct discrim_and_source *das = extra;
+ char *reason;
+ if (das->discrim->reason) {
+ reason = das->discrim->reason;
+ irc_notice_user(opserv, match, reason);
+ }
+ return 0;
+}
+
static int
trace_count_func(UNUSED_ARG(struct userNode *match), UNUSED_ARG(void *extra))
{
}
static int
-is_oper_victim(struct userNode *user, struct userNode *target, int match_opers)
+is_oper_victim(struct userNode *user, struct userNode *target, int match_opers, int check_ip)
{
- return !(IsService(target)
- || (!match_opers && IsOper(target))
- || (target->handle_info
- && target->handle_info->opserv_level > user->handle_info->opserv_level));
+ unsigned char is_victim;
+ unsigned int nn;
+
+ is_victim = !(IsService(target)
+ || (!match_opers && IsOper(target))
+ || (target->handle_info
+ && target->handle_info->opserv_level > user->handle_info->opserv_level));
+
+ /* If we don't need an ip check or want to hit opers or the the "cheap" check already disqualified the target, we are done. */
+ if (!check_ip || match_opers || !is_victim)
+ return is_victim;
+
+ for(nn = 0; nn < curr_opers.used; nn++) {
+ if(memcmp(&curr_opers.list[nn]->ip, &target->ip, sizeof(irc_in_addr_t)) == 0)
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+is_trust_victim(struct userNode *target, int match_trusted)
+{
+ return (match_trusted || !dict_find(opserv_trusted_hosts, irc_ntoa(&target->ip), NULL));
}
static int
{
struct discrim_and_source *das = extra;
- if (is_oper_victim(das->source, match, das->discrim->match_opers)) {
+
+ if (is_oper_victim(das->source, match, das->discrim->match_opers, 1) && is_trust_victim(match, das->discrim->match_trusted)) {
opserv_block(match, das->source->handle_info->handle, das->discrim->reason, das->discrim->duration, das->discrim->silent);
}
{
struct discrim_and_source *das = extra;
- if (is_oper_victim(das->source, match, das->discrim->match_opers)) {
+ if (is_oper_victim(das->source, match, das->discrim->match_opers, 1) && is_trust_victim(match, das->discrim->match_trusted)) {
opserv_shun(match, das->source->handle_info->handle, das->discrim->reason, das->discrim->duration);
}
{
struct discrim_and_source *das = extra;
- if (is_oper_victim(das->source, match, das->discrim->match_opers)) {
+ if (is_oper_victim(das->source, match, das->discrim->match_opers, 1)) {
char *reason;
if (das->discrim->reason) {
reason = das->discrim->reason;
{
struct discrim_and_source *das = extra;
- if (is_oper_victim(das->source, match, das->discrim->match_opers)) {
+ if (is_oper_victim(das->source, match, das->discrim->match_opers, 1) && is_trust_victim(match, das->discrim->match_trusted)) {
char *reason, *mask;
int masksize;
if (das->discrim->reason) {
{
struct discrim_and_source das;
discrim_search_func action;
- unsigned int matches;
+ unsigned int matches, i;
struct svccmd *subcmd;
char buf[MAXLEN];
int ret = 1;
action = trace_print_func;
else if (!irccasecmp(argv[1], "count"))
action = trace_count_func;
+ else if (!irccasecmp(argv[1], "privmsg"))
+ action = trace_privmsg_func;
+ else if (!irccasecmp(argv[1], "notice"))
+ action = trace_notice_func;
else if (!irccasecmp(argv[1], "domains"))
action = trace_domains_func;
else if (!irccasecmp(argv[1], "gline"))
das.dict = NULL;
das.source = user;
das.destination = cmd->parent->bot;
- das.discrim = opserv_discrim_create(user, cmd->parent->bot, argc-2, argv+2, 1);
+ das.discrim = opserv_discrim_create(user, cmd->parent->bot, argc-2, argv+2, 1, argv[1]);
if (!das.discrim)
return 0;
reply("MSG_NO_MATCHES");
}
- if (das.discrim->channel)
- UnlockChannel(das.discrim->channel);
+ for (i = 0; i < das.discrim->channel_count; i++)
+ UnlockChannel(das.discrim->channels[i]);
free(das.discrim->reason);
if(das.discrim->has_regex_nick)
discrim = calloc(1, sizeof(*discrim));
discrim->limit = 25;
+ discrim->max_users = ~0;
+ /* So, time_t is frequently signed. Fun. */
+ discrim->max_ts = (1ul << (CHAR_BIT * sizeof(time_t) - 1)) - 1;
for (i = 0; i < argc; i++) {
/* Assume all criteria require arguments. */
else
discrim->min_users = strtoul(cmp+1, NULL, 0) + 1;
} else {
- discrim->min_users = strtoul(cmp+2, NULL, 0);
+ discrim->min_users = strtoul(cmp, NULL, 0);
}
} else if (!irccasecmp(argv[i], "timestamp")) {
const char *cmp = argv[++i];
{
if ((discrim->name && !match_ircglob(chan->name, discrim->name)) ||
(discrim->topic && !match_ircglob(chan->topic, discrim->topic)) ||
- (discrim->min_users && chan->members.used < discrim->min_users) ||
- (discrim->max_users && chan->members.used > discrim->max_users) ||
- (discrim->min_ts && chan->timestamp < discrim->min_ts) ||
- (discrim->max_ts && chan->timestamp > discrim->max_ts)) {
+ (chan->members.used < discrim->min_users) ||
+ (chan->members.used > discrim->max_users) ||
+ (chan->timestamp < discrim->min_ts) ||
+ (chan->timestamp > discrim->max_ts)) {
return 0;
}
return 1;
gtrace_print_func(struct gline *gline, void *extra)
{
struct gline_extra *xtra = extra;
- char *when_text, set_text[20];
- strftime(set_text, sizeof(set_text), "%Y-%m-%d", localtime(&gline->issued));
- when_text = asctime(localtime(&gline->expires));
- when_text[strlen(when_text)-1] = 0; /* strip lame \n */
- send_message(xtra->user, xtra->bot, "OSMSG_GTRACE_FORMAT", gline->target, set_text, gline->issuer, when_text, gline->reason);
+ char issued[INTERVALLEN];
+ char expires[INTERVALLEN];
+
+ intervalString(issued, now - gline->issued, xtra->user->handle_info);
+ if (gline->expires)
+ intervalString(expires, gline->expires - now, xtra->user->handle_info);
+ else
+ strcpy(expires, "never");
+ send_message(xtra->user, opserv, "OSMSG_GTRACE_FORMAT", gline->target, issued, gline->issuer, expires, gline->reason);
+}
+
+static MODCMD_FUNC(cmd_stats_glines) {
+ if (argc < 2) {
+ reply("OSMSG_GLINE_COUNT", gline_count());
+ return 1;
+ } else if (argc < 3) {
+ struct gline_extra extra;
+ struct gline *gl;
+
+ extra.user = user;
+ gl = gline_find(argv[1]);
+ if (!gl)
+ reply("OSMSG_NO_GLINE", argv[1]);
+ else
+ gtrace_print_func(gl, &extra);
+ return 1;
+ } else return 0;
}
static void
strace_print_func(struct shun *shun, void *extra)
{
struct shun_extra *xtra = extra;
- char *when_text, set_text[20];
- strftime(set_text, sizeof(set_text), "%Y-%m-%d", localtime(&shun->issued));
- when_text = asctime(localtime(&shun->expires));
- when_text[strlen(when_text)-1] = 0; /* strip lame \n */
- send_message(xtra->user, xtra->bot, "OSMSG_STRACE_FORMAT", shun->target, set_text, shun->issuer, when_text, shun->reason);
+ char issued[INTERVALLEN];
+ char expires[INTERVALLEN];
+
+ intervalString(issued, now - shun->issued, xtra->user->handle_info);
+ if (shun->expires)
+ intervalString(expires, shun->expires - now, xtra->user->handle_info);
+ else
+ strcpy(expires, "never");
+ send_message(xtra->user, opserv, "OSMSG_STRACE_FORMAT", shun->target, issued, shun->issuer, expires, shun->reason);
+}
+
+static MODCMD_FUNC(cmd_stats_shuns) {
+ if (argc < 2) {
+ reply("OSMSG_SHUN_COUNT", shun_count());
+ return 1;
+ } else if (argc < 3) {
+ struct shun_extra extra;
+ struct shun *gl;
+
+ extra.user = user;
+ gl = shun_find(argv[1]);
+ if (!gl)
+ reply("OSMSG_NO_SHUN", argv[1]);
+ else
+ strace_print_func(gl, &extra);
+ return 1;
+ } else return 0;
}
static void
return 0;
}
+ if ((alert->reaction != REACT_NOTICE)
+ && !is_trust_victim(user, alert->discrim->match_trusted)) {
+ return 0;
+ }
+
/* The user matches the alert criteria, so trigger the reaction. */
if (alert->discrim->option_log)
log_module(OS_LOG, LOG_INFO, "Alert %s triggered by user %s!%s@%s (%s).", key, user->nick, user->ident, user->hostname, alert->discrim->reason);
log_module(OS_LOG, LOG_ERROR, "Invalid reaction type %d for alert %s.", alert->reaction, key);
/* fall through to REACT_NOTICE case */
case REACT_NOTICE:
- opserv_alert("Alert $b%s$b triggered by user $b%s$b!%s@%s (%s).", key, user->nick, user->ident, user->hostname, alert->discrim->reason);
+ opserv_custom_alert(alert->discrim->notice_target, "Alert $b%s$b triggered by user $b%s$b!%s@%s (%s).", key, user->nick, user->ident, user->hostname, alert->discrim->reason);
break;
case REACT_TRACK:
#ifdef HAVE_TRACK
add_track_user(user);
#endif
break;
+ case REACT_NOTICEUSER:
+ irc_notice_user(opserv, user, alert->discrim->reason);
+ break;
+ case REACT_MSGUSER:
+ irc_privmsg_user(opserv, user, alert->discrim->reason);
+ break;
}
return 0;
}
static void
-opserv_alert_check_account(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
+opserv_alert_check_account(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle), UNUSED_ARG(void *extra))
{
dict_foreach(opserv_account_based_alerts, alert_check_user, user);
}
static void
-opserv_alert_check_nick(struct userNode *user, UNUSED_ARG(const char *old_nick))
+opserv_alert_check_nick(struct userNode *user, UNUSED_ARG(const char *old_nick), UNUSED_ARG(void *extra))
{
struct gag_entry *gag;
/* Gag them if appropriate (and only if). */
user->modes &= ~FLAGS_GAGGED;
for (gag = gagList; gag; gag = gag->next) {
- if (user_matches_glob(user, gag->mask, MATCH_USENICK)) {
+ if (user_matches_glob(user, gag->mask, MATCH_USENICK, 0)) {
gag_helper_func(user, NULL);
break;
}
}
static void
-opserv_staff_alert(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
+opserv_staff_alert(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle), UNUSED_ARG(void *extra))
{
const char *type;
struct svccmd *subcmd;
const char *name;
char buf[MAXLEN];
+ int expire = 0;
name = argv[1];
sprintf(buf, "addalert %s", argv[2]);
reaction = REACT_VERSION;
else if(!irccasecmp(argv[2], "mark"))
reaction = REACT_MARK;
+ else if(!irccasecmp(argv[2], "noticeuser"))
+ reaction = REACT_NOTICEUSER;
+ else if(!irccasecmp(argv[2], "msguser"))
+ reaction = REACT_MSGUSER;
else {
reply("OSMSG_UNKNOWN_REACTION", argv[2]);
return 0;
}
+
+ if (argc >= 4 && !irccasecmp(argv[3], "expire"))
+ expire = now + ParseInterval(argv[4]);
+
if (!svccmd_can_invoke(user, opserv_service->bot, subcmd, channel, SVCCMD_NOISY)
- || !opserv_add_user_alert(user, name, reaction, unsplit_string(argv + 3, argc - 3, NULL), 0)) {
+ || !opserv_add_user_alert(user, name, reaction, unsplit_string(argv + (expire ? 5 : 3), argc - (expire ? 5 : 3), NULL), 0, expire, argv[2])) {
reply("OSMSG_ALERT_ADD_FAILED");
return 0;
}
return 1;
}
+static int delete_alert(char const* name)
+{
+ dict_remove(opserv_nick_based_alerts, (char const*)name);
+ dict_remove(opserv_channel_alerts, (char const*)name);
+ dict_remove(opserv_account_based_alerts, (char const*)name);
+ return dict_remove(opserv_user_alerts, (char const*)name);
+}
+
+static void alert_expire(void* name)
+{
+ int present = 0;
+ struct opserv_user_alert* alert = NULL;
+
+ alert = dict_find(opserv_user_alerts, (char const*)name, &present);
+
+ if (present && alert && alert->expire > 0 && alert->expire <= now)
+ delete_alert(name);
+}
+
static MODCMD_FUNC(cmd_delalert)
{
unsigned int i;
for (i=1; i<argc; i++) {
- dict_remove(opserv_nick_based_alerts, argv[i]);
- dict_remove(opserv_channel_alerts, argv[i]);
- dict_remove(opserv_account_based_alerts, argv[i]);
- if (dict_remove(opserv_user_alerts, argv[i]))
+ if (delete_alert(argv[i]))
reply("OSMSG_REMOVED_ALERT", argv[i]);
else
reply("OSMSG_NO_SUCH_ALERT", argv[i]);
}
static void
-opserv_db_cleanup(void)
+opserv_db_cleanup(UNUSED_ARG(void* extra))
{
unsigned int nn;
free_string_list(opserv_bad_words);
dict_delete(opserv_exempt_channels);
dict_delete(opserv_trusted_hosts);
- unreg_del_user_func(opserv_user_cleanup);
+ unreg_del_user_func(opserv_user_cleanup, NULL);
dict_delete(opserv_hostinfo_dict);
dict_delete(opserv_nick_based_alerts);
dict_delete(opserv_account_based_alerts);
OS_LOG = log_register_type("OpServ", "file:opserv.log");
if (nick) {
const char *modes = conf_get_data("services/opserv/modes", RECDB_QSTRING);
- opserv = AddService(nick, modes ? modes : NULL, "Oper Services", NULL);
+ opserv = AddLocalUser(nick, nick, NULL, "Oper Services", modes);
}
conf_register_reload(opserv_conf_read);
opserv_define_func("ACCESS", cmd_access, 0, 0, 0);
opserv_define_func("ADDALERT", cmd_addalert, 800, 0, 4);
opserv_define_func("ADDALERT NOTICE", NULL, 0, 0, 0);
+ opserv_define_func("ADDALERT NOTICEUSER", NULL, 0, 0, 0);
+ opserv_define_func("ADDALERT MSGUSER", NULL, 0, 0, 0);
opserv_define_func("ADDALERT SILENT", NULL, 900, 0, 0);
opserv_define_func("ADDALERT GLINE", NULL, 900, 0, 0);
opserv_define_func("ADDALERT SHUN", NULL, 900, 0, 0);
opserv_define_func("STRACE PRINT", NULL, 0, 0, 0);
opserv_define_func("INVITE", cmd_invite, 100, 2, 0);
opserv_define_func("INVITEME", cmd_inviteme, 100, 0, 0);
- opserv_define_func("JOIN", cmd_join, 601, 0, 2);
+ opserv_define_func("JOIN", cmd_join, 601, 1, 0);
opserv_define_func("SVSNICK", cmd_svsnick, 999, 0, 3);
opserv_define_func("SVSJOIN", cmd_svsjoin, 999, 0, 3);
opserv_define_func("SVSPART", cmd_svspart, 999, 0, 3);
opserv_define_func("JUMP", cmd_jump, 900, 0, 2);
opserv_define_func("JUPE", cmd_jupe, 900, 0, 4);
opserv_define_func("KICK", cmd_kick, 100, 2, 2);
+ opserv_define_func("FORCEKICK", cmd_forcekick, 800, 2, 2);
opserv_define_func("KICKALL", cmd_kickall, 400, 2, 0);
opserv_define_func("KICKBAN", cmd_kickban, 100, 2, 2);
opserv_define_func("KICKBANALL", cmd_kickbanall, 450, 2, 0);
opserv_define_func("HOPALL", cmd_hopall, 400, 2, 0);
opserv_define_func("MAP", cmd_stats_links, 0, 0, 0);
opserv_define_func("PRIVSET", cmd_privset, 900, 0, 3);
- opserv_define_func("PART", cmd_part, 601, 0, 2);
+ opserv_define_func("PART", cmd_part, 601, 2, 0);
opserv_define_func("QUERY", cmd_query, 0, 0, 0);
opserv_define_func("RAW", cmd_raw, 999, 0, 2);
opserv_define_func("RECONNECT", cmd_reconnect, 900, 0, 0);
opserv_define_func("TRACE", cmd_trace, 100, 0, 3);
opserv_define_func("TRACE PRINT", NULL, 0, 0, 0);
opserv_define_func("TRACE COUNT", NULL, 0, 0, 0);
+ opserv_define_func("TRACE PRIVMSG", NULL, 0, 0, 0);
+ opserv_define_func("TRACE NOTICE", NULL, 0, 0, 0);
opserv_define_func("TRACE DOMAINS", NULL, 0, 0, 0);
opserv_define_func("TRACE GLINE", NULL, 600, 0, 0);
opserv_define_func("TRACE SHUN", NULL, 600, 0, 0);
opserv_waiting_connections = dict_new();
dict_set_free_data(opserv_waiting_connections, opserv_free_waiting_connection);
- reg_new_user_func(opserv_new_user_check);
- reg_nick_change_func(opserv_alert_check_nick);
- reg_del_user_func(opserv_user_cleanup);
- reg_new_channel_func(opserv_channel_check);
- reg_del_channel_func(opserv_channel_delete);
- reg_join_func(opserv_join_check);
- reg_auth_func(opserv_staff_alert);
- reg_auth_func(opserv_alert_check_account);
+ reg_new_user_func(opserv_new_user_check, NULL);
+ reg_nick_change_func(opserv_alert_check_nick, NULL);
+ reg_del_user_func(opserv_user_cleanup, NULL);
+ reg_new_channel_func(opserv_channel_check, NULL);
+ reg_del_channel_func(opserv_channel_delete, NULL);
+ reg_join_func(opserv_join_check, NULL);
+ reg_auth_func(opserv_staff_alert, NULL);
+ reg_auth_func(opserv_alert_check_account, NULL);
reg_notice_func(opserv, opserv_notice_handler);
opserv_db_init();
/* start the karma timer, using the saved one if available */
routing_karma_timer(dict_find(opserv_routing_plan_options, "KARMA_TIMER", NULL));
- reg_exit_func(opserv_db_cleanup);
+ reg_exit_func(opserv_db_cleanup, NULL);
message_register_table(msgtab);
}
projects / irc / evilnet / x3.git / blobdiff