mirror of
https://github.com/Garmelon/PFERD.git
synced 2023-12-21 10:23:01 +01:00
Store cookies in text-based format
Using the stdlib's http.cookie module, cookies are now stored as one "Set-Cookie" header per line. Previously, the aiohttp.CookieJar's save() and load() methods were used (which use pickling).
This commit is contained in:
parent
f40820c41f
commit
722970a255
@ -27,6 +27,9 @@ ambiguous situations.
|
|||||||
- `--credential-file` option for `kit-ilias-web` command
|
- `--credential-file` option for `kit-ilias-web` command
|
||||||
- Warning if using concurrent tasks with `kit-ilias-web`
|
- Warning if using concurrent tasks with `kit-ilias-web`
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Cookies are now stored in a text-based format
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Date parsing now also works correctly in non-group exercises
|
- Date parsing now also works correctly in non-group exercises
|
||||||
|
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
|
import http.cookies
|
||||||
import ssl
|
import ssl
|
||||||
from pathlib import Path, PurePath
|
from pathlib import Path, PurePath
|
||||||
from typing import Dict, List, Optional
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import certifi
|
import certifi
|
||||||
@ -105,6 +106,25 @@ class HttpCrawler(Crawler):
|
|||||||
|
|
||||||
self._shared_cookie_jar_paths.append(self._cookie_jar_path)
|
self._shared_cookie_jar_paths.append(self._cookie_jar_path)
|
||||||
|
|
||||||
|
def _load_cookies_from_file(self, path: Path) -> None:
|
||||||
|
jar: Any = http.cookies.SimpleCookie()
|
||||||
|
with open(path) as f:
|
||||||
|
for i, line in enumerate(f):
|
||||||
|
# Names of headers are case insensitive
|
||||||
|
if line[:11].lower() == "set-cookie:":
|
||||||
|
jar.load(line[11:])
|
||||||
|
else:
|
||||||
|
log.explain(f"Line {i} doesn't start with 'Set-Cookie:', ignoring it")
|
||||||
|
self._cookie_jar.update_cookies(jar)
|
||||||
|
|
||||||
|
def _save_cookies_to_file(self, path: Path) -> None:
|
||||||
|
jar: Any = http.cookies.SimpleCookie()
|
||||||
|
for morsel in self._cookie_jar:
|
||||||
|
jar[morsel.key] = morsel
|
||||||
|
with open(path, "w") as f:
|
||||||
|
f.write(jar.output(sep="\n"))
|
||||||
|
f.write("\n") # A trailing newline is just common courtesy
|
||||||
|
|
||||||
def _load_cookies(self) -> None:
|
def _load_cookies(self) -> None:
|
||||||
log.explain_topic("Loading cookies")
|
log.explain_topic("Loading cookies")
|
||||||
|
|
||||||
@ -134,7 +154,7 @@ class HttpCrawler(Crawler):
|
|||||||
|
|
||||||
log.explain(f"Loading cookies from {fmt_real_path(cookie_jar_path)}")
|
log.explain(f"Loading cookies from {fmt_real_path(cookie_jar_path)}")
|
||||||
try:
|
try:
|
||||||
self._cookie_jar.load(cookie_jar_path)
|
self._load_cookies_from_file(cookie_jar_path)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.explain("Failed to load cookies")
|
log.explain("Failed to load cookies")
|
||||||
log.explain(str(e))
|
log.explain(str(e))
|
||||||
@ -144,7 +164,7 @@ class HttpCrawler(Crawler):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
log.explain(f"Saving cookies to {fmt_real_path(self._cookie_jar_path)}")
|
log.explain(f"Saving cookies to {fmt_real_path(self._cookie_jar_path)}")
|
||||||
self._cookie_jar.save(self._cookie_jar_path)
|
self._save_cookies_to_file(self._cookie_jar_path)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.warn(f"Failed to save cookies to {fmt_real_path(self._cookie_jar_path)}")
|
log.warn(f"Failed to save cookies to {fmt_real_path(self._cookie_jar_path)}")
|
||||||
log.warn(str(e))
|
log.warn(str(e))
|
||||||
|
Loading…
Reference in New Issue
Block a user