Merge pull request #1 from Yaser-Amiri/master

Pretty json
This commit is contained in:
Narbeh 2018-04-21 05:04:40 +00:00 committed by GitHub
commit b7df3d3239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions

View File

@ -21,6 +21,7 @@ optional arguments:
-H [HOSTS [HOSTS ...]], --host [HOSTS [HOSTS ...]] -H [HOSTS [HOSTS ...]], --host [HOSTS [HOSTS ...]]
Hosts as input separated by space Hosts as input separated by space
-j, --json Enable JSON in the output -j, --json Enable JSON in the output
-p, --pretty Print pretty and more human readable Json
-h, --help Show this help message and exit -h, --help Show this help message and exit
``` ```
@ -30,6 +31,8 @@ Port is optional here. The script will use 443 if not specified.
`-j, --json` Use this if you want to only have the result in JSON `-j, --json` Use this if you want to only have the result in JSON
`-p, --pretty` Use this with `-j` to print indented and human readable json
`-H, --host` Enter the hosts separated by space `-H, --host` Enter the hosts separated by space
`-h, --help` Shows the help and exit `-h, --help` Shows the help and exit

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import socket import socket
import sys import sys
from pprint import pprint
from argparse import ArgumentParser, SUPPRESS from argparse import ArgumentParser, SUPPRESS
from datetime import datetime from datetime import datetime
from ssl import PROTOCOL_TLSv1 from ssl import PROTOCOL_TLSv1
@ -98,8 +98,10 @@ def show_result(user_args):
# Enable JSON output if -j argument specified # Enable JSON output if -j argument specified
if user_args.json_true: if user_args.json_true:
print(context) if user_args.pretty_output:
pprint(context)
else:
print(context)
def filter_hostname(host): def filter_hostname(host):
"""Remove unused characters and split by address and port.""" """Remove unused characters and split by address and port."""
@ -119,6 +121,9 @@ def get_args():
parser.add_argument("-j", "--json", dest="json_true", parser.add_argument("-j", "--json", dest="json_true",
action="store_true", default=False, action="store_true", default=False,
help="Enable JSON in the output") help="Enable JSON in the output")
parser.add_argument("-p", "--pretty", dest="pretty_output",
action="store_true",default=False,
help="Print pretty and more human readable Json")
parser.add_argument("-h", "--help", default=SUPPRESS, parser.add_argument("-h", "--help", default=SUPPRESS,
action='help', action='help',
help='Show this help message and exit') help='Show this help message and exit')