CA Bootstrapping
Issue-ID: AAF-419
Change-Id: I921604ab3bea2550ab12c1db43899a52ab91b166
Signed-off-by: Instrumental <jonathan.gathman@att.com>
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index efd4fe3..50a7911 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -15,6 +15,10 @@
/bin/bash $PARAMS
}
+function set_prop() {
+docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2" "$3"
+}
+
function encrypt_it() {
docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP encrypt "$1" "$2"
}
@@ -40,6 +44,9 @@
docker container cp ${AAF_INITIAL_X509_P12} aaf_config_$USER:/opt/app/osaaf/local/org.osaaf.aaf.p12
docker container cp ${AAF_SIGNER_P12} aaf_config_$USER:/opt/app/osaaf/local/org.osaaf.aaf.signer.p12
+ set_prop cm_ca.local "${CM_CA_LOCAL}" org.osaaf.aaf.cm.ca.props
+ set_prop cadi_x509_issuers "${CADI_X509_ISSUERS}" org.osaaf.aaf.props
+
encrypt_it cadi_keystore_password "${AAF_INITIAL_X509_PASSWORD}"
encrypt_it cm_ca.local "${AAF_SIGNER_PASSWORD}"
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index 782f0c3..484aba4 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -18,9 +18,12 @@
LONGITUDE=
#
# Initial AAF Certificate (not Generated)
+CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US"
AAF_INITIAL_X509_P12=
AAF_INITIAL_X509_PASSWORD=
# CA info (leave blank unless functioning as CA)
AAF_SIGNER_P12=
AAF_SIGNER_PASSWORD=
+CM_CA_LOCAL=
+
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 15c3714..33dca67 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -89,9 +89,10 @@
for F in $FILES; do
echo "Changing $1 in $F"
if [ "$ADD" = "Y" ]; then
- echo $2 >> $F
+ echo "$1=$2" >> $F
else
- sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F
+ VALUE=${2//\//\\\/}
+ sed -i.backup -e "s/\(${1}=\).*/\1${VALUE}/" $F
fi
cat $F
done
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index 71ba73a..4a5d071 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -15,7 +15,7 @@
cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12
cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks
cadi_truststore_password=changeit
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
+cadi_x509_issuers=
# Other
aaf_data_dir=/opt/app/osaaf/data
diff --git a/auth/sample/local/org.osaaf.aaf.cm.ca.props b/auth/sample/local/org.osaaf.aaf.cm.ca.props
index 98e16ce..b21cf35 100644
--- a/auth/sample/local/org.osaaf.aaf.cm.ca.props
+++ b/auth/sample/local/org.osaaf.aaf.cm.ca.props
@@ -4,7 +4,7 @@
##
#Certman
-cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.signer.p12;aaf_intermediate_9;enc:
+cm_ca.local=
cm_ca.local.idDomains=org.osaaf
cm_ca.local.baseSubject=/OU=OSAAF/O=ONAP/C=US
cm_ca.local.perm_type=org.osaaf.aaf.ca