Bump SDK

edu-sharing · Dec 1, 2023 · 319f38a · 319f38a
1 parent 7462688
commit 319f38a
Show file tree

Hide file tree

Showing 16 changed files with 150 additions and 68 deletions.
diff --git a/deploy/docker/compose/src/main/scripts/.env.sample b/deploy/docker/compose/src/main/scripts/.env.sample
@@ -114,15 +114,24 @@
 # --- relative login path from external authentication service
 # REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGIN=/shibboleth
 
-# --- relative logout path from external authentication service
-# REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGOUT=/logout
-
 # --- absolut path from external authentication provider
 # REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL=
 
 # --- relative logout path from external authentication target provider
 # REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL=
 
+# --- relative logout path from external authentication service
+# REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGOUT=/Shibboleth.sso/Logout
+
+# --- should edu-sharing destroy it's session or does this the idp for us
+# REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION=false
+
+# --- should edu-sharing redirected us to a page after the logout?
+# REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT=false
+
+# --- the url to redirect to if redirect is true
+# REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL=
+
 # --- guest user name
 # REPOSITORY_SERVICE_GUEST_USER=
 
@@ -216,6 +225,11 @@
 # --- public url protocol
 # SERVICES_RENDERING_SERVICE_PROT=http
 
+# --- use dynamic url
+# SERVICES_RENDERING_SERVICE_DYNAMIC_URL=false
+
+# --- custom content url
+# SERVICES_RENDERING_SERVICE_CUSTOM_CONTENT_URL=
 
 # --- enables general data protection regulation
 # SERVICES_RENDERING_SERVICE_GDPR_ENABLED=false
@@ -239,12 +253,15 @@
 # SERVICES_RENDERING_RENDERMOODLE_URL=https://moodle.example/
 # SERVICES_RENDERING_RENDERMOODLE_TOKEN=
 # SERVICES_RENDERING_RENDERMOODLE_CATEGORY_ID=1
+# SERVICES_RENDERING_RENDERMOODLE_TIMEOUT=90
 
 # --- media converter settings
 # SERVICES_RENDERING_AUDIO_FORMATS=mp3
 # SERVICES_RENDERING_VIDEO_FORMATS=mp4,webm
 # SERVICES_RENDERING_VIDEO_RESOLUTIONS=240,720,1080
 # SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION=720
+# SERVICES_RENDERING_VIDEO_TIMEOUT=3600
+# SERVICES_RENDERING_VIDEO_THREADS=1
 
 ########################################################################################################################
 # ONLY FOR DEBUGGING

diff --git a/deploy/docker/repository/build/search/solr4/src/main/build/Dockerfile b/deploy/docker/repository/build/search/solr4/src/main/build/Dockerfile
@@ -122,7 +122,7 @@ USER worker
 EXPOSE 8080
 
 ENTRYPOINT ["entrypoint.sh"]
-CMD ["catalina.sh", "run"]
+CMD [ "/opt/bitnami/scripts/tomcat/run.sh" ]
 
 VOLUME [ "/opt/alfresco/alf_data" ]
 

diff --git a/deploy/docker/repository/build/search/solr4/src/main/build/assets/entrypoint.sh b/deploy/docker/repository/build/search/solr4/src/main/build/assets/entrypoint.sh
@@ -87,11 +87,4 @@ fi
 
 ########################################################################################################################
 
-# Load libraries
-. /opt/bitnami/scripts/libtomcat.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load Tomcat environment variables
-. /opt/bitnami/scripts/tomcat-env.sh
-
-exec "$@"
+exec /opt/bitnami/scripts/tomcat/entrypoint.sh "$@"
diff --git a/deploy/docker/repository/build/service/src/main/build/Dockerfile b/deploy/docker/repository/build/service/src/main/build/Dockerfile
@@ -116,7 +116,10 @@ RUN set -eux \
     && mv alf_data/keystore .
 
 RUN set -eux \
-    && xmlstarlet ed -L -d '/Context/Loader' tomcat/conf/Catalina/localhost/alfresco.xml
+    && xmlstarlet ed -L \
+      -i '/Context' -t attr -n 'unloadDelay' -v "15000" \
+      -d '/Context/Loader' \
+      tomcat/conf/Catalina/localhost/alfresco.xml
 
 COPY --chown=worker:worker artifacts/alfresco-content-services-share-distribution-${org.alfresco:alfresco-content-services-share-distribution:zip.version}.zip \
     /tmp/alfresco-content-services-share-distribution.zip
@@ -137,7 +140,10 @@ RUN set -eux \
     && rm -f tomcat/webapps/share.war
 
 RUN set -eux \
-    && xmlstarlet ed -L -d '/Context/Loader' tomcat/conf/Catalina/localhost/share.xml
+    && xmlstarlet ed -L \
+      -i '/Context' -t attr -n 'unloadDelay' -v "15000" \
+      -d '/Context/Loader' \
+      tomcat/conf/Catalina/localhost/share.xml
 
 COPY --chown=worker:worker assets/share/log4j.properties tomcat/webapps/share/WEB-INF/classes/log4j.properties
 
@@ -194,18 +200,15 @@ COPY --chown=worker:worker assets/profiler profiler/
 
 USER worker
 
-STOPSIGNAL SIGWINCH
-
 EXPOSE 8009 8080 8081
 
 ENTRYPOINT ["entrypoint.sh"]
-CMD ["catalina.sh", "run"]
+CMD [ "/opt/bitnami/scripts/tomcat/run.sh" ]
 
 VOLUME [ "/opt/alfresco/alf_data", "/opt/bitnami/tomcat/shared/classes/config/cluster", "/opt/bitnami/tomcat/shared/classes/config/node" ]
 
 ########################################################################################################################
 
-
 LABEL git.branch=${git.branch}
 LABEL git.closest.tag.name=${git.closest.tag.fixed}
 LABEL git.commit.id=${git.commit.id}

diff --git a/deploy/docker/repository/build/service/src/main/build/assets/entrypoint.sh b/deploy/docker/repository/build/service/src/main/build/assets/entrypoint.sh
@@ -26,7 +26,12 @@ my_home_appid="${REPOSITORY_SERVICE_HOME_APPID:-local}"
 my_home_auth="${REPOSITORY_SERVICE_HOME_AUTH:-}"
 my_home_auth_external="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL:-false}"
 my_home_auth_external_login="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN:-$my_path_external/shibboleth}"
-my_home_auth_external_logout="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT:-}"
+
+my_home_auth_external_logout="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT:-/Shibboleth.sso/Logout}"
+my_home_auth_external_logout_destroy_session="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION:-"false"}"
+my_home_auth_external_logout_redirect="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT:-"false"}"
+my_home_auth_external_logout_redirect_url="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL:-$my_base_external}"
+
 my_home_auth_external_login_providers_url="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL:-}"
 my_home_auth_external_login_provider_target_url="${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL:-}"
 my_home_provider="${REPOSITORY_SERVICE_HOME_PROVIDER:-}"
@@ -451,19 +456,25 @@ xmlstarlet ed -L \
           -s '/config/values' -t elem -n 'loginProviderTargetUrl' -v '' \
           -d '/config/values/loginProviderTargetUrl[position() != 1]' \
     			-u '/config/values/loginProviderTargetUrl' -v "${my_home_auth_external_login_provider_target_url}" \
+    			-s '/config/values' -t elem -n 'logout' -v '' \
+          -d '/config/values/logout[position() != 1]' \
+          -s '/config/values/logout' -t elem -n 'url' -v '' \
+          -d '/config/values/logout/url[position() != 1]' \
+          -u '/config/values/logout/url' -v "${my_home_auth_external_logout}" \
+          -s '/config/values/logout' -t elem -n 'destroySession' -v '' \
+          -d '/config/values/logout/destroySession[position() != 1]' \
+          -u '/config/values/logout/destroySession' -v "${my_home_auth_external_logout_destroy_session}" \
           ${eduCConf}
 
-          if [[ -n "${my_home_auth_external_logout}" ]] ; then
-             xmlstarlet ed -L \
-                  -s '/config/values' -t elem -n 'logout' -v '' \
-                  -d '/config/values/logout[position() != 1]' \
-                  -s '/config/values/logout' -t elem -n 'url' -v '' \
-                  -d '/config/values/logout/url[position() != 1]' \
-                  -u '/config/values/logout/url' -v "${my_home_auth_external_logout}" \
-                  -s '/config/values/logout' -t elem -n 'destroySession' -v '' \
-                  -d '/config/values/logout/destroySession[position() != 1]' \
-                  -u '/config/values/logout/destroySession' -v 'false' \
-                  ${eduCConf}
+          if [[ "${my_home_auth_external_logout_redirect}" == "true" ]] ; then
+            xmlstarlet ed -L \
+              -s '/config/values/logout' -t elem -n 'ajax' -v '' \
+              -d '/config/values/logout/ajax[position() != 1]' \
+              -u '/config/values/logout/ajax' -v 'true' \
+              -s '/config/values/logout' -t elem -n 'next' -v '' \
+              -d '/config/values/logout/next[position() != 1]' \
+              -u '/config/values/logout/next' -v "${my_home_auth_external_logout_redirect_url}" \
+              ${eduCConf}
           fi
   else
 		sed -i -r 's|<!--\s*SAML||g' tomcat/webapps/edu-sharing/WEB-INF/web.xml
@@ -715,11 +726,4 @@ done
 
 ########################################################################################################################
 
-# Load libraries
-. /opt/bitnami/scripts/libtomcat.sh
-. /opt/bitnami/scripts/liblog.sh
-
-# Load Tomcat environment variables
-. /opt/bitnami/scripts/tomcat-env.sh
-
-exec "$@"
+exec /opt/bitnami/scripts/tomcat/entrypoint.sh "$@"
diff --git a/deploy/docker/repository/compose/src/main/compose/1_repository-common.yml b/deploy/docker/repository/compose/src/main/compose/1_repository-common.yml
@@ -82,6 +82,9 @@ services:
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL: "${REPOSITORY_SERVICE_AUTH_EXTERNAL:-false}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN: "${REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGIN:-}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT: "${REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGOUT:-}"
+      REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_DESTROY_SESSION:-false}"
+      REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT:-}"
+      REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGOUT_REDIRECT_URL:-}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL:-}"
       REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL: "${REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDER_TARGET_URL:-}"
       REPOSITORY_SERVICE_HOME_PROVIDER: "${REPOSITORY_SERVICE_PROVIDER:-}"

diff --git a/deploy/docker/repository/compose/src/main/compose/1_repository-debug.yml b/deploy/docker/repository/compose/src/main/compose/1_repository-debug.yml
@@ -11,16 +11,30 @@ services:
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_MAILCATCHER_PORT_HTTP:-8025}:1080"
 
   repository-search-solr4:
-    command: ["catalina.sh", "jpda", "run"]
     environment:
-      JPDA_ADDRESS: "0.0.0.0:5005"
+      CATALINA_OPTS: >-
+        -Xms${REPOSITORY_SEARCH_SOLR4_JAVA_XMS:-512m}
+        -Xmx${REPOSITORY_SEARCH_SOLR4_JAVA_XMX:-512m}
+        -Dcom.sun.management.jmxremote
+        -Dcom.sun.management.jmxremote.authenticate=false
+        -Dcom.sun.management.jmxremote.port=7199
+        -Dcom.sun.management.jmxremote.ssl=false
+        -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
+        -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
     ports:
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_SEARCH_SOLR4_PORT_HTTP:-8200}:8080"
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_SEARCH_SOLR4_PORT_JPDA:-8201}:5005"
 
   repository-service:
-    command: ["catalina.sh", "jpda", "run"]
     environment:
-      JPDA_ADDRESS: "0.0.0.0:5005"
+      CATALINA_OPTS: >-
+        -Xms${REPOSITORY_SERVICE_JAVA_XMS:-2g}
+        -Xmx${REPOSITORY_SERVICE_JAVA_XMX:-4g}
+        -Dcom.sun.management.jmxremote
+        -Dcom.sun.management.jmxremote.authenticate=false
+        -Dcom.sun.management.jmxremote.port=7199
+        -Dcom.sun.management.jmxremote.ssl=false
+        -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
+        -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
     ports:
       - "${COMMON_BIND_HOST:-127.0.0.1}:${REPOSITORY_SERVICE_PORT_JPDA:-8101}:5005"
diff --git a/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-env.yaml b/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-env.yaml
@@ -31,7 +31,9 @@ data:
     {{- if .Values.config.metrics.enabled }}
     -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
     {{- end }}
-  JPDA_ADDRESS: "0.0.0.0:5005"
+    {{- if default .Values.global.debug .Values.debug }}
+    -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
+    {{- end }}
   {{- if .Values.config.antivirus.enabled }}
   REPOSITORY_ANTIVIRUS_SERVER_HOST: {{ .Values.config.antivirus.host | quote }}
   REPOSITORY_ANTIVIRUS_SERVER_PORT: {{ .Values.config.antivirus.port | quote }}

diff --git a/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-file.yaml b/deploy/docker/repository/helm/service/src/main/chart/templates/configmap-file.yaml
@@ -50,6 +50,10 @@ data:
         return (synth(200, "OK"));
       }
 
+      if (req.method == "POST" || req.method == "PUT" || req.method == "DELETE" || req.url ~ "/rest/") {
+        return (pass);
+      }
+
       if (req.restarts > 0) {
         set req.hash_always_miss = true;
       }

diff --git a/deploy/docker/repository/helm/service/src/main/chart/templates/statefulset.yaml b/deploy/docker/repository/helm/service/src/main/chart/templates/statefulset.yaml
@@ -70,9 +70,6 @@ spec:
       - name: {{ include "edusharing_repository_service.name" . }}-server
         image: {{ include "edusharing_repository_service.image" . }}{{ .Values.image.prefix }}-deploy-docker-repository-build-service:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-        {{- if default .Values.global.debug .Values.debug }}
-        args: [ "catalina.sh", "jpda", "run" ]
-        {{- end }}
         {{- $patroni := merge .Values.config.database.patroni .Values.global.patroni }}
         {{- if $patroni.enabled }}
         env:

diff --git a/deploy/docker/repository/helm/solr4/src/main/chart/templates/configmap-env.yaml b/deploy/docker/repository/helm/solr4/src/main/chart/templates/configmap-env.yaml
@@ -19,7 +19,9 @@ data:
     {{- if .Values.config.metrics.enabled }}
     -javaagent:/opt/alfresco/tomcat/agent/jmx_prometheus_javaagent.jar=9090:/opt/alfresco/tomcat/agent/jmx-exporter-config.yaml
     {{- end }}
-  JPDA_ADDRESS: "0.0.0.0:5005"
+    {{- if default .Values.global.debug .Values.debug }}
+    -agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=n
+    {{- end }}
   {{- with .Values.config.override.application.common }}
   REPOSITORY_SEARCH_SOLR4_CONFIG: | {{ . | nindent 4 }}
   {{- end }}

diff --git a/deploy/docker/repository/helm/solr4/src/main/chart/templates/statefulset.yaml b/deploy/docker/repository/helm/solr4/src/main/chart/templates/statefulset.yaml
@@ -60,9 +60,6 @@ spec:
       - name: {{ include "edusharing_repository_search_solr4.name" . }}
         image: {{ include "edusharing_repository_search_solr4.image" . }}{{ .Values.image.prefix }}-deploy-docker-repository-build-search-solr4:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-        {{- if default .Values.global.debug .Values.debug }}
-        args: [ "catalina.sh", "jpda", "run" ]
-        {{- end }}
         envFrom:
         - configMapRef:
             name: {{ include "edusharing_repository_search_solr4.name" . }}-env
@@ -235,9 +232,6 @@ spec:
       - name: {{ include "edusharing_repository_search_solr4.name" $ }}
         image: {{ include "edusharing_repository_search_solr4.image" $ }}{{ $.Values.image.prefix }}-deploy-docker-repository-build-search-solr4:{{ $.Values.image.tag }}
         imagePullPolicy: {{ $.Values.global.image.pullPolicy }}
-        {{- if default $.Values.global.debug $.Values.debug }}
-        args: [ "catalina.sh", "jpda", "run" ]
-        {{- end }}
         env:
         - name: REPOSITORY_SEARCH_SOLR4_CONFIG
           value: | {{ .spec.config.override.application.common | nindent 12 }}