opensquat 2.2.2__tar.gz → 2.2.3__tar.gz

{opensquat-2.2.2 → opensquat-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensquat
-Version: 2.2.2
+Version: 2.2.3
 Summary: openSquat - Detection of domain squatting, typosquatting, IDN homograph attacks, and phishing threats
 Author-email: Andre Tenreiro <andre@opensquat.com>
 License-Expression: GPL-3.0-only

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Module: __init__.py
 """openSquat Version."""
-__VERSION__ = "2.2.2"
+__VERSION__ = "2.2.3"

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat/app.py

@@ -32,6 +32,7 @@ class Domain:
         self.domain_total = 0
         self.keywords_total = 0
         self.list_domains = []
+        self.keyword_domains = {}
         self.confidence_level = 2
         self.doppelganger_only = False
 
@@ -52,7 +53,7 @@ class Domain:
         """
         Method to read domain files
         """
-        with open(self.domain_filename, mode='r') as file_domains:
+        with open(self.domain_filename, mode='r', encoding='utf-8') as file_domains:
             for mydomains in file_domains:
                 domain = mydomains.replace("\n", "")
                 domain = domain.lower().strip()
@@ -60,7 +61,7 @@ class Domain:
                 if domain and not domain.startswith("#"):
                     self.list_file_domains.append(domain)
 
-        with open(self.keywords_filename, mode='r') as file_keywords:
+        with open(self.keywords_filename, mode='r', encoding='utf-8') as file_keywords:
             for line in file_keywords:
                 line = line.strip()
                 if line and not line.startswith("#"):
@@ -101,7 +102,7 @@ class Domain:
         )
 
         result_domains = detector.check(keyword, domains_list, result_buffer)
-        return result_buffer, result_domains
+        return result_buffer, keyword, result_domains
 
     def worker(self):
         """
@@ -119,9 +120,11 @@ class Domain:
             futs = [executor.submit(worker_func, k_info) for k_info in keyword_infos]
 
         for fut in futs:
-            result_buffer, result_domains = fut.result()
+            result_buffer, keyword, result_domains = fut.result()
             print(result_buffer.getvalue())
             self.list_domains.extend(result_domains)
+            if result_domains:
+                self.keyword_domains[keyword] = result_domains
 
         return self.list_domains
 

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat/cli.py

@@ -55,7 +55,8 @@ def main():
 
     start_time_squatting = time.time()
 
-    file_content = app.Domain().main(
+    domain_scanner = app.Domain()
+    file_content = domain_scanner.main(
         args.keywords,
         args.confidence,
         args.domains,
@@ -144,7 +145,16 @@ def main():
         file_content = list_aux
         print("[*] Total found:", len(file_content))
 
-    output.SaveFile().main(args.output, args.type, file_content)
+    if args.type == "json":
+        filtered_set = set(file_content)
+        json_content = []
+        for kw, doms in domain_scanner.keyword_domains.items():
+            filtered_doms = [d for d in doms if d in filtered_set]
+            if filtered_doms:
+                json_content.append({"keyword": kw, "domains": filtered_doms})
+        output.SaveFile().main(args.output, args.type, json_content)
+    else:
+        output.SaveFile().main(args.output, args.type, file_content)
     end_time_squatting = round(time.time() - start_time_squatting, 2)
 
     # Print summary

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat/file_input.py

@@ -44,7 +44,7 @@ class InputFile:
             )
             exit(-1)
         
-        with open(self.domain_filename, mode='r') as fd_input:
+        with open(self.domain_filename, mode='r', encoding='utf-8') as fd_input:
             for line in fd_input:
                 line = line.strip()
                 # Skip comments and empty lines
@@ -72,14 +72,10 @@ class InputFile:
             )
             exit(-1)
         
-        with open(self.keywords_filename, mode='r') as fd_input:
+        with open(self.keywords_filename, mode='r', encoding='utf-8') as fd_input:
             for line in fd_input:
-                if (
-                    (line[0] != "#") and
-                    (line[0] != " ") and
-                    (line[0] != "") and
-                    (line[0] != "\n")
-                ):
+                line = line.strip()
+                if line and not line.startswith("#"):
                     self.keywords_total += 1
 
         return self.keywords_total

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat/output.py

@@ -45,9 +45,8 @@ class SaveFile:
         Return
             none
         """
-        with open(self.filename, "w") as f_json:
-            json.dump(self.content, f_json)
-        f_json.close()
+        with open(self.filename, "w", encoding='utf-8') as f_json:
+            json.dump(self.content, f_json, indent=2, ensure_ascii=False)
 
     def as_csv(self):
         """
@@ -59,7 +58,7 @@ class SaveFile:
         Return
             none
         """
-        with open(self.filename, "w") as f_csv:
+        with open(self.filename, "w", encoding='utf-8') as f_csv:
             file_csv = csv.writer(
                 f_csv, delimiter=",", quotechar='"', quoting=csv.QUOTE_MINIMAL
             )
@@ -76,7 +75,7 @@ class SaveFile:
         Return
             none
         """
-        with open(self.filename, "w") as f:
+        with open(self.filename, "w", encoding='utf-8') as f:
             for item in self.content:
                 f.write(item + "\n")
         f.close()

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat/phishing.py

@@ -58,7 +58,7 @@ class Phishing:
         i = 0
         
         # Open phishing DB
-        with open(self.keywords_filename, mode='r') as f_key:
+        with open(self.keywords_filename, mode='r', encoding='utf-8') as f_key:
             for keyword in f_key:
                 keyword = keyword.replace("\n", "")
                 keyword = keyword.lower()
@@ -83,7 +83,7 @@ class Phishing:
                         "]" + Style.RESET_ALL,
                     )
                     
-                    with open(self.phishing_filename, mode='r') as f_phishing:
+                    with open(self.phishing_filename, mode='r', encoding='utf-8') as f_phishing:
                         for site in f_phishing:
                             phishing_site = site.lower()
                             phishing_site = site.replace("\n", "")

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat/vt.py

@@ -40,7 +40,7 @@ class VirusTotal:
             )
             exit(-1)
         
-        with open(self.api_key_file, mode='r') as file_vt:
+        with open(self.api_key_file, mode='r', encoding='utf-8') as file_vt:
             for line in file_vt:
                 if (
                     (line[0] != "#") and

{opensquat-2.2.2 → opensquat-2.2.3}/opensquat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensquat
-Version: 2.2.2
+Version: 2.2.3
 Summary: openSquat - Detection of domain squatting, typosquatting, IDN homograph attacks, and phishing threats
 Author-email: Andre Tenreiro <andre@opensquat.com>
 License-Expression: GPL-3.0-only

{opensquat-2.2.2 → opensquat-2.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opensquat"
-version = "2.2.2"
+version = "2.2.3"
 description = "openSquat - Detection of domain squatting, typosquatting, IDN homograph attacks, and phishing threats"
 readme = "README.md"
 license = "GPL-3.0-only"