#include "scache.h"
#include "irc_dictionary.h"
#include "sslproc.h"
+#include "s_assert.h"
#define DEBUG_EXITED_CLIENTS
blptr = client_p->preClient->dnsbl_listed;
if (blptr != NULL)
unref_blacklist(blptr);
- abort_blacklist_queries(client_p);
+ s_assert(rb_dlink_list_length(&client_p->preClient->dnsbl_queries) == 0);
+
rb_bh_free(pclient_heap, client_p->preClient);
client_p->preClient = NULL;
}
rb_free(client_p->localClient->passwd);
}
+ rb_free(client_p->localClient->auth_user);
rb_free(client_p->localClient->challenge);
rb_free(client_p->localClient->fullcaps);
rb_free(client_p->localClient->opername);
rb_free(client_p->localClient->mangledhost);
+ if (client_p->localClient->privset)
+ privilegeset_unref(client_p->localClient->privset);
- ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+ if(IsSSL(client_p))
+ ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+
+ if(IsCapable(client_p, CAP_ZIP))
+ ssld_decrement_clicount(client_p->localClient->z_ctl);
rb_bh_free(lclient_heap, client_p->localClient);
client_p->localClient = NULL;
s_assert(&me != client_p);
free_local_client(client_p);
free_pre_client(client_p);
+ rb_free(client_p->certfp);
rb_bh_free(client_heap, client_p);
}
const char *reason = NULL;
const char *exit_reason = conn_closed;
- if(ConfigFileEntry.kline_with_reason && !EmptyString(aconf->passwd))
+ if(ConfigFileEntry.kline_with_reason)
{
- reason = aconf->passwd;
- exit_reason = aconf->passwd;
+ reason = get_user_ban_reason(aconf);
+ exit_reason = reason;
}
else
{
void
check_banned_lines(void)
{
- struct Client *client_p; /* current local client_p being examined */
- struct ConfItem *aconf = NULL;
- rb_dlink_node *ptr, *next_ptr;
-
- RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
- {
- client_p = ptr->data;
-
- if(IsMe(client_p))
- continue;
-
- /* if there is a returned struct ConfItem then kill it */
- if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, client_p->localClient->ip.ss_family)))
- {
- if(aconf->status & CONF_EXEMPTDLINE)
- continue;
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "DLINE active for %s",
- get_client_name(client_p, HIDE_IP));
-
- notify_banned_client(client_p, aconf, D_LINED);
- continue; /* and go examine next fd/client_p */
- }
-
- if(!IsPerson(client_p))
- continue;
-
- if((aconf = find_kline(client_p)) != NULL)
- {
- if(IsExemptKline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
- get_client_name(client_p, HIDE_IP),
- aconf->user, aconf->host);
- continue;
- }
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "KLINE active for %s",
- get_client_name(client_p, HIDE_IP));
- notify_banned_client(client_p, aconf, K_LINED);
- continue;
- }
- else if((aconf = find_xline(client_p->info, 1)) != NULL)
- {
- if(IsExemptKline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "XLINE over-ruled for %s, client is kline_exempt [%s]",
- get_client_name(client_p, HIDE_IP),
- aconf->name);
- continue;
- }
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "XLINE active for %s",
- get_client_name(client_p, HIDE_IP));
-
- (void) exit_client(client_p, client_p, &me, "Bad user info");
- continue;
- }
- }
-
- /* also check the unknowns list for new dlines */
- RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
- {
- client_p = ptr->data;
-
- if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)))
- {
- if(aconf->status & CONF_EXEMPTDLINE)
- continue;
-
- notify_banned_client(client_p, aconf, D_LINED);
- }
- }
-
+ check_dlines();
+ check_klines();
+ check_xlines();
}
/* check_klines_event()
if(IsExemptKline(client_p))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "KLINE over-ruled for %s, client is kline_exempt",
- get_client_name(client_p, HIDE_IP));
+ "KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
+ get_client_name(client_p, HIDE_IP),
+ aconf->user, aconf->host);
continue;
}
if(IsExemptKline(client_p))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "XLINE over-ruled for %s, client is kline_exempt",
- get_client_name(client_p, HIDE_IP));
+ "XLINE over-ruled for %s, client is kline_exempt [%s]",
+ get_client_name(client_p, HIDE_IP),
+ aconf->host);
continue;
}
}
}
+/* resv_nick_fnc
+ *
+ * inputs - resv, reason, time
+ * outputs - NONE
+ * side effects - all local clients matching resv will be FNC'd
+ */
+void
+resv_nick_fnc(const char *mask, const char *reason, int temp_time)
+{
+ struct Client *client_p, *target_p;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
+ char *nick;
+ char note[NICKLEN+10];
+
+ if (!ConfigFileEntry.resv_fnc)
+ return;
+
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+ {
+ client_p = ptr->data;
+
+ if(IsMe(client_p) || !IsPerson(client_p) || IsExemptResv(client_p))
+ continue;
+
+ /* Skip users that already have UID nicks. */
+ if(IsDigit(client_p->name[0]))
+ continue;
+
+ if(match_esc(mask, client_p->name))
+ {
+ nick = client_p->id;
+
+ /* Tell opers. */
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "RESV forced nick change for %s!%s@%s to %s; nick matched [%s] (%s)",
+ client_p->name, client_p->username, client_p->host, nick, mask, reason);
+
+ sendto_realops_snomask(SNO_NCHANGE, L_ALL,
+ "Nick change: From %s to %s [%s@%s]",
+ client_p->name, nick, client_p->username, client_p->host);
+
+ /* Tell the user. */
+ if (temp_time > 0)
+ {
+ sendto_one_notice(client_p,
+ ":*** Nick %s is temporarily unavailable on this server.",
+ client_p->name);
+ }
+ else
+ {
+ sendto_one_notice(client_p,
+ ":*** Nick %s is no longer available on this server.",
+ client_p->name);
+ }
+
+ /* Do all of the nick-changing gymnastics. */
+ client_p->tsinfo = rb_current_time();
+ add_history(client_p, 1);
+
+ monitor_signoff(client_p);
+
+ invalidate_bancache_user(client_p);
+
+ sendto_common_channels_local(client_p, NOCAPS, ":%s!%s@%s NICK :%s",
+ client_p->name, client_p->username, client_p->host, nick);
+ sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
+ use_id(client_p), nick, (long) client_p->tsinfo);
+
+ del_from_client_hash(client_p->name, client_p);
+ rb_strlcpy(client_p->name, nick, sizeof(client_p->name));
+ add_to_client_hash(nick, client_p);
+
+ monitor_signon(client_p);
+
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
+ {
+ target_p = ptr->data;
+ rb_dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
+ rb_dlinkDestroy(ptr, &client_p->on_allow_list);
+ }
+
+ rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+ rb_note(client_p->localClient->F, note);
+ }
+ }
+}
+
/*
* update_client_exit_stats
*
}
-/*
-** Recursively send QUITs and SQUITs for source_p and all its dependent clients
-** and servers to those servers that need them. A server needs the client
-** QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
-** isn't getting the SQUIT because of @#(*&@)# hostmasking. With TS4, once
-** a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
-** on that one -orabidoo
-*/
-static void
-recurse_send_quits(struct Client *client_p, struct Client *source_p,
- struct Client *to, const char *comment1,
- const char *comment)
-{
- struct Client *target_p;
- rb_dlink_node *ptr, *ptr_next;
- /* If this server can handle quit storm (QS) removal
- * of dependents, just send the SQUIT
- */
-
- if(IsCapable(to, CAP_QS))
- {
- sendto_one(to, "SQUIT %s :%s",
- get_id(source_p, to), comment);
- }
- else
- {
- RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
- {
- target_p = ptr->data;
- sendto_one(to, ":%s QUIT :%s", target_p->name, comment1);
- }
- RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
- {
- target_p = ptr->data;
- recurse_send_quits(client_p, target_p, to, comment1, comment);
- }
- sendto_one(to, "SQUIT %s :%s", source_p->name, comment);
- }
-}
-
/*
** Remove all clients that depend on source_p; assumes all (S)QUITs have
** already been sent. we make sure to exit a server's dependent clients
/*
** Remove *everything* that depends on source_p, from all lists, and sending
-** all necessary QUITs and SQUITs. source_p itself is still on the lists,
+** all necessary SQUITs. source_p itself is still on the lists,
** and its SQUITs have been sent except for the upstream one -orabidoo
*/
static void
{
to = ptr->data;
- if(IsMe(to) || to == source_p->from ||
- (to == client_p && IsCapable(to, CAP_QS)))
+ if(IsMe(to) || to == source_p->from || to == client_p)
continue;
- recurse_send_quits(client_p, source_p, to, comment1, comment);
+ sendto_one(to, "SQUIT %s :%s", get_id(source_p, to), comment);
}
recurse_remove_clients(source_p, comment1);
*
*/
void
-dead_link(struct Client *client_p)
+dead_link(struct Client *client_p, int sendqex)
{
struct abort_client *abt;
abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
- if(client_p->flags & FLAGS_SENDQEX)
+ if(sendqex)
rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
else
rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
if(IsOper(source_p))
rb_dlinkFindDestroy(source_p, &oper_list);
- sendto_common_channels_local(source_p, ":%s!%s@%s QUIT :%s",
+ sendto_common_channels_local(source_p, NOCAPS, ":%s!%s@%s QUIT :%s",
source_p->name,
source_p->username, source_p->host, comment);
const char *comment)
{
delete_auth_queries(source_p);
+ abort_blacklist_queries(source_p);
if (source_p->localClient->dnsquery)
{
delete_resolver_queries(source_p->localClient->dnsquery);
rb_dlinkDelete(&source_p->localClient->tnode, &serv_list);
rb_dlinkFindDestroy(source_p, &global_serv_list);
- unset_chcap_usage_counts(source_p);
sendk = source_p->localClient->sendK;
recvk = source_p->localClient->receiveK;
on_for = rb_current_time() - source_p->localClient->firsttime;
- ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %d/%d",
+ ilog(L_USER, "%s (%3lu:%02lu:%02lu): %s!%s@%s %s %d/%d",
rb_ctime(rb_current_time(), tbuf, sizeof(tbuf)), on_for / 3600,
(on_for % 3600) / 60, on_for % 60,
source_p->name, source_p->username, source_p->host,
+ source_p->sockhost,
source_p->localClient->sendK, source_p->localClient->receiveK);
sendto_one(source_p, "ERROR :Closing Link: %s (%s)", source_p->host, comment);
}
/*
- * show_ip() - asks if the true IP shoudl be shown when source is
- * askin for info about target
+ * show_ip() - asks if the true IP should be shown when source is
+ * asking for info about target
*
* Inputs - source_p who is asking
* - target_p who do we want the info on
- * Output - returns 1 if clear IP can be showed, otherwise 0
+ * Output - returns 1 if clear IP can be shown, otherwise 0
* Side Effects - none
*/
return 1;
}
+int
+show_ip_whowas(struct Whowas *whowas, struct Client *source_p)
+{
+ if(whowas->flags & WHOWAS_IP_SPOOFING)
+ if(ConfigFileEntry.hide_spoof_ips || !MyOper(source_p))
+ return 0;
+ if(whowas->flags & WHOWAS_DYNSPOOF)
+ if(!IsOper(source_p))
+ return 0;
+ return 1;
+}
+
/*
* make_user
*
* side effects - add's an Server information block to a client
* if it was not previously allocated.
*/
-server_t *
+struct Server *
make_server(struct Client *client_p)
{
- server_t *serv = client_p->serv;
+ struct Server *serv = client_p->serv;
if(!serv)
{
- serv = (server_t *) rb_malloc(sizeof(server_t));
+ serv = (struct Server *) rb_malloc(sizeof(struct Server));
client_p->serv = serv;
}
return client_p->serv;
ServerStats.is_sv++;
ServerStats.is_sbs += client_p->localClient->sendB;
ServerStats.is_sbr += client_p->localClient->receiveB;
- ServerStats.is_sti += rb_current_time() - client_p->localClient->firsttime;
+ ServerStats.is_sti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
/*
* If the connection has been up for a long amount of time, schedule
ServerStats.is_cl++;
ServerStats.is_cbs += client_p->localClient->sendB;
ServerStats.is_cbr += client_p->localClient->receiveB;
- ServerStats.is_cti += rb_current_time() - client_p->localClient->firsttime;
+ ServerStats.is_cti += (unsigned long long)(rb_current_time() - client_p->localClient->firsttime);
}
else
ServerStats.is_ni++;
projects / solanum.git / blobdiff