From 0d08765e049a40c711ff4ae49bc50b75119b8ecd Mon Sep 17 00:00:00 2001
From: Chris Hyzer <mchyzer@isc.upenn.edu>
Date: Wed, 10 Aug 2022 15:51:16 -0400
Subject: [PATCH] 2.6.14

---
 Dockerfile                                    |   8 +-
 container_files/index.jsp                     | 126 ------------------
 .../usr-local-bin/librarySetupFiles.sh        |  24 ++--
 3 files changed, 14 insertions(+), 144 deletions(-)
 delete mode 100644 container_files/index.jsp
diff --git a/Dockerfile b/Dockerfile
index e51a1de9..d1a03c69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN yum update -y \
 RUN yum install -y wget tar unzip dos2unix patch
     
 ARG GROUPER_CONTAINER_VERSION
-ENV GROUPER_VERSION=2.6.13 \
+ENV GROUPER_VERSION=2.6.14 \
      GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
 
 # Install Corretto Java JDK
@@ -32,7 +32,7 @@ RUN echo 'Installing Grouper'; \
     cd /opt/grouper/$GROUPER_VERSION/ \
     && $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller
 FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.6.13 \
+ENV GROUPER_VERSION=2.6.14 \
     TOMEE_VERSION=7.0.0
 RUN mkdir -p /opt/grouper/grouperWebapp/
 RUN mkdir -p /opt/tomee/
@@ -101,8 +101,8 @@ COPY container_files/tier-support/log4j_fix/tomeeLib/slf4j-* /opt/tomee/lib/
 RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*
 COPY container_files/tier-support/log4j_fix/webinfLib/* /opt/grouper/grouperWebapp/WEB-INF/lib/
 COPY container_files/certs/* /opt/grouper/certs/
-RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/index.jsp
-COPY container_files/index.jsp /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/
+#RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/index.jsp
+#COPY container_files/index.jsp /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/
 
 # this is to improve openshift
 RUN touch /opt/grouper/grouperEnv.sh \
diff --git a/container_files/index.jsp b/container_files/index.jsp
deleted file mode 100644
index 091046a3..00000000
--- a/container_files/index.jsp
+++ /dev/null
@@ -1,126 +0,0 @@
-<%@ include file="../assetsJsp/commonTaglib.jsp"%>
-
-<!DOCTYPE html>
-<html>
-  <!-- start index.jsp -->
-  <head><title>${textContainer.text['guiTitle']}</title>
-  <%@ include file="../assetsJsp/commonHead.jsp"%>
-  </head>
-  <body class="full claro">
-    <noscript>
-      <h3 style="color: #990000">${textContainer.text['indexNoJavascript'] }</h3>    
-    </noscript>
-    <div class="top-container" id="theTopContainer">
-      <div class="navbar navbar-static-top">
-        <div class="navbar-inner">
-          <div class="container-fluid"><a href="#" onclick="return guiV2link('operation=UiV2Main.indexMain');"><img class="brand" src="../../${mediaMap['image.organisation-logo']}" alt="Logo" /></a>
-            <div class="pull-right">
-
-              <form id="searchForm" action="#" onsubmit="return guiV2link('operation=UiV2Main.searchSubmit', {optionalFormElementNamesToSend: 'searchQuery2'});" class="navbar-search">
-                <input type="text" name="searchQuery2" placeholder="${textContainer.textEscapeXml['searchPlaceholder']}" class="search-query"><a href="#" 
-                  onclick="return guiV2link('operation=UiV2Main.searchSubmit', {optionalFormElementNamesToSend: 'searchQuery2'});" aria-label="${textContainer.text['ariaLabelGuiSearch']}"><i class="fa fa-search"></i></a>
-              </form>
-
-              <%-- GRP-2677: Have searchQuery submit query by URL (this is the POST option)
-              <form id="searchForm" action="#" onsubmit="guiV2link('operation=UiV2Main.searchSubmit&mil=' + Date.now());return false;" class="navbar-search">
-                <input type="text" name="searchQueryTop" id="searchQueryTopId" placeholder="${textContainer.textEscapeXml['searchPlaceholder']}" class="search-query"><a href="#" 
-                  onclick="guiV2link('operation=UiV2Main.searchSubmit&mil=' + Date.now());return false;" aria-label="${textContainer.text['ariaLabelGuiSearch']}"><i class="fa fa-search"></i></a>
-              </form>
-              --%>
-            </div>
-            <div class="navbar-text pull-right">${textContainer.text['indexLoggedInAs'] } 
-              ${guiSettings.loggedInSubject.shortLink} 
-              <c:if test="${mediaMap['logout.link.show']=='true'}">
-                &middot; 
-                <a href="#"
-                      onclick="return guiV2link('operation=Logout.logout');" class="navbar-link">${textContainer.text['indexLogoutLink']}</a>
-              </c:if>
-              &middot; <a href="#"
-                      onclick="return guiV2link('operation=UiV2Main.help');">${textContainer.text['grouper.help'] }</a>
-             </div>
-          </div>
-        </div>
-      </div>
-      <div class="container-fluid">
-        <div id="messaging" class="row-fluid">
-          <%-- this is where messages go --%>
-        </div>
-        <div class="row-fluid">
-          
-          <div class="span3 left-column">
-            <div class="btn-group btn-group-create"><a href="#" 
-              onclick="return guiV2link('operation=UiV2Group.newGroup', {optionalFormElementNamesToSend: 'objectStemId'});"
-              class="btn btn-bigger btn-create" role="button"><i class="fa fa-plus"></i> ${textContainer.text['groupNewCreateNewGroupMenuButton'] }</a>
-              <a data-toggle="dropdown" aria-label="${textContainer.text['ariaLabelGuiMoreOptions']}" class="btn btn-bigger btn-create dropdown-toggle" 
-                aria-haspopup="true" aria-expanded="false" role="menu" onclick="$('#main-more-options').is(':visible') === true ? $(this).attr('aria-expanded','false') : $(this).attr('aria-expanded',function(index, currentValue) { $('#main-more-options li').first().focus();return true;});">
-                <span class="caret"></span>
-              </a>
-              <ul class="dropdown-menu dropdown-menu-right" id="main-more-options">
-                <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2Stem.newStem', {optionalFormElementNamesToSend: 'objectStemId'});">${textContainer.text['stemNewCreateNewStemMenuButton'] }</a></li>
-                <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2Group.newGroup', {optionalFormElementNamesToSend: 'objectStemId'});">${textContainer.text['groupNewCreateNewGroupMenuButton'] }</a></li>
-                <li class="divider"></li>
-                <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2GroupImport.groupImport', {optionalFormElementNamesToSend: 'groupId'});">${textContainer.text['groupImportAddMembersToGroupMenuLink'] }</a></li>
-              </ul>
-            </div>
-            <div class="leftnav-accordions">
-              <button type="button" data-toggle="collapse" data-target="#demo2" class="btn btn-block btn-grouper first" aria-expanded="true" role="menu" ariahaspopup="true" 
-                onclick="$('#demo2').hasClass('in') ? $(this).attr('aria-expanded','false') : $(this).attr('aria-expanded','true');">
-                ${textContainer.text['indexQuickLinksLabel']}
-                <i class="fa fa-plus"></i><i class="fa fa-minus"></i>
-              </button>
-              <div id="demo2" class="collapse in">
-                <div class="accordion-inner">
-                  <ul class="nav nav-list" id="quicklinks-nav">
-                    <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2MyGroups.myGroups');">${textContainer.text['indexMyGroupsButton'] }</a></li>
-                    <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2MyStems.myStems');">${textContainer.text['indexMyStemsButton'] }</a></li>
-                    <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2Main.myFavorites');">${textContainer.text['indexMyFavoritesButton'] }</a></li>
-                    <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2Main.myServices');">${textContainer.text['indexMyServicesButton'] }</a></li>
-                    <li><a href="#" 
-                  onclick="return guiV2link('operation=UiV2Main.myActivity');">${textContainer.text['indexMyActivityButton'] }</a></li>
-                    <li><a href="#" 
-                      onclick="return guiV2link('operation=UiV2Main.miscellaneous');">${textContainer.text['indexMiscellaneousButton'] }</a></li>
-                  </ul>
-                </div>
-              </div>
-              <div class="btn btn-block btn-grouper last" style="cursor: default;">${textContainer.text['indexBrowseFolders'] }
-              <i class="fa fa-exchange" style="cursor: pointer;" aria-label="${textContainer.text['ariaLabelGuiRefreshFolderBrowse'] }"
-                onclick="dojoInitMenu(true)"
-              ></i></div>
-              <div class="accordion-inner">
-                <script>
-                  $(document).ready(function(){
-                    dojoInitMenu();
-                  });
-                </script>
-                <div id="folderTreeContainerId">
-                  <div id="folderTree"></div>
-                </div>
-              </div>
-            </div>
-          </div>
-          
-          <div class="span9 main-content offset3">
-            <!-- this is the main content div where the page content goes via ajax -->
-            <div id="grouperMainContentDivId">
-            </div>
-            <!-- end of the main content div where the page content goes -->
-          </div>
-          
-        </div>
-        <hr>
-        <footer>
-          <p>&copy; ${textContainer.text['institutionName'] }</p>
-        </footer>
-      </div>
-    </div>
-    <%@ include file="../assetsJsp/commonBottom.jsp"%>
-  </body>
-  <!-- end index.jsp -->
-</html>
diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
index 1b24f58d..dd743c0f 100644
--- a/container_files/usr-local-bin/librarySetupFiles.sh
+++ b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -48,23 +48,19 @@ setupFiles_localLogging() {
     echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|__LOGPIPE__||g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $?"
   fi
   
-  if [ -f /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt ]; then
-    additionalLoggersFile=`cat /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt`
-    # replace quote, but then double escape the result for some reason.  this replaces quote with slash quote
-    additionalLoggersFile="$(sed s/\"/\\\\\\\"/g <<<$additionalLoggersFile)"
-    sed -i "s|<!--MORELOGGERS-->|$additionalLoggersFile|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+  additionalLoggersFile=/opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalLoggers.xml.txt
+  if [ -f $additionalLoggersFile ]; then
+    sed -i "/<!--MORELOGGERS-->/r $additionalLoggersFile" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
     returnCode=$?
-    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|<!--MORELOGGERS-->|$additionalLoggersFile|g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
+    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i '/<!--MORELOGGERS-->/r $additionalLoggersFile' /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
     if [ $returnCode != 0 ]; then exit $returnCode; fi
   fi
 
-  if [ -f /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt ]; then
-    additionalAppendersFile=`cat /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt`
-    # replace quote, but then double escape the result for some reason.  this replaces quote with slash quote
-    additionalAppendersFile="$(sed s/\"/\\\\\\\"/g <<<$additionalAppendersFile)"
-    sed -i "s|<!--MOREAPPENDERS-->|$additionalAppendersFile|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
+  additionalAppendersFile=/opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.additionalAppenders.xml.txt
+  if [ -f $additionalAppendersFile ]; then
+    sed -i "/<!--MOREAPPENDERS-->/r $additionalAppendersFile" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml
     returnCode=$?
-    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i \"s|<!--MOREAPPENDERS-->|$additionalAppendersFile|g\" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
+    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) sed -i '/<!--MOREAPPENDERS-->/r $additionalAppendersFile' /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml, result: $returnCode"
     if [ $returnCode != 0 ]; then exit $returnCode; fi
   fi
 
@@ -82,9 +78,9 @@ setupFiles_chownDirs() {
     # do this last
     if [ "$GROUPER_CHOWN_DIRS" = "true" ]
       then
-        chown -R tomcat:tomcat /opt/grouper/grouperWebapp /opt/tomee
+        chown tomcat:tomcat $(find /opt/grouper/grouperWebapp /opt/tomee ! -user tomcat -o -group tomcat -print)
         returnCode=$?
-        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat /opt/grouper/grouperWebapp /opt/tomee, result: $returnCode"
+        echo “grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat inside find /opt/grouper/grouperWebapp /opt/tomee, result: $returnCode”
         # dont fail on chown
         #if [ $returnCode != 0 ]; then exit $returnCode; fi
     fi
