async update_student_password

- was using bcrypt in synchronous way, which is slow on first login of many students. - commented functions from app.py that are not being used.

async update_student_password
- was using bcrypt in synchronous way, which is slow on first login of many students. - commented functions from app.py that are not being used.
Miguel Barão
1 parent 08a607f3
Showing 3 changed files with 36 additions and 32 deletions Show diff stats
perguntations/app.py
perguntations/factory.py
perguntations/serve.py
@@ -32,6 +32,11 @@ async def check_password(try_pw, password):
     hashed = await loop.run_in_executor(None, bcrypt.hashpw, try_pw, password)
     return password == hashed
+async def hash_password(pw):
+    pw = pw.encode('utf-8')
+    loop = asyncio.get_running_loop()
+    return await loop.run_in_executor(None, bcrypt.hashpw, pw, bcrypt.gensalt())
+
 # ============================================================================
 #   Application
@@ -108,7 +113,7 @@ class App(object):
         # first login updates the password
         if password == '':              # update password on first login
-            self.update_student_password(uid, try_pw)
+            await self.update_student_password(uid, try_pw)
             pw_ok = True
         else:                           # check password
             pw_ok = await check_password(try_pw, password)  # async bcrypt
@@ -209,14 +214,14 @@ class App(object):
     # -----------------------------------------------------------------------
     # --- helpers (getters)
-    def get_student_name(self, uid):
-        return self.online[uid]['student']['name']
+    # def get_student_name(self, uid):
+    #     return self.online[uid]['student']['name']
     def get_student_test(self, uid, default=None):
         return self.online[uid].get('test', default)
-    def get_questions_path(self):
-        return self.testfactory['questions_dir']
+    # def get_questions_dir(self):
+    #     return self.testfactory['questions_dir']
     def get_student_grades_from_all_tests(self, uid):
         with self.db_session() as s:
@@ -226,8 +231,8 @@ class App(object):
         with self.db_session() as s:
             return s.query(Test.filename).filter_by(id=test_id).scalar()
-    def get_online_students(self):            # [('uid', 'name', 'starttime')]
-        return [(k, v['student']['name'], str(v.get('test', {}).get('start_time', '---'))) for k, v in self.online.items() if k != '0']
+    # def get_online_students(self):            # [('uid', 'name', 'starttime')]
+    #     return [(k, v['student']['name'], str(v.get('test', {}).get('start_time', '---'))) for k, v in self.online.items() if k != '0']
     def get_all_students(self):
         with self.db_session() as s:
@@ -249,16 +254,16 @@ class App(object):
                 # 'focus': self.online.get(uid, {}).get('student', {}).get('focus', True), # FIXME
                 } for uid, name, pw in self.get_all_students()]
-    def get_allowed_students(self):
-        # set of 'uid' allowed to login
-        return self.allowed
+    # def get_allowed_students(self):
+    #     # set of 'uid' allowed to login
+    #     return self.allowed
-    def get_file(self, uid, ref, key):
-        # get filename of (uid, ref, name) if declared in the question
-        t = self.get_test(uid)
-        for q in t['questions']:
-            if q['ref'] == ref and key in q['files']:
-                return path.abspath(path.join(q['path'], q['files'][key]))
+    # def get_file(self, uid, ref, key):
+    #     # get filename of (uid, ref, name) if declared in the question
+    #     t = self.get_student_test(uid)
+    #     for q in t['questions']:
+    #         if q['ref'] == ref and key in q['files']:
+    #             return path.abspath(path.join(q['path'], q['files'][key]))
     # --- helpers (change state)
     def allow_student(self, uid):
@@ -269,9 +274,9 @@ class App(object):
         self.allowed.discard(uid)
         logger.info(f'Student {uid}: denied to login')
-    def update_student_password(self, uid, pw=''):
+    async def update_student_password(self, uid, pw=''):
         if pw:
-            pw = bcrypt.hashpw(pw.encode('utf-8'), bcrypt.gensalt())
+            pw = await hash_password(pw)
         with self.db_session() as s:
             student = s.query(Student).filter_by(id=uid).one()
             student.password = pw
@@ -31,8 +31,8 @@ from os import path
 import logging
 # this project
-from .tools import load_yaml, run_script
-from .questions import (QuestionRadio, QuestionCheckbox, QuestionText,
+from perguntations.tools import load_yaml, run_script
+from perguntations.questions import (QuestionRadio, QuestionCheckbox, QuestionText,
                         QuestionTextRegex, QuestionNumericInterval,
                         QuestionTextArea, QuestionInformation)
@@ -10,7 +10,6 @@ import logging.config
 import argparse
 import mimetypes
 import signal
-# import asyncio
 import functools
 import json
 import ssl
@@ -19,8 +18,6 @@ import ssl
 import tornado.ioloop
 import tornado.web
 import tornado.httpserver
-# from tornado import template, gen, websocket
-# import yaml
 # this project
 from perguntations.app import App, AppException
@@ -33,11 +30,11 @@ from perguntations import APP_NAME
 # ----------------------------------------------------------------------------
 def admin_only(func):
     @functools.wraps(func)
-    def wrapper(self, *args, **kwargs):
+    async def wrapper(self, *args, **kwargs):
         if self.current_user != '0':
             raise tornado.web.HTTPError(403)  # forbidden
         else:
-            func(self, *args, **kwargs)
+            await func(self, *args, **kwargs)
     return wrapper
@@ -53,7 +50,7 @@ class WebApplication(tornado.web.Application):
             (r'/review',        ReviewHandler),
             (r'/admin',         AdminHandler),
             (r'/file',          FileHandler),
-            # (r'/ws',            SocketHandler),
+            # (r'/ws',            AdminWebSocketHandler),
             (r'/',              RootHandler),  # TODO multiple tests
         ]
@@ -142,7 +139,7 @@ class FileHandler(BaseHandler):
         uid = self.current_user
         ref = self.get_query_argument('ref', None)
         image = self.get_query_argument('image', None)
-        content_type, encoding = mimetypes.guess_type(image)
+        content_type = mimetypes.guess_type(image)[0]
         if uid != '0':
             t = self.testapp.get_student_test(uid)
@@ -163,6 +160,8 @@ class FileHandler(BaseHandler):
                     logging.error(f'File not found: {filepath}')
                 except PermissionError:
                     logging.error(f'No permission: {filepath}')
+                except OSError:
+                    logging.error(f'Error opening file: {filepath}')
                 else:
                     data = f.read()
                     f.close()
@@ -266,7 +265,7 @@ class ReviewHandler(BaseHandler):
     @tornado.web.authenticated
     @admin_only
-    def get(self):
+    async def get(self):
         test_id = self.get_query_argument('test_id', None)
         logging.info(f'Review test {test_id}.')
         fname = self.testapp.get_json_filename_of_test(test_id)
@@ -290,7 +289,7 @@ class AdminHandler(BaseHandler):
     @tornado.web.authenticated
     @admin_only
-    def get(self):
+    async def get(self):
         cmd = self.get_query_argument('cmd', default=None)
         if cmd == 'students_table':
@@ -312,7 +311,7 @@ class AdminHandler(BaseHandler):
     @tornado.web.authenticated
     @admin_only
-    def post(self):
+    async def post(self):
         cmd = self.get_body_argument('cmd', None)
         value = self.get_body_argument('value', None)
@@ -323,14 +322,14 @@ class AdminHandler(BaseHandler):
             self.testapp.deny_student(value)
         elif cmd == 'reset_password':
-            self.testapp.update_student_password(uid=value, pw='')
+            await self.testapp.update_student_password(uid=value, pw='')
         elif cmd == 'insert_student':
             s = json.loads(value)
             self.testapp.insert_new_student(uid=s['number'], name=s['name'])
         else:
-            logging.error(f'Unknown command in post: "{cmd}"')
+            logging.error(f'Unknown command: "{cmd}"')
 # -------------------------------------------------------------------------