*/
#include "stdinc.h"
-#include "tools.h"
#include "send.h"
#include "channel.h"
#include "client.h"
#include "class.h"
#include "ircd.h"
#include "numeric.h"
-#include "memory.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_serv.h"
#include "whowas.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "hash.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
#include "s_conf.h"
#include "s_newconf.h"
+#include "reject.h"
static int mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
static int ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
mapi_clist_av1 xline_clist[] = { &xline_msgtab, &unxline_msgtab, NULL };
DECLARE_MODULE_AV1(xline, NULL, NULL, xline_clist, NULL, NULL, "$Revision: 3161 $");
-static int valid_xline(struct Client *, const char *, const char *);
+static char *escape_perm_xline(const char *);
+static int valid_xline(struct Client *, const char *, const char *, int);
static void apply_xline(struct Client *client_p, const char *name,
const char *reason, int temp_time);
static void write_xline(struct Client *source_p, struct ConfItem *aconf);
const char *name, const char *reason);
static void handle_remote_unxline(struct Client *source_p, const char *name);
-static int remove_temp_xline(struct Client *source_p, const char *name);
-static void remove_xline(struct Client *source_p, const char *gecos);
+static void remove_xline(struct Client *source_p, const char *name);
+static int remove_xline_from_file(struct Client *source_p, const char *gecos);
/* m_xline()
{
struct ConfItem *aconf;
const char *name;
+ char *escapedname;
const char *reason;
const char *target_server = NULL;
int temp_time;
reason = parv[loc];
+ if (temp_time == 0)
+ {
+ escapedname = escape_perm_xline(name);
+ if (strcmp(escapedname, name))
+ sendto_one_notice(source_p, ":Changed xline from [%s] to [%s]",
+ name, escapedname);
+ }
+ else
+ escapedname = rb_strdup(name);
+
if(target_server != NULL)
{
propagate_xline(source_p, target_server, temp_time,
- name, "2", reason);
+ escapedname, "2", reason);
if(!match(target_server, me.name))
+ {
+ rb_free(escapedname);
return 0;
+ }
}
- else if(dlink_list_length(&cluster_conf_list) > 0)
- cluster_xline(source_p, temp_time, name, reason);
+ else if(rb_dlink_list_length(&cluster_conf_list) > 0)
+ cluster_xline(source_p, temp_time, escapedname, reason);
- if((aconf = find_xline(name, 0)) != NULL)
+ if((aconf = find_xline_mask(escapedname)) != NULL)
{
sendto_one(source_p, ":%s NOTICE %s :[%s] already X-Lined by [%s] - %s",
- me.name, source_p->name, parv[1], aconf->name, aconf->passwd);
+ me.name, source_p->name, escapedname, aconf->name, aconf->passwd);
+ rb_free(escapedname);
return 0;
}
- if(!valid_xline(source_p, name, reason))
+ if(!valid_xline(source_p, escapedname, reason, temp_time))
+ {
+ rb_free(escapedname);
return 0;
+ }
- apply_xline(source_p, name, reason, temp_time);
+ apply_xline(source_p, escapedname, reason, temp_time);
+ rb_free(escapedname);
return 0;
}
static int
ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- /* parv[0] parv[1] parv[2] parv[3] parv[4]
- * oper target serv xline type reason
+ /* source_p parv[1] parv[2] parv[3] parv[4]
+ * oper target serv xline type reason
*/
propagate_xline(source_p, parv[1], 0, parv[2], parv[3], parv[4]);
(temp_time > 0) ? SHARED_TXLINE : SHARED_PXLINE))
return;
- if(!valid_xline(source_p, name, reason))
+ if(!valid_xline(source_p, name, reason, temp_time))
return;
/* already xlined */
- if((aconf = find_xline(name, 0)) != NULL)
+ if((aconf = find_xline_mask(name)) != NULL)
{
sendto_one_notice(source_p, ":[%s] already X-Lined by [%s] - %s", name, aconf->name, aconf->passwd);
return;
apply_xline(source_p, name, reason, temp_time);
}
+/* escape_perm_xline()
+ *
+ * inputs - gecos
+ * outputs - escaped gecos (allocated with rb_malloc())
+ * side effects - none
+ */
+static char *
+escape_perm_xline(const char *gecos)
+{
+ char *result;
+ int i, j;
+
+ result = rb_malloc(2 * strlen(gecos) + 1);
+ for (i = 0, j = 0; gecos[i] != '\0'; i++)
+ {
+ result[j++] = gecos[i];
+ if (gecos[i] == '"' && gecos[i + 1] == ',')
+ result[j++] = '\\';
+ }
+ result[j] = '\0';
+ return result;
+}
+
/* valid_xline()
*
- * inputs - client xlining, gecos, reason and whether to warn
+ * inputs - client xlining, gecos, reason and temp time
* outputs -
* side effects - checks the xline for validity, erroring if needed
*/
static int
valid_xline(struct Client *source_p, const char *gecos,
- const char *reason)
+ const char *reason, int temp_time)
{
if(EmptyString(reason))
{
return 0;
}
+ if(temp_time == 0 && strstr(gecos, "\",") != NULL)
+ {
+ sendto_one_notice(source_p,
+ ":Invalid character sequence '\",' in xline, please replace with '\"\\,'");
+ return 0;
+ }
+
if(strchr(reason, ':') != NULL)
{
sendto_one_notice(source_p,
aconf = make_conf();
aconf->status = CONF_XLINE;
- if(strstr(name, "\\s"))
- {
- char *tmp = LOCAL_COPY(name);
- char *orig = tmp;
- char *new = tmp;
-
- while(*orig)
- {
- if(*orig == '\\' && *(orig + 1) != '\0')
- {
- if(*(orig + 1) == 's')
- {
- *new++ = ' ';
- orig += 2;
- }
- /* otherwise skip that and the escaped
- * character after it, so we dont mistake
- * \\s as \s --fl
- */
- else
- {
- *new++ = *orig++;
- *new++ = *orig++;
- }
- }
- else
- *new++ = *orig++;
- }
-
- *new = '\0';
- DupString(aconf->name, tmp);
- }
- else
- DupString(aconf->name, name);
-
- DupString(aconf->passwd, reason);
+ aconf->name = rb_strdup(name);
+ aconf->passwd = rb_strdup(reason);
collapse(aconf->name);
if(temp_time > 0)
{
- aconf->hold = CurrentTime + temp_time;
+ aconf->hold = rb_current_time() + temp_time;
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s added temporary %d min. X-Line for [%s] [%s]",
get_oper_name(source_p), name, reason);
}
- dlinkAddAlloc(aconf, &xline_conf_list);
+ rb_dlinkAddAlloc(aconf, &xline_conf_list);
check_xlines();
}
char buffer[BUFSIZE * 2];
FILE *out;
const char *filename;
+ char *mangle_gecos;
+
+ if(strstr(aconf->name, "\\s"))
+ {
+ char *tmp = LOCAL_COPY(aconf->name);
+ char *orig = tmp;
+ char *new = tmp;
+ while(*orig)
+ {
+ if(*orig == '\\' && *(orig + 1) != '\0')
+ {
+ if(*(orig + 1) == 's')
+ {
+ *new++ = ' ';
+ orig += 2;
+ }
+ /* otherwise skip that and the escaped
+ * character after it, so we dont mistake
+ * \\s as \s --fl
+ */
+ else
+ {
+ *new++ = *orig++;
+ *new++ = *orig++;
+ }
+ }
+ else
+ *new++ = *orig++;
+ }
+
+ *new = '\0';
+ mangle_gecos = tmp;
+ } else
+ mangle_gecos = aconf->name;
filename = ConfigFileEntry.xlinefile;
return;
}
- ircsprintf(buffer, "\"%s\",\"0\",\"%s\",\"%s\",%ld\n",
- aconf->name, aconf->passwd,
- get_oper_name(source_p), CurrentTime);
+ rb_sprintf(buffer, "\"%s\",\"0\",\"%s\",\"%s\",%ld\n",
+ mangle_gecos, aconf->passwd,
+ get_oper_name(source_p), (long) rb_current_time());
if(fputs(buffer, out) == -1)
{
const char *reason)
{
struct remote_conf *shared_p;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, cluster_conf_list.head)
+ RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
{
shared_p = ptr->data;
if(match(parv[3], me.name) == 0)
return 0;
}
- else if(dlink_list_length(&cluster_conf_list))
+ else if(rb_dlink_list_length(&cluster_conf_list))
cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER,
"%s", parv[1]);
- if(remove_temp_xline(source_p, parv[1]))
- return 0;
-
remove_xline(source_p, parv[1]);
return 0;
static int
ms_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- /* parv[0] parv[1] parv[2]
- * oper target server gecos
+ /* source_p parv[1] parv[2]
+ * oper target server gecos
*/
propagate_generic(source_p, "UNXLINE", parv[1], CAP_CLUSTER,
"%s", parv[2]);
source_p->servptr->name, SHARED_UNXLINE))
return;
- if(remove_temp_xline(source_p, name))
- return;
-
remove_xline(source_p, name);
return;
}
-static int
-remove_temp_xline(struct Client *source_p, const char *name)
+static void
+remove_xline(struct Client *source_p, const char *name)
{
struct ConfItem *aconf;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
+ char *encoded;
+
+ encoded = xline_encode_spaces(name);
- DLINK_FOREACH(ptr, xline_conf_list.head)
+ RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{
aconf = ptr->data;
- /* only want to check temp ones! */
- if(!aconf->hold)
- continue;
-
- if(!irccmp(aconf->name, name))
+ if(!irccmp(aconf->name, encoded))
{
- sendto_one_notice(source_p,
- ":X-Line for [%s] is removed",
- name);
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s has removed the temporary X-Line for: [%s]",
- get_oper_name(source_p), name);
- ilog(L_KLINE, "UX %s %s",
- get_oper_name(source_p), name);
+ if (!aconf->hold)
+ {
+ if (!remove_xline_from_file(source_p, encoded))
+ return;
+ }
+ else
+ {
+ sendto_one_notice(source_p,
+ ":X-Line for [%s] is removed",
+ encoded);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the temporary X-Line for: [%s]",
+ get_oper_name(source_p), encoded);
+ ilog(L_KLINE, "UX %s %s",
+ get_oper_name(source_p), encoded);
+ }
+ remove_reject_mask(aconf->name, NULL);
free_conf(aconf);
- dlinkDestroy(ptr, &xline_conf_list);
- return 1;
+ rb_dlinkDestroy(ptr, &xline_conf_list);
+ rb_free(encoded);
+ return;
}
}
- return 0;
+ sendto_one_notice(source_p, ":No X-Line for %s", encoded);
+ rb_free(encoded);
+
+ return;
}
-/* remove_xline()
+/* remove_xline_from_file()
*
* inputs - gecos to remove
* outputs -
* side effects - removes xline from conf, if exists
+ * - does not touch xline_conf_list
*/
-static void
-remove_xline(struct Client *source_p, const char *huntgecos)
+static int
+remove_xline_from_file(struct Client *source_p, const char *huntgecos)
{
FILE *in, *out;
char buf[BUFSIZE];
const char *gecos;
mode_t oldumask;
char *p;
+ char *encoded;
int error_on_write = 0;
int found_xline = 0;
filename = ConfigFileEntry.xlinefile;
- ircsnprintf(temppath, sizeof(temppath),
+ rb_snprintf(temppath, sizeof(temppath),
"%s.tmp", ConfigFileEntry.xlinefile);
if((in = fopen(filename, "r")) == NULL)
{
sendto_one_notice(source_p, ":Cannot open %s", filename);
- return;
+ return 0;
}
oldumask = umask(0);
sendto_one_notice(source_p, ":Cannot open %s", temppath);
fclose(in);
umask(oldumask);
- return;
+ return 0;
}
umask(oldumask);
break;
}
- strlcpy(buff, buf, sizeof(buff));
+ rb_strlcpy(buff, buf, sizeof(buff));
if((p = strchr(buff, '\n')) != NULL)
*p = '\0';
}
/* matching.. */
- if(irccmp(gecos, huntgecos) == 0)
+ encoded = xline_encode_spaces(gecos);
+ if(irccmp(encoded, huntgecos) == 0)
found_xline++;
else
error_on_write = (fputs(buf, out) < 0) ? YES : NO;
+ rb_free(encoded);
}
fclose(in);
{
sendto_one_notice(source_p,
":Couldn't write temp xline file, aborted");
- return;
+ return 0;
}
else if(found_xline == 0)
{
- sendto_one_notice(source_p, ":No X-Line for %s", huntgecos);
+ sendto_one_notice(source_p, ":Cannot find X-Line for %s in file", huntgecos);
if(temppath != NULL)
(void) unlink(temppath);
- return;
+ return 0;
}
if (rename(temppath, filename))
{
sendto_one_notice(source_p, ":Couldn't rename temp file, aborted");
- return;
+ return 0;
}
- rehash_bans(0);
sendto_one_notice(source_p, ":X-Line for [%s] is removed", huntgecos);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s has removed the X-Line for: [%s]",
get_oper_name(source_p), huntgecos);
ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), huntgecos);
+
+ return 1;
}
projects / irc / rqf / shadowircd.git / blobdiff