Commit a5a9c537 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCF93-review-security-issues-and-solve-them' into 'staging' 

Resolve "Review Security issues and solve them"

Closes #93

See merge request !88
parents d9e9ec19 501f152e

services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt

+10 −10
Original line number Diff line number Diff line
@@ -6,20 +6,20 @@ Flask == 3.0.3 
pymongo == 4.7.3

redis ==  4.5.4

flask_jwt_extended == 4.6.0

cryptography == 42.0.8

cryptography == 43.0.1

rfc3987 == 1.3.8

opentelemetry-instrumentation == 0.40b0

opentelemetry-instrumentation-flask == 0.40b0

opentelemetry-instrumentation-redis == 0.40b0

opentelemetry-instrumentation-pymongo == 0.40b0

opentelemetry-exporter-otlp == 1.19.0

opentelemetry-exporter-jaeger == 1.19.0

opentelemetry-instrumentation == 0.41b0

opentelemetry-instrumentation-flask == 0.41b0

opentelemetry-instrumentation-redis == 0.41b0

opentelemetry-instrumentation-pymongo == 0.41b0

opentelemetry-exporter-otlp == 1.20.0

opentelemetry-exporter-jaeger == 1.20.0

fluent == 0.10.0

fluent-logger == 0.10.0

opentelemetry-api == 1.19.0

opentelemetry-sdk == 1.19.0

opentelemetry-api == 1.20.0

opentelemetry-sdk == 1.20.0

flask_executor == 1.0.0

Flask-APScheduler == 1.13.1

werkzeug == 3.0.4

werkzeug == 3.0.6

gunicorn == 22.0.0

packaging == 24.0
 
 No newline at end of file

services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ from flask import current_app 
import asyncio

import aiohttp

from util import dict_to_camel_case, clean_empty, serialize_clean_camel_case

import os



class Notifications():
@@ -67,7 +68,7 @@ class Notifications(): 


    def request_post(self, url, data):

        headers = {'content-type': 'application/json'}

        return requests.post(url, json={'text': str(data.to_str())}, headers=headers)

        return requests.post(url, json={'text': str(data.to_str())}, headers=headers, timeout=os.getenv("TIMEOUT"))

    

    async def send_request(self, url, data):

        async with aiohttp.ClientSession() as session:

services/TS29222_CAPIF_Security_API/capif_security/core/notification.py

+2 −1
Original line number Diff line number Diff line 
import requests

import os





class Notifications():
@@ -9,4 +10,4 @@ class Notifications(): 


    def request_post(self, url, data):

        headers = {'content-type': 'application/json'}

        return requests.post(url, json={'text': str(data.to_str())}, headers=headers)
 
 No newline at end of file
 
        return requests.post(url, json={'text': str(data.to_str())}, headers=headers, timeout=int(os.getenv("TIMEOUT")))
 
 No newline at end of file

services/docker-compose-capif.yml

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ services: 
      - CONTAINER_NAME=api-events

      - MONITORING=${MONITORING}

      - LOG_LEVEL=${LOG_LEVEL}

      - TIMEOUT=10

    extra_hosts:

      - host.docker.internal:host-gateway

      - fluent-bit:host-gateway
@@ -239,6 +240,7 @@ services: 
      - VAULT_ACCESS_TOKEN=dev-only-token

      - VAULT_PORT=8200

      - LOG_LEVEL=${LOG_LEVEL}

      - TIMEOUT=10

    extra_hosts:

      - host.docker.internal:host-gateway

      - fluent-bit:host-gateway

services/docker-compose-mock-server.yml

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ services: 
      - ./mock_server:/usr/src/app

    extra_hosts:

      - host.docker.internal:host-gateway

    environment:

      - DEBUG_MODE=True

    restart: unless-stopped

    image: labs.etsi.org:5050/ocf/capif/mock_server:latest