X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fsample%2Fbin%2Fservice.sh;h=2fd49cacbbef38b8977a3b7d3ac475e212ec0ea6;hb=HEAD;hp=9880e8a6c22f19cade36d0d7324fdcd5e98162be;hpb=9fe1153c6bad63922e026d1db86e51b95a92c6cc;p=aaf%2Fauthz.git

diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 9880e8a6..2fd49cac 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -1,8 +1,45 @@
 #!/bin/bash
+#########
+#  ============LICENSE_START====================================================
+#  org.onap.aaf
+#  ===========================================================================
+#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  ===========================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END====================================================
+#
 # This script is run when starting aaf_config Container.
 #  It needs to cover the cases where the initial data doesn't exist, and when it has already been configured (don't overwrite)
 #
-JAVA=/usr/bin/java
+
+echo "# Properties passed in"
+    for P in `env`; do
+      if [[ "$P" == cadi* ]] || [[ "$P" == aaf* ]] || [[ "$P" == HOSTNAME* ]]; then
+        S="${P/_helm/.helm}"
+        S="${S/_oom/.oom}"
+	echo "$S" 
+      fi
+    done
+
+# Set from CAP Based PROPS, if necessary
+aaf_env=${aaf_env:-"${AAF_ENV}"}
+aaf_deployed_version=${aaf_deployed_version:-"${VERSION}"}
+cadi_latitude=${cadi_latitude:-"${LATITUDE}"}
+cadi_longitude=${cadi_longitude:-"${LONGITUDE}"}
+cadi_x509_issuers=${cadi_x509_issuers:-"${CADI_X509_ISSUERS}"}
+aaf_locate_url=${aaf_locate_url:-"https://${HOSTNAME}:8095"}
+
+JAVA=${JAVA_HOME}/bin/java
 
 OSAAF=/opt/app/osaaf
 LOCAL=$OSAAF/local
@@ -13,20 +50,25 @@ CONFIG=/opt/app/aaf_config
 JAVA_CADI="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar org.onap.aaf.cadi.CmdLine" 
 JAVA_AGENT="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar -Dcadi_prop_files=$LOCAL/org.osaaf.aaf.props org.onap.aaf.cadi.configure.Agent" 
 JAVA_AAFCLI="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar -Dcadi_prop_files=$LOCAL/org.osaaf.aaf.props org.onap.aaf.auth.cmd.AAFcli" 
+JAVA_AAFBATCH="$JAVA -Dcadi_prop_files=$LOCAL/org.osaaf.aaf.batch.props -jar $CONFIG/bin/aaf-auth-batch-*-full.jar"
 
 # If doesn't exist... still create
-mkdir -p /opt/app/osaaf
+mkdir -p $OSAAF
+
+# If not created by separate PV, create
+mkdir -p /opt/app/aaf/status
 
 # Temp use for clarity of code
 FILE=
 
 # Setup Bash, first time only
-if [ ! -e "$HOME/.bash_aliases" ] || [ -z "$(grep cadi $HOME/.bash_aliases)" ]; then
-  echo "alias cadi='$JAVA_CADI \$*'" >>$HOME/.bash_aliases
-  echo "alias agent='$CONFIG/bin/agent.sh EMPTY \$*'" >>$HOME/.bash_aliases
-  echo "alias aafcli='$JAVA_AAFCLI \$*'" >>$HOME/.bash_aliases
+if [ ! -e "$HOME/.bashrc" ] || [ -z "$(grep cadi $HOME/.bashrc)" ]; then
+  echo "alias cadi='$JAVA_CADI \$*'" >>$HOME/.bashrc
+  echo "alias agent='$CONFIG/bin/agent.sh \$*'" >>$HOME/.bashrc
+  echo "alias aafcli='$JAVA_AAFCLI \$*'" >>$HOME/.bashrc
+  echo "alias batch='$JAVA_AAFBATCH \$*'" >>$HOME/.bashrc
   chmod a+x $CONFIG/bin/agent.sh
-  . $HOME/.bash_aliases
+  . $HOME/.bashrc
 fi
 
 # Only load Identities once
@@ -35,7 +77,17 @@ FILE="$DATA/identities.dat"
 if [ ! -e $FILE ]; then
     mkdir -p $DATA
     cp $CONFIG/data/sample.identities.dat $FILE
+    echo "Set Identities"
+    INITIALIZED="true"
+fi
+
+# Should we clean up?
+if [ ! -e "${LOCAL}/VERSION" ] || [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then
+  echo "Clean up directory ${LOCAL}"
+  rm -Rf ${LOCAL}/org.osaaf.aaf.*props ${LOCAL}/org.osaaf.aaf.p12
+  ls ${LOCAL}
 fi
+echo "${VERSION}" > $LOCAL/VERSION
 
 # Load up Cert/X509 Artifacts
 # echo "Check Signer Keyfile"
@@ -45,6 +97,8 @@ if [ ! -e $FILE ]; then
     mkdir -p $PUBLIC
     if [ -e $CONFIG/cert/org.osaaf.aaf.signer.p12 ]; then
         cp $CONFIG/cert/org.osaaf.aaf.signer.p12 $FILE
+        echo "Installed Signer P12"
+        INITIALIZED="true"
     else
         echo "Decode"
         base64 -d $CONFIG/cert/demoONAPsigner.p12.b64 > $FILE
@@ -53,21 +107,24 @@ if [ ! -e $FILE ]; then
 	ln -s $PUBLIC/truststoreONAPall.jks $LOCAL
 	cp $CONFIG/cert/AAF_RootCA.cer $PUBLIC
 	CM_TRUST_CAS="$PUBLIC/AAF_RootCA.cer"
-	echo "cadi_keystore_password=something easy" >> $CONFIG/local/aaf.props        
+        echo "Setup ONAP Test CAs and Signers"
+        INITIALIZED="true"
     fi
 fi
 
-# echo "Check keyfile"
 FILE="$LOCAL/org.osaaf.aaf.p12"
 if [ ! -e $FILE ]; then
     if [ -e $CONFIG/cert/org.osaaf.aaf.p12 ]; then
         cp $CONFIG/cert/org.osaaf.aaf.p12 $FILE
+        echo "Installed AAF P12"
+        INITIALIZED="true"
     else
         echo "Bootstrap Creation of Keystore from Signer"
         cd $CONFIG/CA
 	
-        # Remove this after Casablanca
-	CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+        # Redo all of this after Dublin
+	export cadi_x509_issuers="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+        export signer_subj="/CN=intermediateCA_9/OU=OSAAF/O=ONAP/C=US"
 	bash bootstrap.sh $LOCAL/org.osaaf.aaf.signer.p12 'something easy'
 	cp aaf.bootstrap.p12 $FILE
 	if [ -n "$CADI_X509_ISSUERS" ]; then
@@ -80,40 +137,44 @@ if [ ! -e $FILE ]; then
         CM_CA_PASS="something easy"
         CM_CA_LOCAL="org.onap.aaf.auth.cm.ca.LocalCA,$LOCAL/org.osaaf.aaf.signer.p12;aaf_intermediate_9;enc:"
 	CM_TRUST_CAS="$PUBLIC/AAF_RootCA.cer"
+        echo "Generated ONAP Test AAF certs"
+        INITIALIZED="true"
     fi
 fi
 
 # Only initialize once, automatically...
 if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
-    rsync -avzh --exclude=.gitignore $CONFIG/local/org.osaaf.aaf* $LOCAL
+    cp  $CONFIG/local/org.osaaf.aaf* $LOCAL
     for D in public etc logs; do
-        rsync -avzh --exclude=.gitignore $CONFIG/$D/* /opt/app/osaaf/$D
+        mkdir -p $OSAAF/$D
+        cp $CONFIG/$D/* $OSAAF/$D
     done
 
     TMP=$(mktemp)
-    echo aaf_env=${AAF_ENV} >> ${TMP}
-    echo aaf_release=${VERSION} >> ${TMP}
-    echo cadi_latitude=${LATITUDE} >> ${TMP}
-    echo cadi_longitude=${LONGITUDE} >> ${TMP}
-    echo cadi_x509_issuers=${CADI_X509_ISSUERS} >> ${TMP}
-    echo aaf_register_as=${AAF_REGISTER_AS} >> ${TMP}
-    AAF_LOCATOR_AS=${AAF_LOCATOR_AS:=$AAF_REGISTER_AS}
-    echo aaf_locate_url=https://${AAF_LOCATOR_AS}:8095 >> ${TMP}
-
+    for P in `env`; do
+      if [[ "$P" == aaf_* ]] || [[ "$P" == cadi_* ]]; then
+        S="${P/_helm/.helm}"
+        S="${S/_oom/.oom}"
+	echo "$S" >> ${TMP}
+      fi
+    done
     cat $TMP
 
     $JAVA_AGENT config \
 	aaf@aaf.osaaf.org \
         cadi_etc_dir=$LOCAL \
+        cadi_latitude=${cadi_latitude} \
+        cadi_longitude=${cadi_longitude} \
         cadi_prop_files=$CONFIG/local/initialConfig.props:$CONFIG/local/aaf.props:${TMP}
     rm ${TMP}
+    echo "cm_always_ignore_ips=${cm_always_ignore_ips:=false}" >> $LOCAL/org.osaaf.aaf.props;
 
     # Cassandra Config stuff
     # Default is expect a Cassandra on same Node
-    CASS_HOST=${CASS_HOST:="aaf_cass"}
+    CASS_HOST=${CASS_HOST:="aaf-cass"}
     CASS_PASS=$($JAVA_CADI digest "${CASSANDRA_PASSWORD:-cassandra}" $LOCAL/org.osaaf.aaf.keyfile)
     CASS_NAME=${CASS_HOST/:*/}
-    sed -i.backup -e "s/\\(cassandra.clusters=\\).*/\\1${CASSANDRA_CLUSTERS:=$CASS_HOST}/" \
+    sed -i.backup -e "s/\\(cassandra.clusters=\\).*/\\1${CASSANDRA_CLUSTER:=$CASS_HOST}/" \
                   -e "s/\\(cassandra.clusters.user=\\).*/\\1${CASSANDRA_USER:=cassandra}/" \
                   -e "s/\\(cassandra.clusters.password=enc:\\).*/\\1$CASS_PASS/" \
                   -e "s/\\(cassandra.clusters.port=\\).*/\\1${CASSANDRA_PORT:=9042}/" \
@@ -130,20 +191,29 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
       echo "cm_ca.local=$CM_CA_LOCAL" >> $FILE
       echo "cm_trust_cas=$CM_TRUST_CAS" >> $FILE
     fi
+    echo "Created AAF Initial Configurations"
+    INITIALIZED="true"
+    if [ -n ${DUSER} ]; then
+      mkdir -p /opt/app/osaaf/logs
+      chown -R 1000:1000 /opt/app/aaf /opt/app/osaaf
+    fi
 fi
 
 
 # Now run a command
-CMD=$2
+CMD=$1
 if [ -z "$CMD"  ]; then
-    $JAVA_AGENT    
+    if [ -n "$INITIALIZED" ]; then
+        echo "Initialization Complete"
+    else
+        echo "No Additional Initialization required"
+    fi
 else
-    shift
     shift
     case "$CMD" in
     ls)
         echo ls requested
-        find /opt/app/osaaf -depth
+        find $OSAAF -depth
         ;;
     cat)
         if [ "$1" = "" ]; then
@@ -160,23 +230,17 @@ else
             fi
         fi
         ;;
-    update)
-        rsync -uh --exclude=.gitignore $CONFIG/local/org.osaaf.aaf* $LOCAL
-        for D in public data etc logs; do
-            rsync -uh --exclude=.gitignore $CONFIG/$D/* /opt/app/osaaf/$D
-        done
-        ;;
     validate)
         echo "## validate requested"
         $JAVA_AAFCLI perm list user aaf@aaf.osaaf.org
         ;;
     onap)
-        echo Initializing ONAP configurations.
+        #echo Initializing ONAP configurations.
 	;;
     bash)
         shift
         cd $LOCAL || exit
-        /bin/bash "$@"
+        exec /bin/bash -c "$@"
         ;;
     setProp)
         cd $LOCAL || exit
@@ -191,11 +255,11 @@ else
 	fi
         for F in $FILES; do
 	    if [ "$ADD" = "Y" ]; then
-                echo "Changing $1 to $F"
+                echo "Changing $1 for $F"
 		echo "$1=$2" >> $F
 	    else 
                echo "Changing $1 in $F"
-               sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F
+               sed -i.backup -e "s/\\(${1}=\\).*/\\1${2}/" $F
 	    fi
             cat $F
         done
@@ -230,8 +294,11 @@ else
         done
         ;;
     taillog) 
-	sh /opt/app/osaaf/logs/taillog
+	sh $OSAAF/logs/taillog
 	;;
+    wait)
+	bash $CONFIG/bin/pod_wait.sh wait $1
+        ;;
     --help | -?)
         case "$1" in
         "")