From a4aeefb08d2ed5fb10a94fe3df63910db7827d33 Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Wed, 3 Apr 2019 23:16:06 +0000 Subject: Add client cert PEM files for authenticated requests Note also relocated AAF cert artifacts since they are used by both docker images created in this repo. Change-Id: I539c0062ab9bc573e610bc7669d78e9528e2aace Signed-off-by: dglFromAtt Issue-ID: DMAAP-1142 --- dmaap-bc/misc/org.onap.dmaap-bc.cred.props | 17 -------------- dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh | 15 ------------- dmaap-bc/misc/org.onap.dmaap-bc.jks | Bin 3613 -> 0 bytes dmaap-bc/misc/org.onap.dmaap-bc.keyfile | 27 ---------------------- dmaap-bc/misc/org.onap.dmaap-bc.location.props | 8 ------- dmaap-bc/misc/org.onap.dmaap-bc.p12 | Bin 4151 -> 0 bytes dmaap-bc/misc/org.onap.dmaap-bc.props | 14 ------------ dmaap-bc/misc/org.onap.dmaap-bc.showpass | 9 -------- dmaap-bc/misc/org.onap.dmaap-bc.trust.jks | Bin 1413 -> 0 bytes dmaap-bc/pom.xml | 30 +++++++++++++++---------- dmaap-bc/version.properties | 2 +- 11 files changed, 19 insertions(+), 103 deletions(-) delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.cred.props delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.jks delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.keyfile delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.location.props delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.p12 delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.props delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.showpass delete mode 100644 dmaap-bc/misc/org.onap.dmaap-bc.trust.jks (limited to 'dmaap-bc') diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.cred.props b/dmaap-bc/misc/org.onap.dmaap-bc.cred.props deleted file mode 100644 index fe47e47..0000000 --- a/dmaap-bc/misc/org.onap.dmaap-bc.cred.props +++ /dev/null @@ -1,17 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by root -# on 2019-03-22T17:37:39.746+0000 -# @copyright 2016, AT&T -############################################################ -Challenge=enc:0B6_pOsEETnPFnQpfT0cppU1iw8hQ4580YF98UfazICvACybbPP8e7bOCtu6I3j3 -cadi_alias=dmaap-bc@dmaap-bc.onap.org -cadi_key_password=enc:xzyD6s2QtG6dnrpgXFd3cJvzQQP8cO-XuSYugfJsKiGeUjNla6Ty6LeiuAn6sD2o -cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-bc.keyfile -cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-bc.p12 -cadi_keystore_password=enc:3rLfxd-_WPUHEzYIbt2Cb9PwWOFkIQWBf_2DuHUOGJ4h_-gQjtTsx-h7H8qfkxC9 -cadi_keystore_password_jks=enc:VWdS8tbPO6JcL0gwj9mbV0fKSzWIP6NXLWaz9L1O309Dho9qo7wyJxeF8wR-8_wi -cadi_keystore_password_p12=enc:3rLfxd-_WPUHEzYIbt2Cb9PwWOFkIQWBf_2DuHUOGJ4h_-gQjtTsx-h7H8qfkxC9 -cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-bc.trust.jks -cadi_truststore_password=enc:pVXSw1tBNOOFYnovbI1tHlS_d4dvY0eQyWkhBsRavMRv6DiI9i8WMN5wVrM4KnUY -cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh b/dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh deleted file mode 100644 index 861223c..0000000 --- a/dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash /opt/app/osaaf/local/org.onap.dmaap-bc.crontab.sh -# Certificate Manager Crontab Loading Script -# Add/Update a Crontab entry, that adds a check on Certificate Manager generated Certificate nightly. -# Generated by Certificate Manager 2019-03-22T17:37:39.745Z -TFILE="/tmp/cmcron$$.temp" -DIR="/opt/app/osaaf/local" -CF="org.onap.dmaap-bc Certificate Check Script" -SCRIPT="/opt/app/osaaf/local/org.onap.dmaap-bc.check.sh" -crontab -l | sed -n "/#### BEGIN $CF/,/END $CF ####/!p" > $TFILE -# Note: Randomize Minutes (0-60) and hours (1-4) -echo "#### BEGIN $CF ####" >> $TFILE -echo "$(( $RANDOM % 60)) $(( $(( $RANDOM % 3 )) + 1 )) * * * /bin/bash $SCRIPT >> $DIR/cronlog 2>&1 " >> $TFILE -echo "#### END $CF ####" >> $TFILE -crontab $TFILE -rm $TFILE diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.jks b/dmaap-bc/misc/org.onap.dmaap-bc.jks deleted file mode 100644 index 5f34374..0000000 Binary files a/dmaap-bc/misc/org.onap.dmaap-bc.jks and /dev/null differ diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.keyfile b/dmaap-bc/misc/org.onap.dmaap-bc.keyfile deleted file mode 100644 index a50f742..0000000 --- a/dmaap-bc/misc/org.onap.dmaap-bc.keyfile +++ /dev/null @@ -1,27 +0,0 @@ -AAxU7-TUq8pEp4SVZwpl8rgDrfEjngBUATPivJjmkw65Lg9H2pAyegluPdIBaMiSwV0gGk9PQ8x3 -3k1jb9c0Kt1aSOQpEqHOE44IlqCv8tX5bglqKy0PucUPVppp30nmiMWMVCi5szRfzeG_Vppcv_2u -rbeor-oKC2B5nsyIVMaVnsNMSCwbNAqVf_h4lqB0CtNu_6fXXAxu9xrRvahHHoEeOGXqZI9WdqFF -ds3-gjW8jpyI38u1yckF3-PYGi344KUy--uM4KHNnTfsFMwSwnZnIzzC5vxLt7b-lXRmlk02G6LC -vHwPVVZv0U7qFYwikZdS93k3OwQCVezKGARzdaoycLKaDjsUtqFNJSFSNEaIX9AU37PBRDsaApxe -glG-jbvqMBhjcHaAkSFLA_GKKslvHfyeUdRz_8-WAykn7RfNo45uGlMuNlNz8yvwUZcYfYOTd6Kz -TnPh4c1bxgJFMZrn2X2PK0SB5l-4iwNA5UvXD5QuMdVMSxHaXGi_TioJauSrHLMJvpdzjPK8l46O -etcN8KwOjMuhJEgXv7asz2WwlFlJ81IOYi6ynIqgziymZK39dFCWjj1FBbc5ZmawGfm-uoICNNAf -iPVIwYJjD1YF288tgxBP4--dmqyldpBtecUvck_5t3xdV-BH8CqsjfMnXnyg3nvxLDbI-tnzw8Hd -dmZe3T1WSyofqhiZlmcIZEJk_sU7u-oZcseTO5qc1_dgi16sfyhzwlFZOmMqp4Bk2oZFyyDpk4Tr -g9qJVJQIOLDSaU-CkZ9IW89-MgKEl_ESmYWPt1Q3wdOGBDeNnZvtj6YStpIVsPyofK1yimhAL2jk -OIklv6m-ri2cmWFY9q8ZYmHVEA1iMnw_oLRMfp7s6-RRSQALPK51QEy9PXR9JQ9R7_RK_KU6wMq4 -LTQAzOqu8xVmFbLZxcAiwVs8fV8ukgesMosWXHT1fLDWRlOi9ePfiauHOkGl64M8e6p6IUo5T1dg -fg-vwZCYoeJJ8NEnK0sU7z0OZGS8ECI9sXZ9lAweQqQQBnGa5md0XW25r8svJgFrtAq2_d2G-qla -6Dk00zgzJ3iQNuBA9Tgxr7qP0wro8tRi_ejPC2_0C3DIohFbuGpabMeMFomFAhzMLLZQrdJB_rrs -heAXW3vieVDQkrojelrpuCDST2vveH01ksxaC7ZTtVAk_jVsoLi7wgTHW7IseoJf0FnMB-rxd_qn -umfug96KFtVgVens_8mzNUV1SNFXdfW0J5-qG17TaV_Ynm8S1Fuu1usYiuNZjtmkMuo0hRoVasFK -C3n3qK4WlB0C0abmuR2HiqqrEKRKcZyG3X7cgkhdgiD85yqBVlABXfrgXk6XCbKAt6XVykFHbGhm -X9W3jOltRgNNa_MPYARwqqWu_3CJ83FLJI1FxtP--O7rFj1pPLM38zmUf3Hjz2pfn6EnapEfQ_qq -FNyXK-wxf_7OFKmiZM0UMRICbTA8BBuhfCsYhqMIDqGwd9zMXmnw1ylVj_WFbGCj7swkgI04KSrv -mn64Ct33G13Nf6FDF0e4qOMkjSRrpo51HEE-4SY7MiKjCTAev9Oqf-gRgQ_m6KfzcmkfOsk3goYu -6yvWL4vNPaWTnx49eVyzOMck-UdWBIGWUIALDuKFV6b-WwwSUWj-p6dJGL48lgnEzrCsaZsdcFTv -UgYl1Up3v2NBCmQ6Hv7XWr-r2WE9YiI7wF6pfqhKQ_81A039iQjo6KM0O8tf6b35K40n9Ekudu6D -tG5_GKwPKdd9DZ-VcDzN-g1yYganDHyMLVAX2xvj4rcG5BtFaZgoMZ75BfMRsZ1mpt5vr8aOP98V -1CA-XLM68PPmS_0vj5iKx9Fnk7pw0aRfjLsOwTDuzt4q7Zikz7UE9-HOlSJTu3Apy4cVacqHHhdu -U714tAhWxp0onTVOVC4lVGIQJU9qGSNvyF7bl-gouwFxTAgAr-AfDC0Ny6VL8KEspybFSH75ixBw -a0GAScwtvEtbZnLKOsS7-MpqI0fSCd6XQzqqXuNWS-V17kX5zOy5CjiKPdZkWDX0vLc__bL- \ No newline at end of file diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.location.props b/dmaap-bc/misc/org.onap.dmaap-bc.location.props deleted file mode 100644 index 2507ce4..0000000 --- a/dmaap-bc/misc/org.onap.dmaap-bc.location.props +++ /dev/null @@ -1,8 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by root -# on 2019-03-22T17:37:33.688+0000 -# @copyright 2016, AT&T -############################################################ -cadi_latitude=38.000 -cadi_longitude=-72.000 diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.p12 b/dmaap-bc/misc/org.onap.dmaap-bc.p12 deleted file mode 100644 index eae6c97..0000000 Binary files a/dmaap-bc/misc/org.onap.dmaap-bc.p12 and /dev/null differ diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.props b/dmaap-bc/misc/org.onap.dmaap-bc.props deleted file mode 100644 index 5de2eb3..0000000 --- a/dmaap-bc/misc/org.onap.dmaap-bc.props +++ /dev/null @@ -1,14 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by root -# on 2019-03-22T17:37:33.690+0000 -# @copyright 2016, AT&T -############################################################ -aaf_id=dmaap-bc@dmaap-bc.onap.org -aaf_locate_url=https://aaf-onap-test.osaaf.org:8095 -aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1 -cadi_etc_dir=/opt/app/osaaf/local -cadi_latitude=38.000 -cadi_longitude=-72.000 -cadi_prop_files=/opt/app/osaaf/local/org.onap.dmaap-bc.location.props:/opt/app/osaaf/local/org.onap.dmaap-bc.cred.props -cm_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1 diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.showpass b/dmaap-bc/misc/org.onap.dmaap-bc.showpass deleted file mode 100644 index 7c93e96..0000000 --- a/dmaap-bc/misc/org.onap.dmaap-bc.showpass +++ /dev/null @@ -1,9 +0,0 @@ -cadi_truststore_password=8b&R5%l$l:@jSWz@FCs;rhY* -cadi_keystore_password_jks=Y@Y5f&gm?PAz,CVQL,lk[VAF -cadi_key_password=2U[iOZzMHI:.#tdCwlBqc;}S -cadi_keystore_password=2U[iOZzMHI:.#tdCwlBqc;}S -cadi_keystore_password_p12=2U[iOZzMHI:.#tdCwlBqc;}S -Challenge=9H83TErBrN!u?;]1iCK@&69? -2019-03-22T17:38:32.447+0000: Trans Info - REMOTE Show Password 2214.6292ms - diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks b/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks deleted file mode 100644 index 6e35eed..0000000 Binary files a/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks and /dev/null differ diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml index 24f9e42..8252249 100644 --- a/dmaap-bc/pom.xml +++ b/dmaap-bc/pom.xml @@ -187,10 +187,8 @@ ${basedir}/target/docker-stage/opt/app/dmaapbc/etc - ${basedir}/misc + ${multiproject.basedir}/certs - LocalKey - logback.xml org.onap.dmaap-bc.cred.props org.onap.dmaap-bc.crontab.sh org.onap.dmaap-bc.jks @@ -201,6 +199,22 @@ org.onap.dmaap-bc.showpass org.onap.dmaap-bc.trust.jks + + + ${basedir}/target/docker-stage/opt/app/dmaapbc/misc + ${multiproject.basedir}/misc + + cert-client-init.sh + aaf-ca.crt + + + + ${basedir}/target/docker-stage/opt/app/dmaapbc/etc + ${basedir}/misc + + LocalKey + logback.xml + ${basedir}/target/docker-stage/opt/app/dmaapbc/etc @@ -216,14 +230,6 @@ opensource.env *.tmpl - - - ${basedir}/target/docker-stage/opt/app/dmaapbc/misc - ${multiproject.basedir}/misc - - cert-client-init.sh - aaf-ca.crt - ${basedir}/target/docker-stage/opt/app/dmaapbc/bin @@ -463,7 +469,7 @@ 9.4.12.RC2 1.0.0 1.5.19 - 1.1.2 + 1.1.3 0.7.7.201606060606 3.2 diff --git a/dmaap-bc/version.properties b/dmaap-bc/version.properties index 85e1bd1..635e84d 100644 --- a/dmaap-bc/version.properties +++ b/dmaap-bc/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins -- cgit 1.2.3-korg