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

Merge branch 'master' of https://github.com/cowrie/cowrie

This commit is contained in:
Michel Oosterhof 2020-09-14 23:11:31 +08:00
parent d49cbdcb42 fad1f1388e
commit 0ca426ac06
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cowrie/commands/nc.py
View File

@ -25,6 +25,7 @@ def makeMask(n):
def dottedQuadToNum(ip): def dottedQuadToNum(ip):
""" """
convert decimal dotted quad string to long integer convert decimal dotted quad string to long integer
this will throw builtins.OSError on failure
""" """
return struct.unpack('I', socket.inet_aton(ip))[0] return struct.unpack('I', socket.inet_aton(ip))[0]
@ -72,7 +73,7 @@ usage: nc [-46bCDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]
host = args[0] host = args[0]
port = args[1] port = args[1]
if not re.match(r'\d+', port): if not re.match(r'^\d+$', port):
self.errorWrite('nc: port number invalid: {}\n'.format(port)) self.errorWrite('nc: port number invalid: {}\n'.format(port))
self.exit() self.exit()
return return
@ -80,10 +81,15 @@ usage: nc [-46bCDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]
if re.match(r'^\d+$', host): if re.match(r'^\d+$', host):
address = int(host) address = int(host)
elif re.match(r'^[\d\.]+$', host): elif re.match(r'^[\d\.]+$', host):
address = dottedQuadToNum(host) try:
address = dottedQuadToNum(host)
except OSError:
self.exit()
return
else: else:
# TODO: should do dns lookup # TODO: should do dns lookup
self.exit() self.exit()
return
for net in local_networks: for net in local_networks:
if addressInNetwork(address, net): if addressInNetwork(address, net):