Updates to mask passwords

Author: arunskurian

plugin_config.yml

@@ -7,4 +7,4 @@ pluginType: STAGED
 entryPoint: plugin_runner:plugin
 srcDir: src
 schemaFile: schema.json
-buildNumber: 1.69.7
+buildNumber: 1.69.8

src/resources/restore.sh

@@ -57,35 +57,30 @@ then
    BKUP_FILE="/tmp/dump_${SOURCEPORT}.sql"
    if [[ -f "${BKUP_FILE}" ]]
    then
-      mv ${BKUP_FILE} ${BKUP_FILE}_${DT}
+      #mv ${BKUP_FILE} ${BKUP_FILE}_${DT}
+      rm ${BKUP_FILE}
    fi
 
    # 
    # Source Connection for Backup ...
    #
-   log "Source Connection: ${SOURCECONN}"
+   masklog "Source Connection: ${SOURCECONN}"
    RESULTS=$( buildConnectionString "${SOURCECONN}" "${SOURCEPASS}" "${SOURCEPORT}" "${SOURCEIP}" )
-   log "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"
+   #log "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"
    SOURCE_CONN=`echo "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"`
-   log "New Conn: ${SOURCE_CONN}"
-
+   masklog "New Conn: ${SOURCE_CONN}"
    log "Source Backup Host: ${SOURCEIP}"
 
    ###########################################################
    ## On Source Server ...
-
-   #
    # Backup ...
-   #
-   log "Starting Backup ..."
+   log "Starting Backup"
 
    if [[ "1" == "0" ]] 
    then
-
       #
       # No Replication Backup ...
       #
-
       SQL="SELECT schema_name FROM information_schema.schemata WHERE schema_name NOT IN"
       SQL="${SQL} ('mysql','information_schema','performance_schema')"
 
@@ -102,27 +97,24 @@ then
       log "${INSTALL_BIN}/mysqldump ***** ${MYSQLDUMP_OPTIONS} --databases ${DBLIST}"
       ${INSTALL_BIN}/mysqldump ${SOURCE_CONN} ${MYSQLDUMP_OPTIONS} --databases ${DBLIST} > ${BKUP_FILE}
 
-   else 
-
+   else
       #
       # Create Backup File for Replication ...
       #
-
       log "LogSync Enabled: ${LOGSYNC}"
       if [[ "${LOGSYNC}" == "true" ]]
       then 
-         log "Backup CMD: ${INSTALL_BIN}/mysqldump ${SOURCE_CONN} --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob --master-data=2 -A"
+         masklog "Backup CMD: ${INSTALL_BIN}/mysqldump ${SOURCE_CONN} --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob --master-data=2 -A"
          ##log "Backup CMD: ${INSTALL_BIN}/mysqldump ******** --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob --master-data=2 -A > ${BKUP_FILE}"
          ${INSTALL_BIN}/mysqldump ${SOURCE_CONN} --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob --master-data=2 -A  > ${BKUP_FILE}
       else 
-         log "Backup CMD: ${INSTALL_BIN}/mysqldump ${SOURCE_CONN} --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob"
+         masklog "Backup CMD: ${INSTALL_BIN}/mysqldump ${SOURCE_CONN} --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob"
          ##log "Backup CMD: ${INSTALL_BIN}/mysqldump ******** --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob > ${BKUP_FILE}"
          ${INSTALL_BIN}/mysqldump ${SOURCE_CONN} --all-databases --skip-lock-tables --single-transaction --flush-logs --hex-blob > ${BKUP_FILE}
       fi 
 
    fi
 
-   #
    # Verify Backup File Exists ...
    #
    FS=`du -s ${BKUP_FILE} 2>/dev/null`
@@ -138,8 +130,6 @@ then
    echo "Delphix Backup File: ${STAT}"
 
 else	# else if ${BACKUP_PATH} ...
-
-
    #
    # Customer Provided Backup File ...
    #
@@ -165,6 +155,7 @@ log "Environment: "
 export DLPX_LIBRARY_SOURCE=""
 export REPLICATION_PASS=""
 export STAGINGPASS=""
+export SOURCEPASS=""
 env | sort  >>$DEBUG_LOG
 log "-- End --"
 exit 0

src/resources/restore_stage.sh

@@ -358,14 +358,15 @@ fi
 # Change Password for Staging Conn ...
 #
 CMD="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY ${STAGINGPASS};UPDATE mysql.user SET authentication_string=PASSWORD(${STAGINGPASS}) where USER='root';FLUSH PRIVILEGES;\""
-masklog "Final Command to Change Password is : ${CMD}"
+CMDFORLOG="${INSTALL_BIN}/mysql ${STAGING_CONN} --connect-expired-password -se \"ALTER USER 'root'@'localhost' IDENTIFIED BY '********';UPDATE mysql.user SET authentication_string=PASSWORD('********') where USER='root';FLUSH PRIVILEGES;\""
+masklog "Final Command to Change Password is : ${CMDFORLOG}"
 
 eval ${CMD} 1>>${DEBUG_LOG} 2>&1
 
 #
 # Update Staging Connection with supplied password ...
 #
-log "Staging Connection Prior to updaging password : ${STAGINGCONN}"
+masklog "Staging Connection Prior to updaging password : ${STAGINGCONN}"
 RESULTS=$( buildConnectionString "${STAGINGCONN}" "${STAGINGPASS}" "${STAGINGPORT}" "${STAGINGHOSTIP}" )
 echo "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"
 STAGING_CONN=`echo "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"`
@@ -546,6 +547,7 @@ log "Environment: "
 export DLPX_LIBRARY_SOURCE=""
 export REPLICATION_PASS=""
 export STAGINGPASS=""
+export SOURCEPASS=""
 env | sort  >>$DEBUG_LOG
 log " <<<End"
 exit 0

src/resources/startStagedDB.sh

@@ -22,11 +22,11 @@ printParams
 
 # These passwords contain special characters so need to wrap in single / literal quotes ...
 STAGINGPASS=`echo "'"${STAGINGPASS}"'"`
-log "Staging Connection: ${STAGINGCONN}"
+masklog "Staging Connection: ${STAGINGCONN}"
 RESULTS=$( buildConnectionString "${STAGINGCONN}" "${STAGINGPASS}" "${STAGINGPORT}" )
 #log "${RESULTS}"
 STAGING_CONN=`echo "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"`
-log "Staging Connection: ${STAGING_CONN}"
+masklog "Staging Connection: ${STAGING_CONN}"
 
 #
 # Process Status ...

src/resources/stopStagedDB.sh

@@ -24,11 +24,11 @@ fi
 
 # These passwords contain special characters so need to wrap in single / literal quotes ...
 STAGINGPASS=`echo "'"${STAGINGPASS}"'"`
-log "Staging Connection: ${STAGINGCONN}"
+masklog "Staging Connection: ${STAGINGCONN}"
 RESULTS=$( buildConnectionString "${STAGINGCONN}" "${STAGINGPASS}" "${STAGINGPORT}" )
 #log "${RESULTS}"
 STAGING_CONN=`echo "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"`
-log "Staging Connection: ${STAGING_CONN}"
+masklog "Staging Connection: ${STAGING_CONN}"
 
 #
 # Get Process ...