Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[COMMON] Add custom certs into AAF truststore"
[oom.git]
/
kubernetes
/
common
/
cert-wrapper
/
resources
/
import-custom-certs.sh
diff --git
a/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
b/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
index
7e2fa91
..
cb4153e
100755
(executable)
--- a/
kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
+++ b/
kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
@@
-17,6
+17,7
@@
*/}}
CERTS_DIR=${CERTS_DIR:-/certs}
*/}}
CERTS_DIR=${CERTS_DIR:-/certs}
+MORE_CERTS_DIR=${MORE_CERTS_DIR:-/more_certs}
WORK_DIR=${WORK_DIR:-/updatedTruststore}
ONAP_TRUSTSTORE=${ONAP_TRUSTSTORE:-truststoreONAPall.jks}
JRE_TRUSTSTORE=${JRE_TRUSTSTORE:-$JAVA_HOME/lib/security/cacerts}
WORK_DIR=${WORK_DIR:-/updatedTruststore}
ONAP_TRUSTSTORE=${ONAP_TRUSTSTORE:-truststoreONAPall.jks}
JRE_TRUSTSTORE=${JRE_TRUSTSTORE:-$JAVA_HOME/lib/security/cacerts}
@@
-26,14
+27,20
@@
mkdir -p $WORK_DIR
# Decrypt and move relevant files to WORK_DIR
for f in $CERTS_DIR/*; do
# Decrypt and move relevant files to WORK_DIR
for f in $CERTS_DIR/*; do
- if [[ $AAF_ENABLED == false ]] && [[ $f == *$ONAP_TRUSTSTORE* ]]; then
+ export canonical_name_nob64=$(echo $f | sed 's/.*\/\([^\/]*\)/\1/')
+ export canonical_name_b64=$(echo $f | sed 's/.*\/\([^\/]*\)\(\.b64\)/\1/')
+ if [ "$AAF_ENABLED" = "false" ] && [ "$canonical_name_b64" = "$ONAP_TRUSTSTORE" ]; then
# Dont use onap truststore when aaf is disabled
continue
fi
# Dont use onap truststore when aaf is disabled
continue
fi
- if [[ $f == *.sh ]]; then
+ if [ "$AAF_ENABLED" = "false" ] && [ "$canonical_name_nob64" = "$ONAP_TRUSTSTORE" ]; then
+ # Dont use onap truststore when aaf is disabled
+ continue
+ fi
+ if [ ${f: -3} = ".sh" ]; then
continue
fi
continue
fi
- if [
[ $f == *.b64 ]
]
+ if [
${f: -4} = ".b64"
]
then
base64 -d $f > $WORK_DIR/`basename $f .b64`
else
then
base64 -d $f > $WORK_DIR/`basename $f .b64`
else
@@
-41,10
+48,18
@@
for f in $CERTS_DIR/*; do
fi
done
fi
done
+for f in $MORE_CERTS_DIR/*; do
+ if [ ${f: -4} == ".pem" ]
+ then
+ cp $f $WORK_DIR/.
+ fi
+done
+
# Prepare truststore output file
# Prepare truststore output file
-if [
[ $AAF_ENABLED == true ]
]
+if [
"$AAF_ENABLED" = "true"
]
then
then
- mv $WORK_DIR/$ONAP_TRUSTSTORE $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME
+ echo "AAF is enabled, use 'AAF' truststore"
+ export TRUSTSTORE_OUTPUT_FILENAME=${ONAP_TRUSTSTORE}
else
echo "AAF is disabled, using JRE truststore"
cp $JRE_TRUSTSTORE $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME
else
echo "AAF is disabled, using JRE truststore"
cp $JRE_TRUSTSTORE $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME
@@
-52,10
+67,10
@@
fi
# Import Custom Certificates
for f in $WORK_DIR/*; do
# Import Custom Certificates
for f in $WORK_DIR/*; do
- if [
[ $f == *.pem ]
]; then
+ if [
${f: -4} = ".pem"
]; then
echo "importing certificate: $f"
keytool -import -file $f -alias `basename $f` -keystore $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME -storepass $TRUSTSTORE_PASSWORD -noprompt
echo "importing certificate: $f"
keytool -import -file $f -alias `basename $f` -keystore $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME -storepass $TRUSTSTORE_PASSWORD -noprompt
- if [
[ $? != 0 ]
]; then
+ if [
$? != 0
]; then
echo "failed importing certificate: $f"
exit 1
fi
echo "failed importing certificate: $f"
exit 1
fi