Merge pull request #317 from 0xdabbad00/master

wot renamed to weboftrust; Link for report command

README.md

@@ -155,7 +155,8 @@ python cloudmapper.py collect --account my_account
 - `public`: Find public hosts and port ranges. More details [here](https://summitroute.com/blog/2018/06/13/cloudmapper_public/).
 - `sg_ips`: Get geoip info on CIDRs trusted in Security Groups. More details [here](https://summitroute.com/blog/2018/06/12/cloudmapper_sg_ips/).
 - `stats`: Show counts of resources for accounts. More details [here](https://summitroute.com/blog/2018/06/06/cloudmapper_stats/).
-- `wot`: Show Web Of Trust. More details [here](https://summitroute.com/blog/2018/06/13/cloudmapper_wot/).
+- `weboftrust`: Show Web Of Trust. More details [here](https://summitroute.com/blog/2018/06/13/cloudmapper_wot/).
+- `report`: Generate report. More details [here](https://summitroute.com/blog/2019/03/04/cloudmapper_report_generation/).
 
 If you want to add your own private commands, you can create a `private_commands` directory and add them there.
 

cloudmapper.py

@@ -31,7 +31,7 @@
 import importlib 
 import commands
 
-__version__ = "2.3.1"
+__version__ = "2.3.2"
 
 def show_help(commands):
     print("CloudMapper {}".format(__version__))

commands/wot.py → commands/weboftrust.py

@@ -8,7 +8,7 @@
 
 from shared.common import parse_arguments, make_list, query_aws, get_regions
 
-__description__ = "Determine Web Of Trust (wot) for accounts"
+__description__ = "Create Web Of Trust diagram for accounts"
 
 # TODO: This command would benefit from a few days of work and some sample data sets to improve:
 # - How saml providers are identified. Currently only Okta is identified, and that's a hack.
@@ -47,7 +47,7 @@ def __init__(self, *args, **kwargs):
         if json_blob:
             self.name = json_blob["name"]
             self.id = json_blob["id"]
-            self.type = json_blob.get('type', 'wot_account')
+            self.type = json_blob.get('type', 'weboftrust_account')
         elif account_id:
             self.name = account_id
             self.id = account_id
@@ -290,7 +290,7 @@ def get_nodes_and_connections(account_data, nodes, connections, args):
         get_s3_trusts(account, nodes, connections)
 
 
-def wot(args, accounts, config):
+def weboftrust(args, accounts, config):
     """Collect the data and write it to a file"""
 
     nodes = {}
@@ -328,7 +328,7 @@ def wot(args, accounts, config):
                 was_scanned = True
 
                 # TODO: This is a hack to set this again here, as I had an account of type 'unknown_account' somehow
-                n.type = 'wot_account'
+                n.type = 'weboftrust_account'
                 n.name = scanned_account['name']
                 break
 
@@ -398,6 +398,6 @@ def run(arguments):
         print("ERROR: You cannot use network_only and admin_only at the same time")
         exit(-1)
 
-    cytoscape_json = wot(args, accounts, config)
+    cytoscape_json = weboftrust(args, accounts, config)
     with open('web/data.json', 'w') as outfile:
         json.dump(cytoscape_json, outfile, indent=4)

commands/webserver.py

@@ -29,7 +29,7 @@
 from six.moves.BaseHTTPServer import HTTPServer
 from six.moves.SimpleHTTPServer import SimpleHTTPRequestHandler
 
-__description__ = "Run a webserver to display network or wot map"
+__description__ = "Run a webserver to display network or web of trust map"
 
 class RootedHTTPServer(HTTPServer):
     def __init__(self, base_path, *args, **kwargs):

web/style.json

@@ -237,7 +237,7 @@
 
 
     {
-        "selector": "[type = \"wot_account\"]",
+        "selector": "[type = \"weboftrust_account\"]",
         "css": {
             "shape": "rectangle",
             "width": "200",