Commit 112e7225 authored by guillecxb's avatar guillecxb
Browse files

refactor config

parent f890e5dd

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py

+2 −2
Changes for services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ class InvokerManagementOperations(Resource): 


    def __sign_cert(self, publick_key, invoker_id):



        capif_config = self.db.get_col_by_name("capifConfiguration").find_one({"config_name": "default"})

        ttl_invoker_cert = capif_config["settings"].get("ttl_invoker_cert", "43000h")

        capif_config = self.db.get_col_by_name("capif_configuration").find_one({"config_name": "default"})

        ttl_invoker_cert = capif_config.get("settings", {}).get("certificates_expiry", {}).get("ttl_invoker_cert", "4300h")



        url = f"http://{self.config['ca_factory']['url']}:{self.config['ca_factory']['port']}/v1/pki_int/sign/my-ca"

        headers = {'X-Vault-Token': self.config['ca_factory']['token']}

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py

+2 −2
Changes for services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ def sign_certificate(publick_key, provider_id): 
    config =  Config().get_config()



    db = MongoDatabse()

    capif_config = db.get_col_by_name("capifConfiguration").find_one({"config_name": "default"})

    ttl_provider_cert = capif_config.get("settings", {}).get("ttl_provider_cert", "4300h")

    capif_config = db.get_col_by_name("capif_configuration").find_one({"config_name": "default"})

    ttl_provider_cert = capif_config.get("settings", {}).get("certificates_expiry", {}).get("ttl_provider_cert", "4300h")



    url = f"http://{config['ca_factory']['url']}:{config['ca_factory']['port']}/v1/pki_int/sign/my-ca"

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py

+2 −2
Changes for services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ class InternalServiceOps(Resource): 


        mycol = self.db.get_col_by_name(self.db.acls)



        # 🚨 Nueva Lógica: Recuperar configuración desde capifConfiguration en MongoDB

        config_col = self.db.get_col_by_name("capifConfiguration")

        # 🚨 Nueva Lógica: Recuperar configuración desde capif_configuration en MongoDB

        config_col = self.db.get_col_by_name("capif_configuration")

        capif_config = config_col.find_one({"config_name": "default"})



        if capif_config:

services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py

+1 −1
Changes for services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ class SecurityOperations(Resource): 
                    return bad_request_error(detail="Not found compatible security method with pref security method", cause="Error pref security method", invalid_params=[{"param": "prefSecurityMethods", "reason": "pref security method not compatible with security method available"}])



                # Retrieve security method priority configuration from the database

                config_col = self.db.get_col_by_name("capifConfiguration")

                config_col = self.db.get_col_by_name("capif_configuration")

                capif_config = config_col.find_one({"config_name": "default"})

                if not capif_config:

                    current_app.logger.error("CAPIF Configuration not found when trying to retrieve security method priority")

services/helper/config.yaml

+8 −6
Changes for services/helper/config.yaml: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -20,19 +20,21 @@ ca_factory: { 
}



capif_configuration: {

  config_name: "default",

  version: "1.0",

  description: "Default CAPIF Configuration",

  settings: {

  "config_name": "default",

  "version": "1.0",

  "description": "Default CAPIF Configuration",

  "settings": {

    "certificates_expiry": {

      ttl_superadmin_cert: "4300h",

      ttl_invoker_cert: "4300h",

      ttl_provider_cert: "4300h",

    security_method_priority: {

    },

    "security_method_priority": {

      oauth: 1,

      pki: 2,

      psk: 3

    },

    acl_policy_settings: {

    "acl_policy_settings": {

      allowedTotalInvocations: 5,

      allowedInvocationsPerSecond: 10,

      allowedInvocationTimeRangeDays: 365