Skip to content

Commit 532df30

Browse files
rjeberhardrjeberhard
authored
Merge pull request #3 from sanjaymantoor/main
Updated shell scripts as per security review comments
2 parents 1e9b53e + 3da4080 commit 532df30

File tree

13 files changed

+219
-219
lines changed

13 files changed

+219
-219
lines changed

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ function parseLDAPCertificate()
215215
done
216216

217217
openssl base64 -d -in ${SCRIPT_PWD}/security/AzureADLDAPCerBase64String.txt -out ${SCRIPT_PWD}/security/AzureADTrust.cer
218-
export addsCertificate=${SCRIPT_PWD}/security/AzureADTrust.cer
218+
addsCertificate=${SCRIPT_PWD}/security/AzureADTrust.cer
219219
}
220220

221221
function importAADCertificate()
@@ -311,7 +311,7 @@ function wait_for_admin()
311311
{
312312
#check admin server status
313313
count=1
314-
export CHECK_URL="http://$wlsAdminURL/weblogic/ready"
314+
CHECK_URL="http://$wlsAdminURL/weblogic/ready"
315315
status=`curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}`
316316
echo "Check admin server status"
317317
while [[ "$status" != "200" ]]
@@ -361,57 +361,57 @@ fi
361361

362362
function createTempFolder()
363363
{
364-
export SCRIPT_PATH="/u01/tmp"
364+
SCRIPT_PATH="/u01/tmp"
365365
sudo rm -f -r ${SCRIPT_PATH}
366366
sudo mkdir ${SCRIPT_PATH}
367367
sudo rm -rf $SCRIPT_PATH/*
368368
}
369369

370-
export LDAP_USER_NAME='sAMAccountName'
371-
export LDAP_USER_FROM_NAME_FILTER='(&(sAMAccountName=%u)(objectclass=user))'
372-
export JAVA_OPTIONS_TLS_V12="-Djdk.tls.client.protocols=TLSv1.2"
373-
export STRING_ENABLE_TLSV12="Append -Djdk.tls.client.protocols to JAVA_OPTIONS in jdk8"
374-
export SCRIPT_PWD=`pwd`
375-
export USER_ORACLE="oracle"
376-
export GROUP_ORACLE="oracle"
377-
export DOMAIN_PATH="/u01/domains"
370+
LDAP_USER_NAME='sAMAccountName'
371+
LDAP_USER_FROM_NAME_FILTER='(&(sAMAccountName=%u)(objectclass=user))'
372+
JAVA_OPTIONS_TLS_V12="-Djdk.tls.client.protocols=TLSv1.2"
373+
STRING_ENABLE_TLSV12="Append -Djdk.tls.client.protocols to JAVA_OPTIONS in jdk8"
374+
SCRIPT_PWD=`pwd`
375+
USER_ORACLE="oracle"
376+
GROUP_ORACLE="oracle"
377+
DOMAIN_PATH="/u01/domains"
378378

379379
if [ $# -ne 20 ]
380380
then
381381
usage
382382
exit 1
383383
fi
384384

385-
export wlsUserName=$1
386-
export wlsPassword=$2
387-
export wlsDomainName=$3
388-
export adProviderName=$4
389-
export adServerHost=$5
390-
export adServerPort=$6
391-
export adPrincipal=$7
392-
export adPassword=$8
393-
export adGroupBaseDN=$9
394-
export adUserBaseDN=${10}
395-
export oracleHome=${11}
396-
export wlsAdminHost=${12}
397-
export wlsAdminPort=${13}
398-
export wlsADSSLCer="${14}"
399-
export wlsLDAPPublicIP="${15}"
400-
export wlsAdminServerName=${16}
401-
export wlsDomainPath=${17}
402-
export isCustomSSLEnabled=${18}
403-
export customTrustKeyStorePassPhrase="${19}"
404-
export customTrustKeyStoreType="${20}"
405-
406-
export isCustomSSLEnabled="${isCustomSSLEnabled,,}"
385+
wlsUserName=$1
386+
wlsPassword=$2
387+
wlsDomainName=$3
388+
adProviderName=$4
389+
adServerHost=$5
390+
adServerPort=$6
391+
adPrincipal=$7
392+
adPassword=$8
393+
adGroupBaseDN=$9
394+
adUserBaseDN=${10}
395+
oracleHome=${11}
396+
wlsAdminHost=${12}
397+
wlsAdminPort=${13}
398+
wlsADSSLCer="${14}"
399+
wlsLDAPPublicIP="${15}"
400+
wlsAdminServerName=${16}
401+
wlsDomainPath=${17}
402+
isCustomSSLEnabled=${18}
403+
customTrustKeyStorePassPhrase="${19}"
404+
customTrustKeyStoreType="${20}"
405+
406+
isCustomSSLEnabled="${isCustomSSLEnabled,,}"
407407

408408
if [ "${isCustomSSLEnabled,,}" == "true" ];
409409
then
410410
customTrustKeyStorePassPhrase=$(echo "$customTrustKeyStorePassPhrase" | base64 --decode)
411411
customTrustKeyStoreType=$(echo "$customTrustKeyStoreType" | base64 --decode)
412412
fi
413413

414-
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
414+
wlsAdminURL=$wlsAdminHost:$wlsAdminPort
415415

416416
validateInput
417417
createTempFolder

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-oracle.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
# Description
66
# This script configures datasource on WebLogic Server Domain for Oracle database.
77

8-
export oracleHome=$1
9-
export wlsAdminHost=$2
10-
export wlsAdminPort=$3
11-
export wlsUserName=$4
12-
export wlsPassword=$5
13-
export jdbcDataSourceName=$6
14-
export dsConnectionURL=$7
15-
export dsUser=$8
16-
export dsPassword=$9
17-
export wlsClusterName=${10-cluster1}
18-
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
19-
export hostName=`hostname`
8+
oracleHome=$1
9+
wlsAdminHost=$2
10+
wlsAdminPort=$3
11+
wlsUserName=$4
12+
wlsPassword=$5
13+
jdbcDataSourceName=$6
14+
dsConnectionURL=$7
15+
dsUser=$8
16+
dsPassword=$9
17+
wlsClusterName=${10-cluster1}
18+
wlsAdminURL=$wlsAdminHost:$wlsAdminPort
19+
hostName=`hostname`
2020

2121
#Function to output message to StdErr
2222
function echo_stderr ()
@@ -142,7 +142,7 @@ EOF
142142

143143
function createTempFolder()
144144
{
145-
export scriptPath="/u01/tmp"
145+
scriptPath="/u01/tmp"
146146
sudo rm -f -r ${scriptPath}
147147
sudo mkdir ${scriptPath}
148148
sudo rm -rf $scriptPath/*

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-postgresql.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
# Description
66
# This script configures datasource on WebLogic Server Domain for PostgreSQL database.
77

8-
export oracleHome=$1
9-
export wlsAdminHost=$2
10-
export wlsAdminPort=$3
11-
export wlsUserName=$4
12-
export wlsPassword=$5
13-
export jdbcDataSourceName=$6
14-
export dsConnectionURL=$7
15-
export dsUser=$8
16-
export dsPassword=$9
17-
export wlsClusterName=${10-cluster1}
18-
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
19-
export hostName=`hostname`
8+
oracleHome=$1
9+
wlsAdminHost=$2
10+
wlsAdminPort=$3
11+
wlsUserName=$4
12+
wlsPassword=$5
13+
jdbcDataSourceName=$6
14+
dsConnectionURL=$7
15+
dsUser=$8
16+
dsPassword=$9
17+
wlsClusterName=${10-cluster1}
18+
wlsAdminURL=$wlsAdminHost:$wlsAdminPort
19+
hostName=`hostname`
2020

2121
#Function to output message to StdErr
2222
function echo_stderr ()
@@ -142,7 +142,7 @@ EOF
142142

143143
function createTempFolder()
144144
{
145-
export scriptPath="/u01/tmp"
145+
scriptPath="/u01/tmp"
146146
sudo rm -f -r ${scriptPath}
147147
sudo mkdir ${scriptPath}
148148
sudo rm -rf $scriptPath/*

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-sqlserver.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
# Description
66
# This script configures datasource on WebLogic Server Domain for SQL Server database.
77

8-
export oracleHome=$1
9-
export wlsAdminHost=$2
10-
export wlsAdminPort=$3
11-
export wlsUserName=$4
12-
export wlsPassword=$5
13-
export jdbcDataSourceName=$6
14-
export dsConnectionURL=$7
15-
export dsUser=$8
16-
export dsPassword=$9
17-
export wlsClusterName=${10-cluster1}
18-
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
19-
export hostName=`hostname`
8+
oracleHome=$1
9+
wlsAdminHost=$2
10+
wlsAdminPort=$3
11+
wlsUserName=$4
12+
wlsPassword=$5
13+
jdbcDataSourceName=$6
14+
dsConnectionURL=$7
15+
dsUser=$8
16+
dsPassword=$9
17+
wlsClusterName=${10-cluster1}
18+
wlsAdminURL=$wlsAdminHost:$wlsAdminPort
19+
hostName=`hostname`
2020

2121
#Function to output message to StdErr
2222
function echo_stderr ()
@@ -142,7 +142,7 @@ EOF
142142

143143
function createTempFolder()
144144
{
145-
export scriptPath="/u01/tmp"
145+
scriptPath="/u01/tmp"
146146
sudo rm -f -r ${scriptPath}
147147
sudo mkdir ${scriptPath}
148148
sudo rm -rf $scriptPath/*

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/elkIntegration.sh‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
# Description
66
# This script configures ELK (Elasticsearch, Logstash and Kibana) Stack on WebLogic Server Domain.
77

8-
export oracleHome=$1
9-
export wlsAdminHost=$2
10-
export wlsAdminPort=$3
11-
export wlsUserName=$4
12-
export wlsPassword=$5
13-
export wlsAdminServerName=$6
14-
export elasticURI=$7
15-
export elasticUserName=$8
16-
export elasticPassword=$9
17-
export wlsDomainName=${10}
18-
export wlsDomainPath=${11}
19-
export logsToIntegrate=${12}
20-
export logIndex=${13}
21-
22-
export hostName=`hostname`
23-
export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
24-
export userOracle="oracle"
25-
export groupOracle="oracle"
8+
oracleHome=$1
9+
wlsAdminHost=$2
10+
wlsAdminPort=$3
11+
wlsUserName=$4
12+
wlsPassword=$5
13+
wlsAdminServerName=$6
14+
elasticURI=$7
15+
elasticUserName=$8
16+
elasticPassword=$9
17+
wlsDomainName=${10}
18+
wlsDomainPath=${11}
19+
logsToIntegrate=${12}
20+
logIndex=${13}
21+
22+
hostName=`hostname`
23+
wlsAdminURL=$wlsAdminHost:$wlsAdminPort
24+
userOracle="oracle"
25+
groupOracle="oracle"
2626

2727
#Function to output message to StdErr
2828
function echo_stderr ()
@@ -567,7 +567,7 @@ function wait_for_admin()
567567
{
568568
#check admin server status
569569
count=1
570-
export CHECK_URL="http://$wlsAdminURL/weblogic/ready"
570+
CHECK_URL="http://$wlsAdminURL/weblogic/ready"
571571
status=`curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}`
572572
echo "Check admin server status"
573573
while [[ "$status" != "200" ]]
@@ -594,7 +594,7 @@ function wait_for_admin()
594594
function shutdown_admin() {
595595
#check admin server status
596596
count=1
597-
export CHECK_URL="http://$wlsAdminURL/weblogic/ready"
597+
CHECK_URL="http://$wlsAdminURL/weblogic/ready"
598598
status=$(curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'})
599599
echo "Check admin server status"
600600
while [[ "$status" == "200" ]]; do
@@ -624,7 +624,7 @@ function cleanup()
624624

625625
function create_temp_folder()
626626
{
627-
export SCRIPT_PATH="/u01/tmp"
627+
SCRIPT_PATH="/u01/tmp"
628628
sudo rm -f -r ${SCRIPT_PATH}
629629
sudo mkdir ${SCRIPT_PATH}
630630
sudo rm -rf $SCRIPT_PATH/*
@@ -665,7 +665,7 @@ function validate_elastic_server()
665665
done
666666
}
667667

668-
export SCRIPT_PWD=`pwd`
668+
SCRIPT_PWD=`pwd`
669669

670670
if [ $# -ne 13 ]
671671
then

0 commit comments

Comments
 (0)