mirror of
https://github.com/simple-login/app.git
synced 2024-09-28 20:51:29 +02:00
Remove nullsfirst as not compatible with sqlite. Add more logging
This commit is contained in:
parent
b3f8fd6789
commit
d4e930c930
@ -167,6 +167,9 @@ class Hibp(db.Model, ModelMixin):
|
|||||||
name = db.Column(db.String(), nullable=False, unique=True, index=True)
|
name = db.Column(db.String(), nullable=False, unique=True, index=True)
|
||||||
breached_aliases = db.relationship("Alias", secondary="alias_hibp")
|
breached_aliases = db.relationship("Alias", secondary="alias_hibp")
|
||||||
|
|
||||||
|
def __repr__(self):
|
||||||
|
return f"<HIBP Breach {self.id} {self.name}>"
|
||||||
|
|
||||||
|
|
||||||
class Fido(db.Model, ModelMixin):
|
class Fido(db.Model, ModelMixin):
|
||||||
__tablename__ = "fido"
|
__tablename__ = "fido"
|
||||||
|
4
cron.py
4
cron.py
@ -792,6 +792,8 @@ async def _hibp_check(api_key, queue):
|
|||||||
alias.hibp_breaches = [
|
alias.hibp_breaches = [
|
||||||
Hibp.get_by(name=entry["Name"]) for entry in r.json()
|
Hibp.get_by(name=entry["Name"]) for entry in r.json()
|
||||||
]
|
]
|
||||||
|
if len(alias.hibp_breaches) > 0:
|
||||||
|
LOG.w("%s appears in HIBP breaches %s", alias, alias.hibp_breaches)
|
||||||
elif r.status_code == 404:
|
elif r.status_code == 404:
|
||||||
# No breaches found
|
# No breaches found
|
||||||
alias.hibp_breaches = []
|
alias.hibp_breaches = []
|
||||||
@ -837,7 +839,7 @@ async def check_hibp():
|
|||||||
Alias.query.filter(
|
Alias.query.filter(
|
||||||
or_(Alias.hibp_last_check.is_(None), Alias.hibp_last_check < max_date)
|
or_(Alias.hibp_last_check.is_(None), Alias.hibp_last_check < max_date)
|
||||||
)
|
)
|
||||||
.order_by(Alias.hibp_last_check.asc().nullsfirst())
|
.order_by(Alias.id)
|
||||||
.all()
|
.all()
|
||||||
):
|
):
|
||||||
await queue.put(alias.id)
|
await queue.put(alias.id)
|
||||||
|
Loading…
Reference in New Issue
Block a user