Merge branch 'develop'

3c7 · Aug 15, 2023 · d8ebd01 · d8ebd01
2 parents d0f67b4 + 856fce0
commit d8ebd01
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 1,099 deletions.
diff --git a/README.md b/README.md
@@ -96,22 +96,6 @@ for idx, service in enumerate(host.services):
 
 print("Exporting data as flattened json blob for further use, e.g. Elasticsearch indexing...")
 print(host.flattened_json())
-
-# Pre-v0.4.0 (Dictionary based approach - DEPRECATED)
-from common_osint_model import from_shodan, from_shodan_flattened, from_censys_ipv4, from_censys_ipv4_flattened,
-    from_x509_pem, from_x509_pem_flattened
-
-raw_shodan = get_my_shodan_data()
-converted_s = from_shodan(raw_shodan)  # Deprecated
-flattened_s = from_shodan_flattened(raw_shodan)  # Deprecated
-
-raw_censys_ipv4 = get_my_censys_ipv4_data()
-converted_c = from_censys_ipv4(raw_censys_ipv4)
-flattened_c = from_censys_ipv4_flattened(raw_censys_ipv4)
-
-raw_certificate = open('certificate.pem').read()
-converted_certificate = from_x509_pem(raw_shodan)
-flattened_certificate = from_x509_pem_flattened(raw_shodan)
 ```
 
 ### Example output

diff --git a/common_osint_model/__init__.py b/common_osint_model/__init__.py
@@ -1,13 +1,3 @@
-from common_osint_model.shodan import from_shodan, from_shodan_flattened
-from common_osint_model.censys.v1 import (
-    from_censys_ipv4,
-    from_censys_ipv4_flattened,
-    from_censys_certificates,
-    from_censys_certificates_flattened
-)
-from common_osint_model.censys.v2 import from_censys, from_censys_flattened
-from common_osint_model.certificate import from_x509_pem, from_x509_pem_flattened
-
 from common_osint_model.models.host import Host
 from common_osint_model.models.domain import *
 from common_osint_model.models.service import Service

diff --git a/common_osint_model/censys/__init__.py b/common_osint_model/censys/__init__.py
diff --git a/common_osint_model/censys/v1.py b/common_osint_model/censys/v1.py