[external-import] Break loop if run and terminate is enabled (#762)

external-import/alienvault/src/alienvault/builder.py

@@ -6,6 +6,8 @@
 from typing import Callable, List, Mapping, NamedTuple, Optional, Set
 
 import stix2
+from stix2.v21 import _DomainObject, _Observable  # type: ignore
+
 from alienvault.models import Pulse, PulseIndicator
 from alienvault.utils import (
     OBSERVATION_FACTORY_CRYPTOCURRENCY_WALLET,
@@ -41,7 +43,6 @@
     create_vulnerability_external_reference,
     get_tlp_string_marking_definition,
 )
-from stix2.v21 import _DomainObject, _Observable  # type: ignore
 
 log = logging.getLogger(__name__)
 

external-import/alienvault/src/alienvault/client.py

@@ -4,10 +4,11 @@
 from datetime import datetime
 from typing import List
 
-from alienvault.models import Pulse
 from OTXv2 import OTXv2  # type: ignore
 from pydantic import parse_obj_as
 
+from alienvault.models import Pulse
+
 
 class AlienVaultClient:
     """AlienVault client."""

external-import/alienvault/src/alienvault/core.py

@@ -3,11 +3,17 @@
 
 import datetime
 import os
+import sys
 import time
 from typing import Any, Dict, List, Mapping, Optional
 
 import stix2
 import yaml
+from pycti.connector.opencti_connector_helper import (  # type: ignore
+    OpenCTIConnectorHelper,
+    get_config_variable,
+)
+
 from alienvault.client import AlienVaultClient
 from alienvault.importer import PulseImporter, PulseImporterConfig
 from alienvault.utils import (
@@ -16,10 +22,6 @@
     get_tlp_string_marking_definition,
 )
 from alienvault.utils.constants import DEFAULT_TLP_MARKING_DEFINITION
-from pycti.connector.opencti_connector_helper import (  # type: ignore
-    OpenCTIConnectorHelper,
-    get_config_variable,
-)
 
 
 class AlienVault:
@@ -263,10 +265,15 @@ def run(self):
                         "Connector will not run, next run in: {0} seconds", next_run
                     )
 
-                self._sleep(delay_sec=run_interval)
             except (KeyboardInterrupt, SystemExit):
                 self._info("Connector stop")
-                exit(0)
+                sys.exit(0)
+
+            if self.helper.connect_run_and_terminate:
+                self.helper.log_info("Connector stop")
+                sys.exit(0)
+
+            self._sleep(delay_sec=run_interval)
 
     @classmethod
     def _sleep(cls, delay_sec: Optional[int] = None) -> None:

external-import/alienvault/src/alienvault/importer.py

@@ -6,15 +6,16 @@
 from typing import Any, Dict, List, Mapping, NamedTuple, Optional, Set
 
 import stix2
-from alienvault.builder import PulseBundleBuilder, PulseBundleBuilderConfig
-from alienvault.client import AlienVaultClient
-from alienvault.models import Pulse
-from alienvault.utils import iso_datetime_str_to_datetime
 from pycti.connector.opencti_connector_helper import (
     OpenCTIConnectorHelper,
 )  # type: ignore
 from stix2.exceptions import STIXError  # type: ignore
 
+from alienvault.builder import PulseBundleBuilder, PulseBundleBuilderConfig
+from alienvault.client import AlienVaultClient
+from alienvault.models import Pulse
+from alienvault.utils import iso_datetime_str_to_datetime
+
 
 class PulseImporterConfig(NamedTuple):
     """Pulse importer configuration."""

external-import/amitt/src/amitt.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import time
 import urllib.request
 from datetime import datetime
@@ -116,21 +117,26 @@ def run(self):
                         + str(round(self.get_interval() / 60 / 60 / 24, 2))
                         + " days"
                     )
-                    time.sleep(60)
                 else:
                     new_interval = self.get_interval() - (timestamp - last_run)
                     self.helper.log_info(
                         "Connector will not run, next run in: "
                         + str(round(new_interval / 60 / 60 / 24, 2))
                         + " days"
                     )
-                    time.sleep(60)
+
             except (KeyboardInterrupt, SystemExit):
                 self.helper.log_info("Connector stop")
-                exit(0)
+                sys.exit(0)
+
             except Exception as e:
                 self.helper.log_error(str(e))
-                time.sleep(60)
+
+            if self.helper.connect_run_and_terminate:
+                self.helper.log_info("Connector stop")
+                sys.exit(0)
+
+            time.sleep(60)
 
 
 if __name__ == "__main__":
@@ -140,4 +146,4 @@ def run(self):
     except Exception as e:
         print(e)
         time.sleep(10)
-        exit(0)
+        sys.exit(0)

external-import/cape/src/main.py

@@ -1,11 +1,13 @@
 import os
+import sys
 import time
 from datetime import datetime
 
 import yaml
+from pycti import OpenCTIConnectorHelper, get_config_variable
+
 from cape.cape import cuckoo, cuckooReport
 from cape.telemetry import openCTIInterface
-from pycti import OpenCTIConnectorHelper, get_config_variable
 
 
 class capeConnector:
@@ -179,6 +181,10 @@ def run(self):
                 f"Run Complete. Sleeping until next run in " f"{self.interval} Minutes"
             )
 
+            if self.helper.connect_run_and_terminate:
+                self.helper.log_info("Connector stop")
+                sys.exit(0)
+
             time.sleep(self.get_interval())
 
 

external-import/cisa-known-exploited-vulnerabilities/src/cisa.py

@@ -148,9 +148,11 @@ def process_data(self):
                     + str(round(new_interval / 60 / 60 / 24, 2))
                     + " days"
                 )
+
         except (KeyboardInterrupt, SystemExit):
             self.helper.log_info("Connector stop")
             sys.exit(0)
+
         except Exception as e:
             self.helper.log_error(str(e))
 

external-import/crowdstrike/src/crowdstrike/core.py

@@ -2,11 +2,16 @@
 """OpenCTI CrowdStrike connector core module."""
 
 import os
+import sys
 import time
 from typing import Any, Dict, List, Mapping, Optional
 
 import stix2
 import yaml
+from crowdstrike_client.client import CrowdStrikeClient
+from pycti import OpenCTIConnectorHelper  # type: ignore
+from pycti.connector.opencti_connector_helper import get_config_variable  # type: ignore
+
 from crowdstrike.actor.importer import ActorImporter
 from crowdstrike.importer import BaseImporter
 from crowdstrike.indicator.importer import IndicatorImporter, IndicatorImporterConfig
@@ -20,9 +25,6 @@
     timestamp_to_datetime,
 )
 from crowdstrike.utils.constants import DEFAULT_TLP_MARKING_DEFINITION
-from crowdstrike_client.client import CrowdStrikeClient
-from pycti import OpenCTIConnectorHelper  # type: ignore
-from pycti.connector.opencti_connector_helper import get_config_variable  # type: ignore
 
 
 class CrowdStrike:
@@ -381,12 +383,23 @@ def run(self):
                         "Connector will not run, next run in: {0} seconds", next_run
                     )
 
+                if self.helper.connect_run_and_terminate:
+                    self.helper.log_info("Connector stop")
+                    sys.exit(0)
+
                 self._sleep(delay_sec=run_interval)
+
             except (KeyboardInterrupt, SystemExit):
                 self._info("CrowdStrike connector stopping...")
-                exit(0)
+                sys.exit(0)
+
             except Exception as e:  # noqa: B902
                 self._error("CrowdStrike connector internal error: {0}", str(e))
+
+                if self.helper.connect_run_and_terminate:
+                    self.helper.log_info("Connector stop")
+                    sys.exit(0)
+
                 self._sleep()
 
     def _initiate_work(self, timestamp: int) -> str:

external-import/cryptolaemus/src/cryptolaemus.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import time
 from datetime import datetime
 
@@ -234,21 +235,26 @@ def run(self):
                         + str(round(self.get_interval() / 60 / 60 / 24, 2))
                         + " days"
                     )
-                    time.sleep(60)
                 else:
                     new_interval = self.get_interval() - (timestamp - last_run)
                     self.helper.log_info(
                         "Connector will not run, next run in: "
                         + str(round(new_interval / 60 / 60 / 24, 2))
                         + " days"
                     )
-                    time.sleep(60)
+
             except (KeyboardInterrupt, SystemExit):
                 self.helper.log_info("Connector stop")
-                exit(0)
+                sys.exit(0)
+
             except Exception as e:
                 self.helper.log_error(str(e))
-                time.sleep(60)
+
+            if self.helper.connect_run_and_terminate:
+                self.helper.log_info("Connector stop")
+                sys.exit(0)
+
+            time.sleep(60)
 
 
 if __name__ == "__main__":
@@ -258,4 +264,4 @@ def run(self):
     except Exception as e:
         print(e)
         time.sleep(10)
-        exit(0)
+        sys.exit(0)

external-import/cuckoo/src/main.py

@@ -1,11 +1,13 @@
 import os
+import sys
 import time
 from datetime import datetime
 
 import yaml
+from pycti import OpenCTIConnectorHelper, get_config_variable
+
 from cuckoo.cuckoo import cuckoo
 from cuckoo.telemetry import openCTIInterface
-from pycti import OpenCTIConnectorHelper, get_config_variable
 
 
 class cuckooConnector:
@@ -181,6 +183,10 @@ def run(self):
                 f"Run Complete. Sleeping until next run in " f"{self.interval} Minutes"
             )
 
+            if self.helper.connect_run_and_terminate:
+                self.helper.log_info("Connector stop")
+                sys.exit(0)
+
             time.sleep(self.get_interval())
 
 

external-import/cve/src/cve.py

@@ -4,15 +4,17 @@
 import os
 import shutil
 import ssl
+import sys
 import time
 import urllib.request
 from datetime import datetime
 
 import certifi
 import yaml
-from cvetostix2 import convert
 from pycti import OpenCTIConnectorHelper, get_config_variable
 
+from cvetostix2 import convert
+
 
 class Cve:
     def __init__(self):
@@ -150,9 +152,11 @@ def process_data(self):
                     + str(round(new_interval / 60 / 60 / 24, 2))
                     + " days"
                 )
+
         except (KeyboardInterrupt, SystemExit):
             self.helper.log_info("Connector stop")
-            exit(0)
+            sys.exit(0)
+
         except Exception as e:
             self.helper.log_error(str(e))
 
@@ -174,4 +178,4 @@ def run(self):
     except Exception as e:
         print(e)
         time.sleep(10)
-        exit(0)
+        sys.exit(0)

external-import/cybercrime-tracker/src/cybercrime-tracker.py

@@ -1,5 +1,6 @@
 import datetime
 import os
+import sys
 import time
 from urllib.parse import quote, urlparse
 
@@ -366,7 +367,6 @@ def run(self):
                             str(round(self.interval, 2))
                         )
                     )
-                    time.sleep(60)
                 else:
                     new_interval = self.interval - (timestamp - last_run)
                     self.helper.log_info(
@@ -375,14 +375,19 @@ def run(self):
                             str(round(new_interval, 2))
                         )
                     )
-                    time.sleep(60)
 
             except (KeyboardInterrupt, SystemExit):
                 self.helper.log_info("Connector stop")
-                exit(0)
+                sys.exit(0)
+
             except Exception as e:
                 self.helper.log_error(str(e))
-                time.sleep(60)
+
+            if self.helper.connect_run_and_terminate:
+                self.helper.log_info("Connector stop")
+                sys.exit(0)
+
+            time.sleep(60)
 
 
 if __name__ == "__main__":
@@ -392,4 +397,4 @@ def run(self):
     except Exception as e:
         print(e)
         time.sleep(10)
-        exit(0)
+        sys.exit(0)