diff options
| -rw-r--r-- | auth/docker/aaf.sh | 9 | ||||
| -rw-r--r-- | auth/docker/d.props.init | 1 | ||||
| -rw-r--r-- | auth/sample/local/aaf.props | 2 | ||||
| -rw-r--r-- | conf/CA/.gitignore | 4 | ||||
| -rw-r--r-- | conf/CA/bootstrap.sh | 44 |
5 files changed, 43 insertions, 17 deletions
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index efd4fe37..c41192fe 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -19,9 +19,13 @@ function encrypt_it() { docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP encrypt "$1" "$2" } +function set_it() { + docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2" +} + P12_LOAD="no" -for PROP in AAF_INITIAL_X509_P12 AAF_INITIAL_X509_PASSWORD AAF_SIGNER_P12 AAF_SIGNER_PASSWORD; do +for PROP in AAF_INITIAL_X509_P12 AAF_INITIAL_X509_PASSWORD AAF_SIGNER_P12 AAF_SIGNER_PASSWORD CADI_X509_ISSUERS; do if [ "${!PROP}" != "" ]; then P12_LOAD='yes' break; @@ -43,6 +47,9 @@ if [ "$(docker volume ls | grep aaf_config)" = "" ] && [ ${P12_LOAD} = "yes" ]; encrypt_it cadi_keystore_password "${AAF_INITIAL_X509_PASSWORD}" encrypt_it cm_ca.local "${AAF_SIGNER_PASSWORD}" + set_it cadi_x509_issuers "${CADI_X509_ISSUERS}" + + echo -n "Stopping " docker container stop aaf_config_$USER echo -n "Removing " diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index 782f0c3f..7b9cd13c 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -20,6 +20,7 @@ LONGITUDE= # Initial AAF Certificate (not Generated) AAF_INITIAL_X509_P12= AAF_INITIAL_X509_PASSWORD= +CADI_X509_ISSUERS= # CA info (leave blank unless functioning as CA) AAF_SIGNER_P12= diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props index 71ba73a2..4a5d0716 100644 --- a/auth/sample/local/aaf.props +++ b/auth/sample/local/aaf.props @@ -15,7 +15,7 @@ cadi_alias=aaf@aaf.osaaf.org 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/conf/CA/.gitignore b/conf/CA/.gitignore new file mode 100644 index 00000000..ee117ccf --- /dev/null +++ b/conf/CA/.gitignore @@ -0,0 +1,4 @@ +aaf.bootstrap.p12 +index.txt* +newcerts/ +serial* diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh index ea7a23ec..20093ee3 100644 --- a/conf/CA/bootstrap.sh +++ b/conf/CA/bootstrap.sh @@ -3,8 +3,14 @@ # Removed Variables so it can be run for AutoDeployments # echo "Bootstrap AAF Certificate" +mkdir -p private certs newcerts +chmod 700 private +chmod 755 certs newcerts +touch index.txt +echo "unique_subject = no" > index.txt.attr + NAME=aaf.bootstrap -FQDN=$(uname -n) +FQDN=$(hostname -f) FQI=aaf@aaf.osaaf.org SUBJECT="/CN=$FQDN/OU=$FQI`cat subject.aaf`" SIGNER_P12=$1 @@ -18,6 +24,7 @@ BOOTSTRAP_SAN=/tmp/$NAME.san BOOTSTRAP_KEY=/tmp/$NAME.key BOOTSTRAP_CSR=/tmp/$NAME.csr BOOTSTRAP_CRT=/tmp/$NAME.crt +BOOTSTRAP_CHAIN=/tmp/$NAME.chain BOOTSTRAP_P12=$NAME.p12 @@ -25,8 +32,10 @@ BOOTSTRAP_P12=$NAME.p12 if [ ! -e "$SIGNER_P12" ]; then # Creating Signer CA openssl req -config openssl.conf -x509 -sha256 -extensions v3_ca \ - -newkey rsa:4096 -nodes -subj /CN="RootCA$(cat subject.aaf)" \ - -keyout $SIGNER_KEY -out $SIGNER_CRT -days 365 + -newkey rsa:4096 -subj /CN="Signer$(cat subject.aaf)" \ + -keyout $SIGNER_KEY -out $SIGNER_CRT -days 365 -passout stdin << EOF +$PASSPHRASE +EOF # Move to P12 (Signer) openssl pkcs12 -name RootCA -export -in $SIGNER_CRT -inkey $SIGNER_KEY -out $SIGNER_P12 -passin stdin -passout stdin << EOF @@ -58,31 +67,36 @@ for D in $FQDN aaf.osaaf.org service.aaf.osaaf.org locate.aaf.osaaf.org oauth.aa done # Create CSR -openssl req -new -newkey rsa:2048 -sha256 -nodes -keyout $BOOTSTRAP_KEY \ - -out $BOOTSTRAP_CSR -outform PEM -subj "$SUBJECT" - #-passout stdin << EOF -#$PASSPHRASE -#EOF +openssl req -new -newkey rsa:2048 -nodes -keyout $BOOTSTRAP_KEY \ + -out $BOOTSTRAP_CSR -outform PEM -subj "$SUBJECT" \ + -passout stdin << EOF +$PASSPHRASE +EOF -ls -l BOOTSTRAP_CSR $BOOTSTRAP_CSR -# Sign it -openssl ca -batch -config openssl.conf -extensions server_cert -out $BOOTSTRAP_CRT \ +echo Sign it +openssl ca -batch -config openssl.conf -extensions server_cert \ -cert $SIGNER_CRT -keyfile $SIGNER_KEY \ -policy policy_loose \ -days 90 \ + -passin stdin \ + -out $BOOTSTRAP_CRT \ -extfile $BOOTSTRAP_SAN \ - -infiles $BOOTSTRAP_CSR + -infiles $BOOTSTRAP_CSR << EOF +$PASSPHRASE +EOF # Make a P12 # Add THIS Intermediate CA into chain -cat $SIGNER_CRT >> $BOOTSTRAP_CRT +cat $BOOTSTRAP_CRT +cp $BOOTSTRAP_CRT $BOOTSTRAP_CHAIN +cat $SIGNER_CRT >> $BOOTSTRAP_CHAIN # Note: Openssl will pickup and load all Certs in the Chain file -openssl pkcs12 -name $FQI -export -in $BOOTSTRAP_CRT -inkey $BOOTSTRAP_KEY -out $BOOTSTRAP_P12 -passin stdin -passout stdin << EOF +openssl pkcs12 -name $FQI -export -in $BOOTSTRAP_CHAIN -inkey $BOOTSTRAP_KEY -out $BOOTSTRAP_P12 -passin stdin -passout stdin << EOF $PASSPHRASE $PASSPHRASE $PASSPHRASE EOF # Cleanup -rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $SIGNER_KEY $SIGNER_CRT +rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $BOOTSTRAP_CHAIN $SIGNER_KEY $SIGNER_CRT |