mirror
/
auto-archiver
kopia lustrzana https://github.com/bellingcat/auto-archiver
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

allows auth_for_site to receive do.main directly

pull/313/head
msramalho 2025-06-08 14:16:12 +01:00
rodzic c96fd71f35
commit 18cc05a2fe
Nie znaleziono w bazie danych klucza dla tego podpisu
1 zmienionych plików z 4 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
src/auto_archiver/core/base_module.py
Wyświetl plik

@ -98,12 +98,11 @@ class BaseModule(ABC):
""" """
# TODO: think about if/how we can deal with sites that have multiple domains (main one is x.com/twitter.com) # TODO: think about if/how we can deal with sites that have multiple domains (main one is x.com/twitter.com)
# for now the user must enter them both, like "x.com,twitter.com" in their config. Maybe we just hard-code? # for now the user must enter them both, like "x.com,twitter.com" in their config. Maybe we just hard-code?
domain = UrlUtil.domain_for_url(site).removeprefix("www.")
site = UrlUtil.domain_for_url(site).removeprefix("www.")
# add the 'www' version of the site to the list of sites to check # add the 'www' version of the site to the list of sites to check
authdict = {} authdict = {}
for to_try in [site, f"www.{site}"]: for to_try in [site, domain, f"www.{domain}"]:
if to_try in self.authentication: if to_try in self.authentication:
authdict.update(self.authentication[to_try]) authdict.update(self.authentication[to_try])
break break
@ -111,9 +110,9 @@ class BaseModule(ABC):
# do a fuzzy string match just to print a warning - don't use it since it's insecure # do a fuzzy string match just to print a warning - don't use it since it's insecure
if not authdict: if not authdict:
for key in self.authentication.keys(): for key in self.authentication.keys():
if key in site or site in key: if key in domain or domain in key:
logger.debug( logger.debug(
f"Could not find exact authentication information for site '{site}'. \ f"Could not find exact authentication information for '{domain}'. \
did find information for '{key}' which is close, is this what you meant? \ did find information for '{key}' which is close, is this what you meant? \
If so, edit your authentication settings to make sure it exactly matches." If so, edit your authentication settings to make sure it exactly matches."
) )