From a003d5320c3fb7e67561ba1f381864a493a963e8 Mon Sep 17 00:00:00 2001
From: mchyzer <mchyzer@isc.upenn.edu>
Date: Mon, 11 Mar 2024 12:02:13 -0400
Subject: [PATCH] 5.8.6
---
Dockerfile | 2 +-
.../grouperWebapp/WEB-INF/classes/log4j2.xml | 20 +++++++++++++++++
container_files/usr-local-bin/libraryPrep.sh | 22 ++++++++-----------
.../usr-local-bin/librarySetupFiles.sh | 21 ++++++++++++++++++
4 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 40fe9fc..77d208b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
ARG GROUPER_CONTAINER_VERSION
ENV GROUPER_VERSION=5.8.5 \
- GROUPER_CONTAINER_VERSION=5.8.5 \
+ GROUPER_CONTAINER_VERSION=5.8.6 \
JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
diff --git a/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml b/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
index f95bdeb..891330f 100644
--- a/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
+++ b/container_files/grouperWebapp/WEB-INF/classes/log4j2.xml
@@ -111,82 +111,102 @@
<Root level="error">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Root>
<Logger name="org.apache.catalina" level="info" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_catalina" />__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_catalina"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware" level="warn" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.loader.GrouperLoaderLog" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_daemon"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_daemon"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.provisioning.GrouperProvisioningObjectLog" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_provisioning"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_provisioning"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.syncToGrouper.SyncToGrouperFromSqlDaemon" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.provisioning.GrouperProvisioningLogCommands" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.stem.StemViewPrivilegeEsbListener" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.stem.StemViewPrivilegeFullDaemonLogic" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="org.apache.tools.ant" level="warn" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.util.PerformanceLogger" level="info" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.ws.util.GrouperWsLog" level="off" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_ws"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_ws"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.ws.util.GrouperWsLongRunningLog" level="off" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_ws_longRunning"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_ws_longRunning"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.ui.customUi.CustomUiEngine" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.upenn.isc.pennGrouper.o365" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.remedy.GrouperRemedyLog" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_provisioning"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_provisioning"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.remedy.digitalMarketplace.GrouperDigitalMarketplaceLog" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_provisioning"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_provisioning"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouperBox.GrouperBoxLog" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_provisioning"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_provisioning"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouperClient.jdbc.tableSync.GcTableSyncLog" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_error"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_error"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<Logger name="edu.internet2.middleware.grouper.app.zoom" level="debug" additivity="false">
__LOGPIPESTART__<AppenderRef ref="logpipe_grouper_provisioning"/>__LOGPIPEEND__
__FILESTART__<AppenderRef ref="file_grouper_provisioning"/>__FILEEND__
+ __STDERRSTART__<AppenderRef ref="stderr"/>__STDERREND__
</Logger>
<!--MORELOGGERS-->
diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
index eb8f145..70bfee5 100644
--- a/container_files/usr-local-bin/libraryPrep.sh
+++ b/container_files/usr-local-bin/libraryPrep.sh
@@ -207,12 +207,12 @@ prep_finishBegin() {
# default the cert path to self signed and no chain file
if [ -z "$GROUPER_SSL_CERT_FILE" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_CERT_FILE=/opt/grouper/certs/client/localhost.pem"
- export GROUPER_SSL_CERT_FILE=/opt/grouper/certs/client/localhost.pem
+ echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_CERT_FILE=/opt/container_files/certs/client/localhost.pem"
+ export GROUPER_SSL_CERT_FILE=/opt/container_files/certs/client/localhost.pem
fi
if [ -z "$GROUPER_SSL_KEY_FILE" ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_KEY_FILE=/opt/grouper/certs/keys/localhost.key"
- export GROUPER_SSL_KEY_FILE=/opt/grouper/certs/keys/localhost.key
+ echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_KEY_FILE=/opt/container_files/certs/keys/localhost.key"
+ export GROUPER_SSL_KEY_FILE=/opt/container_files/certs/keys/localhost.key
fi
if [ -z "$GROUPER_SSL_CHAIN_FILE" ] && [ -z "$GROUPER_SSL_USE_CHAIN_FILE" ] ; then
echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_USE_CHAIN_FILE=false"
@@ -220,15 +220,6 @@ prep_finishBegin() {
fi
fi
- # default the cert path
- if [ -z "$GROUPER_SSL_CERT_FILE" ] && [ -f /etc/pki/tls/certs/host-cert.pem ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_CERT_FILE=/etc/pki/tls/certs/host-cert.pem"
- export GROUPER_SSL_CERT_FILE=/etc/pki/tls/certs/host-cert.pem
- fi
- if [ -z "$GROUPER_SSL_KEY_FILE" ] && [ -f /etc/pki/tls/private/host-key.pem ] ; then
- echo "grouperContainer; INFO: (libraryPrep.sh-prep_finishBegin) export GROUPER_SSL_KEY_FILE=/etc/pki/tls/private/host-key.pem"
- export GROUPER_SSL_KEY_FILE=/etc/pki/tls/private/host-key.pem
- fi
if [ -z "$GROUPER_SSL_CHAIN_FILE" ] ; then
if [ -f /etc/pki/tls/certs/cachain.pem ]; then
@@ -353,6 +344,11 @@ prep_finishBegin() {
echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_LOG_TO_HOST=false"
export GROUPER_LOG_TO_HOST=false
fi
+ if [ -z "$GROUPER_LOG_TO_STDERR" ] ; then
+ echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_analyzeOriginalFiles) export GROUPER_LOG_TO_STDERR=true"
+ export GROUPER_LOG_TO_STDERR=true
+ fi
+
}
diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
index 2ed9ac6..b066f5b 100644
--- a/container_files/usr-local-bin/librarySetupFiles.sh
+++ b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -79,6 +79,27 @@ setupFiles_localLogging() {
if [ $returnCode != 0 ]; then exit $returnCode; fi
fi
+ if [ "$GROUPER_LOG_TO_STDERR" = "true" ]; then
+ sed -i "s|__STDERRSTART__||g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+ returnCode=$?
+ echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|__STDERRSTART__||g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $?"
+ if [ $returnCode != 0 ]; then exit $returnCode; fi
+
+ sed -i "s|__STDERREND__||g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+ returnCode=$?
+ echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|__STDERREND__||g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $?"
+ if [ $returnCode != 0 ]; then exit $returnCode; fi
+ else
+ sed -i "s|__STDERRSTART__|<!--|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+ returnCode=$?
+ echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|__STDERRSTART__|<!--|g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $?"
+ if [ $returnCode != 0 ]; then exit $returnCode; fi
+
+ sed -i "s|__STDERREND__|-->|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+ returnCode=$?
+ echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|__STDERREND__|-->|g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $?"
+ if [ $returnCode != 0 ]; then exit $returnCode; fi
+ fi
if [ "$GROUPER_LOG_TO_HOST" = "true" ]; then
sed -i "s|__FILESTART__||g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
returnCode=$?