Proper JSON backward compatibility fix (#1235)

Co-authored-by: Yurii Klymenko <Yurii.Klymenko@ibm.com>
opencybersecurityalliance · Jan 12, 2023 · 80685fe · 80685fe
1 parent 774dab8
commit 80685fe
Show file tree

Hide file tree

Showing 49 changed files with 155 additions and 108 deletions.
diff --git a/lab/connector_coding_lab.md b/lab/connector_coding_lab.md
@@ -184,13 +184,13 @@ class APIClient():
 ```
 import datetime
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
 
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)

diff --git a/stix_shifter_modules/alertflex/stix_transmission/results_connector.py b/stix_shifter_modules/alertflex/stix_transmission/results_connector.py
@@ -1,10 +1,10 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 import json
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, api_client):
         self.api_client = api_client
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/arcsight/stix_transmission/results_connector.py b/stix_shifter_modules/arcsight/stix_transmission/results_connector.py
@@ -1,6 +1,6 @@
 import json
 import re
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 
 MAX_LIMIT = 10000
@@ -10,7 +10,7 @@
 FILE_HASHES = ["MD5", "SHA256", "SHA1"]
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, api_client):
         self.api_client = api_client
         self.connector = __name__.split('.')[1]

diff --git a/stix_shifter_modules/async_template/stix_transmission/results_connector.py b/stix_shifter_modules/async_template/stix_transmission/results_connector.py
@@ -1,8 +1,8 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, api_client):
         self.api_client = api_client
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/aws_athena/stix_transmission/results_connector.py b/stix_shifter_modules/aws_athena/stix_transmission/results_connector.py
@@ -1,5 +1,5 @@
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 from flatten_json import flatten
@@ -13,7 +13,7 @@ class AccessDeniedException(Exception):
     pass
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     # https://docs.aws.amazon.com/athena/latest/APIReference/API_GetQueryResults.html#API_GetQueryResults_RequestSyntax
     # Athena MaxResults count is 1000 when calling get_query_results
     ATHENA_MAX_RESULTS_SIZE = 1000

diff --git a/stix_shifter_modules/aws_cloud_watch_logs/stix_transmission/results_connector.py b/stix_shifter_modules/aws_cloud_watch_logs/stix_transmission/results_connector.py
@@ -1,13 +1,13 @@
 import json
 from flatten_json import flatten
 import copy
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 from stix_shifter_utils.utils.file_helper import read_json
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, client, options):
         self.client = client
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/aws_security_hub/stix_transmission/connector.py b/stix_shifter_modules/aws_security_hub/stix_transmission/connector.py
@@ -1,10 +1,10 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 
 import aioboto3
 from json import loads
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     def __init__(self, connection, configuration):
         self.connection = connection
         self.configuration = configuration

diff --git a/stix_shifter_modules/azure_sentinel/stix_transmission/connector.py b/stix_shifter_modules/azure_sentinel/stix_transmission/connector.py
@@ -2,13 +2,13 @@
 import adal
 import re
 from flatten_json import flatten
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     init_error = None
     max_limit = 1000
 

diff --git a/stix_shifter_modules/bigfix/stix_transmission/results_connector.py b/stix_shifter_modules/bigfix/stix_transmission/results_connector.py
@@ -1,4 +1,4 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 import json
 import time
 from stix_shifter_utils.utils.error_response import ErrorResponder
@@ -10,7 +10,7 @@ class UnexpectedResponseException(Exception):
     pass
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, api_client):
         self.api_client = api_client
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/carbonblack/stix_transmission/connector.py b/stix_shifter_modules/carbonblack/stix_transmission/connector.py
@@ -1,5 +1,5 @@
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
@@ -11,7 +11,7 @@ class UnexpectedResponseException(Exception):
     pass
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)
         self.show_events = Connector.get_show_events_mode(connection)

diff --git a/stix_shifter_modules/cbcloud/stix_transmission/results_connector.py b/stix_shifter_modules/cbcloud/stix_transmission/results_connector.py
@@ -1,11 +1,11 @@
 import json
 
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, api_client):
         self.api_client = api_client
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/cloudsql/stix_transmission/results_connector.py b/stix_shifter_modules/cloudsql/stix_transmission/results_connector.py
@@ -1,12 +1,12 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils import logger
 import json
 import re
 import math
 
 import pandas as pd
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, api_client):
         self.api_client = api_client
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/crowdstrike/stix_transmission/connector.py b/stix_shifter_modules/crowdstrike/stix_transmission/connector.py
@@ -1,11 +1,11 @@
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     init_error = None
     logger = logger.set_logger(__name__)
     PROVIDER = 'CrowdStrike'

diff --git a/stix_shifter_modules/cybereason/stix_transmission/connector.py b/stix_shifter_modules/cybereason/stix_transmission/connector.py
@@ -1,4 +1,4 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 from .api_client import APIClient
@@ -18,7 +18,7 @@ class InvalidAuthenticationException(Exception):
     pass
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
 
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)

diff --git a/stix_shifter_modules/darktrace/stix_transmission/connector.py b/stix_shifter_modules/darktrace/stix_transmission/connector.py
@@ -1,4 +1,4 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 from .api_client import APIClient
@@ -25,7 +25,7 @@ class InvalidAuthenticationException(Exception):
     pass
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
 
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)

diff --git a/stix_shifter_modules/datadog/stix_transmission/connector.py b/stix_shifter_modules/datadog/stix_transmission/connector.py
@@ -1,11 +1,11 @@
 import json
 from stix_shifter_modules.datadog.stix_transmission.api_client import APIClient
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/demo_template/stix_transmission/connector.py b/stix_shifter_modules/demo_template/stix_transmission/connector.py
@@ -1,12 +1,12 @@
 import datetime
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
 
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)

diff --git a/stix_shifter_modules/elastic_ecs/stix_transmission/connector.py b/stix_shifter_modules/elastic_ecs/stix_transmission/connector.py
@@ -1,4 +1,4 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 import json
 from stix_shifter_utils.utils.error_response import ErrorResponder
@@ -9,7 +9,7 @@ class UnexpectedResponseException(Exception):
     pass
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/error_test/stix_transmission/connector.py b/stix_shifter_modules/error_test/stix_transmission/connector.py
@@ -5,7 +5,7 @@
 from stix2matcher.matcher import MatchListener
 from stix2validator import validate_instance
 
-from stix_shifter_utils.modules.base.stix_transmission.base_connector import BaseConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from stix_shifter_utils.modules.base.stix_transmission.base_status_connector import Status
 from stix_shifter_utils.stix_transmission.utils.RestApiClientAsync import RestApiClientAsync
 from stix_shifter_utils.utils.error_response import ErrorResponder
@@ -18,7 +18,7 @@ class UnexpectedResponseException(Exception):
     pass
 
 
-class Connector(BaseConnector):
+class Connector(BaseJsonSyncConnector):
     def __init__(self, connection, configuration):
         self.connector = __name__.split('.')[1]
         self.connection = connection

diff --git a/stix_shifter_modules/gcp_chronicle/stix_transmission/results_connector.py b/stix_shifter_modules/gcp_chronicle/stix_transmission/results_connector.py
@@ -1,4 +1,4 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 import json
@@ -8,7 +8,7 @@
 import re
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     EMAIL_PATTERN = re.compile(r'(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)')
     GCP_MAX_PAGE_SIZE = 1000
 

diff --git a/stix_shifter_modules/guardium/stix_transmission/results_connector.py b/stix_shifter_modules/guardium/stix_transmission/results_connector.py
@@ -1,10 +1,10 @@
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 import json
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     def __init__(self, api_client):
         self.api_client = api_client
         self.logger = logger.set_logger(__name__)

diff --git a/stix_shifter_modules/ibm_security_verify/stix_transmission/results_connector.py b/stix_shifter_modules/ibm_security_verify/stix_transmission/results_connector.py
@@ -1,13 +1,13 @@
 import json
 import traceback
 
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import \
-    BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import \
+    BaseJsonResultsConnector
 from stix_shifter_utils.utils import logger
 from stix_shifter_utils.utils.error_response import ErrorResponder
 
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
 
     def __init__(self, api_client):
         self.api_client = api_client

diff --git a/stix_shifter_modules/infoblox/stix_transmission/results_connector.py b/stix_shifter_modules/infoblox/stix_transmission/results_connector.py
@@ -3,11 +3,11 @@
 
 See: https://github.com/opencybersecurityalliance/stix-shifter/blob/develop/adapter-guide/develop-transmission-module.md
 """
-from stix_shifter_utils.modules.base.stix_transmission.base_results_connector import BaseResultsConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_results_connector import BaseJsonResultsConnector
 from stix_shifter_utils.utils import logger
 from stix_shifter_utils.utils.error_response import ErrorResponder
 
-class ResultsConnector(BaseResultsConnector):
+class ResultsConnector(BaseJsonResultsConnector):
     """
     Class that handles results connector integration.
 

diff --git a/stix_shifter_modules/msatp/stix_transmission/connector.py b/stix_shifter_modules/msatp/stix_transmission/connector.py
@@ -1,13 +1,13 @@
 import json
 import adal
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 import copy
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     init_error = None
     logger = logger.set_logger(__name__)
 

diff --git a/stix_shifter_modules/mysql/stix_transmission/connector.py b/stix_shifter_modules/mysql/stix_transmission/connector.py
@@ -1,12 +1,12 @@
 import datetime
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
 
     def __init__(self, connection, configuration):
         self.api_client = APIClient(connection, configuration)

diff --git a/stix_shifter_modules/onelogin/stix_transmission/connector.py b/stix_shifter_modules/onelogin/stix_transmission/connector.py
@@ -1,12 +1,12 @@
 import datetime
 import json
-from stix_shifter_utils.modules.base.stix_transmission.base_sync_connector import BaseSyncConnector
+from stix_shifter_utils.modules.base.stix_transmission.base_json_sync_connector import BaseJsonSyncConnector
 from .api_client import APIClient
 from stix_shifter_utils.utils.error_response import ErrorResponder
 from stix_shifter_utils.utils import logger
 
 
-class Connector(BaseSyncConnector):
+class Connector(BaseJsonSyncConnector):
     max_limit = 50
 
     def __init__(self, connection, configuration):