p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor get_credentials_from_request to get_username_password_from_request 

This better indicates that get_username_password_from_request returns a username/password pair rather than UserCreds structure
This commit is contained in:
VakarisZ 2021-10-01 15:33:46 +03:00
parent da169dddc9
commit 26ba02a1d0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/monkey_island/cc/resources/auth/auth.py
View File

@ -10,7 +10,7 @@ from jwt import PyJWTError
import monkey_island.cc.environment.environment_singleton as env_singleton
import monkey_island.cc.resources.auth.user_store as user_store
from monkey_island.cc.resources.auth.credential_utils import (
get_credentials_from_request,
get_username_password_from_request,
password_matches_hash,
)
from monkey_island.cc.server_utils.encryption import (
@ -44,7 +44,7 @@ class Authenticate(flask_restful.Resource):
"password": "my_password"
}
"""
username, password = get_credentials_from_request(request)
username, password = get_username_password_from_request(request)
if _credentials_match_registered_user(username, password):
if not get_datastore_encryptor():

4
monkey/monkey_island/cc/resources/auth/credential_utils.py
View File

@ -19,13 +19,13 @@ def password_matches_hash(plaintext_password, password_hash):
def get_user_credentials_from_request(_request) -> UserCreds:
username, password = get_credentials_from_request(_request)
username, password = get_username_password_from_request(_request)
password_hash = hash_password(password)
return UserCreds(username, password_hash)
def get_credentials_from_request(_request: Request) -> Tuple[str, str]:
def get_username_password_from_request(_request: Request) -> Tuple[str, str]:
cred_dict = json.loads(request.data)
username = cred_dict.get("username", "")
password = cred_dict.get("password", "")

7
monkey/monkey_island/cc/resources/auth/registration.py
View File

@ -5,7 +5,10 @@ from flask import make_response, request
import monkey_island.cc.environment.environment_singleton as env_singleton
from common.utils.exceptions import InvalidRegistrationCredentialsError, RegistrationNotNeededError
from monkey_island.cc.resources.auth.credential_utils import get_user_credentials_from_request
from monkey_island.cc.resources.auth.credential_utils import (
get_user_credentials_from_request,
get_username_password_from_request,
)
from monkey_island.cc.server_utils.encryption import (
initialize_datastore_encryptor,
remove_old_datastore_key,
@ -26,7 +29,7 @@ class Registration(flask_restful.Resource):
try:
env_singleton.env.try_add_user(credentials)
remove_old_datastore_key()
username, password = get_user_credentials_from_request(request)
username, password = get_username_password_from_request(request)
initialize_datastore_encryptor(username, password)
reset_database()
return make_response({"error": ""}, 200)