Merged

Author: mxrch

README.md

@@ -52,7 +52,7 @@ Then, use GHunt Companion to complete the login.
 
 The extension is available on the following stores :\
 \
-[![Firefox](https://files.catbox.moe/5g2ld5.png)](https://addons.mozilla.org/en-US/firefox/addon/ghunt-companion/)   [![Chrome](https://storage.googleapis.com/web-dev-uploads/image/WlD8wC6g8khYWPJUsQceQkhXSlv1/UV4C4ybeBTsZt43U4xis.png)](https://chrome.google.com/webstore/detail/ghunt-companion/dpdcofblfbmmnikcbmmiakkclocadjab)
+[![Firefox](https://files.catbox.moe/5g2ld5.png)](https://addons.mozilla.org/en-US/firefox/addon/ghunt-companion/)   [![Chrome](https://developer.chrome.com/static/docs/webstore/branding/image/206x58-chrome-web-bcb82d15b2486.png)](https://chrome.google.com/webstore/detail/ghunt-companion/dpdcofblfbmmnikcbmmiakkclocadjab)
 
 ## Modules
 
@@ -116,7 +116,7 @@ This project is under [AGPL Licence](https://choosealicense.com/licenses/agpl-3.
 
 Thanks to these awesome people for supporting me !
 
-<!-- sponsors --><a href="https://github.com/BlWasp"><img src="https://github.com/BlWasp.png" width="50px" alt="BlWasp" /></a>&nbsp;&nbsp;<a href="https://github.com/C3n7ral051nt4g3ncy"><img src="https://github.com/C3n7ral051nt4g3ncy.png" width="50px" alt="C3n7ral051nt4g3ncy" /></a>&nbsp;&nbsp;<a href="https://github.com/gingeleski"><img src="https://github.com/gingeleski.png" width="50px" alt="gingeleski" /></a>&nbsp;&nbsp;<!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/BlWasp"><img src="https://github.com/BlWasp.png" width="50px" alt="BlWasp" /></a>&nbsp;&nbsp;<a href="https://github.com/gingeleski"><img src="https://github.com/gingeleski.png" width="50px" alt="gingeleski" /></a>&nbsp;&nbsp;<!-- sponsors -->
 
 \
 You like my work ?\

examples/email_registered.py

@@ -1,3 +1,5 @@
+import os
+
 import httpx
 import asyncio
 
@@ -8,7 +10,8 @@
 
 async def main():
     if not sys.argv[1:]:
-        exit("Please give an email address.")
+        print("Please give an email address.")
+        exit()
 
     as_client = httpx.AsyncClient() # Async Client
 

ghunt/ghunt.py

@@ -1,3 +1,4 @@
+import os
 import sys
 
 
@@ -6,7 +7,7 @@ def main():
     if (version < (3, 10)):
         print('[-] GHunt only works with Python 3.10+.')
         print(f'Your current Python version : {version.major}.{version.minor}.{version.micro}')
-        sys.exit(1)
+        sys.exit(os.EX_SOFTWARE)
 
     from ghunt.cli import parse_and_run
     from ghunt.helpers.banner import show_banner

ghunt/helpers/auth.py

@@ -1,6 +1,7 @@
 import asyncio
 import json
 import base64
+import os
 from typing import *
 
 import httpx
@@ -174,7 +175,7 @@ def auth_dialog() -> Tuple[Dict[str, str], str] :
                 "=> https://github.com/mxrch/ghunt_companion\n\n"
                 "[1] (Companion) Put GHunt on listening mode (currently not compatible with docker)\n"
                 "[2] (Companion) Paste base64-encoded authentication\n"
-                "[3] Enter the oauth_token (stats with \"oauth2_4/\")\n"
+                "[3] Enter the oauth_token (starts with \"oauth2_4/\")\n"
                 "[4] Enter the master token (starts with \"aas_et/\")\n"
                 "Choice => ")
 
@@ -196,7 +197,8 @@ def auth_dialog() -> Tuple[Dict[str, str], str] :
         master_token = input(f"Master token => ").strip('" ')
 
     else:
-        exit("Please choose a valid choice. Exiting...")
+        print("Please choose a valid choice. Exiting...")
+        exit()
 
     return oauth_token, master_token
 
@@ -213,4 +215,4 @@ async def load_and_auth(as_client: httpx.AsyncClient, help=True) -> GHuntCreds:
 
     await check_and_gen(as_client, creds)
 
-    return creds
+    return creds

ghunt/helpers/ia.py

@@ -1,3 +1,5 @@
+import os
+
 from ghunt import globals as gb
 from ghunt.apis.vision import VisionHttp
 
@@ -20,7 +22,8 @@ async def detect_face(vision_api: VisionHttp, as_client: httpx.AsyncClient, imag
             break
         await asyncio.sleep(0.5)
     else:
-        exit("\n[-] Vision API keeps rate-limiting.")
+        print("\n[-] Vision API keeps rate-limiting.")
+        exit(os.EX_UNAVAILABLE)
 
     if are_faces_found:
         if len(faces_results.face_annotations) > 1:

ghunt/helpers/listener.py

@@ -1,3 +1,4 @@
+import os
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from typing import *
 
@@ -45,7 +46,8 @@ def run(server_class=HTTPServer, handler_class=Server, port=60067):
                 break
 
     except KeyboardInterrupt:
-        exit("[-] Exiting...")
+        print("[-] Exiting...")
+        exit(os.CLD_KILLED)
     else:
         if handler_class.data_bridge.data:
             print("[+] Received cookies !")

ghunt/modules/drive.py

@@ -1,3 +1,5 @@
+import os
+
 from ghunt.helpers.utils import *
 from ghunt.objects.base import DriveExtractedUser, GHuntCreds
 from ghunt.apis.drive import DriveHttp
@@ -38,7 +40,8 @@ async def hunt(as_client: httpx.AsyncClient, file_id: str, json_file: bool=Path)
     drive = DriveHttp(ghunt_creds)
     file_found, file = await drive.get_file(as_client, file_id)
     if not file_found:
-        exit("[-] The file wasn't found.")
+        print("[-] The file wasn't found.")
+        exit()
 
     is_folder = file.mime_type == "application/vnd.google-apps.folder"
     file_type = drive_knownledge.mime_types.get(file.mime_type)

ghunt/modules/email.py

@@ -1,3 +1,5 @@
+import os
+
 from ghunt import globals as gb
 from ghunt.helpers.utils import get_httpx_client
 from ghunt.objects.base import GHuntCreds
@@ -24,7 +26,8 @@ async def hunt(as_client: httpx.AsyncClient, email_address: str, json_file: Path
     # vision_api = VisionHttp(ghunt_creds)
     is_found, target = await people_pa.people_lookup(as_client, email_address, params_template="max_details")
     if not is_found:
-        exit("[-] The target wasn't found.")
+        print("[-] The target wasn't found.")
+        exit()
 
     if json_file:
         json_results = {}
@@ -37,7 +40,8 @@ async def hunt(as_client: httpx.AsyncClient, email_address: str, json_file: Path
             print(f"- {container.title()}")
 
     if not "PROFILE" in containers:
-        exit("[-] Given information does not match a public Google Account.")
+        print("[-] Given information does not match a public Google Account.")
+        exit()
 
     container = "PROFILE"
 
@@ -66,7 +70,10 @@ async def hunt(as_client: httpx.AsyncClient, email_address: str, json_file: Path
             # await ia.detect_face(vision_api, as_client, target.coverPhotos[container].url)
             print()
 
-    print(f"Last profile edit : {target.sourceIds[container].lastUpdated.strftime('%Y/%m/%d %H:%M:%S (UTC)')}\n")
+    if target.sourceIds[container].lastUpdated:
+        print(f"Last profile edit : {target.sourceIds[container].lastUpdated.strftime('%Y/%m/%d %H:%M:%S (UTC)')}\n")
+    else:
+        gb.rc.print(f"Last profile edit : [italic]Not found.[/italic]\n")
 
     if container in target.emails:
         print(f"Email : {target.emails[container].value}")
@@ -160,4 +167,4 @@ async def hunt(as_client: httpx.AsyncClient, email_address: str, json_file: Path
             f.write(json.dumps(json_results, cls=GHuntEncoder, indent=4))
         gb.rc.print(f"\n[+] JSON output wrote to {json_file} !", style="italic")
 
-    await as_client.aclose()
+    await as_client.aclose()

ghunt/modules/gaia.py

@@ -1,3 +1,5 @@
+import os
+
 from ghunt import globals as gb
 from ghunt.objects.base import GHuntCreds
 from ghunt.apis.peoplepa import PeoplePaHttp
@@ -16,108 +18,108 @@ async def hunt(as_client: httpx.AsyncClient, gaia_id: str, json_file: Path=None)
     if not as_client:
         as_client = get_httpx_client()
 
-    # ghunt_creds = await auth.load_and_auth(as_client)
+    ghunt_creds = await auth.load_and_auth(as_client)
 
     # #gb.rc.print("\n[+] Target found !", style="spring_green3")
 
-    # people_pa = PeoplePaHttp(ghunt_creds)
+    people_pa = PeoplePaHttp(ghunt_creds)
     # # vision_api = VisionHttp(ghunt_creds)
-    # is_found, target = await people_pa.people(as_client, gaia_id, params_template="max_details")
-    # if not is_found:
-    #     exit("[-] The target wasn't found.")
+    is_found, target = await people_pa.people(as_client, gaia_id, params_template="max_details")
+    if not is_found:
+        exit("[-] The target wasn't found.")
 
-    # if json_file:
-    #     json_results = {}
+    if json_file:
+        json_results = {}
 
-    # containers = target.sourceIds
+    containers = target.sourceIds
 
-    # if len(containers) > 1 or not "PROFILE" in containers:
-    #     print("[!] You have this person in these containers :")
-    #     for container in containers:
-    #         print(f"- {container.title()}")
+    if len(containers) > 1 or not "PROFILE" in containers:
+        print("[!] You have this person in these containers :")
+        for container in containers:
+            print(f"- {container.title()}")
 
-    # if not "PROFILE" in containers:
-    #     exit("[-] Given information does not match a public Google Account.")
+    if not "PROFILE" in containers:
+        exit("[-] Given information does not match a public Google Account.")
 
-    # container = "PROFILE"
+    container = "PROFILE"
 
-    # gb.rc.print("🙋 Google Account data\n", style="plum2")
+    gb.rc.print("🙋 Google Account data\n", style="plum2")
 
-    # # if container in target.names:
-    #     # print(f"Name : {target.names[container].fullname}\n")
+    # if container in target.names:
+        # print(f"Name : {target.names[container].fullname}\n")
 
-    # if container in target.profilePhotos:
-    #     if target.profilePhotos[container].isDefault:
-    #         print("[-] Default profile picture")
-    #     else:
-    #         print("[+] Custom profile picture !")
-    #         print(f"=> {target.profilePhotos[container].url}")
+    if container in target.profilePhotos:
+        if target.profilePhotos[container].isDefault:
+            print("[-] Default profile picture")
+        else:
+            print("[+] Custom profile picture !")
+            print(f"=> {target.profilePhotos[container].url}")
 
     #         # await ia.detect_face(vision_api, as_client, target.profilePhotos[container].url)
     #         print()
 
-    # if container in target.coverPhotos:
-    #     if target.coverPhotos[container].isDefault:
-    #         print("[-] Default cover picture\n")
-    #     else:
-    #         print("[+] Custom cover picture !")
-    #         print(f"=> {target.coverPhotos[container].url}")
+    if container in target.coverPhotos:
+        if target.coverPhotos[container].isDefault:
+            print("[-] Default cover picture\n")
+        else:
+            print("[+] Custom cover picture !")
+            print(f"=> {target.coverPhotos[container].url}")
 
     #         # await ia.detect_face(vision_api, as_client, target.coverPhotos[container].url)
-    #         print()
+            print()
 
-    # print(f"Last profile edit : {target.sourceIds[container].lastUpdated.strftime('%Y/%m/%d %H:%M:%S (UTC)')}\n")
+    print(f"Last profile edit : {target.sourceIds[container].lastUpdated.strftime('%Y/%m/%d %H:%M:%S (UTC)')}\n")
 
-    # print(f"Gaia ID : {target.personId}\n")
+    print(f"Gaia ID : {target.personId}\n")
 
-    # if container in target.profileInfos:
-    #     print("User types :")
-    #     for user_type in target.profileInfos[container].userTypes:
-    #         definition = get_user_type_definition(user_type)
-    #         gb.rc.print(f"- {user_type} [italic]({definition})[/italic]")
+    if container in target.profileInfos:
+        print("User types :")
+        for user_type in target.profileInfos[container].userTypes:
+            definition = get_user_type_definition(user_type)
+            gb.rc.print(f"- {user_type} [italic]({definition})[/italic]")
 
-    # gb.rc.print(f"\n📞 Google Chat Extended Data\n", style="light_salmon3")
+    gb.rc.print(f"\n📞 Google Chat Extended Data\n", style="light_salmon3")
 
-    # #print(f"Presence : {target.extendedData.dynamiteData.presence}")
-    # print(f"Entity Type : {target.extendedData.dynamiteData.entityType}")
-    # #print(f"DND State : {target.extendedData.dynamiteData.dndState}")
-    # gb.rc.print(f"Customer ID : {x if (x := target.extendedData.dynamiteData.customerId) else '[italic]Not found.[/italic]'}")
+    #print(f"Presence : {target.extendedData.dynamiteData.presence}")
+    print(f"Entity Type : {target.extendedData.dynamiteData.entityType}")
+    #print(f"DND State : {target.extendedData.dynamiteData.dndState}")
+    gb.rc.print(f"Customer ID : {x if (x := target.extendedData.dynamiteData.customerId) else '[italic]Not found.[/italic]'}")
 
-    # gb.rc.print(f"\n🌐 Google Plus Extended Data\n", style="cyan")
+    gb.rc.print(f"\n🌐 Google Plus Extended Data\n", style="cyan")
 
-    # print(f"Entreprise User : {target.extendedData.gplusData.isEntrepriseUser}")
-    # #print(f"Content Restriction : {target.extendedData.gplusData.contentRestriction}")
+    print(f"Entreprise User : {target.extendedData.gplusData.isEntrepriseUser}")
+    #print(f"Content Restriction : {target.extendedData.gplusData.contentRestriction}")
 
-    # if container in target.inAppReachability:
-    #     print("\n[+] Activated Google services :")
-    #     for app in target.inAppReachability[container].apps:
-    #         print(f"- {app}")
+    if container in target.inAppReachability:
+        print("\n[+] Activated Google services :")
+        for app in target.inAppReachability[container].apps:
+            print(f"- {app}")
 
     gb.rc.print("\n🗺️ Maps data", style="green4")
 
     err, stats = await gmaps.get_reviews(as_client, gaia_id)
     gmaps.output(err, stats, gaia_id)
 
-    # if json_file:
-    #     if container == "PROFILE":
-    #         json_results[f"{container}_CONTAINER"] = {
-    #             "profile": target,
-    #             "maps": {
-    #                 "photos": photos,
-    #                 "reviews": reviews,
-    #                 "stats": stats
-    #             }
-    #         }
-    #     else:
-    #         json_results[f"{container}_CONTAINER"] = {
-    #             "profile": target
-    #         }
+    if json_file:
+        if container == "PROFILE":
+            json_results[f"{container}_CONTAINER"] = {
+                "profile": target,
+                "maps": {
+                    # "photos": photos,
+                    # "reviews": reviews,
+                    "stats": stats
+                }
+            }
+        else:
+            json_results[f"{container}_CONTAINER"] = {
+                "profile": target
+            }
 
-    # if json_file:
-    #     import json
-    #     from ghunt.objects.encoders import GHuntEncoder;
-    #     with open(json_file, "w", encoding="utf-8") as f:
-    #         f.write(json.dumps(json_results, cls=GHuntEncoder, indent=4))
-    #     gb.rc.print(f"\n[+] JSON output wrote to {json_file} !", style="italic")
+    if json_file:
+        import json
+        from ghunt.objects.encoders import GHuntEncoder;
+        with open(json_file, "w", encoding="utf-8") as f:
+            f.write(json.dumps(json_results, cls=GHuntEncoder, indent=4))
+        gb.rc.print(f"\n[+] JSON output wrote to {json_file} !", style="italic")
 
     await as_client.aclose()

ghunt/modules/geolocate.py

@@ -1,3 +1,5 @@
+import os
+
 from ghunt import globals as gb
 from ghunt.helpers.utils import get_httpx_client
 from ghunt.apis.geolocation import GeolocationHttp
@@ -16,12 +18,14 @@ async def main(as_client: httpx.AsyncClient, bssid: str, input_file: Path, json_
     body = None
     if input_file:
         if not input_file.exists():
-            exit(f"[-] The input file \"{input_file}\" doesn't exist.")
+            print(f"[-] The input file \"{input_file}\" doesn't exist.")
+            exit()
         with open(input_file, "r", encoding="utf-8") as f:
             try:
                 body = json.load(f)
             except json.JSONDecodeError:
-                exit("[-] The input file is not a valid JSON file.")
+                print(f"[-] The input file \"{input_file}\" is not a valid JSON file.")
+                exit()
 
     if not as_client:
         as_client = get_httpx_client()
@@ -31,7 +35,8 @@ async def main(as_client: httpx.AsyncClient, bssid: str, input_file: Path, json_
     geo_api = GeolocationHttp(ghunt_creds)
     found, resp = await geo_api.geolocate(as_client, bssid=bssid, body=body)
     if not found:
-        exit("[-] The location wasn't found.")
+        print("[-] The location wasn't found.")
+        exit()
 
     geolocator = Nominatim(user_agent="nominatim")
     location = geolocator.reverse(f"{resp.location.latitude}, {resp.location.longitude}", timeout=10)