GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00
Code Issues Projects Releases Wiki Activity

nefarious: fix checks for what is an IPv6 / IPv4 address

Browse Source
This commit is contained in:
James Lu 2016-04-18 20:54:16 -07:00
parent 0fad0f7a2c
commit bc578240bb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
protocols/nefarious.py
View File

@ -723,7 +723,15 @@ class P10Protocol(Protocol):
# Thanks to Jobe @ evilnet for the code on what to do here. :) -GL
ip = args[-3]
if '_' in ip: # IPv6
if len(ip) == 6: # IPv4
# Pad the characters with two \x00's (represented in P10 B64 as AA)
ip = 'AA' + ip
# Decode it via Base64, dropping the initial padding characters.
ip = base64.b64decode(ip, altchars='[]')[2:]
# Convert the IP to a string.
ip = socket.inet_ntoa(ip)
elif len(ip) <= 24 or '_' in ip: # IPv6
s = ''
# P10-encoded IPv6 addresses are formed with chunks, where each 16-bit
# portion of the address (each part between :'s) is encoded as 3 B64 chars.
@ -741,14 +749,6 @@ class P10Protocol(Protocol):
ip = s.rstrip(':')
else: # IPv4
# Pad the characters with two \x00's (represented in P10 B64 as AA)
ip = 'AA' + ip
# Decode it via Base64, dropping the initial padding characters.
ip = base64.b64decode(ip, altchars='[]')[2:]
# Convert the IP to a string.
ip = socket.inet_ntoa(ip)
uid = args[-2]
realname = args[-1]