From 8fcb63fa27d1478e0fa24aec2c90b95c1901bd8c Mon Sep 17 00:00:00 2001 From: edenbr Date: Wed, 15 May 2024 18:47:43 +0300 Subject: [PATCH 1/2] Fix import failure of threat-profile overrides --- exporting/special_treatment_objects.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/exporting/special_treatment_objects.py b/exporting/special_treatment_objects.py index 2b0bd85..f954ead 100644 --- a/exporting/special_treatment_objects.py +++ b/exporting/special_treatment_objects.py @@ -1,3 +1,6 @@ +from utils import debug_log + + def handle_fields(obj): if obj["type"] == "threat-profile": new_items = {} @@ -11,7 +14,23 @@ def handle_fields(obj): for index in range(len(obj[key])): for sub_index in range(len(obj[key][index]["values"])): new_items[new_key].append({"category": obj[key][index]["name"], - "name": obj[key][index]["values"][sub_index]["name"]}) + "name": obj[key][index]["values"][sub_index]["name"]}) + + if key == "overrides": + new_overrides = [] + for override in obj[key]: + protection = override["protection"] + override_obj = override["override"] + + new_override = {"protection": protection} + for k, v in override_obj.items(): + new_override[k] = v + + new_overrides.append(new_override) + + obj[key] = new_overrides + + debug_log(f"threat profile overrides: {obj[key]}") for key in old_keys: obj.pop(key) for new_key, new_item in new_items.items(): From 4e5f3545054671db615ec52a84ad2745ab036fde Mon Sep 17 00:00:00 2001 From: edenbr Date: Wed, 15 May 2024 19:29:45 +0300 Subject: [PATCH 2/2] Fix import failure of threat-profile overrides --- import_export_package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/import_export_package.py b/import_export_package.py index 32747ae..4896117 100644 --- a/import_export_package.py +++ b/import_export_package.py @@ -26,7 +26,7 @@ def get_version(client): if sys.version_info < (3, 7): raise Exception("Min Python version required is 3.7") - arg_parser = argparse.ArgumentParser(description="R80.X Policy Package Export/Import Tool, V6") + arg_parser = argparse.ArgumentParser(description="R80.X Policy Package Export/Import Tool, V6.1.0") args = process_arguments(arg_parser) if args.force: args.unsafe_auto_accept = True