Add authentication based on userinfo

dev-requirements.txt

@@ -3,3 +3,4 @@ flake8
 pytest
 pytest-asyncio
 notebook==5.7.2
+bcrypt

nativeauthenticator/nativeauthenticator.py

@@ -1,3 +1,4 @@
+import bcrypt
 from jupyterhub.orm import User
 from jupyterhub.auth import Authenticator
 
@@ -19,15 +20,18 @@ def __init__(self, *args, **kwargs):
 
     @gen.coroutine
     def authenticate(self, handler, data):
-        return data['username']
+        user = UserInfo.find(self.db, data['username'])
+        if user and user.is_valid_password(data['password']):
+            return data['username']
 
     def get_or_create_user(self, username, password):
         user = User.find(self.db, username)
         if not user:
             user = User(name=username, admin=False)
             self.db.add(user)
 
-        user_info = UserInfo(username=username, password=password)
+        encoded_pw = bcrypt.hashpw(password.encode(), bcrypt.gensalt())
+        user_info = UserInfo(username=username, password=encoded_pw)
         self.db.add(user_info)
         return user
 

nativeauthenticator/orm.py

@@ -1,3 +1,4 @@
+import bcrypt
 from sqlalchemy import (
     Column, Integer, String
 )
@@ -18,3 +19,7 @@ def find(cls, db, username):
         Returns None if not found.
         """
         return db.query(cls).filter(cls.username == username).first()
+
+    def is_valid_password(self, password):
+        encoded_pw = bcrypt.hashpw(password.encode(), self.password)
+        return encoded_pw == self.password

nativeauthenticator/tests/test_authenticator.py

@@ -1,8 +1,9 @@
 import pytest
-from unittest.mock import Mock
+from jupyterhub.orm import User
 from jupyterhub.tests.mocking import MockHub
 
 from nativeauthenticator import NativeAuthenticator
+from ..orm import UserInfo
 
 
 @pytest.fixture
@@ -23,14 +24,44 @@ def app():
 pytestmark = pytestmark(pytest.mark.usefixtures("tmpcwd"))
 
 
-async def test_basic(tmpcwd, app):
+async def test_auth_get_or_create(tmpcwd, app):
+    '''Test if method get_or_create_user creates a new user'''
     auth = NativeAuthenticator(db=app.db)
-    response = await auth.authenticate(Mock(), {'username': 'name',
-                                                'password': '123'})
-    assert response == 'name'
+    user = auth.get_or_create_user('John Snow', 'password')
+    main_user = User.find(app.db, 'John Snow')
+    user_info = UserInfo.find(app.db, 'John Snow')
+    assert user == main_user
+    assert user_info.username == 'John Snow'
+
+
+async def test_failed_authentication_user_doesnt_exist(tmpcwd, app):
+    '''Test if authentication fails with a unexistent user'''
+    auth = NativeAuthenticator(db=app.db)
+    response = await auth.authenticate(app, {'username': 'name',
+                                             'password': '123'})
+    assert not response
+
+
+async def test_failed_authentication_wrong_password(tmpcwd, app):
+    '''Test if authentication fails with a wrong password'''
+    auth = NativeAuthenticator(db=app.db)
+    auth.get_or_create_user('John Snow', 'password')
+    response = await auth.authenticate(app, {'username': 'John Snow',
+                                             'password': '123'})
+    assert not response
+
+
+async def test_succeded_authentication(tmpcwd, app):
+    '''Test a successfull authentication'''
+    auth = NativeAuthenticator(db=app.db)
+    user = auth.get_or_create_user('John Snow', 'password')
+    response = await auth.authenticate(app, {'username': 'John Snow',
+                                             'password': 'password'})
+    assert response == user.name
 
 
 async def test_handlers(app):
+    '''Test if all handlers are available on the Authenticator'''
     auth = NativeAuthenticator(db=app.db)
     handlers = auth.get_handlers(app)
     assert handlers[1][0] == '/signup'