From 9125665293fefe917255a5f9611c6912052fb1da Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Wed, 26 Jun 2024 15:12:29 +0200 Subject: [PATCH 1/5] minor fix, problem deatils not serialized correctly --- .../capif_security/core/validate_user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py index 45ec518..04d893e 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py @@ -3,7 +3,7 @@ import json from ..models.problem_details import ProblemDetails from ..encoder import JSONEncoder from .resources import Resource -from .responses import internal_server_error +from .responses import internal_server_error,serialize_clean_camel_case class ControlAccess(Resource): @@ -18,6 +18,7 @@ class ControlAccess(Resource): if cert_entry is not None: if cert_entry["cert_signature"] != cert_signature: prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource") + prob = serialize_clean_camel_case(prob) return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json") except Exception as e: -- GitLab From 944ad92046a3ba31c48e29c9e065f8c08bb6f69d Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Thu, 27 Jun 2024 10:01:54 +0200 Subject: [PATCH 2/5] Code Refactor on register --- .../register/register_service/core/register_operations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index dac2654..a33df69 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -1,4 +1,4 @@ -from flask import Flask, jsonify, request, Response, current_app +from flask import jsonify from flask_jwt_extended import create_access_token from db.db import MongoDatabse from datetime import datetime @@ -26,7 +26,7 @@ class RegisterOperations: user_info["uuid"] = user_uuid user_info["onboarding_date"]=datetime.now() - obj = mycol.insert_one(user_info) + mycol.insert_one(user_info) return jsonify(message="User registered successfully", uuid=user_uuid), 201 -- GitLab From 5bd05c33b505770e9cabb0fb20448008143bf113 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Thu, 27 Jun 2024 10:09:05 +0200 Subject: [PATCH 3/5] Minor fix on register --- .../register/register_service/core/register_operations.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index 96cc468..42627fd 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -1,4 +1,4 @@ -from flask import jsonify +from flask import jsonify, current_app from flask_jwt_extended import create_access_token from db.db import MongoDatabse from datetime import datetime @@ -43,8 +43,8 @@ class RegisterOperations: exist_user = mycol.find_one({"username": username}) if exist_user is None: - current_app.logger.debug(f"Not exister user with this credentials : {username}") - return jsonify("Not exister user with this credentials"), 400 + current_app.logger.debug(f"No user exists with these credentials: {username}") + return jsonify("No user exists with these credentials"), 400 access_token = create_access_token(identity=(username + " " + exist_user["uuid"])) current_app.logger.debug(f"Access token generated for user {username} : {access_token}") -- GitLab From 1fbe673cb9be2b7ebe6d97da2a57abbbf5d0b6df Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Thu, 27 Jun 2024 10:11:19 +0200 Subject: [PATCH 4/5] Remove commented code --- .../capif_acl/controllers/default_controller.py | 1 - 1 file changed, 1 deletion(-) diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py index eb047f0..52174b1 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py @@ -43,5 +43,4 @@ def access_control_policy_list_service_api_id_get(service_api_id, aef_id, api_in :rtype: Union[AccessControlPolicyList, Tuple[AccessControlPolicyList, int], Tuple[AccessControlPolicyList, int, Dict[str, str]] """ current_app.logger.debug("Obtaining service ACLs") - #current_app.logger.debug(f"AEF-id: {service_api_id}") return accessControlPolicyApi().get_acl(service_api_id, aef_id, api_invoker_id, supported_features) -- GitLab From 08a0dab6698f4596acb2c3e06e9247b215dd6d98 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Thu, 27 Jun 2024 11:54:38 +0200 Subject: [PATCH 5/5] Add configurable timeout to requests at robot tests --- tests/resources/common.resource | 2 ++ tests/resources/common/basicRequests.robot | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/resources/common.resource b/tests/resources/common.resource index d4733b8..b2f19ae 100644 --- a/tests/resources/common.resource +++ b/tests/resources/common.resource @@ -32,6 +32,8 @@ ${CAPIF_CALLBACK_PORT} 8086 ${REGISTER_ADMIN_USER} admin ${REGISTER_ADMIN_PASSWORD} password123 +${REQUESTS_TIMEOUT} 120s + ${MOCK_SERVER_URL} diff --git a/tests/resources/common/basicRequests.robot b/tests/resources/common/basicRequests.robot index 433a13c..6d4f456 100644 --- a/tests/resources/common/basicRequests.robot +++ b/tests/resources/common/basicRequests.robot @@ -84,7 +84,7 @@ Create Register Admin Session ## NEW REQUESTS TO REGISTER Post Request Admin Register - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -114,7 +114,7 @@ Post Request Admin Register RETURN ${resp} Get Request Admin Register - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE} @@ -142,7 +142,7 @@ Get Request Admin Register # NEW REQUESTS END Post Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -172,7 +172,7 @@ Post Request Capif RETURN ${resp} Get Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE} @@ -198,7 +198,7 @@ Get Request Capif RETURN ${resp} Get CA Vault - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE} @@ -225,7 +225,7 @@ Get CA Vault RETURN ${response} Put Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -254,7 +254,7 @@ Put Request Capif RETURN ${resp} Patch Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -283,7 +283,7 @@ Patch Request Capif RETURN ${resp} Delete Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE} -- GitLab