elie/ssh-audit
1
0
Fork 0
mirror of https://github.com/jtesta/ssh-audit.git synced 2024-07-02 12:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix method type and naming.

Browse Source
This commit is contained in:
Andris Raugulis 2017-04-05 16:31:43 +03:00
parent c132c62b96
commit e4bdabb891
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ssh-audit.py
View File

@ -198,6 +198,7 @@ class Output(object):
self.colors = True self.colors = True
self.verbose = False self.verbose = False
self.__minlevel = 0 self.__minlevel = 0
self.__colsupport = 'colorama' in sys.modules or os.name == 'posix'
@property @property
def minlevel(self): def minlevel(self):
@ -226,7 +227,7 @@ class Output(object):
@property @property
def colors_supported(self): def colors_supported(self):
# type: () -> bool # type: () -> bool
return 'colorama' in sys.modules or os.name == 'posix' return self.__colsupport
@staticmethod @staticmethod
def _colorized(color): def _colorized(color):
@ -1270,19 +1271,19 @@ class SSH(object): # pylint: disable=too-few-public-methods
@property @property
def maxlen(self): def maxlen(self):
# type: () -> int # type: () -> int
def ml(items): def _ml(items):
# type: (Sequence[text_type]) -> int # type: (Sequence[text_type]) -> int
return max(len(i) for i in items) return max(len(i) for i in items)
maxlen = 0 maxlen = 0
if self.ssh1kex is not None: if self.ssh1kex is not None:
maxlen = max(ml(self.ssh1kex.supported_ciphers), maxlen = max(_ml(self.ssh1kex.supported_ciphers),
ml(self.ssh1kex.supported_authentications), _ml(self.ssh1kex.supported_authentications),
maxlen) maxlen)
if self.ssh2kex is not None: if self.ssh2kex is not None:
maxlen = max(ml(self.ssh2kex.kex_algorithms), maxlen = max(_ml(self.ssh2kex.kex_algorithms),
ml(self.ssh2kex.key_algorithms), _ml(self.ssh2kex.key_algorithms),
ml(self.ssh2kex.server.encryption), _ml(self.ssh2kex.server.encryption),
ml(self.ssh2kex.server.mac), _ml(self.ssh2kex.server.mac),
maxlen) maxlen)
return maxlen return maxlen