* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_serv.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
#include "msg.h"
#include "reject.h"
#include "sslproc.h"
+#include "irc_dictionary.h"
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
{ "SAVE", CAP_SAVE },
{ "EUID", CAP_EUID },
{ "EOPMOD", CAP_EOPMOD },
+ { "BAN", CAP_BAN },
+ { "MLOCK", CAP_MLOCK },
{0, 0}
};
{
error = -2;
- if(ServerConfEncrypted(tmp_p))
+ if(tmp_p->passwd)
{
- if(!strcmp(tmp_p->passwd, rb_crypt(client_p->localClient->passwd,
- tmp_p->passwd)))
+ if(ServerConfEncrypted(tmp_p))
{
- server_p = tmp_p;
- break;
+ if(!strcmp(tmp_p->passwd, rb_crypt(client_p->localClient->passwd,
+ tmp_p->passwd)))
+ {
+ server_p = tmp_p;
+ break;
+ }
+ else
+ continue;
}
+ else if(strcmp(tmp_p->passwd, client_p->localClient->passwd))
+ continue;
}
- else if(!strcmp(tmp_p->passwd, client_p->localClient->passwd))
+
+ if(tmp_p->certfp)
{
- server_p = tmp_p;
- break;
+ if(!client_p->certfp || strcasecmp(tmp_p->certfp, client_p->certfp) != 0)
+ continue;
}
+
+ server_p = tmp_p;
+ break;
}
}
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
char *t;
int tlen, mlen;
int cur_len = 0;
+ struct Metadata *md;
+ struct DictionaryIter iter;
hclientinfo.client = hchaninfo.client = client_p;
RB_DLINK_FOREACH(ptr, global_client_list.head)
{
- const char *awaymsg = NULL;
-
target_p = ptr->data;
if(!IsPerson(target_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))
use_id(target_p), target_p->user->suser);
}
- if(ConfigFileEntry.burst_away && (awaymsg = get_metadata(target_p, "away")) != NULL)
+ 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),
- awaymsg);
+ target_p->user->away);
hclientinfo.target = target_p;
call_hook(h_burst_client, &hclientinfo);
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++;
}
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');
ConfigChannel.burst_topicwho ? " " : "",
chptr->topic);
+ if(IsCapable(client_p, CAP_MLOCK))
+ sendto_one(client_p, ":%s MLOCK %ld %s :%s",
+ me.id, (long) chptr->channelts, chptr->chname,
+ EmptyString(chptr->mode_lock) ? "" : chptr->mode_lock);
+
hchaninfo.chptr = chptr;
call_hook(h_burst_channel, &hchaninfo);
}
if(IsUnknown(client_p))
{
- /*
- * jdc -- 1. Use EmptyString(), not [0] index reference.
- * 2. Check ->spasswd, not ->passwd.
- */
- if(!EmptyString(server_p->spasswd))
- {
- sendto_one(client_p, "PASS %s TS %d :%s",
- server_p->spasswd, TS_CURRENT, me.id);
- }
+ /* the server may be linking based on certificate fingerprint now. --nenolod */
+ sendto_one(client_p, "PASS %s TS %d :%s",
+ EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id);
/* pass info to new server */
send_capabilities(client_p, default_server_capabs
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 */
/* Next, send the initial handshake */
SetHandshake(client_p);
- if(!EmptyString(server_p->spasswd))
- {
- sendto_one(client_p, "PASS %s TS %d :%s",
- server_p->spasswd, TS_CURRENT, me.id);
- }
+ /* the server may be linking based on certificate fingerprint now. --nenolod */
+ sendto_one(client_p, "PASS %s TS %d :%s",
+ EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id);
/* pass my info to the new server */
send_capabilities(client_p, default_server_capabs