X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/e17ab35b5dbba3b55a377e8be87253ac62b57df6..fa6495b47f0cce2f187b29fff92bb6012630bc39:/src/s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 10c0fab..2569d56 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -54,6 +54,7 @@
 #include "msg.h"
 #include "reject.h"
 #include "sslproc.h"
+#include "irc_dictionary.h"
 
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned int) 0xffffffff)
@@ -88,6 +89,7 @@ struct Capability captab[] = {
 	{ "SAVE",	CAP_SAVE },
 	{ "EUID",	CAP_EUID },
 	{ "EOPMOD",	CAP_EOPMOD },
+	{ "BAN",	CAP_BAN },
 	{0, 0}
 };
 
@@ -391,6 +393,67 @@ send_capabilities(struct Client *client_p, int cap_can_send)
 	sendto_one(client_p, "CAPAB :%s", msgbuf);
 }
 
+static void
+burst_ban(struct Client *client_p)
+{
+	rb_dlink_node *ptr;
+	struct ConfItem *aconf;
+	const char *type, *oper;
+	/* +5 for !,@,{,} and null */
+	char operbuf[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
+	char *p;
+	size_t melen;
+
+	melen = strlen(me.name);
+	RB_DLINK_FOREACH(ptr, prop_bans.head)
+	{
+		aconf = ptr->data;
+
+		/* Skip expired stuff. */
+		if(aconf->lifetime < rb_current_time())
+			continue;
+		switch(aconf->status & ~CONF_ILLEGAL)
+		{
+			case CONF_KILL: type = "K"; break;
+			case CONF_DLINE: type = "D"; break;
+			case CONF_XLINE: type = "X"; break;
+			case CONF_RESV_NICK: type = "R"; break;
+			case CONF_RESV_CHANNEL: type = "R"; break;
+			default:
+				continue;
+		}
+		oper = aconf->info.oper;
+		if(aconf->flags & CONF_FLAGS_MYOPER)
+		{
+			/* Our operator{} names may not be meaningful
+			 * to other servers, so rewrite to our server
+			 * name.
+			 */
+			rb_strlcpy(operbuf, aconf->info.oper, sizeof buf);
+			p = strrchr(operbuf, '{');
+			if (p != NULL &&
+					operbuf + sizeof operbuf - p > (ptrdiff_t)(melen + 2))
+			{
+				memcpy(p + 1, me.name, melen);
+				p[melen + 1] = '}';
+				p[melen + 2] = '\0';
+				oper = operbuf;
+			}
+		}
+		sendto_one(client_p, ":%s BAN %s %s %s %lu %d %d %s :%s%s%s",
+				me.id,
+				type,
+				aconf->user ? aconf->user : "*", aconf->host,
+				(unsigned long)aconf->created,
+				(int)(aconf->hold - aconf->created),
+				(int)(aconf->lifetime - aconf->created),
+				oper,
+				aconf->passwd,
+				aconf->spasswd ? "|" : "",
+				aconf->spasswd ? aconf->spasswd : "");
+	}
+}
+
 /* burst_modes_TS6()
  *
  * input	- client to burst to, channel name, list to burst, mode flag
@@ -469,6 +532,8 @@ burst_TS6(struct Client *client_p)
 	char *t;
 	int tlen, mlen;
 	int cur_len = 0;
+	struct Metadata *md;
+	struct DictionaryIter iter;
 
 	hclientinfo.client = hchaninfo.client = client_p;
 
@@ -506,6 +571,10 @@ burst_TS6(struct Client *client_p)
 				   IsIPSpoof(target_p) ? "0" : target_p->sockhost,
 				   target_p->id, target_p->info);
 
+		if(!EmptyString(target_p->certfp))
+			sendto_one(client_p, ":%s ENCAP * CERTFP :%s",
+					use_id(target_p), target_p->certfp);
+
 		if(!IsCapable(client_p, CAP_EUID))
 		{
 			if(IsDynSpoof(target_p))
@@ -516,6 +585,12 @@ burst_TS6(struct Client *client_p)
 						use_id(target_p), target_p->user->suser);
 		}
 
+		DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
+		{
+			sendto_one(client_p, ":%s ENCAP * METADATA ADD %s %s :%s",
+				   use_id(&me), use_id(target_p), md->name, md->value);
+		}
+
 		if(ConfigFileEntry.burst_away && !EmptyString(target_p->user->away))
 			sendto_one(client_p, ":%s AWAY :%s",
 				   use_id(target_p),
@@ -543,8 +618,12 @@ burst_TS6(struct Client *client_p)
 			msptr = uptr->data;
 
 			tlen = strlen(use_id(msptr->client_p)) + 1;
+			if(is_admin(msptr))
+				tlen++;
 			if(is_chanop(msptr))
 				tlen++;
+			if(is_halfop(msptr))
+				tlen++;
 			if(is_voiced(msptr))
 				tlen++;
 
@@ -570,6 +649,14 @@ burst_TS6(struct Client *client_p)
 		}
 		sendto_one(client_p, "%s", buf);
 
+		DICTIONARY_FOREACH(md, &iter, chptr->metadata)
+		{
+			/* don't bother bursting +J metadata */
+			if(!(md->name[0] == 'K'))
+				sendto_one(client_p, ":%s ENCAP * METADATA ADD %s %s :%s",
+					   use_id(&me), chptr->chname, md->name, md->value);
+		}
+
 		if(rb_dlink_list_length(&chptr->banlist) > 0)
 			burst_modes_TS6(client_p, chptr, &chptr->banlist, 'b');
 
@@ -856,6 +943,9 @@ server_estab(struct Client *client_p)
 					target_p->serv->fullcaps);
 	}
 
+	if(IsCapable(client_p, CAP_BAN))
+		burst_ban(client_p);
+
 	burst_TS6(client_p);
 
 	/* Always send a PING after connect burst is done */