Fix Osintracker

Author: atao

README.md

@@ -74,17 +74,17 @@ Options:
 ```bash
 Usage: shodan2db.py export [OPTIONS]
 
-  Export data from database (HTML report or osinttracker JSON).
+  Export data from database (HTML report or osintracker JSON).
 
 Options:
   -d, --database FILE       Path to the SQLite database file.  [required]
   -o, --output FILE         Output path for HTML report file.
   -t, --template-file FILE  Path to the Jinja2 template file (HTML export
                             only).  [default: templates/report.html]
-  --osint TEXT              Central entity name for osinttracker export
+  --osint TEXT              Central entity name for osintracker export
                             (default: shodan).
-  --osint-output TEXT       Output path for osinttracker JSON file.  [default:
-                            assets_osinttracker.json]
+  --osint-output TEXT       Output path for osintracker JSON file.  [default:
+                            assets_osintracker.json]
   -v, --verbose             Verbose mode.
   -h, --help                Show this message and exit.
 ```

plugins/export_osintracker.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-Export assets from Shodan2DB SQLite database to osinttracker JSON format.
+Export assets from Shodan2DB SQLite database to osintracker JSON format.
 Creates entities (IPs, domains, hostnames) and relationships between them.
 
 Format reference: https://wiki.osintracker.com/data/import-export
@@ -17,10 +17,10 @@
 import click
 
 
-class OsintTrackerExporter:
-    """Handles exporting Shodan2DB data to osinttracker JSON format."""
+class OsintrackerExporter:
+    """Handles exporting Shodan2DB data to osintracker JSON format."""
 
-    # Entity type IDs from osinttracker instance
+    # Entity type IDs from osintracker instance
     ENTITY_TYPES = {
         "ip": "clh6sgxq9tww10buuhzho55jg",  # Internet > IP
         "hostname": "clh6sdulhtz2s0buj08lo5r40",  # Internet > domain name (or create Hostname type)
@@ -120,7 +120,7 @@ def _create_entity(
         vuln_count: int,
         cve_ids: List[str],
     ) -> Dict[str, Any]:
-        """Create an osinttracker entity."""
+        """Create an osintracker entity."""
         entity_id = self._get_entity_id(entity_type, value)
 
         # Determine max CVSS for color coding
@@ -197,11 +197,11 @@ def _add_relationship(
         return str(uuid.uuid4())
 
     def export_to_json(self, output_file: str) -> None:
-        """Export all assets to osinttracker JSON format."""
+        """Export all assets to osintracker JSON format."""
         if not output_file.endswith(".json"):
             output_file = f"{output_file}.json"
 
-        self._log(f"Exporting to osinttracker format: {output_file}...")
+        self._log(f"Exporting to osintracker format: {output_file}...")
 
         try:
             with sqlite3.connect(self.database) as conn:
@@ -338,8 +338,8 @@ def export_to_json(self, output_file: str) -> None:
     @click.option(
         "-o",
         "--output",
-        default="assets_osinttracker.json",
-        help="Output JSON file path (default: assets_osinttracker.json)",
+        default="assets_osintracker.json",
+        help="Output JSON file path (default: assets_osintracker.json)",
     )
     @click.option(
         "-a",
@@ -355,13 +355,13 @@ def export_to_json(self, output_file: str) -> None:
     )
     def main(database: str, output: str, alias: Optional[str], verbose: bool) -> None:
         """
-        Export Shodan2DB assets to osinttracker JSON format.
+        Export Shodan2DB assets to osintracker JSON format.
 
         Generates entities (IPs, hostnames, domains) with relationships.
-        Compatible with osinttracker import/export format.
+        Compatible with osintracker import/export format.
         """
         try:
-            exporter = OsintTrackerExporter(database, verbose, alias)
+            exporter = OsintrackerExporter(database, verbose, alias)
             exporter.export_to_json(output)
             print(f"[✓] Export completed successfully!")
 

shodan2db.py

@@ -7,8 +7,8 @@
 import click
 from jinja2 import Environment, FileSystemLoader, TemplateError
 
-# Import osinttracker exporter module
-from plugins.export_osintracker import OsintTrackerExporter
+# Import osintracker exporter module
+from plugins.export_osintracker import OsintrackerExporter
 
 
 class Shodan2DB:
@@ -386,25 +386,25 @@ def export(verbose, exportfile, database, template_file):
             sys.exit(1)
 
     @staticmethod
-    def export_osinttracker(verbose, database, output_file, alias):
+    def export_osintracker(verbose, database, output_file, alias):
         """
-        Export Shodan2DB data to osinttracker JSON format.
+        Export Shodan2DB data to osintracker JSON format.
         Creates entities (IPs, domains, hostnames) and relationships between them.
         """
         # Ensure the database file has the correct extension
         if not database.endswith(".db"):
             database = f"{database}.db"
 
         if verbose:
-            print(f"[+] Exporting to osinttracker format...")
+            print(f"[+] Exporting to osintracker format...")
 
         try:
             # Create exporter instance and export
-            exporter = OsintTrackerExporter(database, verbose, alias)
+            exporter = OsintrackerExporter(database, verbose, alias)
             exporter.export_to_json(output_file)
 
             if verbose:
-                print(f"[+] osinttracker export completed successfully!")
+                print(f"[+] osintracker export completed successfully!")
 
         except FileNotFoundError as e:
             print(f"[-] Error: {e}", file=sys.stderr)
@@ -455,7 +455,7 @@ def parse(verbose, database, input_file):
 # Define the export command with options for database, report file, and verbose mode
 @click.command(
     name="export",
-    help="Export data from database (HTML report or osinttracker JSON).",
+    help="Export data from database (HTML report or osintracker JSON).",
     context_settings=dict(help_option_names=["-h", "--help"]),
 )
 @click.option(
@@ -486,27 +486,27 @@ def parse(verbose, database, input_file):
     is_flag=False,
     flag_value="shodan",
     type=str,
-    help="Central entity name for osinttracker export (default: shodan).",
+    help="Central entity name for osintracker export (default: shodan).",
 )
 @click.option(
     "--osint-output",
-    default="assets_osinttracker.json",
+    default="assets_osintracker.json",
     type=str,
-    help="Output path for osinttracker JSON file.",
+    help="Output path for osintracker JSON file.",
     show_default=True,
 )
 @click.option("--verbose", "-v", is_flag=True, help="Verbose mode.")
 def export(verbose, database, output, template_file, osint, osint_output):
     """
     Export data from the database.
 
-    Generates both HTML report and osinttracker JSON format.
+    Generates both HTML report and osintracker JSON format.
 
     Examples:
         Default files:                 shodan2db.py export -d database.db
         Custom HTML path:              shodan2db.py export -d database.db -o rapport.html
         Custom entity:                 shodan2db.py export -d database.db --osint "Campaign"
-        Custom osinttracker output:    shodan2db.py export -d database.db --osint-output custom.json
+        Custom osintracker output:    shodan2db.py export -d database.db --osint-output custom.json
     """
     # Always generate HTML report
     if output is None:
@@ -518,8 +518,8 @@ def export(verbose, database, output, template_file, osint, osint_output):
         template_file=template_file,
     )
 
-    # Always generate osinttracker JSON with the specified entity name
-    Shodan2DB.export_osinttracker(
+    # Always generate osintracker JSON with the specified entity name
+    Shodan2DB.export_osintracker(
         verbose=verbose,
         database=database,
         output_file=osint_output,