change password is now async

Miguel Barao
1 parent 41d56522
Showing 2 changed files with 10 additions and 4 deletions Show diff stats
learnapp.py
serve.py
@@ -35,6 +35,8 @@ async def check_password(try_pw, password):
     hashed_pw = await loop.run_in_executor(None, bcrypt.hashpw, try_pw, password)
     return password == hashed_pw
  
+def bcrypt_hash_gen(pw):
+    return bcrypt.hashpw(pw.encode('utf-8'), bcrypt.gensalt())
  
 # ============================================================================
 # LearnApp - application logic
@@ -124,13 +126,16 @@ class LearnApp(object):
     # ------------------------------------------------------------------------
     # change_password
     # ------------------------------------------------------------------------
-    def change_password(self, uid, pw):
+    async def change_password(self, uid, pw):
         if not pw:
             return False
  
+        loop = asyncio.get_running_loop()
+        pw = await loop.run_in_executor(None, bcrypt_hash_gen, pw)
+
         with self.db_session() as s:
             u = s.query(Student).get(uid)
-            u.password = bcrypt.hashpw(pw.encode('utf-8'), bcrypt.gensalt())
+            u.password = pw
  
         logger.info(f'User "{uid}" changed password')
         return True
@@ -114,11 +114,12 @@ class LogoutHandler(BaseHandler):
 # ----------------------------------------------------------------------------
 class ChangePasswordHandler(BaseHandler):
     @tornado.web.authenticated
-    def post(self):
+    async def post(self):
         uid = self.current_user
         pw = self.get_body_arguments('new_password')[0]
  
-        if self.learn.change_password(uid, pw):
+        changed_ok = await self.learn.change_password(uid, pw)
+        if changed_ok:
             notification = tornado.escape.to_unicode(self.render_string('notification.html', type='success', msg='A password foi alterada!'))
         else:
             notification = tornado.escape.to_unicode(self.render_string('notification.html', type='danger', msg='A password não foi alterada!'))
...	...	@@ -35,6 +35,8 @@ async def check_password(try_pw, password):
35	35	hashed_pw = await loop.run_in_executor(None, bcrypt.hashpw, try_pw, password)
36	36	return password == hashed_pw
37	37
	38	+def bcrypt_hash_gen(pw):
	39	+ return bcrypt.hashpw(pw.encode('utf-8'), bcrypt.gensalt())
38	40
39	41	# ============================================================================
40	42	# LearnApp - application logic
...	...	@@ -124,13 +126,16 @@ class LearnApp(object):
124	126	# ------------------------------------------------------------------------
125	127	# change_password
126	128	# ------------------------------------------------------------------------
127		- def change_password(self, uid, pw):
	129	+ async def change_password(self, uid, pw):
128	130	if not pw:
129	131	return False
130	132
	133	+ loop = asyncio.get_running_loop()
	134	+ pw = await loop.run_in_executor(None, bcrypt_hash_gen, pw)
	135	+
131	136	with self.db_session() as s:
132	137	u = s.query(Student).get(uid)
133		- u.password = bcrypt.hashpw(pw.encode('utf-8'), bcrypt.gensalt())
	138	+ u.password = pw
134	139
135	140	logger.info(f'User "{uid}" changed password')
136	141	return True
...	...
...	...	@@ -114,11 +114,12 @@ class LogoutHandler(BaseHandler):
114	114	# ----------------------------------------------------------------------------
115	115	class ChangePasswordHandler(BaseHandler):
116	116	@tornado.web.authenticated
117		- def post(self):
	117	+ async def post(self):
118	118	uid = self.current_user
119	119	pw = self.get_body_arguments('new_password')[0]
120	120
121		- if self.learn.change_password(uid, pw):
	121	+ changed_ok = await self.learn.change_password(uid, pw)
	122	+ if changed_ok:
122	123	notification = tornado.escape.to_unicode(self.render_string('notification.html', type='success', msg='A password foi alterada!'))
123	124	else:
124	125	notification = tornado.escape.to_unicode(self.render_string('notification.html', type='danger', msg='A password não foi alterada!'))
...	...