X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4aa86bbb5cab8eb6a672bdff71964669450da021..52c80cff91dce5fa14ae903c6c2bf20533ccca46:/bot.py

diff --git a/bot.py b/bot.py
index 73115a8..fd92922 100644
--- a/bot.py
+++ b/bot.py
@@ -4,7 +4,7 @@
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
 
-import os, random, socket, struct, sys, threading, time, traceback
+import os, random, socket, struct, sys, threading, time, traceback, fcntl
 from collections import deque
 
 if sys.version_info.major < 3:
@@ -71,6 +71,7 @@ class Bot(object):
 	def watchdog(self):
 		if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=300))+self.lastreceived:
 			self.parse("ERROR :Fake-error from watchdog timer.")
+			return
 		if self.conn.registered():
 			self.conn.send("PING :%s" % (time.time()))
 			self._checknick()
@@ -118,6 +119,7 @@ class Bot(object):
 			'354': self._got354, #WHO
 			'396': self._gotHiddenHost, # hidden host has been set
 			'433': self._got433, #nick in use
+			'437': self._got433, #nick protected
 			'JOIN': self._gotjoin,
 			'PART': self._gotpart,
 			'KICK': self._gotkick,
@@ -245,6 +247,10 @@ class Bot(object):
 			for u in chan.users:
 				if u.nick != self.nick:
 					self._clientLeft(u.nick, chan)
+			if chan.deleting:
+				chan.bot.chans.remove(chan)
+				del self.parent.chans[chan.name.lower()]
+				del chan
 		else:
 			user = self.parent.user(nick)
 			gone = user.part(chan)
@@ -552,17 +558,23 @@ class BotConnection(object):
 		self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack('ii', 0, 0))
 		self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
 		self.socket.bind((self.bind, 0))
+		self._write_oidentd()
 		self.socket.connect((self.server, self.port))
 		return True
 	def register(self):
 		if self.state == 0:
+			pss = self.parent.parent.cfg.get('erebus', 'pass')
+			if pss:
+				self.send("PASS %s" % (pss))
 			self.send("NICK %s" % (self.parent.nick))
 			self.send("USER %s 0 * :%s" % (self.parent.user, self.parent.realname))
 			self.state = 1
 		return True
 
 	def registered(self, done=False):
-		if done: self.state = 2
+		if done:
+			self.state = 2
+			self._unwrite_oidentd()
 		return self.state == 2
 
 	def send(self, line):
@@ -580,7 +592,7 @@ class BotConnection(object):
 				self.parent.log('X', line)
 
 	def _write(self, line):
-		self.socket.sendall(line.encode('utf-8', 'backslashreplace')+b"\r\n")
+		self.socket.sendall(line.encode('utf-8', 'surrogateescape')+b"\r\n")
 
 	def _getsockerr(self):
 		try: # SO_ERROR might not exist on all platforms
@@ -602,5 +614,33 @@ class BotConnection(object):
 
 		return lines
 
+	def _format_oidentd(self):
+		ident = self.parent.user
+		fport = self.parent.port
+		from_ = self.bind
+		lport = self.socket.getsockname()[1]
+		if from_:
+			return 'fport %s from %s lport %s { reply "%s" }\n' % (fport, from_, lport, ident)
+		else:
+			return 'fport %s lport %s { reply "%s" }\n' % (fport, lport, ident)
+	def _write_oidentd(self):
+		path = self.parent.parent.cfg.get('erebus', 'oidentd_path')
+		if path is not None:
+			with open(path, 'a') as fh:
+				fcntl.lockf(fh, fcntl.LOCK_EX)
+				fh.write(self._format_oidentd())
+				fcntl.lockf(fh, fcntl.LOCK_UN)
+	def _unwrite_oidentd(self):
+		path = self.parent.parent.cfg.get('erebus', 'oidentd_path')
+		if path is not None:
+			with open(path, 'r+') as fh:
+				fcntl.lockf(fh, fcntl.LOCK_EX)
+				data = fh.read()
+				newdata = data.replace(self._format_oidentd(), '')
+				fh.seek(0)
+				fh.write(newdata)
+				fh.truncate()
+				fcntl.lockf(fh, fcntl.LOCK_UN)
+
 	def __str__(self): return self.parent.nick
 	def __repr__(self): return "<BotConnection %r (%r)>" % (self.socket.fileno(), self.parent.nick)