hak5
/
ToorChat
mirror of https://github.com/hak5/ToorChat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes to protocol

master
haddaway 2012-10-21 14:47:55 -07:00
parent 0819a5ae0e
commit 8a332f1467
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libtoorchat.py
View File

@ -57,10 +57,10 @@ class ToorChatProtocol():
if isinstance(frequency, int): if isinstance(frequency, int):
self.device.setFreq(int(frequency)) self.device.setFreq(int(frequency))
def send_web_request(self, site = ""): def send_web_request(self, site = "", xid):
'''This is used to attempt to get anyone who is registered as a server to load a website on your behalf ''' '''This is used to attempt to get anyone who is registered as a server to load a website on your behalf '''
if site != "": if site != "":
request = ToorMessage(site, None, ToorChatProtocol.get_web_request_type()) request = ToorMessage(site, None, ToorChatProtocol.get_web_request_type(), xid)
self.device.RFxmit(request.to_string()) self.device.RFxmit(request.to_string())
return request return request
@ -120,7 +120,7 @@ class ToorMessage():
''' Note: The more data bytes we use, the harder it is to catch over the air ''' ''' Note: The more data bytes we use, the harder it is to catch over the air '''
def __init__(self, message = "", user = None, protocol_type=ToorChatProtocol.get_chat_type(), xid=None, index="00", last="00"): def __init__(self, message = "", user = None, protocol_type=ToorChatProtocol.get_chat_type(), xid=None, index="0000", last="0000"):
self.raw = None self.raw = None
self.start = ToorChatProtocol.get_packet_start() self.start = ToorChatProtocol.get_packet_start()
if xid == None: if xid == None:
@ -139,6 +139,7 @@ class ToorMessage():
self.data = message self.data = message
self.end = ToorChatProtocol.get_packet_end() self.end = ToorChatProtocol.get_packet_end()
@classmethod
def get_random_xid(self): def get_random_xid(self):
return os.urandom(8) return os.urandom(8)

4
toorchat.py
View File

@ -115,8 +115,8 @@ class Visualizer():
if entry == ord('w'): if entry == ord('w'):
self.screen.nodelay(0) self.screen.nodelay(0)
user_input = self.screen.getstr(1, 1, 60) user_input = self.screen.getstr(1, 1, 60)
self.request_xid = request.xid self.request_xid = ToorMessage.get_random_xid()
request = self.protocol.send_web_request(user_input) request = self.protocol.send_web_request(user_input, self.request_xid)
self.screen.nodelay(1) self.screen.nodelay(1)
self.screen.addstr(1,1," "*(self.screen_max_x-3)) self.screen.addstr(1,1," "*(self.screen_max_x-3))