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

island: Replace private static functions in Authenticator with functions 

In python, private static methods serve no purpose. Python has
first-class functions; let's use them.
This commit is contained in:
Mike Salvatore 2021-05-04 12:28:17 -04:00
parent c7d47fee9c
commit 904e51a365
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,41 +38,39 @@ class Authenticate(flask_restful.Resource):
"password": "my_password" "password": "my_password"
} }
""" """
(username, password) = Authenticate._get_credentials_from_request(request) (username, password) = _get_credentials_from_request(request)
if self._credentials_match_registered_user(username, password): if _credentials_match_registered_user(username, password):
access_token = Authenticate._create_access_token(username) access_token = _create_access_token(username)
return make_response({"access_token": access_token, "error": ""}, 200) return make_response({"access_token": access_token, "error": ""}, 200)
else: else:
return make_response({"error": "Invalid credentials"}, 401) return make_response({"error": "Invalid credentials"}, 401)
@staticmethod
def _get_credentials_from_request(request):
credentials = json.loads(request.data)
username = credentials["username"] def _get_credentials_from_request(request):
password = credentials["password"] credentials = json.loads(request.data)
return (username, password) username = credentials["username"]
password = credentials["password"]
@staticmethod return (username, password)
def _credentials_match_registered_user(username, password):
user = user_store.UserStore.username_table.get(username, None)
if user and bcrypt.checkpw(password.encode("utf-8"), user.secret.encode("utf-8")):
return True
return False
@staticmethod def _credentials_match_registered_user(username, password):
def _create_access_token(username): user = user_store.UserStore.username_table.get(username, None)
access_token = flask_jwt_extended.create_access_token( if user and bcrypt.checkpw(password.encode("utf-8"), user.secret.encode("utf-8")):
identity=user_store.UserStore.username_table[username].id return True
)
logger.debug(
f"Created access token for user {username} that begins with {access_token[:4]}"
)
return access_token return False
def _create_access_token(username):
access_token = flask_jwt_extended.create_access_token(
identity=user_store.UserStore.username_table[username].id
)
logger.debug(f"Created access token for user {username} that begins with {access_token[:4]}")
return access_token
# See https://flask-jwt-extended.readthedocs.io/en/stable/custom_decorators/ # See https://flask-jwt-extended.readthedocs.io/en/stable/custom_decorators/