Commit 5fc5738d authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch...

Merge branch 'OCF176-design-of-logic-to-read-all-apis-in-discover-operation-and-filtering' into 'staging'

OCF176: Update visibility control API tests and complete workflow with the access decision (restriction during the discovery process)

See merge request !203
parents 864b73de 46461c28
Loading
Loading
Loading
Loading
Loading
+41 −2
Changes for services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py: 41 added lines, 2 removed lines.
Original line number Diff line number Diff line

import json
import os
import requests

from flask import current_app

@@ -11,6 +13,7 @@ from ..util import serialize_clean_camel_case
from ..vendor_specific import (filter_apis_with_vendor_specific_params,
                               find_attribute_in_body,
                               remove_vendor_specific_fields)
from ..encoder import CustomJSONEncoder

TOTAL_FEATURES = 4
SUPPORTED_FEATURES_HEX = "2"
@@ -20,7 +23,8 @@ def filter_fields(filtered_apis):
    key_filter = [
        "api_name", "api_id", "aef_profiles", "description",
        "supported_features", "shareable_info", "service_api_category",
        "api_supp_feats", "pub_api_path", "ccf_id", "api_status"
        "api_supp_feats", "pub_api_path", "ccf_id", "api_status",
        "api_prov_name"
    ]
    field_filtered_api = {}
    for key in filtered_apis.keys():
@@ -117,6 +121,42 @@ class DiscoverApisOperations(Resource):
            if len(json_docs) == 0:
                return not_found_error(detail="API Invoker " + api_invoker_id + " has no API Published that accomplish filter conditions", cause="No API Published accomplish filter conditions")

            # Visibility Control Integration

            try:
                visibility_control_url = os.getenv(
                    "VISIBILITY_CONTROL_URL",
                    "http://helper:8080/helper/visibility-control/decision/invokers/{}/discoverable-apis"
                ).format(api_invoker_id)
                visibility_payload = {
                    "serviceAPIDescriptions": json_docs
                }

                current_app.logger.debug("Calling visibility control for invoker: " + api_invoker_id)
                visibility_response = requests.post(
                    visibility_control_url,
                    data=json.dumps(visibility_payload, cls=CustomJSONEncoder),
                    headers={"Content-Type": "application/json"},
                    timeout=int(os.getenv("TIMEOUT", "10"))
                )

                if visibility_response.status_code == 200:
                    filtered_data = visibility_response.json()
                    json_docs = filtered_data.get("serviceAPIDescriptions", [])
                    current_app.logger.debug(f"Visibility control filtered {len(json_docs)} APIs for invoker {api_invoker_id}")
                else:
                    current_app.logger.warning(f"Visibility control returned status {visibility_response.status_code}: {visibility_response.text}")

            except requests.exceptions.RequestException as e:
                current_app.logger.warning(f"Visibility control unreachable for invoker {api_invoker_id}: {str(e)}")
            except Exception as e:
                current_app.logger.warning(f"Error filtering APIs for invoker {api_invoker_id}: {str(e)}")

            if len(json_docs) == 0:
                return not_found_error(detail="API Invoker " + api_invoker_id + " has no visible APIs after applying visibility rules", cause="No APIs visible after visibility filtering")

            # End of Visibility Control Integration
            
            apis_discovered = DiscoveredAPIs(service_api_descriptions=json_docs)
            res = make_response(object=serialize_clean_camel_case(apis_discovered), status=200)
            return res
@@ -125,4 +165,3 @@ class DiscoverApisOperations(Resource):
            exception = "An exception occurred in discover services"
            current_app.logger.error(exception + "::" + str(e))
            return internal_server_error(detail=exception, cause=str(e))
−536

File deleted.

+38 −2
Changes for services/helper/helper_service/services/visibility_control/controllers/decision_controller.py: 38 added lines, 2 removed lines.
Original line number Diff line number Diff line
import connexion
import logging
from typing import Dict
from typing import Tuple
from typing import Union

from visibility_control.auth import cert_validation
from visibility_control.models.discovered_apis import DiscoveredAPIs  # noqa: E501
from visibility_control.models.discovery_request import DiscoveryRequest  # noqa: E501
from visibility_control.models.error import Error  # noqa: E501
from visibility_control import util
from visibility_control.core import visibility_control_core

logger = logging.getLogger(__name__)

def decision_invokers_api_invoker_id_discoverable_apis_get(api_invoker_id):  # noqa: E501
#@cert_validation()
def decision_invokers_api_invoker_id_discoverable_apis_post(api_invoker_id, body=None):  # noqa: E501
    """Get discoverable APIs filter for an invoker (global scope)

    Returns a filtered list of APIs for the API Invoker.  # noqa: E501

    :param api_invoker_id: CAPIF API Invoker identifier
    :type api_invoker_id: str
    :param body: List of all discovered APIs to be filtered
    :type body: DiscoveryRequest

    :rtype: Union[DiscoveredAPIs, Tuple[DiscoveredAPIs, int], Tuple[DiscoveredAPIs, int, Dict[str, str]]
    """
    return 'do some magic!'
    # Handle body parameter - it may come as None from Connexion
    if body is None:
        if connexion.request.is_json:
            body = connexion.request.get_json()
        else:
            return {'code': 400, 'message': 'JSON body required'}, 400

    if body is None or body.get('serviceAPIDescriptions') is None:
        return {'code': 400, 'message': 'Missing serviceAPIDescriptions in request body'}, 400

    logger.debug(
        f"Visibility decision request for invoker {api_invoker_id}, request body keys: {list(body.keys())}"
    )

    try:
        apis_list = body.get('serviceAPIDescriptions', [])
        logger.debug(
            f"Visibility decision input API count: {len(apis_list)} for invoker {api_invoker_id}"
        )
        result = visibility_control_core.get_discoverable_apis(api_invoker_id, apis_list)
        logger.debug(
            f"Visibility decision returned {len(result)} APIs for invoker {api_invoker_id}"
        )
        return {"serviceAPIDescriptions": result}, 200
    except Exception as e:
        logger.error(
            f"Visibility decision processing failed for invoker {api_invoker_id}: {str(e)}"
        )
        return {"error": str(e)}, 400
+265

File changed.

Preview size limit exceeded, changes collapsed.

+3
Changes for services/helper/helper_service/services/visibility_control/models/discovery_request.py: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
class DiscoveryRequest:
    def __init__(self, *args, **kwargs):
        pass
Loading