userscripts: Avoid tldextract warning

This commit is contained in:
Florian Bruhin 2025-04-11 15:41:59 +02:00
parent 351fef8c1e
commit 3dc212a815
4 changed files with 43 additions and 8 deletions

View File

@ -67,6 +67,7 @@ Fixed
- Resolved issues in userscripts:
* `qute-bitwarden` will now prompt a re-login if its cached session has
been invalidated since last used. (#8456)
* `qute-bitwarden`, `-lastpass` and `-pass` now avoid a `DeprecationWarning` from the upcoming 6.0 release of `tldextract`
[[v3.4.0]]
v3.4.0 (2024-12-14)

View File

@ -204,12 +204,20 @@ def main(arguments):
# the registered domain name and finally: the IPv4 address if that's what
# the URL represents
candidates = []
for target in filter(None, [
extract_result.fqdn,
extract_result.registered_domain,
extract_result.subdomain + '.' + extract_result.domain,
extract_result.domain,
extract_result.ipv4]):
for target in filter(
None,
[
extract_result.fqdn,
getattr(
extract_result,
"top_domain_under_public_suffix",
getattr(extract_result, "registered_domain"),
),
extract_result.subdomain + "." + extract_result.domain,
extract_result.domain,
extract_result.ipv4,
],
):
target_candidates = json.loads(
pass_(
target,

View File

@ -117,7 +117,20 @@ def main(arguments):
# the URL represents
candidates = []
seen_id = set()
for target in filter(None, [extract_result.fqdn, extract_result.registered_domain, extract_result.subdomain + extract_result.domain, extract_result.domain, extract_result.ipv4]):
for target in filter(
None,
[
extract_result.fqdn,
getattr(
extract_result,
"top_domain_under_public_suffix",
getattr(extract_result, "registered_domain"),
),
extract_result.subdomain + extract_result.domain,
extract_result.domain,
extract_result.ipv4,
],
):
target_candidates, err = pass_(target, arguments.io_encoding)
if err:
stderr("LastPass CLI returned for {:s} - {:s}".format(target, err))

View File

@ -243,7 +243,20 @@ def main(arguments):
netloc = urlparse(arguments.url).netloc
for target in filter(None, [extract_result.fqdn, extract_result.registered_domain, extract_result.ipv4, private_domain, netloc]):
for target in filter(
None,
[
extract_result.fqdn,
getattr(
extract_result,
"top_domain_under_public_suffix",
getattr(extract_result, "registered_domain"),
),
extract_result.ipv4,
private_domain,
netloc,
],
):
attempted_targets.append(target)
target_candidates = find_pass_candidates(target, unfiltered=arguments.unfiltered)
if not target_candidates: