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

Don't try to execute IGD commands if ctrlURL is empty

This commit is contained in:
Oleksii Shevchuk 2017-03-12 08:12:23 +02:00
parent aed19503f4
commit 84f2faa818
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pupy/modules/igd.py
View File

@ -37,7 +37,7 @@ class IGDCMDClient(object):
columnlen = len(column) - 3 columnlen = len(column) - 3
else: else:
columnlen = len(column) columnlen = len(column)
columns.append(column) columns.append(column)
column_sizes[column] = max(len(str(cvalue)), columnlen) column_sizes[column] = max(len(str(cvalue)), columnlen)
else: else:
@ -52,13 +52,13 @@ class IGDCMDClient(object):
header += colorize(fmt.format(column), 'yellow') header += colorize(fmt.format(column), 'yellow')
lines.append(header) lines.append(header)
for value in values: for value in values:
row = '' row = ''
for column in columns: for column in columns:
fmt = ' {{:<{}}} '.format(column_sizes[column]) fmt = ' {{:<{}}} '.format(column_sizes[column])
row += fmt.format(value[column]) row += fmt.format(value[column])
lines.append(row) lines.append(row)
self.log('\n'.join(lines)) self.log('\n'.join(lines))
def addPM(self, args): def addPM(self, args):
@ -195,7 +195,7 @@ class IGDClient(PupyModule):
def init_argparse(self): def init_argparse(self):
cli = IGDCMDClient() cli = IGDCMDClient()
parser = PupyArgumentParser( parser = PupyArgumentParser(
prog='igdc', prog='igdc',
description=self.__doc__ description=self.__doc__
@ -409,6 +409,10 @@ class IGDClient(PupyModule):
igdc = self.client.conn.modules['network.lib.igd'].IGDClient igdc = self.client.conn.modules['network.lib.igd'].IGDClient
UPNPError = self.client.conn.modules['network.lib.igd'].UPNPError UPNPError = self.client.conn.modules['network.lib.igd'].UPNPError
self.cli.init(igdc, args, self.log) self.cli.init(igdc, args, self.log)
if not self.cli.igdc.available:
self.error('IGD: Not found in LAN')
return
self.cli.igdc.enableDebug(args.DEBUG) self.cli.igdc.enableDebug(args.DEBUG)
self.cli.igdc.enablePPrint(args.pretty_print) self.cli.igdc.enablePPrint(args.pretty_print)
try: try: