From d91188a824d4a74f6787ded5e203d710974b4a7e Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 7 May 2021 13:07:22 -0400 Subject: AAF cadi fixes Fixed AAF cadi log configuration and added missing dependency Change-Id: I4b32e069c4cc94129241225152759e953c32859b Issue-ID: SDNC-1532 Signed-off-by: Dan Timoney --- ms/gra/gra-app/pom.xml | 5 ++++ ms/gra/gra-docker/src/main/dc/docker-compose.yaml | 7 +++++- .../src/main/resources/cadi-example.properties | 16 ++++--------- .../src/main/resources/cadi-log.properties | 3 +++ ms/gra/gra-docker/src/main/resources/cadi.keyfile | 27 ++++++++++++++++++++++ 5 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 ms/gra/gra-docker/src/main/resources/cadi-log.properties create mode 100644 ms/gra/gra-docker/src/main/resources/cadi.keyfile (limited to 'ms/gra') diff --git a/ms/gra/gra-app/pom.xml b/ms/gra/gra-app/pom.xml index 475eda5..5ed517c 100644 --- a/ms/gra/gra-app/pom.xml +++ b/ms/gra/gra-app/pom.xml @@ -52,6 +52,11 @@ aaf-auth-client ${aaf.cadi.version} + + org.onap.aaf.authz + aaf-cadi-aaf + ${aaf.cadi.version} + org.onap.aaf.authz aaf-misc-env diff --git a/ms/gra/gra-docker/src/main/dc/docker-compose.yaml b/ms/gra/gra-docker/src/main/dc/docker-compose.yaml index 91c8c30..4b0bd46 100644 --- a/ms/gra/gra-docker/src/main/dc/docker-compose.yaml +++ b/ms/gra/gra-docker/src/main/dc/docker-compose.yaml @@ -27,6 +27,11 @@ services: ports: - "8181:8080" - "8443:8443" + volumes: + - ../resources/application.properties:/opt/onap/sdnc/config/application.properties + - ../resources/cadi-example.properties:/opt/onap/sdnc/config/cadi.properties + - ../resources/cadi-log.properties:/opt/onap/sdnc/config/cadi-log.properties + - ../resources/cadi.keyfile:/opt/onap/sdnc/config/cadi.keyfile links: - db:dbhost environment: @@ -36,7 +41,7 @@ services: - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_DATABASE=${MYSQL_DATABASE} - SDNC_CONFIG_DIR=/opt/onap/sdnc/config - - LOG_LEVEL=INFO + - LOG_LEVEL=DEBUG - TRUSTSTORE_PASSWORD=changeit - CACERT_PASSWORD=changeit - SDNC_CERT_DIR=/opt/onap/sdnc/config diff --git a/ms/gra/gra-docker/src/main/resources/cadi-example.properties b/ms/gra/gra-docker/src/main/resources/cadi-example.properties index c4ab3a4..766588a 100644 --- a/ms/gra/gra-docker/src/main/resources/cadi-example.properties +++ b/ms/gra/gra-docker/src/main/resources/cadi-example.properties @@ -16,13 +16,9 @@ localhost_allow=TRUE #localhost_deny=false #csp_devl_localhost=true -# Report all AUTHN and AUTHZ activity -cadi_loglevel=DEBUG -basic_warn=TRUE - # Use Certificates for authentication -cadi_protocols= -#cadi_prop_files=/opt/app/aafcertman/com.att.sdncp.dev.props +cadi_protocols=TLSv1.1,TLSv1.2 +cadi_prop_files=${SDNC_CONFIG_DIR}/cadi-log.properties # Basic Auth on HTTP without SSL shows warning # TRUE will warn everytime, FALSE will warn only once at beginning @@ -32,9 +28,9 @@ cadi_protocols= basic_realm=csp.att.com # Configure AAF -aaf_locate_url=https://${AAF_HOST:-aafist-azure.test.att.com} -aaf_url=https://${AAF_HOST:-aafist-azure.test.att.com}/locate/com.att.aaf.service:2.0 -aaf_id=${AAF_MECHID}@${AAF_NAMESPACE:-dev.sdncp.att.com} +#aaf_locate_url=https://${AAF_HOST:-aafist-azure.test.att.com} +aaf_url=https://${AAF_HOST:-aafist-azure.test.att.com} +aaf_id=${AAF_MECHID}@${AAF_NAMESPACE:-dev.sdnnft.att.com} aaf_password=${AAF_MECHID_CRED} aaf_lur=com.att.cadi.aaf.v2_0.AAFLurPerm @@ -51,5 +47,3 @@ aaf_clean_interval=30000 cadi_latitude=${AAF_LATITUDE:-30.267} cadi_longitude=${AAF_LONGITUDE:--97.743} -# cadi conversion file -#cadi_bath_convert=/opt/sdnc/gra/config/bath_config.csv diff --git a/ms/gra/gra-docker/src/main/resources/cadi-log.properties b/ms/gra/gra-docker/src/main/resources/cadi-log.properties new file mode 100644 index 0000000..eff5fa2 --- /dev/null +++ b/ms/gra/gra-docker/src/main/resources/cadi-log.properties @@ -0,0 +1,3 @@ +# Report all AUTHN and AUTHZ activity +cadi_loglevel=DEBUG +basic_warn=TRUE diff --git a/ms/gra/gra-docker/src/main/resources/cadi.keyfile b/ms/gra/gra-docker/src/main/resources/cadi.keyfile new file mode 100644 index 0000000..76b601a --- /dev/null +++ b/ms/gra/gra-docker/src/main/resources/cadi.keyfile @@ -0,0 +1,27 @@ +dP1HAq8vX5cVRs37JKfjf-oh3AE01Z6imFFtewQcDf8CpYz7ts9gEEj5lBnj3hkroZqVVJBCKjl7 +NIu9HSM4Q2KKy7apoIAssuBvJTILfsMipBExc4l7Ol6iZDh2otZzLG3cQOnah9LoRZwYuQ5t_CTD +SRRHUhlGKZLDnHkUAG4hGoYDL0Qg0fxVWD2AzTwAo6TE0TTM-tNa5tZeSCxFuAU12cSnQiTWcXqS +RNFZeafvgzk7TbH9kOrj07FEyhfD1Sc4kBvwyRfckU0P9MUcBqqZWqF5IgcX3szK0t58nXMGKWla +IvlDdRKTUxrgnPrWPHQ0vc2bn0wehWFIXFQl-EsqAaVB8e4Qg1BRLAK07df0WoLgJWQNJTjWKXO2 +HwPq9--XRvoT2ImGo1rhbwVnAXkWTxZMEt1dg7UbJgsP0TqjAjI8UJXRjSmtqbY3YD19pcIwk980 +zSsaq5qJHoTfW6U4LK_V-zZQ45xfCxI6redejXfZksmEpmpZa7gY-qMUHRcVa6QCHUEsctnN9QuK +ifr7zaKzsYjgTwXfQqVIpSBK6qIgpoQZ1CpybL1bstLXSY4cQ9Xu9_movbTW-71MJnujW-m2F7yc +8NyFJiSxlj9AawJZBwFiP0WmN6yaPF1CMj3679mLnEQMTezpyfXY_8fivDHWO4TsF1ToJrNhppR7 +b0SPagzbmaWPJCCfnJ8TCXZJhL_cYmECPyzZPsr3o-uzGbrMdf9L90JnTr7IkPHq0ix-GOc-C8Nq +o4SvnsdEeCGIoMnSUhYvddfDDNvpO8wakA7iW4s1kcshf1yLz_laher9c7rdXYD4R6YfTqb-JHYW +sUQ0UNwG1quaRmVmbKU_LQzLlUDF_PEVKbRlZIm8GGc8q2gEZQiy9cqYXP5FTcVjaujZBRNoKgqC +wORgmEluJNcgNzSk-k0Gnu89WK7IW4INjK2gAhzhyxvoEEIvm8HoxN8D_veZKtk8pXzBQNT_mHF1 +5WiZzWfTt1esPK3oXTmemJAbSIBeJErj5NHlex8hMedR0wPobE9zv3A7Tkhm5qka0hDuL4SWPinP +ngWNMAmSk3j8gDotUf5HU99BOvV-Ha7A0uelyOecsP7NgMWFl8jfCLqG0ITcXQct3EzcEzCYWpIw +YuTvZmnVzpeyk01kQcCU3pEwpBR8D29OxNYWTKJsHVcvYGnOR_t8HAyb2lIrkfcAJbiP1IQiChQK +pfCo--v2PBaWZ5KsaCvWW2lrlYiidQJEGj2eqpXV00sQFJ69jFIVZH_6N9MWb1RLVeC2k3ZBaaOr +jEjxRGM5rFgrcoUBMcLvRpGYSng0uYIIbmznyTCBUddtgDh4c8F5rBe9ZddxCp1iAe2wEYsywutJ +HuK_qnU6yUXuKtdwpbLp3fb8_g_xl3WX4NaZfmRmXJR_91qxwu6Om7Mf4Vx1n0kLMHZlREuuhXEQ +0P6tdGQCJD_x5dnQzbL4n1t2g9nIELY9lKPmCjEIDtnRBCnla6LBFPClSq_ARzmLefqIkYPIEJbG +it3Kzmz__jD3dhZJPd7rmyCsJDI6UGM6BDySu4jk-2OwTdl7v2E6g-SLUiFZWJs3S5XHuVj2wFsK +fjO0Jwd4QLyWKT4Pp-1B0Ud2MS1ucjgqbcZ8MJj_RrMl2SEQZyKKbPdjWroT3VjdwGzSG7oKmeqR +KcQE7kMWVw1F2GLMDFPQeiFpo5wORdiVhFZXVrKkJ-IDusJjhfUUjpv2-WZNPoN5XC5XEsbU8Lh0 +5eBCuIn1tG1gs8oD2IXet9cAG-IxXLhjnWAZ-eIs70DHqPocWKuerXSFbdxdvZdnRFkcJWxZVmd8 +aG1BacS0LuU8a_a1WrkHHc9JGCmRwm9iMQN95UZjJ1kxBk8Z7DZhXruu5uuUqa166NiWf-LA7z0j +KbqfZHqBtw-mU02CH0IlhQDcqJNXvcfhzZ59FxvHFQYueReQV2ovzIpwODFwk-Q1hkYIFQMTGezy +SBf0e3iqz77Mr7IddIFimUrkKuWWcPhA-eN3WCDW0lc2yfX49vFdwQ1AT836ndNnu5YtpPPq \ No newline at end of file -- cgit 1.2.3-korg