Quick patches

Author: clittle

layers/README.md

@@ -30,10 +30,10 @@ This folder contains modules and scripts for working with ATT&CK Navigator layer
 | [matrix_gen](exporters/matrix_gen.py) | Provides a means by which to generate a matrix from raw data, either from the ATT&CK TAXII server or from a local STIX Bundle. |
 | [svg_templates](exporters/svg_templates.py) | Provides a means by which to convert a layer file into a marked up svg file. |
 | [svg_objects](exporters/svg_objects.py) | Provides raw templates and supporting functionality for generating svg objects. | 
-##### Command LIne Tools
+##### Command Line Tools
 | script | description |
 |:-------|:------------|
-| [cmdline.py](cmdline.py) | A commandline utility to export Layer files to excel or svg formats using the exporter tools. Run with `-h` for usage. |
+| [layerExporter_cli.py](layerExporter_cli.py) | A commandline utility to export Layer files to excel or svg formats using the exporter tools. Run with `-h` for usage. |
 
 ## Layer
 The Layer class provides format validation and read/write capabilities to aid in working with ATT&CK Navigator Layers in python. It is the primary interface through which other Layer-related classes defined in the core module should be used. The Layer class API and a usage example are below.
@@ -177,7 +177,7 @@ tells the exporter what data source to use when building the output matrix. Vali
 
 ##### ToSVG()
 ```python
-x = ToSVG(domain='enterprise', source='taxii', local=None)
+x = ToSvg(domain='enterprise', source='taxii', local=None)
 ```
 The ToSVG constructor, just like the ToExcel constructor, takes domain, server, and local arguments during instantiation. The domain can be either `enterprise` or `mobile`, and can be pulled directly from a layer file as `layer.domain`. The source argument tells the matrix generation tool which data source to use when building the matrix. `taxii` indicates that the tool should utilize the `cti-taxii` server when building the matrix, while the `local` option indicates that it should use a local bundle respectively. The local argument is only required if the source is set to `local`, in which case it should be a path to a local stix bundle.
 
@@ -191,14 +191,14 @@ The to_svg method exports the layer file referenced as `layer`, as an excel file
 #### Example Usage
 ```python
 from layers import Layer
-from layers import ToSVG
+from layers import ToSvg
 
 lay = Layer()
 lay.from_file("path/to/layer/file.json")
 # Using taxii server for template
-t = ToSVG(domain=lay.layer.domain, source='taxii')
+t = ToSvg(domain=lay.layer.domain, source='taxii')
 t.to_svg(layer=lay, filepath="demo.svg")
 #Using local stix data for template
-t2 = ToSVG(domain='mobile', source='local', local='path/to/local/stix.json')
+t2 = ToSvg(domain='mobile', source='local', local='path/to/local/stix.json')
 t2.to_svg(layer=lay, filepath="demo2.svg")
 ```

layers/cmdline.py layers/layerExporter_cli.pylayers/cmdline.py renamed to layers/layerExporter_cli.py

@@ -4,12 +4,12 @@
 from core import Layer
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Export an Att&ck layer as a svg image or excel file')
+    parser = argparse.ArgumentParser(description='Export an ATT&CK Navigator layer as a svg image or excel file')
     parser.add_argument('-m', '--mode', choices=['svg', 'excel'], required=True, help='The form to export the layers in')
     parser.add_argument('input', nargs='+', help='Path(s) to the file to export')
     parser.add_argument('-s','--source', choices=['taxii', 'local'], default='taxii', help='What source to utilize when building the matrix')
     parser.add_argument('--local', help='Path to the local resource if --source=local', default=None)
-    parser.add_argument('-o','--output', nargs='+', help='Path(s) to the exported svg file', required=True)
+    parser.add_argument('-o','--output', nargs='+', help='Path(s) to the exported svg/xlsx file', required=True)
     args = parser.parse_args()
     if len(args.output) != len(args.input):
         print('Mismatched number of output filepaths to input file paths. Exiting...')
@@ -24,9 +24,15 @@
             print('Unable to load {}. Skipping...'.format(entry))
             continue
         if args.mode=='excel':
+            if not args.output[i].endwith('.xlsx'):
+                print('[ERROR] Unable to export {} as type: excel to {}'.format(entry, args.output[i]))
+                continue
             exy = ToExcel(domain=lay.layer.domain, source=args.source, local=args.local)
             exy.to_xlsx(lay, filepath=args.output[i])
         else:
+            if not args.output[i].endwith('.svg'):
+                print('[ERROR] Unable to export {} as type: svg to {}'.format(entry, args.output[i]))
+                continue
             svy = ToSvg(domain=lay.layer.domain, source=args.source, local=args.local)
             svy.to_svg(lay, filepath=args.output[i])
         print('{}/{} - Finished processing {}'.format(i + 1, len(args.input), entry))