clean up for release 0.1.0

Author: rdmmf

ghidra_scripts/GUI-MISP-fetch-comments-for-all-functions.py

@@ -12,8 +12,8 @@
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
 
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 
@@ -28,7 +28,7 @@
     # Default args
     PyMISPGhidraScripts.search_functions_in_misp(
         all_functions=True,
-        ignored_functions=["thunks"],
+        ignored_functions=["thunk"],
         state=state,
         interpreter=get_current_interpreter(),
         monitor=monitor,

ghidra_scripts/GUI-MISP-fetch-comments-for-current-function.py

@@ -13,8 +13,8 @@
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
 
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 

ghidra_scripts/GUI-MISP-fetch-comments-for-current-selection.py

@@ -13,8 +13,8 @@
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
 
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 

ghidra_scripts/GUI-create-MISP-call-tree.py

@@ -0,0 +1,32 @@
+# Recreate call tree in MISP
+# @author Thomas Caillet @rdmmf
+# @category MISP.ghidra-function
+# @keybinding
+# @menupath MISP.Send to MISP.Call Tree.Recreate call tree in MISP
+# @toolbar misp.png
+# @runtime PyGhidra
+
+import time, logging, argparse, importlib, os, sys
+
+# Add library folder to sys.path
+lib_dir = os.path.join(os.path.dirname(__file__), "..")
+if lib_dir not in sys.path:
+    sys.path.append(lib_dir)
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
+
+importlib.reload(PyMISPGhidraScripts)
+
+from pyghidra import get_current_interpreter
+
+if __name__ == "__main__":
+
+    start = time.time()
+
+    PyMISPGhidraScripts.create_call_tree(state, get_current_interpreter(), monitor)
+
+    end = time.time()
+    logger.info(f"Operation took {end - start:.6f} seconds")

ghidra_scripts/GUI-ghidra-all-functions-to-MISP.py

@@ -14,8 +14,8 @@
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
 
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 

ghidra_scripts/GUI-ghidra-current-function-to-MISP.py

@@ -14,8 +14,8 @@
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
 
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 

ghidra_scripts/GUI-ghidra-current-selection-functions-to-MISP.py

@@ -14,8 +14,8 @@
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
 
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 

ghidra_scripts/GUI-ghidra-functions-to-MISP.py

@@ -13,8 +13,8 @@
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
 
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 

ghidra_scripts/test-MISP-API.py

@@ -33,6 +33,7 @@
 
 import time, datetime, logging
 
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 

ghidra_scripts/create-MISP-call-tree.py headless_scripts/create-MISP-call-tree.pyghidra_scripts/create-MISP-call-tree.py renamed to headless_scripts/create-MISP-call-tree.py

@@ -6,17 +6,13 @@
 # @toolbar misp.png
 # @runtime PyGhidra
 
-# TODO seperate GUI and Headless
-
 import time, logging, argparse, importlib, os, sys
 
 # Add library folder to sys.path
 lib_dir = os.path.join(os.path.dirname(__file__), "..")
 if lib_dir not in sys.path:
     sys.path.append(lib_dir)
 
-logger = logging.getLogger(__name__)
-
 import mispghidra.PyMISPGhidraScripts as PyMISPGhidraScripts
 
 importlib.reload(PyMISPGhidraScripts)
@@ -32,7 +28,25 @@
     parser.add_argument(
         "--event-uuid", type=str, default=None, help="The MISP Event UUID"
     )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        dest="verbose",
+        default=0,
+        help="increase output verbosity",
+        action="count",
+    )
+
     args = parser.parse_args(args_list)
+    if args.verbose == 0:
+        level = logging.WARNING
+    elif args.verbose == 1:
+        level = logging.INFO
+    else:
+        level = logging.DEBUG
+
+    logging.basicConfig(level=level)
+    logger = logging.getLogger(__name__)
 
     PyMISPGhidraScripts.create_call_tree(
         state, get_current_interpreter(), monitor, args.event_uuid