xtekky/gpt4free
1
1
Fork 0
mirror of https://github.com/xtekky/gpt4free.git synced 2024-11-29 22:34:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix "domain" KeyError with Firefox .har

Browse Source
This commit is contained in:
Heiner Lohaus 2024-04-22 17:55:31 +02:00
parent 454be0ed70
commit 6a05a238d9
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
g4f/cookies.py
View File

@ -26,6 +26,12 @@ from . import debug
# Global variable to store cookies # Global variable to store cookies
_cookies: Dict[str, Cookies] = {} _cookies: Dict[str, Cookies] = {}
DOMAINS = [
".bing.com",
".meta.ai",
".google.com"
]
if has_browser_cookie3 and os.environ.get('DBUS_SESSION_BUS_ADDRESS') == "/dev/null": if has_browser_cookie3 and os.environ.get('DBUS_SESSION_BUS_ADDRESS') == "/dev/null":
_LinuxPasswordManager.get_password = lambda a, b: b"secret" _LinuxPasswordManager.get_password = lambda a, b: b"secret"
@ -88,6 +94,15 @@ def load_cookies_from_browsers(domain_name: str, raise_requirements_error: bool
return cookies return cookies
def read_cookie_files(dirPath: str = "./har_and_cookies"): def read_cookie_files(dirPath: str = "./har_and_cookies"):
def get_domain(v: dict) -> str:
host = [h["value"] for h in v['request']['headers'] if h["name"].lower() in ("host", ":authority")]
if not host:
return
host = host.pop()
for d in DOMAINS:
if d in host:
return d
global _cookies global _cookies
harFiles = [] harFiles = []
cookieFiles = [] cookieFiles = []
@ -109,17 +124,15 @@ def read_cookie_files(dirPath: str = "./har_and_cookies"):
print("Read .har file:", path) print("Read .har file:", path)
new_cookies = {} new_cookies = {}
for v in harFile['log']['entries']: for v in harFile['log']['entries']:
domain = get_domain(v)
if domain is None:
continue
v_cookies = {} v_cookies = {}
for c in v['request']['cookies']: for c in v['request']['cookies']:
if "domain" not in c: v_cookies[c['name']] = c['value']
continue if len(v_cookies) > 0:
_cookies[domain] = v_cookies
if c['domain'] not in v_cookies: new_cookies[domain] = len(v_cookies)
v_cookies[c['domain']] = {}
v_cookies[c['domain']][c['name']] = c['value']
for domain, c in v_cookies.items():
_cookies[domain] = c
new_cookies[domain] = len(c)
if debug.logging: if debug.logging:
for domain, new_values in new_cookies.items(): for domain, new_values in new_cookies.items():
print(f"Cookies added: {new_values} from {domain}") print(f"Cookies added: {new_values} from {domain}")