Skip to content

ENH: Simplify JSON/Dictionary parsing logic #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rmhowe425 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ENH: Simplify JSON/Dictionary parsing logic #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fb898f
Simplifying dictionary / json parsing logic
rmhowe425 Jul 14, 2024
4b2490b
Updating implementation
rmhowe425 Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions shodan/cli/host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ def host_print_pretty(host, history=False):
for banner in sorted(host['data'], key=lambda k: k['port']):
product = ''
version = ''
if 'product' in banner and banner['product']:
if banner.get('product'):
product = banner['product']
if 'version' in banner and banner['version']:
if banner.get('version'):
version = '({})'.format(banner['version'])

click.echo(click.style('{:>7d}'.format(banner['port']), fg='cyan'), nl=False)
Expand All @@ -92,25 +92,24 @@ def host_print_pretty(host, history=False):
click.echo('')

# Show optional HTTP information
if 'http' in banner:
if 'title' in banner['http'] and banner['http']['title']:
click.echo('\t|-- HTTP title: {}'.format(banner['http']['title']))
if banner.get('http') and banner['http'].get('title'):
click.echo('\t|-- HTTP title: {}'.format(banner['http']['title']))

# Show optional ssl info
if 'ssl' in banner:
if 'cert' in banner['ssl'] and banner['ssl']['cert']:
if 'issuer' in banner['ssl']['cert'] and banner['ssl']['cert']['issuer']:
issuer = ', '.join(['{}={}'.format(key, value) for key, value in banner['ssl']['cert']['issuer'].items()])
click.echo('\t|-- Cert Issuer: {}'.format(issuer))
if 'subject' in banner['ssl']['cert'] and banner['ssl']['cert']['subject']:
if banner['ssl']['cert'].get('subject'):
subject = ', '.join(['{}={}'.format(key, value) for key, value in banner['ssl']['cert']['subject'].items()])
click.echo('\t|-- Cert Subject: {}'.format(subject))
if 'versions' in banner['ssl'] and banner['ssl']['versions']:
if banner['ssl'].get('versions'):
click.echo('\t|-- SSL Versions: {}'.format(', '.join([item for item in sorted(banner['ssl']['versions']) if not version.startswith('-')])))
if 'dhparams' in banner['ssl'] and banner['ssl']['dhparams']:
if banner['ssl'].get('dhparams'):
click.echo('\t|-- Diffie-Hellman Parameters:')
click.echo('\t\t{:15s}{}\n\t\t{:15s}{}'.format('Bits:', banner['ssl']['dhparams']['bits'], 'Generator:', banner['ssl']['dhparams']['generator']))
if 'fingerprint' in banner['ssl']['dhparams']:
if banner['ssl']['dhparams'].get('fingerprint'):
click.echo('\t\t{:15s}{}'.format('Fingerprint:', banner['ssl']['dhparams']['fingerprint']))


Expand Down
6 changes: 3 additions & 3 deletions shodan/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ def iterate_files(files, fast=False):


def get_screenshot(banner):
if 'screenshot' in banner and banner['screenshot']:
if banner.get('screenshot'):
return banner['screenshot']
elif 'opts' in banner and 'screenshot' in banner['opts']:
elif banner.get('opts') and banner['opts'].get('screenshot'):]:
return banner['opts']['screenshot']

return None


Expand Down