From 1fda7b2a3e98181e3056b4b21a871ac4af5858fa Mon Sep 17 00:00:00 2001 From: Andris Raugulis Date: Wed, 28 Sep 2016 16:58:58 +0300 Subject: [PATCH] Support simple software output (without patch). --- ssh-audit.py | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/ssh-audit.py b/ssh-audit.py index 9d78d0d..981ecb7 100755 --- a/ssh-audit.py +++ b/ssh-audit.py @@ -517,15 +517,15 @@ class SSH(object): return -1 elif self.version > oversion: return 1 - spatch = self.patch + spatch = self.patch or '' if self.product == SSH.Product.DropbearSSH: if not re.match(r'^test\d.*$', opatch): opatch = 'z{0}'.format(opatch) - if not re.match(r'^test\d.*$', self.patch): - spatch = 'z{0}'.format(self.patch) + if not re.match(r'^test\d.*$', spatch): + spatch = 'z{0}'.format(spatch) elif self.product == SSH.Product.OpenSSH: mx1 = re.match(r'^p\d(.*)', opatch) - mx2 = re.match(r'^p\d(.*)', self.patch) + mx2 = re.match(r'^p\d(.*)', spatch) if not (mx1 and mx2): if mx1: opatch = mx1.group(1) @@ -544,23 +544,27 @@ class SSH(object): return False return True - def __str__(self): + def display(self, full=True): out = '{0} '.format(self.vendor) if self.vendor else '' out += self.product if self.version: out += ' {0}'.format(self.version) - patch = self.patch - if self.product == SSH.Product.OpenSSH: - mx = re.match('^(p\d)(.*)$', self.patch) - if mx is not None: - out += mx.group(1) - patch = mx.group(2).strip() - if patch: - out += ' ({0})'.format(self.patch) - if self.os: - out += ' running on {0}'.format(self.os) + if full: + patch = self.patch or '' + if self.product == SSH.Product.OpenSSH: + mx = re.match('^(p\d)(.*)$', patch) + if mx is not None: + out += mx.group(1) + patch = mx.group(2).strip() + if patch: + out += ' ({0})'.format(patch) + if self.os: + out += ' running on {0}'.format(self.os) return out + def __str__(self): + return self.display() + def __repr__(self): out = 'vendor={0} '.format(self.vendor) if self.vendor else '' if self.product: