refining pw lookup to fall back on get_domain() only when the base_url fails, using get_domain() for all generated passwords

This commit is contained in:
Andrew Davidson 2012-03-12 20:49:56 -07:00
parent 9679d119f5
commit 0f10f0c9e7

View file

@ -69,10 +69,17 @@ def mkpass(size=10):
return string.join([random.choice(validChars) for x in range(size)],"") return string.join([random.choice(validChars) for x in range(size)],"")
def get_pair_from_url(domain): def get_pair_from_url(domain):
return db.select('passwords', where='base_url LIKE "%'+domain+'%"', order='id DESC') a = db.select('passwords', where='base_url LIKE "%'+domain+'%"', order='id DESC')
if not len(a) > 0:
a = db.select('passwords', where='base_url LIKE "%'+get_domain(domain)+'%"',
order='id DESC')
return a
def get_generated_from_url(domain): def get_generated_from_url(domain):
gen = db.select('generated', where='base_url LIKE "%'+domain+'%"', order='id DESC') gen = db.select('generated', where='base_url LIKE "%'+get_domain(domain)+'%"',
order='id DESC')
while not len(gen) > 0: while not len(gen) > 0:
db.insert('generated', base_url = domain, password = mkpass()) db.insert('generated', base_url = domain, password = mkpass())
@ -106,12 +113,12 @@ class index:
body = [] body = []
domain = get_domain(i.base_url) domain = i.base_url
body.append('<h1>'+domain+'</h1>\n') body.append('<h1>'+domain+'</h1>\n')
selected = get_pair_from_url(domain) selected = get_pair_from_url(i.base_url)
generated = get_generated_from_url(domain) generated = get_generated_from_url(i.base_url)
if selected: if selected:
body.append('<h2>Existing:</h2>\n<ul>') body.append('<h2>Existing:</h2>\n<ul>')