Skip to content

Replace Azure Active Directory with Microsoft Entra ID. #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Replace Azure Active Directory with Microsoft Entra ID. #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...m-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
exit 1
fi

# For SSL enabled causes AAD failure #225
# For SSL enabled causes Entra ID failure #225
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225

echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "

sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore $customSSLTrustKeyStoreFile -storepass $customTrustKeyStorePassPhrase -alias aadtrust -file ${addsCertificate} -storetype $customTrustKeyStoreType
else
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
fi
}

Expand Down
8 changes: 4 additions & 4 deletions weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ function importAADCertificate()
# import the key to java security
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh

# For AAD failure: exception happens when importing certificate to JDK 11.0.7
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
# JRE was removed since JDK 11.
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
Expand Down Expand Up @@ -305,14 +305,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
exit 1
fi

# For SSL enabled causes AAD failure #225
# For SSL enabled causes Entra ID failure #225
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225

echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "

sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
else
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
fi
}

Expand Down
8 changes: 4 additions & 4 deletions weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ function importAADCertificate()
{
# import the key to java security
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
# JRE was removed since JDK 11.
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
Expand Down Expand Up @@ -658,14 +658,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
exit 1
fi

# For SSL enabled causes AAD failure #225
# For SSL enabled causes Entra ID failure #225
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225

echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "

sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore {KEYSTORE_PATH}/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
else
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
fi
}

Expand Down
12 changes: 6 additions & 6 deletions ...rm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2021, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# Description
# This script is to configure AAD for WebLogic cluster domain.
# This script is to configure Entra ID for WebLogic cluster domain.


#Function to output message to StdErr
Expand Down Expand Up @@ -304,7 +304,7 @@ function importAADCertificate()
{
# import the key to java security
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
# JRE was removed since JDK 11.
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
Expand Down Expand Up @@ -341,14 +341,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
exit 1
fi

# For SSL enabled causes AAD failure #225
# For SSL enabled causes Entra ID failure #225
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225

echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "

sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
else
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
fi
}

Expand Down Expand Up @@ -414,7 +414,7 @@ EOF
java $WLST_ARGS weblogic.WLST ${SCRIPT_PWD}/restart-managedServer.py

if [[ $? != 0 ]]; then
echo "Error : Fail to restart managed server to sync up aad configuration."
echo "Error : Fail to restart managed server to sync up Entra ID configuration."
exit 1
fi
}
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2021, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# Description
# This script is to generate test parameters for AAD and appgeateway testing.
# This script is to generate test parameters for Entra ID and appgeateway testing.

#read arguments from stdin
read parametersPath repoPath testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2021, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# Description
# This script is to generate test parameters for AAD testing.
# This script is to generate test parameters for Entra ID testing.

#read arguments from stdin
read parametersPath repoPath testbranchName
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2021, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# Description
# This script is to generate test parameters for database datasource, AAD and Appgateway testing.
# This script is to generate test parameters for database datasource, Entra ID and Appgateway testing.

#read arguments from stdin
read parametersPath repoPath testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2021, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
# Description
# This script is to generate test parameters for database datasource and AAD testing.
# This script is to generate test parameters for database datasource and Entra ID testing.

#read arguments from stdin
read parametersPath repoPath testbranchName
Expand Down
8 changes: 4 additions & 4 deletions ...m/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ function importAADCertificate()
{
# import the key to java security
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
# JRE was removed since JDK 11.
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
Expand Down Expand Up @@ -558,14 +558,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
exit 1
fi

# For SSL enabled causes AAD failure #225
# For SSL enabled causes Entra ID failure #225
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225

echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "

sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore {KEYSTORE_PATH}/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
else
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
fi
}

Expand Down
8 changes: 4 additions & 4 deletions ...ls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ function importAADCertificate()
{
# import the key to java security
. $oracleHome/oracle_common/common/bin/setWlstEnv.sh
# For AAD failure: exception happens when importing certificate to JDK 11.0.7
# For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
# JRE was removed since JDK 11.
java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
Expand Down Expand Up @@ -345,14 +345,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
exit 1
fi

# For SSL enabled causes AAD failure #225
# For SSL enabled causes Entra ID failure #225
# ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225

echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "

sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
else
echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
fi
}

Expand Down