X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fsample%2Fbin%2Fclient.sh;h=97a1262fde43c13dd9d3c8aba49efeebc4f18681;hb=96bf6a2771dfe992fb27bd6361d191d83b6ff605;hp=46c85be91b93e0d97e1b9fa95c05b3ce842ba7d5;hpb=3aca33c5bb9af1ba4df574ceb90435f54d14ccf5;p=aaf%2Fauthz.git

diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh
old mode 100644
new mode 100755
index 46c85be9..97a1262f
--- a/auth/sample/bin/client.sh
+++ b/auth/sample/bin/client.sh
@@ -1,8 +1,27 @@
 #!/bin/bash
-# This script is run when starting aaf_config Container.
+#########
+#  ============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 client 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
+JAVA=${JAVA_HOME}/bin/java
 AAF_INTERFACE_VERSION=2.1
 
 # Extract Name, Domain and NS from FQI
@@ -15,51 +34,158 @@ for (( i=( ${#FQIA_E[@]} -1 ); i>0; i-- )); do
    NS=${NS}${FQIA_E[i]}'.'
 done
 NS=${NS}${FQIA_E[0]}
+CONFIG="/opt/app/aaf_config"
+OSAAF="/opt/app/osaaf"
+LOCAL="$OSAAF/local"
+DOT_AAF="$HOME/.aaf"
+SSO="$DOT_AAF/sso.props"
+
+if [ -e "$CONFIG" ]; then
+  CONFIG_BIN="$CONFIG/bin" 
+else 
+  CONFIG_BIN="."
+fi
 
+AGENT_JAR="$CONFIG_BIN/aaf-cadi-aaf-*-full.jar"
+
+JAVA_AGENT="$JAVA -Dcadi_loglevel=DEBUG -Dcadi_etc_dir=${LOCAL} -Dcadi_log_dir=${LOCAL} -jar $AGENT_JAR "
 
 # Setup SSO info for Deploy ID
 function sso_encrypt() {
- $JAVA -cp /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar org.onap.aaf.cadi.CmdLine digest ${1} ~/.aaf/keyfile
+   $JAVA_AGENT cadi digest ${1} $DOT_AAF/keyfile
 }
 
-if [ ! -e " ~/.aaf/keyfile" ]; then
-    mkdir -p ~/.aaf
-    SSO=~/.aaf/sso.props
-    $JAVA -cp /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar org.onap.aaf.cadi.CmdLine keygen ~/.aaf/keyfile
-    chmod 400 ~/.aaf/keyfile
-    echo cadi_latitude=${LATITUDE} > ${SSO}
-    echo cadi_longitude=${LONGITUDE} >> ${SSO}
-    echo aaf_id=${DEPLOY_FQI} >> ${SSO}
+# Setup Bash, first time only, Agent only
+if [ -n "$HOME/.bashrc" ] || [ -z "$(grep agent $HOME/.bashrc)" ]; then
+  echo "alias agent='$CONFIG_BIN/agent.sh agent \$*'" > $HOME/.bashrc
+  chmod a+x $CONFIG_BIN/agent.sh
+  . $HOME/.bashrc
+fi
+
+if [ ! -e "$DOT_AAF/truststoreONAPall.jks" ]; then
+    mkdir -p $DOT_AAF
+    base64 -d $CONFIG/cert/truststoreONAPall.jks.b64 > $DOT_AAF/truststoreONAPall.jks
+fi
+
+# Create Deployer Info, located at /root/.aaf
+if [ ! -e "$DOT_AAF/keyfile" ]; then
+    $JAVA_AGENT cadi keygen $DOT_AAF/keyfile
+    chmod 400 $DOT_AAF/keyfile
+    echo "cadi_keyfile=$DOT_AAF/keyfile" > ${SSO}
+
+    # Add Deployer Creds to Root's SSO
+    DEPLOY_FQI="${DEPLOY_FQI:=$app_id}"
+    echo "aaf_id=${DEPLOY_FQI}" >> ${SSO}
     if [ ! "${DEPLOY_PASSWORD}" = "" ]; then
        echo aaf_password=enc:$(sso_encrypt ${DEPLOY_PASSWORD}) >> ${SSO}
     fi
-    echo aaf_locate_url=https://${AAF_FQDN}:8095 >> ${SSO}
-    echo aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:${AAF_INTERFACE_VERSION} >> ${SSO}
-    echo cadi_truststore=$(ls /opt/app/aaf_config/public/*trust*) >> ${SSO}
-    echo cadi_truststore_password=enc:$(sso_encrypt changeit) >> ${SSO}
-fi
+    
+    # Cover case where using app.props
+    aaf_locator_container_ns=${aaf_locator_container_ns:=$CONTAINER_NS}
+    if [ "$aaf_locator_container" = "docker" ]; then
+        echo "aaf_locate_url=https://aaf-locate:8095" >> ${SSO}
+        echo "aaf_url_cm=https://aaf-cm:8150" >> ${SSO}
+        echo "aaf_url=https://aaf-service:8100" >> ${SSO}
+    else 
+        echo "aaf_locate_url=https://$aaf-locator.${CONTAINER_NS}:8095" >> ${SSO}
+        echo "aaf_url_cm=https://AAF_LOCATE_URL/%CNS.%NS.cm:2.1" >> ${SSO}
+        echo "aaf_url=https://AAF_LOCATE_URL/%CNS.%NS.service:2.1" >> ${SSO}
+    fi
 
-# Only initialize once, automatically...
-if [ ! -e /opt/app/osaaf/local/${NS}.props ]; then
-    for D in bin logs; do
-        rsync -avzh --exclude=.gitignore /opt/app/aaf_config/$D/* /opt/app/osaaf/$D
+    echo "cadi_truststore=$DOT_AAF/truststoreONAPall.jks" >> ${SSO}
+    echo "cadi_truststore_password=changeit" >> ${SSO}
+    echo "cadi_latitude=${LATITUDE}" >> ${SSO}
+    echo "cadi_longitude=${LONGITUDE}" >> ${SSO}
+    echo "hostname=${aaf_locator_fqdn}" >> ${SSO}
+
+    # Push in all AAF and CADI properties to SSO
+    for E in $(env); do
+        if [ "${E:0:4}" = "aaf_" ] || [ "${E:0:5}" = "cadi_" ]; then
+           # Use Deployer ID in ${SSO}
+           if [ "app_id" != "${E%=*}" ]; then
+              S="${E/_helm/.helm}"
+              S="${S/_oom/.oom}"
+             echo "$S" >> ${SSO}
+           fi
+        fi
     done
 
-    # setup Configs
-    $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar config $APP_FQI \
-        cadi_etc_dir=/opt/app/osaaf/local 
+    . ${SSO}
+    echo "Caller Properties Initialized"
+    INITIALIZED="true"
+    echo "cat SSO"
+    cat ${SSO}
+fi
+
+# Check for local dir
+if [ -d $LOCAL ]; then
+    echo "$LOCAL exists"
+else
+    mkdir -p $LOCAL
+    echo "Created $LOCAL"
+fi
 
-    # Place Certificates
-    $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar place ${APP_FQI} ${APP_FQDN}
+cd $LOCAL
+echo "Existing files in $LOCAL"
+ls -l
 
-    # Validate
-    $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar validate \
-        cadi_prop_files=/opt/app/osaaf/local/${NS}.props
+# Should we clean up?
+if [ "${VERSION}" != "$(cat ${LOCAL}/VERSION 2> /dev/null)" ]; then
+  echo "Clean up directory ${LOCAL}"
+  rm -Rf ${LOCAL}/*
+fi
+
+# update client info
+echo "${VERSION}" > $LOCAL/VERSION
+cp $AGENT_JAR $LOCAL
+echo "#!/bin/bash" > $LOCAL/agent
+     echo 'java -jar aaf-cadi-aaf-*-full.jar $*' >> $LOCAL/agent
+echo "#!/bin/bash" > $LOCAL/cadi
+     echo 'java -jar aaf-cadi-aaf-*-full.jar cadi $*' >> $LOCAL/cadi
+chmod 755 $LOCAL/agent $LOCAL/cadi
+
+echo "Namespace is ${NS}"
+# Only initialize once, automatically...
+if [ -n $LOCAL/${NS}.props ]; then
+    echo "#### Create Configuration files "
+    > $LOCAL/$NS
+    $JAVA_AGENT config $APP_FQI $APP_FQDN --nopasswd
+    cat $LOCAL/$NS.props
+
+    echo
+    echo "#### Certificate Authorization Artifact"
+    # TMP=$(mktemp)
+    TMP=$LOCAL/agent.log
+    $JAVA_AGENT read ${APP_FQI} ${APP_FQDN} | tee $TMP
+
+    if [ -n "$(grep 'Namespace:' $TMP)" ]; then
+        echo "#### Place Certificates (by deployer)"
+        $JAVA_AGENT place $APP_FQI $APP_FQDN
+    
+        if [ -z "$(grep cadi_alias $NS.cred.props)" ]; then
+	  echo "FAILED to get Certificate"
+          INITIALIZED="false"
+        else 
+          echo "Obtained Certificates"
+          echo "#### Validate Configuration and Certificate with live call"
+          $JAVA_AGENT validate cadi_prop_files=${NS}.props
+          INITIALIZED="true"
+        fi
+    else
+	echo "#### Certificate Authorization Artifact must be valid to continue"
+    fi
+    rm $TMP    
+else
+    INITIALIZED="true"
 fi
 
 # Now run a command
 CMD=$2
-if [ ! "$CMD" = "" ]; then
+if [ -z "$CMD" ]; then
+    if [ -n "$INITIALIZED" ]; then
+      echo "Initialization complete"
+    fi
+else 
     shift
     shift
     case "$CMD" in
@@ -82,54 +208,64 @@ if [ ! "$CMD" = "" ]; then
             fi
         fi
         ;;
-    update)
-        for D in bin logs; do
-            rsync -uh --exclude=.gitignore /opt/app/aaf_config/$D/* /opt/app/osaaf/$D
-        done
+    read)
+        echo "## Read Artifacts"
+        $JAVA_AGENT read $APP_FQI $APP_FQDN cadi_prop_files=${SSO} cadi_loglevel=INFO
         ;;
     showpass)
         echo "## Show Passwords"
-        $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar showpass ${APP_FQI} ${APP_FQDN}
+        $JAVA_AGENT showpass $APP_FQI $APP_FQDN cadi_prop_files=${SSO} cadi_loglevel=ERROR
         ;;
     check)
-        $JAVA -Dcadi_prop_files=/opt/app/osaaf/local/${NS}.props -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar check ${APP_FQI} ${APP_FQDN}
+        echo "## Check Certificate"
+        echo "$JAVA_AGENT check $APP_FQI $APP_FQDN cadi_prop_files=${LOCAL}/${NS}.props"
+        $JAVA_AGENT check $APP_FQI $APP_FQDN cadi_prop_files=${LOCAL}/${NS}.props
         ;;
     validate)
         echo "## validate requested"
-        $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar validate /opt/app/osaaf/local/${NS}.props
+        $JAVA_AGENT validate $APP_FQI $APP_FQDN
+        ;;
+    place)
+        echo "## Renew Certificate"
+        $JAVA_AGENT place $APP_FQI $APP_FQDN cadi_prop_files=${SSO}
+        ;;
+    renew)
+        echo "## Renew Certificate"
+        $JAVA_AGENT place $APP_FQI $APP_FQDN
         ;;
     bash)
-        if [ ! -e ~/.bash_aliases ]; then
-            echo "alias cadi='$JAVA -cp /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar org.onap.aaf.cadi.CmdLine \$*'" >~/.bash_aliases
-            echo "alias agent='$JAVA -cp /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar org.onap.aaf.cadi.configure.Agent \$*'" >>~/.bash_aliases
-        fi
         shift
-        cd /opt/app/osaaf/local || exit
-        /bin/bash "$@"
+        cd $LOCAL || exit
+        exec bash "$@"
         ;;
     setProp)
-        cd /opt/app/osaaf/local || exit
+        cd $LOCAL || exit
         FILES=$(grep -l "$1" ./*.props)
-	if [ "$FILES" = "" ]; then 
-  	    FILES="$3"
+	if [ -z "$FILES" ]; then 
+  	    if [ -z "$3" ]; then
+               FILES=${NS}.props
+            else 
+               FILES="$3"
+            fi
 	    ADD=Y
 	fi
         for F in $FILES; do
-            echo "Changing $1 in $F"
 	    if [ "$ADD" = "Y" ]; then
-		echo $2 >> $F
+                echo "Changing $1 to $F"
+		echo "$1=$2" >> $F
 	    else 
-                sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F
+               echo "Changing $1 in $F"
+               sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F
 	    fi
             cat $F
         done
         ;;
     encrypt)
-        cd /opt/app/osaaf/local || exit
+        cd $LOCAL || exit
 	echo $1
         FILES=$(grep -l "$1" ./*.props)
 	if [ "$FILES" = "" ]; then
-             FILES=/opt/app/osaaf/local/${NS}.cred.props
+             FILES=$LOCAL/${NS}.cred.props
 	     ADD=Y
         fi
         for F in $FILES; do
@@ -144,7 +280,7 @@ if [ ! "$CMD" = "" ]; then
             else
                 ORIG_PW="$2"
             fi
-            PWD=$("$JAVA" -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar cadi digest "$ORIG_PW" /opt/app/osaaf/local/${NS}.keyfile)
+            PWD=$($JAVA_CADI digest "$ORIG_PW" $LOCAL/${NS}.keyfile)
             if [ "$ADD" = "Y" ]; then
                   echo "$1=enc:$PWD" >> $F
             else 
@@ -156,6 +292,10 @@ if [ ! "$CMD" = "" ]; then
     taillog) 
 	sh /opt/app/osaaf/logs/taillog
 	;;
+    testConnectivity|testconnectivity)
+        echo "--- Test Connectivity ---"
+        $JAVA -cp $AGENT_JAR org.onap.aaf.cadi.aaf.TestConnectivity $LOCAL/org.osaaf.aaf.props 
+	;;
     --help | -?)
         case "$1" in
         "")
@@ -174,17 +314,26 @@ if [ ! "$CMD" = "" ]; then
             ;;
         cadi)
             echo "--- cadi Tool Comands ---"
-            $JAVA -Dcadi_prop_files=/opt/app/osaaf/local/${NS}.props -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar cadi | tail -n +6
+            $JAVA_CADI
             ;;
         agent)
             echo "--- agent Tool Comands ---"
-            $JAVA -Dcadi_prop_files=/opt/app/osaaf/local/${NS}.props -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar
+            $JAVA_AGENT
+            ;;
+        aafcli)
+            echo "--- aafcli Tool Comands ---"
+            $JAVA_AAFCLI
             ;;
         esac
         echo ""
         ;;
+    ### Possible Dublin
+    # sample)
+    #    echo "--- run Sample Servlet App ---"
+    #    $JAVA -Dcadi_prop_files=$LOCAL/${NS}.props -cp $AGENT_JAR:$CONFIG_BIN/aaf-cadi-servlet-sample-*-sample.jar org.onap.aaf.sample.cadi.jetty.JettyStandalone ${NS}.props
+    #    ;;
     *)
-        $JAVA -Dcadi_prop_files=/opt/app/osaaf/local/${NS}.props -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar "$CMD" "$@"
+        $JAVA_AGENT "$CMD" "$@"
         ;;
     esac
 fi