diff --git a/docs/testing_with_postman/CAPIF.postman_collection.json b/docs/testing_with_postman/CAPIF.postman_collection.json index e65c826994c986b46367eeb223d65444a38cebf9..dcbd5adbd0b6688caed14dfcb104e4519413f156 100644 --- a/docs/testing_with_postman/CAPIF.postman_collection.json +++ b/docs/testing_with_postman/CAPIF.postman_collection.json @@ -806,7 +806,7 @@ ], "body": { "mode": "raw", - "raw": "{\n\"name\": {{USERNAME_INVOKER}}\n}", + "raw": "{\n\"name\": \"{{USERNAME_INVOKER}}\"\n}", "options": { "raw": { "language": "json" diff --git a/docs/testing_with_postman/CAPIF.postman_environment.json b/docs/testing_with_postman/CAPIF.postman_environment.json index ab3839e9e78b498312a14db675316a76455747b0..fd084b3c9a3bedd57ac8b3c388eed1a219aac9e8 100644 --- a/docs/testing_with_postman/CAPIF.postman_environment.json +++ b/docs/testing_with_postman/CAPIF.postman_environment.json @@ -32,6 +32,12 @@ "type": "default", "enabled": true }, + { + "key": "USERNAME_INVOKER", + "value": "InvokerONE", + "type": "default", + "enabled": true + }, { "key": "PASSWORD", "value": "pass", diff --git a/services/register/register_service/auth_utils.py b/services/register/register_service/auth_utils.py new file mode 100644 index 0000000000000000000000000000000000000000..f799772997bc614be1644391d0fed838cfd8534b --- /dev/null +++ b/services/register/register_service/auth_utils.py @@ -0,0 +1,8 @@ +import bcrypt + +def hash_password(password): + hashed_password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()) + return hashed_password + +def check_password(input_password, stored_password): + return bcrypt.checkpw(input_password.encode('utf-8'), stored_password) \ No newline at end of file diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index f929820f7e4d532af039ce50856d1e4bcbe86798..4cc5c37d09019f43cb8a7923c2525d6c3f48179a 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -2,11 +2,12 @@ from flask import Flask, jsonify, request, current_app from flask_jwt_extended import create_access_token from ..db.db import MongoDatabse from ..config import Config +from register_service import auth_utils import secrets import requests import json import sys - + class RegisterOperations: def __init__(self): @@ -21,7 +22,8 @@ class RegisterOperations: if exist_user: return jsonify("user already exists"), 409 - user_info = dict(_id=secrets.token_hex(7), username=username, password=password, role=role, description=description, cn=cn, list_invokers=[], list_providers=[]) + hashed_password = auth_utils.hash_password(password) + user_info = dict(_id=secrets.token_hex(7), username=username, password=hashed_password, role=role, description=description, cn=cn, list_invokers=[], list_providers=[]) obj = mycol.insert_one(user_info) if role == "invoker": @@ -42,11 +44,15 @@ class RegisterOperations: try: - exist_user = mycol.find_one({"username": username, "password": password}) + exist_user = mycol.find_one({"username": username}) if exist_user is None: - return jsonify("Not exister user with this credentials"), 400 + return jsonify("No user with these credentials"), 400 + stored_password = exist_user["password"] + if not auth_utils.check_password(password, stored_password): + return jsonify("No user with these credentials"), 400 + access_token = create_access_token(identity=(username + " " + exist_user["role"])) url = f"http://{self.config['ca_factory']['url']}:{self.config['ca_factory']['port']}/v1/secret/data/ca" headers = { @@ -64,7 +70,16 @@ class RegisterOperations: mycol = self.db.get_col_by_name(self.db.capif_users) try: - mycol.delete_one({"username": username, "password": password}) + exist_user = mycol.find_one({"username": username}) + + if exist_user is None: + return jsonify("No user with these credentials"), 400 + + stored_password = exist_user["password"] + if not auth_utils.check_password(password, stored_password): + return jsonify("No user with these credentials"), 400 + + mycol.delete_one({"username": username}) return jsonify(message="User removed successfully"), 204 except Exception as e: return jsonify(message=f"Errors when try remove user: {e}"), 500 diff --git a/services/register/requirements.txt b/services/register/requirements.txt index c5a4f37e70ec061faaeb1876ee7d907e71c92d49..05b9f7dfa88c8967b3cb20c0686e05d3c90076e0 100644 --- a/services/register/requirements.txt +++ b/services/register/requirements.txt @@ -6,3 +6,4 @@ flask_jwt_extended pyopenssl pyyaml requests +bcrypt