Merge 192.168.1.7:Projects/mcproxy into prod

Author: ekimekim

config.py

@@ -1,8 +1,8 @@
 import os
 
 # Info for proxy
-LISTEN_ADDR = ('0.0.0.0', 25564)
-SERVER_ADDR = ('127.0.0.1', 25565)
+LISTEN_ADDR = ('0.0.0.0', 25565)
+SERVER_ADDR = ('127.0.0.1', 25042)
 LOG_FILE = '/var/minecraft/logs/proxy.log'
 PLUGIN_PATH = '/var/minecraft/Proxy2/plugins'
 

helpers.py

@@ -1,12 +1,67 @@
+# -*- coding: cp1252 -*-
 """Helper functions for plugins"""
 
 import os
-
-
 from proxy import send_packet
 from proxy import server_cmd as cmd
+from packet_decoder import names as packet_names
 from config import *
 
 def ops():
 	"""Get list of op usernames."""
-	open(os.path.join(SERVER_DIR, 'ops.txt'))
+	ret = open(os.path.join(SERVER_DIR, 'ops.txt')).read().strip().split('\n')
+	ret = [unicode(name) for name in ret]
+	return ret
+
+colors = {
+		'black': u'0',
+		'dark blue': u'1',
+		'dark green': u'2',
+		'dark cyan': u'3',
+		'dark red': u'4',
+		'purple': u'5',
+		'gold': u'6',
+		'gray': u'7',
+		'dark gray': u'8',
+		'blue': u'9',
+		'green': u'a',
+		'cyan': u'b',
+		'red': u'c',
+		'pink': u'd',
+		'yellow': u'e',
+		'white': u'f'
+	}
+def color(name):
+	"""Takes a color name and returns the string needed to turn the chat message that color."""
+	if name not in color_map:
+		raise ValueError('Bad color %s' % repr(name))
+	return u'§' + color_map[name]
+
+
+locks = set()
+def tell(user, message, delay=0, lock=None):
+	"""Send a server message to user.
+	Optional args:
+		delay: Wait delay seconds before sending message. Useful mainly with lock. See below.
+		lock: Until message sent (see delay) allow no new messages with the same user and lock value.
+			Generally speaking, expected to be a string. But it doesn't really matter.
+	Returns bool of whether message was sent (see lock)
+	"""
+	global locks
+	if lock is not None:
+		if (user, lock) in locks:
+			return False
+		else:
+			locks.add((user, lock))
+	def tell_send():
+		packet = Packet()
+		packet.ident = packet_names['Chat message']
+		packet.direction = CLIENT_TO_SERVER if to_server else SERVER_TO_CLIENT
+		packet.data = {'text': unicode(message)}
+		send_packet(packet, user, False)
+		locks.remove((user, lock))
+
+	if delay:
+		schedule(tell_send, delay)
+	else:
+		tell_send()

killproxy

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-ps aux | grep 'python proxy\.py' | grep -v grep | awk '{print $2}' | xargs kill
+{ ps aux | grep 'python proxy\.py' | grep -v grep | awk '{print $2}' | xargs kill 2>/dev/null ; } &&
+	echo "Killed proxy"

packet_decoder.py

@@ -2,7 +2,6 @@
 
 import struct
 import sys
-import nbt
 
 #TODO: Review which of these we actually need
 NODE_SERVER = 0x01
@@ -541,7 +540,6 @@ def get_struct(self, packet):
 			o = o[packet.direction]
 		if len(o) and not isinstance(o[0], tuple):
 			o = (o),
-		#print o
 		return o
 
 
@@ -562,18 +560,14 @@ def pack(self, data_type, data):
 				if nbtdata is None:
 					o += self.pack('short', -1)
 				else:
-					nbtdata = nbt.encode(nbtdata)
-					nbtdata = nbt.gzip(nbtdata)
 					nbt_len = len(nbtdata)
 					o += self.pack('short', nbt_len)
 					o += nbtdata
 			return o
 		if data_type == "metadata":
 			o = ''
 			for mtype, val in data:
-				#print "Packing", mtype, val
 				mtype2 = mtype >> 5
-				#print "mtype2 is", mtype2
 				o += self.pack('byte', mtype)
 				if mtype2 == 0: o += self.pack('byte', val) 
 				if mtype2 == 1: o += self.pack('short', val) 
@@ -626,9 +620,11 @@ def unpack(self, data_type):
 				if extra_len <= 0:
 					o["extra"] = None
 				else:
+					if len(self.buff) < extra_len:
+						raise IncompleteData()
 					extra_buff = self.buff[:extra_len]
 					self.buff = self.buff[extra_len:]
-					o["extra"] = nbt.decode(nbt.gunzip(self.buff))
+					o["extra"] = extra_buff
 			return o
 		if data_type == "metadata":
 			#[(17, 0), (0, 0), (16, -1)]
@@ -704,7 +700,7 @@ def read_packet(self):
 		"""
 
 		#self.debug("READ BUFFER SIZE: %d" % len(self.buff))
-		backup = self.buff
+		backup = self.buff[:]
 		packet = Packet()
 		try:
 			packet.direction = self.node
@@ -763,7 +759,7 @@ def read_packet(self):
 			if packet.ident == 0x82:
 				packet.data["text"] = []
 				for i in range(4):
-					packet.data["text"].append(packet.data.pop("line_%s" % (i+1)))
+					packet.data["text"].append(packet.data["line_%s" % (i+1)])
 
 			#0x83
 			if packet.ident == 0x83:
@@ -779,7 +775,9 @@ def read_packet(self):
 			self.buff = backup
 			return None
 		except Exception, ex:
+			self.buff = backup
 			ex.args += (self.buff[20:],)
+			raise
 
 
 	def encode_packet(self, packet):
@@ -829,7 +827,6 @@ def encode_packet(self, packet):
 			if packet.ident == 0x82:
 				for i in range(4):
 					packet.data["line_%s" % (i+1)] = packet.data["text"][i]
-				del packet.data["text"]
 			#0x83
 			if packet.ident == 0x83:
 				packet.data['data_size'] = len(packet.data['data'])
@@ -839,26 +836,6 @@ def encode_packet(self, packet):
 				output += self.pack(i[0], packet.data[i[1]])
 
 			output += append
-			# Is this meant to be a multiline comment? Seriously?
-			"""
-			if hasattr(packet, "original") and output != packet.original:
-				f1 = open('err1.bin', 'w')
-				f1.write(packet.original)
-				f1.close()
-				f2 = open('err2.bin', 'w')
-				f2.write(output)
-				f2.close()
-				self.debug("Packet mis-match!")
-				self.debug("ID: %x" % packet.ident)
-				print packet.data
-				sys.exit(1)"""
-			"""if len(output) != len(packet.original):
-				print "%x\tXX %i\t%i" % (packet.ident, len(packet.original), len(output))
-				print "APPEND: %i" % len(append)
-				print packet.data
-			else:
-				print "OK"
-				print "%x\tOK %i\t%i" % (packet.ident, len(packet.original), len(output))"""
 			return output
 		except:
 			raise

plugins.py

@@ -3,7 +3,7 @@
 sys.path.append(PLUGIN_PATH)
 
 # Import plugins here
-import log_all, log_sorted, usernames, no_changes
+import log_all, log_sorted, usernames, no_changes, sp_opcolor
 
 # Set ordering here
-plugins = [log_all, log_sorted, usernames, no_changes]
+plugins = [log_all, log_sorted, usernames, sp_opcolor]

plugins/cmd.py

@@ -0,0 +1,58 @@
+
+AUTHOR = 'ekimekim'
+CONTACT = '[email protected]'
+DESCRIPTION = """A module intended to be a single module for command-like chat triggers.
+Modules shoud register a regex to match a chat message exactly.
+Along with this regex is a callback function that has args: (message, user, *regex_groups)
+	and returns False to let packet pass through or True to drop it.
+This behaviour is intended to allow further checking before deciding if the packet should be dropped.
+Messages are passed through all matching functions (unless dropped)
+	in the order of regsitration (shich should occur during on_start()).
+"""
+
+from packet_decoder import names as packet_names
+import re
+
+registrations = [] # List of (regex obj, function)
+
+
+def on_start():
+	pass
+
+
+def on_packet(packet, user, to_server):
+	global registrations
+
+	if not to_server or packet.ident != packet_names['Chat message']:
+		return packet
+
+	message = packet.data['text']
+
+	for regex, func in registrations:
+		match = regex.match(message)
+		if match is not None:
+			if not func(message, user, *match.groups):
+				break # break skips the else and so returns [] immediately
+	else: # runs only if break is never reached, ie. no dropping matches.
+		return packet
+	return []
+
+
+def register(regex, func):
+	"""Register a callback function to be called when a chat message matches regex.
+	regex should be a valid regular expression that matches against the whole chat message.
+	func should take args (message, user, *regex_groups) and return False
+		to pass packet along or True to drop it.
+		regex_groups are the groups returned by a regex match (as per re.match(regex).groups)
+	Example:
+		def private_msg(message, user, target, priv_msg):
+			# sends target the message priv_msg
+			return True # drop packet
+
+		def on_start():
+			cmd.register('/msg ([^ ]+) (.*)', private_msg)
+	"""
+	global registrations
+	regex = r'(?:%s)$' # Make match end of string also
+	regex = re.compile(regex)
+	registrations.append((regex, func))

plugins/no_changes.py

@@ -2,6 +2,7 @@
 Note this is a lengthy operation and should be used sparingly."""
 
 import packet_decoder
+import simple_logging as logging
 
 def on_start():
 	pass
@@ -11,4 +12,7 @@ def on_packet(packet, user, to_server):
 		reencoded = packet_decoder.stateless_pack(packet, to_server)
 		if packet.original != reencoded:
 			raise Exception("Packet (%s) changed: Reencodes to %s, not %s" % (packet, repr(reencoded), repr(packet.original)))
-		return packet
+	else:
+		logging.debug('Packet without original')
+	logging.debug("Packet of type %s" % packet.name())
+	return packet

plugins/sp_opcolor.py

@@ -0,0 +1,30 @@
+
+AUTHOR='sleepyparadox'
+CONTACT='[email protected]'
+DESCRIPTION= """Sleepy Paradox - Op Color
+A simple plugin that highlights the developers efforts.
+Highlights 'Sleepy Paradox' and ekimekim' in red.
+Also replaces 'bitblitz' with 'Sleepy Paradox' (To make account consistent with developer name)"""
+
+from packet_decoder import Packet
+from helpers import ops, color
+
+opColor = color('red')
+userColor = color('dark cyan')
+
+def on_start():
+    pass
+
+def on_packet(packet, user, to_server):
+    if packet.name() == 'Chat message':
+        #Highlight admin names in red
+        if not to_server:
+            for op in ops():
+                #insert op color flag before name and normal color flag after name
+                packet.data['text'] = packet.data['text'].replace(op, opColor + op + color('white'))
+            packet.data['text'] = packet.data['text'].replace(user.username, userColor + user.username + color('white'))
+                
+            #replace 'bitblitz' with developer name 'Sleepy Paradox'
+            packet.data['text'] = packet.data['text'].replace(u'bitblitz', u'Sleepy Paradox')
+    #return edited packet
+    return packet

plugins/usercolors.py

@@ -0,0 +1,50 @@
+
+AUTHOR="ekimekim (based on sleepyparadox's 'sp_opcolor')"
+CONTACT='[email protected]'
+DESCRIPTION= """A plugin that highlights usernames in chat.
+Has different colours for ops, logged in users, not logged in users, and yourself.
+Colours have sensible defaults but are configurable with in-game commands:
+	/colors help
+	/colors TYPE COLOR
+"""
+
+from packet_decoder import Packet
+from helpers import ops, color
+
+opColor = color('red')
+userColor = color('dark cyan')
+
+def on_start():
+	cmd.register('/color (.*)', on_command)
+
+def on_packet(packet, user, to_server):
+    if packet.name() == 'Chat message':
+        #Highlight admin names in red
+        if not to_server:
+            for op in ops():
+                #insert op color flag before name and normal color flag after name
+                packet.data['text'] = packet.data['text'].replace(op, opColor + op + color('white'))
+            packet.data['text'] = packet.data['text'].replace(user.username, userColor + user.username + color('white'))
+                
+            #replace 'bitblitz' with developer name 'Sleepy Paradox'
+            packet.data['text'] = packet.data['text'].replace(u'bitblitz', u'Sleepy Paradox')
+    #return edited packet
+    return packet
+
+HELP = """Chat color commands:
+/color help - This message
+/color colors - List available colors
+/color all X - set all chat messages to X
+/color active X - set logged in usernames to X
+/color inactive X - set logged out usernames to X
+/color me X - set yourself to appear as X
+___Note: Only you see the new color, not everyone.
+/color ops X - set ops to appear as X
+Replace X with the color you want, as given by /color colors."""
+
+def on_command(message, user, command):
+	verb, value = command.split(' ', 1)
+	if verb == 'help':
+		user.tell(HELP)
+	elif verb in user.setcolors:
+		if value in color.colors