Add blacklist plugins to help output

Currently none of the blacklist plugins get printed to the help
output. This patch appends them to the plugin list and updates
the README.

Closes-Bug: #1543882

Change-Id: I0eebf73b5a4f0a364ae204b69551d805e9aa3def
This commit is contained in:
Eric Brown 2016-02-09 17:58:06 -08:00
parent 782d641346
commit c0f31a8e6e
2 changed files with 31 additions and 4 deletions

View File

@ -144,9 +144,32 @@ Usage::
B110 try_except_pass
B111 execute_with_run_as_root_equals_true
B201 flask_debug_true
B301 blacklist_calls
B401 blacklist_imports
B402 blacklist_import_func
B301 pickle
B302 marshal
B303 md5
B304 ciphers
B305 cipher_modes
B306 mktemp_q
B307 eval
B308 mark_safe
B309 httpsconnection
B310 urllib_urlopen
B311 random
B312 telnetlib
B313 xml_bad_cElementTree
B314 xml_bad_ElementTree
B315 xml_bad_expatreader
B316 xml_bad_expatbuilder
B317 xml_bad_sax
B318 xml_bad_minidom
B319 xml_bad_pulldom
B320 xml_bad_etree
B321 ftplib
B401 telnet
B402 ftp
B403 info_libs
B404 xml_libs
B405 xml_libs_high
B501 request_with_no_cert_validation
B502 ssl_with_bad_version
B503 ssl_with_bad_defaults

View File

@ -262,8 +262,12 @@ def main():
plugin_info = ["%s\t%s" % (a[0], a[1].name) for a in
six.iteritems(extension_mgr.plugins_by_id)]
blacklist_info = []
for a in six.iteritems(extension_mgr.blacklist):
for b in a[1]:
blacklist_info.append('%s\t%s' % (b['id'], b['name']))
plugin_list = '\n\t'.join(sorted(plugin_info))
plugin_list = '\n\t'.join(sorted(set(plugin_info + blacklist_info)))
parser.epilog = ('The following plugin suites were discovered and'
' loaded:\n\t{0}\n'.format(plugin_list))