#include "nickserv.h"
#include "modcmd.h"
#include "modules.h"
+#include "proto.h"
#include "opserv.h"
#include "timeq.h"
#include "saxdb.h"
{ "OSMSG_NO_DEBUG_CHANNEL", "No debug channel has been configured." },
{ "OSMSG_INVITE_DONE", "Invited $b%s$b to $b%s$b." },
{ "OSMSG_ALREADY_THERE", "You are already in $b%s$b." },
+ { "OSMSG_NOT_THERE", "You not in $b%s$b." },
{ "OSMSG_JOIN_DONE", "I have joined $b%s$b." },
+ { "OSMSG_SVSJOIN_SENT", "Sent the SVSJOIN." },
+ { "OSMSG_SVSPART_SENT", "Sent the SVSPART." },
{ "OSMSG_ALREADY_JOINED", "I am already in $b%s$b." },
{ "OSMSG_NOT_ON_CHANNEL", "$b%s$b does not seem to be on $b%s$b." },
{ "OSMSG_KICKALL_DONE", "I have cleared out %s." },
{ "OSMSG_WHOIS_POSTAL_CODE","Postal Code : %s" },
{ "OSMSG_WHOIS_LATITUDE", "Latitude : %f" },
{ "OSMSG_WHOIS_LONGITUDE", "Longitude : %f" },
+ { "OSMSG_WHOIS_MAP", "Map : %s" },
{ "OSMSG_WHOIS_DMA_CODE", "DMA Code : %d" },
{ "OSMSG_WHOIS_AREA_CODE", "Area Code : %d" },
{ "OSMSG_WHOIS_MODES", "Modes : +%s " },
{ "OSMSG_WHOIS_SERVER", "Server : %s" },
{ "OSMSG_WHOIS_NICK_AGE", "Nick Age : %s" },
{ "OSMSG_WHOIS_ACCOUNT", "Account : %s" },
+ { "OSMSG_WHOIS_PRIVS", "IRCd Privs : %s" },
{ "OSMSG_WHOIS_CHANNELS", "Channels : %s" },
{ "OSMSG_WHOIS_HIDECHANS", "Channel list omitted for your sanity." },
+ { "OSMSG_WHOIS_VERSION", "Version : %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_CHANNEL_DEVOICED", "All voiced users on %s de-voiced." },
{ "OSMSG_USER_SEARCH_BAR", "-------------------------------------------" },
{ "OSMSG_USER_SEARCH_COUNT", "There were %4u matches" },
{ "OSMSG_USER_SEARCH_COUNT_BAR", "------------ Found %4u matches -----------" },
+ { "OSMSG_SVSJOIN_NO_TARGET", "SVSJOIN action requires chantarget criteria (where should they join?)" },
+ { "OSMSG_SVSPART_NO_TARGET", "SVSPART action requires chantarget criteria (where should they join?)" },
{ "OSMSG_CHANNEL_SEARCH_RESULTS", "The following channels were found:" },
{ "OSMSG_GLINE_SEARCH_RESULTS", "The following glines were found:" },
{ "OSMSG_SHUN_SEARCH_RESULTS", "The following shun were found:" },
{ "OSMSG_ALERT_EXISTS", "An alert named $b%s$b already exists." },
{ "OSMSG_UNKNOWN_REACTION", "Unknown alert reaction $b%s$b." },
{ "OSMSG_ADDED_ALERT", "Added alert named $b%s$b." },
+ { "OSMSG_ALERT_ADD_FAILED", "Unable to add alert. Check syntax, required parts, and access" },
{ "OSMSG_REMOVED_ALERT", "Removed alert named $b%s$b." },
{ "OSMSG_NO_SUCH_ALERT", "No alert named $b%s$b could be found." },
- { "OSMSG_ALERTS_LIST", "$bCurrent $O alerts$b" },
+ { "OSMSG_ALERTS_LIST", "$bCurrent $O alerts matching '$b%s$b'$b" },
{ "OSMSG_ALERTS_BAR", "----------------------------------------------" },
{ "OSMSG_ALERTS_HEADER", "Name Action (by Oper)" },
{ "OSMSG_ALERTS_DESC", " Criteria: %s" },
{ "OSMSG_ALERT_IS", "$b%-20s$b %-6s (by %s)" },
{ "OSMSG_ALERT_END", "----------------End of Alerts-----------------" },
/* routing messages */
- { "OSMSG_ROUTINGPLAN_LIST", "$bRouting Plans$b" },
+ { "OSMSG_ROUTINGPLAN", "$bRouting Plan(s)$b" },
+ { "OSMSG_ROUTINGPLAN_LIST_HEAD", "$bRouting Plans$b" },
{ "OSMSG_ROUTINGPLAN_BAR", "----------------------------------------------" },
- { "OSMSG_ROUTINGPLAN_END", "-------------End of Routing Plans-------------" },
+ { "OSMSG_ROUTINGPLAN_END", "------------End of Routing Plan(s)------------" },
{ "OSMSG_ROUTINGPLAN_OPTION", "%s is set to %s" },
{ "OSMSG_ROUTINGPLAN_ACTIVE", "Auto routing is active, using plan '%s'." },
{ "OSMSG_ROUTING_ACTIVATION_ERROR", "There was an error activating the routing plan. Check for loops, and make sure the map includes my own uplink." },
{ "OSMSG_ROUTINGPLAN_OPTION_NOT_FOUND", "There is no routing plan option '%s'." },
{ "OSMSG_ROUTINGPLAN_OPTION_NOT_SET", "Option '%s' is not currently set." },
{ "OSMSG_ROUTINGPLAN_NAME", "$b%s:$b" },
+ { "OSMSG_ROUTINGPLAN_LIST", "$b%s$b" },
{ "OSMSG_ROUTINGPLAN_SERVER"," %s:%d <-- %s[%d/%s] (%s)" },
{ "OSMSG_ADDPLAN_SUCCESS", "Added new routing plan '%s'." },
{ "OSMSG_ADDPLAN_FAILED", "Could not add new plan '%s' (does it already exist?)." },
{ "OSMSG_DEFCON_SHUN_NEW_CLIENTS", "Shunning New Clients" },
{ "OSMSG_DEFCON_NO_NEW_MEMOS", "Disallowing New Memos" },
+ { "OSMSG_PRIV_UNKNOWN", "Unknown privilege flag %s, see /msg $O HELP PRIVFLAGS for a flag list" },
+ { "OSMSG_PRIV_SET", "Privilege flag %s has been %sset" },
+
{ NULL, NULL }
};
typedef struct opservDiscrim {
struct chanNode *channel;
- char *mask_nick, *mask_ident, *mask_host, *mask_info, *server, *reason, *accountmask;
+ char *mask_nick, *mask_ident, *mask_host, *mask_info, *mask_version, *server, *reason, *accountmask, *chantarget;
irc_in_addr_t ip_mask;
unsigned long limit;
time_t min_ts, max_ts;
- regex_t regex_nick, regex_ident, regex_host, regex_info;
- unsigned int has_regex_nick : 1, has_regex_ident : 1, has_regex_host : 1, has_regex_info : 1;
+ regex_t regex_nick, regex_ident, regex_host, regex_info, regex_version;
+ 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;
typedef enum {
REACT_NOTICE,
REACT_KILL,
-// REACT_SILENT,
REACT_GLINE,
REACT_TRACK,
- REACT_SHUN
+ REACT_SHUN,
+ REACT_SVSJOIN,
+ REACT_SVSPART,
+ REACT_VERSION
} opserv_alert_reaction;
struct opserv_user_alert {
regfree(&alert->discrim->regex_host);
if(alert->discrim->has_regex_info)
regfree(&alert->discrim->regex_info);
+ if(alert->discrim->has_regex_version)
+ regfree(&alert->discrim->regex_version);
free(alert->discrim->reason);
free(alert->discrim);
free(alert);
showDefConSettings(user, cmd);
if (DefConTimeOut > 0) {
- timeq_del(0, defcon_timeout, NULL, TIMEQ_IGNORE_DATA & TIMEQ_IGNORE_WHEN);
+ timeq_del(0, defcon_timeout, NULL, TIMEQ_IGNORE_DATA | TIMEQ_IGNORE_WHEN);
timeq_add(now + DefConTimeOut, defcon_timeout, NULL);
}
return 1;
}
+/* TODO
+static MODCMD_FUNC(cmd_privallow)
+{
+//privallow servername/username +/-flag (global is set in conf)
+}
+
+static MODCMD_FUNC(cmd_privdissallow)
+{
+//privdisallow servername/username +/-flag (global is set in conf)
+}
+
+static MODCMD_FUNC(cmd_privlist)
+{
+//privlist servername/user (global with none)
+}
+*/
+
+static MODCMD_FUNC(cmd_privset)
+{
+ struct userNode *target;
+ char *flag;
+ int add = PRIV_ADD;
+
+ flag = argv[2];
+ if (*flag == '-') {
+ add = PRIV_DEL;
+ flag++;
+ } else if (*flag == '+') {
+ add = PRIV_ADD;
+ flag++;
+ }
+
+ target = GetUserH(argv[1]);
+ if (!target) {
+ reply("MSG_NICK_UNKNOWN", argv[1]);
+ return 0;
+ }
+
+ if (check_priv(flag)) {
+ irc_privs(target, flag, add);
+ reply("OSMSG_PRIV_SET", argv[2], (add == 1) ? "" : "un");
+ } else {
+ reply("OSMSG_PRIV_UNKNOWN", argv[2]);
+ return 0;
+ }
+
+ return 1;
+}
+
/* A lot of these commands are very similar to what ChanServ can do,
* but OpServ can do them even on channels that aren't registered.
*/
return 1;
}
+static void
+opserv_version(struct userNode *target)
+{
+ irc_version_user(opserv, target);
+}
+
+static void
+opserv_svsjoin(struct userNode *target, UNUSED_ARG(char *src_handle), UNUSED_ARG(char *reason), char *channame)
+{
+ struct chanNode *channel;
+
+ if(!channame || !IsChannelName(channame)) {
+ /* Not a valid channel name. We shouldnt ever get this if we check properly in addalert */
+ return;
+ }
+
+ if (!(channel = GetChannel(channame))) {
+ channel = AddChannel(channame, now, NULL, NULL, NULL);
+ }
+ if (GetUserMode(channel, target)) {
+ /* already in it */
+ return;
+ }
+
+ irc_svsjoin(opserv, target, channel);
+ /* Should we tell the user they got joined? -Rubin*/
+}
+
+static void
+opserv_svspart(struct userNode *target, UNUSED_ARG(char *src_handle), UNUSED_ARG(char *reason), char *channame)
+{
+ struct chanNode *channel;
+
+ if(!channame || !IsChannelName(channame)) {
+ /* Not a valid channel name. We shouldnt ever get this if we check properly in addalert */
+ return;
+ }
+
+ if (!(channel = GetChannel(channame))) {
+ /* channel doesnt exist */
+ return;
+ }
+
+ if (!GetUserMode(channel, target)) {
+ /* not in it */
+ return;
+ }
+
+ irc_svspart(opserv, target, channel);
+}
+
static struct shun *
opserv_shun(struct userNode *target, char *src_handle, char *reason, unsigned long duration)
{
}
static void
-opserv_ison(struct userNode *tell, struct userNode *target, const char *message)
+opserv_ison(struct userNode *bot, struct userNode *tell, struct userNode *target, const char *message)
{
struct modeNode *mn;
unsigned int count, here_len, n, maxlen;
here_len = strlen(mn->channel->name);
if ((count + here_len + 4) > maxlen) {
buff[count] = 0;
- send_message(tell, opserv, message, buff);
+ send_message(tell, bot, message, buff);
count = 0;
}
if (mn->modes & MODE_CHANOP)
}
if (count) {
buff[count] = 0;
- send_message(tell, opserv, message, buff);
+ send_message(tell, bot, message, buff);
}
}
return 1;
}
+static MODCMD_FUNC(cmd_svsjoin)
+{
+ struct userNode *target;
+
+
+ if(!IsChannelName(argv[2])) {
+ reply("MSG_NOT_CHANNEL_NAME");
+ return 0;
+ }
+ target = GetUserH(argv[1]);
+ if (!target) {
+ reply("MSG_NICK_UNKNOWN", argv[1]);
+ return 0;
+ }
+
+ if (!(channel = GetChannel(argv[2]))) {
+ channel = AddChannel(argv[2], now, NULL, NULL, NULL);
+ }
+ if (GetUserMode(channel, target)) {
+ reply("OSMSG_ALREADY_THERE", channel->name);
+ return 0;
+ }
+ irc_svsjoin(opserv, target, channel);
+ reply("OSMSG_SVSJOIN_SENT");
+ return 1;
+}
+
static MODCMD_FUNC(cmd_join)
{
struct userNode *bot = cmd->parent->bot;
return 1;
}
+static MODCMD_FUNC(cmd_svspart)
+{
+ struct userNode *target;
+
+ if(!IsChannelName(argv[2])) {
+ reply("MSG_NOT_CHANNEL_NAME");
+ return 0;
+ }
+ target = GetUserH(argv[1]);
+ if (!target) {
+ reply("MSG_NICK_UNKNOWN", argv[1]);
+ return 0;
+ }
+
+ if (!(channel = GetChannel(argv[2]))) {
+ reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name);
+ return 0;
+ }
+
+ if (!GetUserMode(channel, target)) {
+ reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name);
+ return 0;
+ }
+
+ irc_svspart(opserv, target, channel);
+ reply("OSMSG_SVSPART_SENT");
+ return 1;
+}
+
static MODCMD_FUNC(cmd_part)
{
char *reason;
reply("OSMSG_WHOIS_POSTAL_CODE", target->postal_code);
reply("OSMSG_WHOIS_LATITUDE", target->latitude);
reply("OSMSG_WHOIS_LONGITUDE", target->longitude);
+ /* Only show a map url if we have a city, latitude and longitude.
+ * Theres not much point of latitude and longitude coordinates are
+ * returned but no city, the coordinates are useless.
+ */
+ if (target->latitude && target->longitude && target->city) {
+ char map_url[MAXLEN];
+ snprintf(map_url, sizeof(map_url), "http://www.mapquest.com/maps/map.adp?searchtype=address&formtype=address&latlongtype=decimal&latitude=%f&longitude=%f",
+ target->latitude, target->longitude);
+ reply("OSMSG_WHOIS_MAP", map_url);
+ }
reply("OSMSG_WHOIS_DMA_CODE", target->dma_code);
reply("OSMSG_WHOIS_AREA_CODE", target->area_code);
} else if (target->country_name) {
reply("OSMSG_WHOIS_COUNTRY", target->country_name);
}
+ if(target->version_reply) {
+ reply("OSMSG_WHOIS_VERSION", target->version_reply);
+ }
+ reply("OSMSG_WHOIS_NO_NOTICE", target->no_notice ? "YES":"NO");
if (target->modes) {
bpos = 0;
#endif
reply("OSMSG_WHOIS_SERVER", target->uplink->name);
reply("OSMSG_WHOIS_ACCOUNT", (target->handle_info ? target->handle_info->handle : "Not authenticated"));
+
+ reply("OSMSG_WHOIS_PRIVS", client_report_privs(target));
+
intervalString(buffer, now - target->timestamp, user->handle_info);
reply("OSMSG_WHOIS_NICK_AGE", buffer);
if (target->channels.used <= MAX_CHANNELS_WHOIS)
- opserv_ison(user, target, "OSMSG_WHOIS_CHANNELS");
+ opserv_ison(cmd->parent->bot, user, target, "OSMSG_WHOIS_CHANNELS");
else
reply("OSMSG_WHOIS_HIDECHANS");
return 1;
dict_iterator_t it;
struct opserv_user_alert *alert;
const char *reaction;
+ char *m = NULL;
- reply("OSMSG_ALERTS_LIST");
+ if(argc > 1)
+ m = unsplit_string(argv + 1, argc - 1, NULL);
+ reply("OSMSG_ALERTS_LIST", m ? m : "*");
reply("OSMSG_ALERTS_BAR");
reply("OSMSG_ALERTS_HEADER");
reply("OSMSG_ALERTS_BAR");
for (it = dict_first(opserv_user_alerts); it; it = iter_next(it)) {
alert = iter_data(it);
+ if(m && (!match_ircglob(alert->text_discrim, m) && strcasecmp(alert->owner, m)) )
+ continue; /* not a match to requested filter */
switch (alert->reaction) {
case REACT_NOTICE: reaction = "notice"; break;
case REACT_KILL: reaction = "kill"; break;
case REACT_GLINE: reaction = "gline"; break;
case REACT_TRACK: reaction = "track"; break;
case REACT_SHUN: reaction = "shun"; break;
+ case REACT_SVSJOIN: reaction = "svsjoin"; break;
+ case REACT_SVSPART: reaction = "svspart"; break;
+ case REACT_VERSION: reaction = "version"; break;
default: reaction = "<unknown>"; break;
}
reply("OSMSG_ALERT_IS", iter_key(it), reaction, alert->owner);
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))
+{
+ char *cmd;
+ /* 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, " ");
+ if(!irccasecmp(cmd, "VERSION")) {
+ char *version = mysep(&text, "\n");
+ if(!version)
+ version = "";
+ /* opserv_debug("Opserv got CTCP VERSION Notice from %s: %s", user->nick, version); */
+ /* user->version_reply = strdup(version); done in parse-p10.c now */
+ dict_foreach(opserv_user_alerts, alert_check_user, user);
+ }
+ }
+ }
+}
+
static int
opserv_join_check(struct modeNode *mNode)
{
add_routestruct_server(opserv_route, servername, rps->port, uplink, NULL);
}
if(change_route_uplinks(opserv_route))
+ {
return 1;
+ }
else if(user) {
reply("OSMSG_ROUTING_ACTIVATION_ERROR");
activate_routing(cmd, user, "*");
return 0;
}
+ /* routing activation failed but we dont do anything? */
return 1;
}
+
+void routing_init()
+{
+ activate_routing(NULL, NULL, NULL);
+
+ /* start auto-routing system */
+ reroute_timer_reset(0);
+}
+
/*******************************************************
* Functions to handle online route configuration via opserv
*/
wc->server = strdup(server);
wc->target = strdup(to->name);
+ /* Just to make sure there isn't one left hanging
+ * if 2 connections are attempted at once..
+ * */
+ routing_delete_connect_timer(server);
dict_insert(opserv_waiting_connections, strdup(server), wc);
timeq_add(now + ROUTING_CONNECT_TIMEOUT, routing_connect_timeout, wc);
* and setup timer.
*/
void reroute_timer(void *data) {
+ /* Delete any other timers such as this one.. */
+ timeq_del(0, reroute_timer, NULL, TIMEQ_IGNORE_DATA | TIMEQ_IGNORE_WHEN);
+
if(!opserv_route || !opserv_route->servers)
return; /* no active route */
char *retry_period = dict_find(opserv_routing_plan_options, "RETRY_PERIOD", NULL);
if(freq < 1)
return; /* retry_period set to 0, disable */
+ /* opserv_debug("Reroute timer checking reroute"); */
+ log_module(MAIN_LOG, LOG_ERROR, "Reroute timer checking reroute()");
+
/* Do the reroute C attempt */
if(data)
reroute(opserv_route, NULL, NULL, "C");
/* Delete any existing timers, and start the timer again
* using the passed time for the first run.
* - this is called during a retry_period change
- * before it has saved the new value. */
+ * before it has saved the new value.
+ *
+ * If time is 0, lookup the interval. */
void reroute_timer_reset(unsigned int time)
{
- timeq_del(0, reroute_timer, NULL, TIMEQ_IGNORE_DATA & TIMEQ_IGNORE_WHEN);
+ timeq_del(0, reroute_timer, NULL, TIMEQ_IGNORE_DATA | TIMEQ_IGNORE_WHEN);
+ if(time == 0) {
+ if(!opserv_route || !opserv_route->servers)
+ return; /* no active route */
+ char *retry_period = dict_find(opserv_routing_plan_options, "RETRY_PERIOD", NULL);
+ if(!retry_period)
+ return; /* retry_period invalid */
+ time = atoi(retry_period);
+ if(time < 1)
+ return; /* retry_period set to 0, disable */
+
+ }
timeq_add(now + time, reroute_timer, "run");
}
dict_iterator_t rpit;
dict_iterator_t it;
struct routingPlan *rp;
- reply("OSMSG_ROUTINGPLAN_LIST");
- reply("OSMSG_ROUTINGPLAN_BAR");
- for(rpit = dict_first(opserv_routing_plans); rpit; rpit = iter_next(rpit)) {
- const char* name = iter_key(rpit);
- rp = iter_data(rpit);
- reply("OSMSG_ROUTINGPLAN_NAME", name);
- for(it = dict_first(rp->servers); it; it = iter_next(it)) {
- const char* servername = iter_key(it);
- struct routingPlanServer *rps = iter_data(it);
- reply("OSMSG_ROUTINGPLAN_SERVER", servername, rps->port, rps->uplink, rps->karma, rps->offline? "offline" : "online", rps->secondaryuplink ? rps->secondaryuplink : "None");
- }
+ if(argc > 1) {
+ reply("OSMSG_ROUTINGPLAN");
+ reply("OSMSG_ROUTINGPLAN_BAR");
+ for(rpit = dict_first(opserv_routing_plans); rpit; rpit = iter_next(rpit)) {
+ const char* name = iter_key(rpit);
+ rp = iter_data(rpit);
+ if(match_ircglob(name, argv[1])) {
+ reply("OSMSG_ROUTINGPLAN_NAME", name);
+ for(it = dict_first(rp->servers); it; it = iter_next(it)) {
+ const char* servername = iter_key(it);
+ struct routingPlanServer *rps = iter_data(it);
+ reply("OSMSG_ROUTINGPLAN_SERVER", servername, rps->port, rps->uplink, rps->karma, rps->offline? "offline" : "online", rps->secondaryuplink ? rps->secondaryuplink : "None");
+ }
+ }
+ }
+ reply("OSMSG_ROUTINGPLAN_END");
+ }
+ else {
+ reply("OSMSG_ROUTINGPLAN_LIST_HEAD");
+ reply("OSMSG_ROUTINGPLAN_BAR");
+ for(rpit = dict_first(opserv_routing_plans); rpit; rpit = iter_next(rpit)) {
+ const char* name = iter_key(rpit);
+ reply("OSMSG_ROUTINGPLAN_LIST", name);
+ }
+ reply("OSMSG_ROUTINGPLAN_END");
+ route_show_options(cmd, user);
}
- reply("OSMSG_ROUTINGPLAN_END");
- route_show_options(cmd, user);
return 1;
}
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);
- if (!alert->discrim) {
+ if (!alert->discrim || (reaction==REACT_SVSJOIN && !alert->discrim->chantarget) ||
+ (reaction==REACT_SVSPART && !alert->discrim->chantarget)) {
free(alert->text_discrim);
free(discrim_copy);
free(alert);
reaction = REACT_TRACK;
else if (!irccasecmp(react, "shun"))
reaction = REACT_SHUN;
+ else if (!irccasecmp(react, "svsjoin"))
+ reaction = REACT_SVSJOIN;
+ else if (!irccasecmp(react, "svspart"))
+ reaction = REACT_SVSPART;
+ else if (!irccasecmp(react, "version"))
+ reaction = REACT_VERSION;
else {
log_module(OS_LOG, LOG_ERROR, "Invalid reaction %s for alert %s.", react, key);
return 0;
case REACT_GLINE: reaction = "gline"; break;
case REACT_TRACK: reaction = "track"; break;
case REACT_SHUN: reaction = "shun"; break;
+ case REACT_SVSJOIN: reaction = "svsjoin"; break;
+ case REACT_SVSPART: reaction = "svspart"; break;
+ case REACT_VERSION: reaction = "version"; 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));
discrim->intra_scmp = 3;
else
discrim->mask_info = argv[i];
+ } else if (irccasecmp(argv[i], "version") == 0) {
+ discrim->mask_version = argv[++i];
} else if (irccasecmp(argv[i], "server") == 0) {
discrim->server = argv[++i];
} else if (irccasecmp(argv[i], "ip") == 0) {
}
discrim->accountmask = argv[++i];
discrim->authed = 1;
+ } else if (irccasecmp(argv[i], "chantarget") == 0) {
+ if(!IsChannelName(argv[i+1])) {
+ send_message(user, bot, "MSG_NOT_CHANNEL_NAME");
+ goto fail;
+ }
+ discrim->chantarget = argv[++i];
} else if (irccasecmp(argv[i], "authed") == 0) {
i++; /* true_string and false_string are macros! */
if (true_string(argv[i])) {
if (discrim->mask_info && !strcmp(discrim->mask_info, "*")) {
discrim->mask_info = 0;
}
+ if (discrim->mask_version && !strcmp(discrim->mask_version, "*")) {
+ discrim->mask_version = 0;
+ }
if (discrim->mask_host && !discrim->mask_host[strspn(discrim->mask_host, "*.")]) {
discrim->mask_host = 0;
}
goto regfail;
}
}
+
+ if(discrim->mask_version)
+ {
+ int err = regcomp(&discrim->regex_version, discrim->mask_version, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+ discrim->has_regex_version = !err;
+ if(err)
+ {
+ char buff[256];
+ buff[regerror(err, &discrim->regex_version, buff, sizeof(buff))] = 0;
+
+ send_message(user, bot, "OSMSG_INVALID_REGEX", discrim->mask_version, buff, err);
+ goto regfail;
+ }
+ }
}
return discrim;
if((discrim->has_regex_nick && regexec(&discrim->regex_nick, user->nick, 0, 0, 0))
|| (discrim->has_regex_ident && regexec(&discrim->regex_ident, user->ident, 0, 0, 0))
|| (discrim->has_regex_host && regexec(&discrim->regex_host, user->hostname, 0, 0, 0))
- || (discrim->has_regex_info && regexec(&discrim->regex_info, user->info, 0, 0, 0))) {
+ || (discrim->has_regex_info && regexec(&discrim->regex_info, user->info, 0, 0, 0))
+ || (discrim->has_regex_version && (!user->version_reply || regexec(&discrim->regex_version, user->version_reply, 0, 0, 0)))) {
return 0;
}
}
if ((discrim->mask_nick && !match_ircglob(user->nick, discrim->mask_nick))
|| (discrim->mask_ident && !match_ircglob(user->ident, discrim->mask_ident))
|| (discrim->mask_host && !match_ircglob(user->hostname, discrim->mask_host))
- || (discrim->mask_info && !match_ircglob(user->info, discrim->mask_info))) {
+ || (discrim->mask_info && !match_ircglob(user->info, discrim->mask_info))
+ || (discrim->mask_version && (!user->version_reply || !match_ircglob(user->version_reply, discrim->mask_version))) ) {
return 0;
}
}
return 0;
}
+static int
+trace_svsjoin_func(struct userNode *match, void *extra)
+{
+ struct discrim_and_source *das = extra;
+
+ char *channame = das->discrim->chantarget;
+ struct chanNode *channel;
+
+ if(!channame || !IsChannelName(channame)) {
+ //reply("MSG_NOT_CHANNEL_NAME");
+ return 1;
+ }
+
+ if (!(channel = GetChannel(channame))) {
+ channel = AddChannel(channame, now, NULL, NULL, NULL);
+ }
+ if (GetUserMode(channel, match)) {
+// reply("OSMSG_ALREADY_THERE", channel->name);
+ return 1;
+ }
+ irc_svsjoin(opserv, match, channel);
+ // reply("OSMSG_SVSJOIN_SENT");
+ return 0;
+}
+
+static int
+trace_svspart_func(struct userNode *match, void *extra)
+{
+ struct discrim_and_source *das = extra;
+ char *channame = das->discrim->chantarget;
+ struct chanNode *channel;
+
+ if(!channame || !IsChannelName(channame))
+ return 1;
+
+ if (!(channel = GetChannel(channame)))
+ return 1;
+
+ if (!GetUserMode(channel, match))
+ return 1;
+
+ irc_svspart(opserv, match, channel);
+ return 0;
+}
+
+static int
+trace_version_func(struct userNode *match, UNUSED_ARG(void *extra))
+{
+ irc_version_user(opserv, match);
+ return 0;
+}
+
static int
is_gagged(char *mask)
{
unsigned int matches;
struct svccmd *subcmd;
char buf[MAXLEN];
+ int ret = 1;
sprintf(buf, "trace %s", argv[1]);
if (!(subcmd = dict_find(opserv_service->commands, buf, NULL))) {
action = trace_kill_func;
else if (!irccasecmp(argv[1], "gag"))
action = trace_gag_func;
+ else if (!irccasecmp(argv[1], "svsjoin"))
+ action = trace_svsjoin_func;
+ else if (!irccasecmp(argv[1], "svspart"))
+ action = trace_svspart_func;
+ else if (!irccasecmp(argv[1], "version"))
+ action = trace_version_func;
else {
reply("OSMSG_BAD_ACTION", argv[1]);
return 0;
das.disp_limit = das.discrim->limit;
das.discrim->limit = INT_MAX;
}
- matches = opserv_discrim_search(das.discrim, action, &das);
- if (action == trace_domains_func)
- dict_foreach(das.dict, opserv_show_hostinfo, &das);
+ if (action == trace_svsjoin_func && !das.discrim->chantarget) {
+ reply("OSMSG_SVSJOIN_NO_TARGET");
+ ret = 0;
+ }
+ else if (action == trace_svspart_func && !das.discrim->chantarget) {
+ reply("OSMSG_SVSPART_NO_TARGET");
+ ret = 0;
+ }
+ else {
+ matches = opserv_discrim_search(das.discrim, action, &das);
- if (matches)
- {
- if(action == trace_print_func)
- reply("OSMSG_USER_SEARCH_COUNT_BAR", matches);
+ if (action == trace_domains_func)
+ dict_foreach(das.dict, opserv_show_hostinfo, &das);
+
+ if (matches)
+ {
+ if(action == trace_print_func)
+ reply("OSMSG_USER_SEARCH_COUNT_BAR", matches);
+ else
+ reply("OSMSG_USER_SEARCH_COUNT", matches);
+ }
else
- reply("OSMSG_USER_SEARCH_COUNT", matches);
+ reply("MSG_NO_MATCHES");
}
- else
- reply("MSG_NO_MATCHES");
if (das.discrim->channel)
UnlockChannel(das.discrim->channel);
regfree(&das.discrim->regex_host);
if(das.discrim->has_regex_info)
regfree(&das.discrim->regex_info);
+ if(das.discrim->has_regex_version)
+ regfree(&das.discrim->regex_version);
free(das.discrim);
dict_delete(das.dict);
- return 1;
+ return ret;
}
typedef void (*cdiscrim_search_func)(struct chanNode *match, void *data, struct userNode *bot);
case REACT_KILL:
DelUser(user, opserv, 1, alert->discrim->reason);
return 1;
-/*
- case REACT_SILENT:
- opserv_block(user, alert->owner, alert->discrim->reason, alert->discrim->duration, 1);
- return 1;
-*/
case REACT_GLINE:
opserv_block(user, alert->owner, alert->discrim->reason, alert->discrim->duration, alert->discrim->silent);
return 1;
case REACT_SHUN:
opserv_shun(user, alert->owner, alert->discrim->reason, alert->discrim->duration);
return 1;
+ case REACT_SVSJOIN:
+ opserv_svsjoin(user, alert->owner, alert->discrim->reason, alert->discrim->chantarget);
+ break;
+ case REACT_SVSPART:
+ opserv_svspart(user, alert->owner, alert->discrim->reason, alert->discrim->chantarget);
+ break;
+ case REACT_VERSION:
+ /* Don't auto-version a user who we already have a version on, because the version reply itself
+ * re-triggers this check...
+ * TODO: maybe safer if we didn't even check react_version type alerts for the 2nd check?
+ * sort of like we only look at channel alerts on join. -Rubin
+ */
+ if(!user->version_reply)
+ opserv_version(user);
+ break;
default:
log_module(OS_LOG, LOG_ERROR, "Invalid reaction type %d for alert %s.", alert->reaction, key);
/* fall through to REACT_NOTICE case */
reaction = REACT_NOTICE;
else if (!irccasecmp(argv[2], "kill"))
reaction = REACT_KILL;
-/*
- else if (!irccasecmp(argv[2], "silent"))
- reaction = REACT_SILENT;
-*/
else if (!irccasecmp(argv[2], "gline"))
reaction = REACT_GLINE;
else if (!irccasecmp(argv[2], "track")) {
#endif
} else if (!irccasecmp(argv[2], "shun"))
reaction = REACT_SHUN;
+ else if(!irccasecmp(argv[2], "svsjoin"))
+ reaction = REACT_SVSJOIN;
+ else if(!irccasecmp(argv[2], "svspart"))
+ reaction = REACT_SVSPART;
+ else if(!irccasecmp(argv[2], "version"))
+ reaction = REACT_VERSION;
else {
reply("OSMSG_UNKNOWN_REACTION", argv[2]);
return 0;
}
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)))
+ || !opserv_add_user_alert(user, name, reaction, unsplit_string(argv + 3, argc - 3, NULL))) {
+ reply("OSMSG_ALERT_ADD_FAILED");
return 0;
+ }
reply("OSMSG_ADDED_ALERT", name);
return 1;
}
opserv_define_func("ADDALERT SHUN", NULL, 900, 0, 0);
opserv_define_func("ADDALERT TRACK", NULL, 900, 0, 0);
opserv_define_func("ADDALERT KILL", NULL, 900, 0, 0);
+ opserv_define_func("ADDALERT SVSJOIN", NULL, 999, 0, 0);
+ opserv_define_func("ADDALERT SVSPART", NULL, 999, 0, 0);
+ opserv_define_func("ADDALERT VERSION", NULL, 999, 0, 0);
opserv_define_func("ADDBAD", cmd_addbad, 800, 0, 2);
opserv_define_func("ADDEXEMPT", cmd_addexempt, 800, 0, 2);
opserv_define_func("ADDTRUST", cmd_addtrust, 800, 0, 5);
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("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("HOP", cmd_hop, 100, 2, 2);
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("QUERY", cmd_query, 0, 0, 0);
opserv_define_func("RAW", cmd_raw, 999, 0, 2);
opserv_define_func("TRACE SHUN", NULL, 600, 0, 0);
opserv_define_func("TRACE GAG", NULL, 600, 0, 0);
opserv_define_func("TRACE KILL", NULL, 600, 0, 0);
+ opserv_define_func("TRACE VERSION", NULL, 999, 0, 0);
+ opserv_define_func("TRACE SVSJOIN", NULL, 999, 0, 0);
+ opserv_define_func("TRACE SVSPART", NULL, 999, 0, 0);
opserv_define_func("UNBAN", cmd_unban, 100, 2, 2);
opserv_define_func("UNGAG", cmd_ungag, 600, 0, 2);
opserv_define_func("UNGLINE", cmd_ungline, 600, 0, 2);
reg_del_channel_func(opserv_channel_delete);
reg_join_func(opserv_join_check);
reg_auth_func(opserv_staff_alert);
+ reg_notice_func(opserv, opserv_notice_handler);
opserv_db_init();
saxdb_register("OpServ", opserv_saxdb_read, opserv_saxdb_write);
}
/* start auto-routing system */
- reroute_timer(NULL);
+ /* this cant be done here, because the routing system isnt marked active yet. */
+ /* reroute_timer(NULL); */
+
/* start the karma timer, using the saved one if available */
routing_karma_timer(dict_find(opserv_routing_plan_options, "KARMA_TIMER", NULL));
projects / irc / evilnet / x3.git / blobdiff