From c795cadc3cec522e549db9345bb89e1189cd7877 Mon Sep 17 00:00:00 2001 From: mchyzer Date: Tue, 25 Jun 2024 10:51:35 -0400 Subject: [PATCH] 5.10.2 --- container_files/tomcat/lib/someOtherValve.jar | Bin 0 -> 2213 bytes container_files/usr-local-bin/libraryPrep.sh | 4 ++ .../usr-local-bin/librarySetupFilesTomcat.sh | 43 +++++++++++++++--- 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 container_files/tomcat/lib/someOtherValve.jar diff --git a/container_files/tomcat/lib/someOtherValve.jar b/container_files/tomcat/lib/someOtherValve.jar new file mode 100644 index 0000000000000000000000000000000000000000..9b736a3a2097ac2e4f55a4ba54a88b4c7454b60d GIT binary patch literal 2213 zcmZ{mdpHwpAIB%>%@P)KN>7eW4mH}4Q&LVt6p0RGa;$BZkd%sYR`x8lO)4gG$oW(# z9b`ieImE(P=4{BeLJ#ltzCHC^@AJE^`?~M@x_;m9{r&y*xt;9=g&+ViF)=`HTHi6i zFC`8T0-&sqSnAk19@JZF0RRL6&i0~W8y%be+vfbQV#s>OPch2U(e|LV>k(bl!9^6E z=3uX*+X1%Mfwj@w%Utxk;lnJPt{rNZEvn-}zL5Aaw)|^F5)|golT+6i&xRq#<+hH= zsS^PogBEZcoWOrl%v2I62iD)PUSEHwp!{QmjTEluL(oome>Bd`J2(ujdnVXBG&I?b zAF6m(KHAJqIGDFN39^en&Xhr{}Fhugmv&{YfW} z%*LKqf%cAzf<)6PFIAe2lecL)EG2}NFjsv~ijO}Lxi(=^8Uat4dEeFYnb*%xAaiuK z`P%^TUWR8|lUTkBZ#*I30ijxmx7n!e#Y&A;hdiSpW=F}1)Am;w4{%;n@~+D2&t&Qh zvW1oliIj!ad-Ux$oo)TAViWHQhwcO>$$lA0X zjO1t)(Qo+Vpk~@UHlTb2S50Wq{Q{(dxdE|bxBuavN*KYL9ZFr85?rDc6t%vn?f5u>= zZpDA8>bY8ZtiHvw3RpgJJ4I7IMcc16-8d7t;B~i!n+nZnL?3SpvYb@t*3nj*Y*}Gm zTf!d^zEM01%oSEXKyHRvyMw)~P!{71E{aCYXJ{YI(-4OqQk!#9fXZsoj4dT6MThKEu5;{{94?PmL4Ge0j)lAB{bjCu@+H9+NsUI+<_t zz-D3UWLMno9JY*zS-g{>_M7S;K9FNVEVIv$=pv*wYMJZJJAd{Ysmz}+HV-0o?Lh@o z&pNb|LI(pQ6YB04P-&nE93!89Q^!OZ@=X;RCHtUvzGmwMY%EUjR3nIm}L5s_n45ea-+qapi^au|R(Iu7_5Q=*D8T9^(ZW1mTk%LQS zX@$G`^S~x^)H_)tRnId>pcirO{lRvQjKbznVq`78Ai7lP@N#GJK6Qpt&{fTeY}qi` z$}?^{Pa4GBqjq4st7#ZNzU9=7|KwB5@($>K*=vZn{AD z+KkA@R+S*?t}zze?x8D z>S@7KCf!vx?s{hJ>6G>z6CQk5LXmRX)26(OM~RvX9v4K5irn_m9E{E75$YUT)H=h7 zJFnbcq*bdVvfrkbNFtu86mu?rMJx@6EHPD(*RDuynj02a5tRf|+OySC;y07GT*A6! zW9^j2rf#Ng??^3xHa=$V+XiyxJl}sE3OxMKt(T)53n{8koa<=2r8WGWCoqH1;#)o6 ze?v)@!jp0@>?UWSilwct^AORm;K^nyGUhD1+>Z^9D$K2tDu0k0+@aSmLSs%1-?jNr zgt69jHe1$Zqy%hHh%Ov41e+M*g?}JOpkekXvw^K<)tebI!S2ZUmZ4B{A;k^9h%l1{vVm0?S||g' /opt/tomcat/conf/server.xml + returnCode=$? + echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authnValve) Apply valve: sed -i 's|||g' /opt/tomcat/conf/server.xml, result: $returnCode" + if [ $returnCode != 0 ]; then exit $returnCode; fi + + else + echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authnValve) Not setting up authn valve SomeOtherValve is in /opt/tomcat/conf/server.xml" + fi + + else + echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authnValve) Not setting up authn valve since this file does not exist: /opt/tomcat/lib/someOtherValve.jar" + fi + + else + echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authnValve) Not setting up authn valve since GROUPER_SETUP_AUTHN_VALVE is not true" + fi +} + setupFilesTomcat_rewriteValve() { - if [ "$GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER" ] ; then + if [ "$GROUPER_REDIRECT_FROM_SLASH_TO_GROUPER" = "true" ] ; then if [ "$GROUPER_UI" = "true" ]; then if [ ! -f /opt/tomcat/conf/Catalina/localhost/rewrite.config ] ; then mv /opt/tomcat/conf/Catalina/localhost/rewrite.config.grouper /opt/tomcat/conf/Catalina/localhost/rewrite.config @@ -321,11 +348,13 @@ setupFilesTomcat_ports() { fi if [ "$GROUPER_TOMCAT_MAX_HEADER_COUNT" != "-1" ]; then - # add in maxHeaderCount since new chrome sends too many headers - sed -i "s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g" /opt/tomcat/conf/server.xml - returnCode=$? - echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml add maxHeaderCount: sed -i \"s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g\" /opt/tomcat/conf/server.xml, result: $returnCode" - if [ $returnCode != 0 ]; then exit $returnCode; fi + if [ $(grep -c 'maxHeaderCount' /opt/tomcat/conf/server.xml) -eq 0 ]; then + # add in maxHeaderCount since new chrome sends too many headers + sed -i "s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g" /opt/tomcat/conf/server.xml + returnCode=$? + echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml add maxHeaderCount: sed -i \"s|port=\"$GROUPER_TOMCAT_AJP_PORT\"|port=\"$GROUPER_TOMCAT_AJP_PORT\" maxHeaderCount=\"$GROUPER_TOMCAT_MAX_HEADER_COUNT\" |g\" /opt/tomcat/conf/server.xml, result: $returnCode" + if [ $returnCode != 0 ]; then exit $returnCode; fi + fi fi if [ "$GROUPER_TOMCAT_SHUTDOWN_PORT" != "8005" ]; then @@ -554,6 +583,7 @@ setupFilesTomcat_unsetAll() { unset -f setupFilesTomcat unset -f setupFilesTomcat_authn + unset -f setupFilesTomcat_authnValve unset -f setupFilesTomcat_context unset -f setupFilesTomcat_ports unset -f setupFilesTomcat_remoteCidrValve @@ -576,6 +606,7 @@ setupFilesTomcat_exportAll() { export -f setupFilesTomcat export -f setupFilesTomcat_authn + export -f setupFilesTomcat_authnValve export -f setupFilesTomcat_context export -f setupFilesTomcat_ports export -f setupFilesTomcat_remoteCidrValve