GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-30 14:49:28 +01:00
Code Issues Projects Releases Wiki Activity

relay: factorize fetching of remote users/SIDs, spawning them if they don't exist

Browse Source
This commit is contained in:
James Lu 2015-07-14 12:04:05 -07:00
parent 994b2961ee
commit a1299676f1
1 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
plugins/relay.py
View File

@ -15,6 +15,10 @@ from log import log
dbname = "pylinkrelay.db" dbname = "pylinkrelay.db"
relayusers = defaultdict(dict) relayusers = defaultdict(dict)
relayservers = defaultdict(dict) relayservers = defaultdict(dict)
# We need to use a synchronization method here, because multiple threads
# can call getRelaySid at the same time, and we risk spawning the same
# pseudoserver more than once, which will cause SQUITs.
relayservers_lock = threading.Lock()
def normalizeNick(irc, netname, nick, separator="/"): def normalizeNick(irc, netname, nick, separator="/"):
orig_nick = nick orig_nick = nick
@ -79,6 +83,37 @@ def getPrefixModes(irc, remoteirc, channel, user):
modes += remoteirc.cmodes[pmode] modes += remoteirc.cmodes[pmode]
return modes return modes
def getRemoteUser(irc, remoteirc, user):
# If the user (stored here as {(netname, UID):
# {network1: UID1, network2: UID2}}) exists, don't spawn it
# again!
try:
u = relayusers[(irc.name, user)][remoteirc.name]
except KeyError:
userobj = irc.users[user]
nick = normalizeNick(remoteirc, irc.name, userobj.nick)
ident = userobj.ident
host = userobj.host
realname = userobj.realname
sid = getRelaySid(irc, remoteirc)
u = remoteirc.proto.spawnClient(remoteirc, nick, ident=ident,
host=host, realname=realname,
server=sid).uid
remoteirc.users[u].remote = irc.name
relayusers[(irc.name, user)][remoteirc.name] = u
remoteirc.users[u].remote = irc.name
return u
def getRelaySid(irc, remoteirc):
with relayservers_lock:
log.debug('relayservers: %s', relayservers)
try:
sid = relayservers[remoteirc.name][irc.name]
except KeyError: # hasn't been spawned yet.
sid = irc.proto.spawnServer(irc, '%s.relay' % remoteirc.name)
relayservers[remoteirc.name][irc.name] = sid
return sid
def findRelay(chanpair): def findRelay(chanpair):
if chanpair in db: # This chanpair is a shared channel; others link to it if chanpair in db: # This chanpair is a shared channel; others link to it
return chanpair return chanpair
@ -87,7 +122,9 @@ def findRelay(chanpair):
if chanpair in dbentry['links']: if chanpair in dbentry['links']:
return name return name
def findRemoteChan(remotenetname, query): def findRemoteChan(irc, remoteirc, channel):
query = (irc.name, channel)
remotenetname = remoteirc.name
chanpair = findRelay(query) chanpair = findRelay(query)
if chanpair is None: if chanpair is None:
return return
@ -106,6 +143,7 @@ def initializeChannel(irc, channel):
relay = findRelay((irc.name, channel)) relay = findRelay((irc.name, channel))
log.debug('(%s) initializeChannel being called on %s', irc.name, channel) log.debug('(%s) initializeChannel being called on %s', irc.name, channel)
log.debug('(%s) initializeChannel: relay pair found to be %s', irc.name, relay) log.debug('(%s) initializeChannel: relay pair found to be %s', irc.name, relay)
queued_users = []
if relay: if relay:
all_links = db[relay]['links'].copy() all_links = db[relay]['links'].copy()
all_links.update((relay,)) all_links.update((relay,))
@ -118,19 +156,18 @@ def initializeChannel(irc, channel):
remoteirc = utils.networkobjects[remotenet] remoteirc = utils.networkobjects[remotenet]
rc = remoteirc.channels[remotechan] rc = remoteirc.channels[remotechan]
for user in remoteirc.channels[remotechan].users: for user in remoteirc.channels[remotechan].users:
# Don't spawn our pseudoclients again.
if not utils.isInternalClient(remoteirc, user): if not utils.isInternalClient(remoteirc, user):
log.debug('(%s) initializeChannel: should be joining %s/%s to %s', irc.name, user, remotenet, channel) log.debug('(%s) initializeChannel: should be joining %s/%s to %s', irc.name, user, remotenet, channel)
remoteuser = relayusers[(remotenet, user)][irc.name] remoteuser = getRemoteUser(remoteirc, irc, user)
irc.proto.joinClient(irc, remoteuser, channel) userpair = (getPrefixModes(remoteirc, irc, remotechan, user), remoteuser)
for m in getPrefixModes(remoteirc, irc, remotechan, user): log.debug('(%s) initializeChannel: adding %s to queued_users for %s', irc.name, userpair, channel)
mpair = ('+%s' % m, remoteuser) queued_users.append(userpair)
modes.append(mpair) if queued_users:
if modes: sid = getRelaySid(irc, remoteirc)
sid = relayservers[remotenet][irc.name] irc.proto.sjoinServer(irc, sid, channel, queued_users, ts=rc.ts)
irc.proto.modeServer(irc, sid, channel, modes, ts=rc.ts)
log.debug('(%s) initializeChannel: syncing modes %r', irc.name, modes)
log.debug('(%s) initializeChannel: relay users: %s', irc.name, c.users) log.debug('(%s) initializeChannel: joining our users: %s', irc.name, c.users)
relayJoins(irc, channel, c.users, c.ts, c.modes) relayJoins(irc, channel, c.users, c.ts, c.modes)
def handle_join(irc, numeric, command, args): def handle_join(irc, numeric, command, args):
@ -164,8 +201,8 @@ def handle_part(irc, numeric, command, args):
channel = args['channel'] channel = args['channel']
text = args['text'] text = args['text']
for netname, user in relayusers[(irc.name, numeric)].items(): for netname, user in relayusers[(irc.name, numeric)].items():
remotechan = findRemoteChan(netname, (irc.name, channel))
remoteirc = utils.networkobjects[netname] remoteirc = utils.networkobjects[netname]
remotechan = findRemoteChan(irc, remoteirc, channel)
remoteirc.proto.partClient(remoteirc, user, remotechan, text) remoteirc.proto.partClient(remoteirc, user, remotechan, text)
utils.add_hook(handle_part, 'PART') utils.add_hook(handle_part, 'PART')
@ -183,66 +220,34 @@ def relayJoins(irc, channel, users, ts, modes):
# We don't need to clone the PyLink pseudoclient... That's # We don't need to clone the PyLink pseudoclient... That's
# meaningless. # meaningless.
continue continue
userobj = irc.users[user]
userpair_index = relayusers.get((irc.name, user))
ident = userobj.ident
host = userobj.host
realname = userobj.realname
log.debug('Okay, spawning %s/%s everywhere', user, irc.name) log.debug('Okay, spawning %s/%s everywhere', user, irc.name)
for name, remoteirc in utils.networkobjects.items(): for name, remoteirc in utils.networkobjects.items():
if name == irc.name: if name == irc.name:
# Don't relay things to their source network... # Don't relay things to their source network...
continue continue
try: # Spawn our pseudoserver first sid = getRelaySid(remoteirc, irc)
relayservers[remoteirc.name][irc.name] = sid = \
remoteirc.proto.spawnServer(remoteirc, '%s.relay' % irc.name,
endburst=False)
# We want to wait a little bit for the remote IRCd to send their users,
# so we can join them as part of a burst on remote networks.
# Because IRC is asynchronous, we can't really control how long
# this will take.
endburst_timer = threading.Timer(0.5, remoteirc.proto.endburstServer,
args=(remoteirc, sid))
log.debug('(%s) Setting timer to BURST %s', remoteirc.name, sid)
endburst_timer.start()
except ValueError:
# Server already exists (raised by the protocol module).
sid = relayservers[remoteirc.name][irc.name]
log.debug('(%s) Have we bursted %s yet? %s', remoteirc.name, sid, log.debug('(%s) Have we bursted %s yet? %s', remoteirc.name, sid,
remoteirc.servers[sid].has_bursted) remoteirc.servers[sid].has_bursted)
nick = normalizeNick(remoteirc, irc.name, userobj.nick) u = getRemoteUser(irc, remoteirc, user)
# If the user (stored here as {(netname, UID): remotechan = findRemoteChan(irc, remoteirc, channel)
# {network1: UID1, network2: UID2}}) exists, don't spawn it
# again!
u = None
if userpair_index is not None:
u = userpair_index.get(remoteirc.name)
if u is None: # .get() returns None if not found
u = remoteirc.proto.spawnClient(remoteirc, nick, ident=ident,
host=host, realname=realname,
server=sid).uid
remoteirc.users[u].remote = irc.name
relayusers[(irc.name, userobj.uid)][remoteirc.name] = u
remoteirc.users[u].remote = irc.name
remotechan = findRemoteChan(remoteirc.name, (irc.name, channel))
if remotechan is None: if remotechan is None:
continue continue
if not remoteirc.servers[sid].has_bursted: ts = irc.channels[channel].ts
# TODO: join users in batches with SJOIN, not one by one. # TODO: join users in batches with SJOIN, not one by one.
prefixes = getPrefixModes(irc, remoteirc, channel, user) prefixes = getPrefixModes(irc, remoteirc, channel, user)
remoteirc.proto.sjoinServer(remoteirc, sid, remotechan, [(prefixes, u)], ts=ts) userpair = (prefixes, u)
else: log.debug('(%s) relayJoin: joining %s to %s%s', irc.name, userpair, remoteirc.name, remotechan)
remoteirc.proto.joinClient(remoteirc, u, remotechan) remoteirc.proto.sjoinServer(remoteirc, sid, remotechan, [userpair], ts=ts)
def relayPart(irc, channel, user): def relayPart(irc, channel, user):
for name, remoteirc in utils.networkobjects.items(): for name, remoteirc in utils.networkobjects.items():
if name == irc.name: if name == irc.name:
# Don't relay things to their source network... # Don't relay things to their source network...
continue continue
remotechan = findRemoteChan(remoteirc.name, (irc.name, channel)) remotechan = findRemoteChan(irc, remoteirc, channel)
log.debug('(%s) relayPart: looking for %s/%s on %s', irc.name, user, irc.name, remoteirc.name) log.debug('(%s) relayPart: looking for %s/%s on %s', irc.name, user, irc.name, remoteirc.name)
log.debug('(%s) relayPart: remotechan found as %s', irc.name, remotechan) log.debug('(%s) relayPart: remotechan found as %s', irc.name, remotechan)
remoteuser = relayusers[(irc.name, user)][remoteirc.name] remoteuser = getRemoteUser(irc, remoteirc, user)
log.debug('(%s) relayPart: remoteuser for %s/%s found as %s', irc.name, user, irc.name, remoteuser) log.debug('(%s) relayPart: remoteuser for %s/%s found as %s', irc.name, user, irc.name, remoteuser)
if remotechan is None: if remotechan is None:
continue continue