Commit f63cfe32 authored by Guillermo Sanz López's avatar Guillermo Sanz López
Browse files

all problems fixed

parent a9c6a7f5

capif_backend/backoffice_service/__main__.py

+11 −7
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ app.register_blueprint(backoffice_routes) 
app.register_blueprint(access_routes)





# @app.route("/options", methods=["OPTIONS"])

# def handle_options():

#     return "", 200

@app.route("/options", methods=["OPTIONS"])

def handle_options():

    return "", 200





@app.route('/', defaults={'path': ''})

@app.route('/<path:path>', methods=['OPTIONS'])

def handle_options(path):     

    return 'Success', 200

# @app.route('/', defaults={'path': ''})

# @app.route('/<path:path>', methods=['OPTIONS'])

# def handle_options(path):     

#     return 'Success', 200





# Configure JWT
@@ -63,9 +63,13 @@ url = 'http://{}:{}/v1/secret/data/ca'.format(os.getenv('VAULT_HOSTNAME'), os.ge 
headers = {'X-Vault-Token': config['ca_factory']['token']}

response = requests.request("GET", url, headers=headers, verify = False)

ca_cert = json.loads(response.text)["data"]["data"]["ca"]

# print ("CA CERT URL: ", url)

# print ("VAULT_HOSTNAME", os.get_environ('VAULT_HOSTNAME'))

# print ("VAULT_PORT", os.get_environ('VAULT_PORT'))



# Request Vault a CA certificate to backoffice application

url = 'http://{}:{}/v1/pki_int/sign/my-ca'.format(os.getenv('VAULT_HOSTNAME'), os.getenv('VAULT_PORT'))  # http://vault:8200/v1/pki_int/sign/my-ca



headers = {'X-Vault-Token': config['ca_factory']['token']}  # token = dev-only-token

data = {

    'format':'pem_bundle',

capif_backend/backoffice_service/core/operations.py

+10 −6
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import requests 
from ..configs.config import Config

import os

import json

import copy





class Operations:
@@ -29,17 +30,19 @@ class Operations: 


    def retrieve_invokers(self):

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

        user_col = self.db.get_col_by_name_register(self.db.user)

        #user_col = self.db.get_col_by_name_register(self.db.user)

        #users = user_col.find({}, {"_id": 0})



        invokers = mycol.find({}, {"_id": 0})

        users = user_col.find({}, {"_id": 0})

        users = self.retrieve_users()



        json_invokers = []

        for invoker in invokers:

            invoker_aux = copy.deepcopy(invoker)

            for user in users:

                if invoker["api_invoker_id"] in user["list_invokers"]:

                    invoker["username"] = user["username"]

            json_invokers.append(invoker)

                    invoker_aux["username"] = user["username"]

            json_invokers.append(invoker_aux)



        return json_invokers
@@ -78,9 +81,10 @@ class Operations: 


    def retrieve_providers(self):

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

        user_col = self.db.get_col_by_name_register(self.db.user)

        #user_col = self.db.get_col_by_name_register(self.db.user)

        #users = user_col.find({}, {"_id": 0})



        users = user_col.find({}, {"_id": 0})

        users = self.retrieve_users()

        providers = mycol.find({}, {"_id": 0})



        json_providers = []

capif_backend/config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ capif: { 
ca_factory: {

  "url": "vault",

  "port": "8200",

  "token": "dev-only-token"

  "token": "hvs.9Q1LIPRwkfKoaMWywiB2HO4o"

}