Move Security Context API from testing to production server and remove unnecessary imports (2500a7d3) · Commits · OCF / capif

services/TS29222_CAPIF_Security_API/capif_security/main.py→services/TS29222_CAPIF_Security_API/capif_security/app.py

+26 −32

Original line number	Diff line number	Diff line
		@@ -2,14 +2,11 @@

		import connexion
		import logging
		from capif_security import encoder
		import encoder
		from flask_jwt_extended import JWTManager
		from .config import Config
		from .core.consumer_messager import Subscriber
		from threading import Thread
		from flask_executor import Executor
		from config import Config
		from core.consumer_messager import Subscriber
		from logging.handlers import RotatingFileHandler
		import sys
		import os
		from fluent import sender
		from flask_executor import Executor
		@@ -22,10 +19,9 @@ from opentelemetry.sdk.trace import TracerProvider
		from opentelemetry.sdk.trace.export import BatchSpanProcessor
		from opentelemetry.instrumentation.redis import RedisInstrumentor



		NAME = "Security-Service"


		def configure_monitoring(app, config):

		resource = Resource(attributes={"service.name": NAME})
		@@ -110,7 +106,6 @@ def verbose_formatter():
		datefmt='%d/%m/%Y %H:%M:%S'
		)

		def main():

		with open("/usr/src/app/capif_security/server.key", "rb") as key_file:
		key_data = key_file.read()
		@@ -141,8 +136,7 @@ def main():
		executor.submit(subscriber.listen)


		app.run(port=8080, debug=True)

		if __name__ == '__main__':
		main()
		#
		# if __name__ == '__main__':
		# main()

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ import os
		class Config:
		def __init__(self):
		self.cached = 0
		self.file="./config.yaml"
		self.file="../config.yaml"
		self.my_config = {}

		stamp = os.stat(self.file).st_mtime

+9 −15

Original line number	Diff line number	Diff line
		import connexion
		import six

		from capif_security.models.access_token_err import AccessTokenErr # noqa: E501
		from capif_security.models.access_token_rsp import AccessTokenRsp # noqa: E501
		from capif_security.models.access_token_req import AccessTokenReq # noqa: E501
		from capif_security.models.security_notification import SecurityNotification # noqa: E501
		from capif_security.models.service_security import ServiceSecurity # noqa: E501
		from capif_security import util

		from ..models.access_token_req import AccessTokenReq # noqa: E501
		from ..models.security_notification import SecurityNotification # noqa: E501
		from ..models.service_security import ServiceSecurity # noqa: E501

		from ..core.servicesecurity import SecurityOperations
		from ..core.consumer_messager import Subscriber

		from ..core.publisher import Publisher
		import json

		from flask import Response, request, current_app
		from flask_jwt_extended import jwt_required, get_jwt_identity
		from ..encoder import JSONEncoder
		from ..models.problem_details import ProblemDetails
		import sys

		from cryptography import x509
		from cryptography.hazmat.backends import default_backend
		from ..core.validate_user import ControlAccess
		from functools import wraps
		import pymongo


		service_security_ops = SecurityOperations()
		publish_ops = Publisher()

+0 −5

Original line number	Diff line number	Diff line
		# subscriber.py
		import redis
		import time
		import sys
		import json
		import asyncio
		from threading import Thread
		from .internal_security_ops import InternalSecurityOps
		from flask import current_app

+0 −1

Original line number	Diff line number	Diff line

		from flask import current_app
		from .resources import Resource

		class InternalSecurityOps(Resource):