From d310412e8ffc6c197b561769ff3d21a72c33fee4 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 1 Aug 2024 18:40:47 +0300 Subject: [PATCH 01/12] fix Bug 66601 - Add fixes to WOPI modulus configuration (#756) --- Dockerfile | 1 + run-document-server.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 732bde9..f438a47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,6 +69,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ unixodbc-dev \ unzip \ xvfb \ + xxd \ zlib1g && \ if [ $(ls -l /usr/share/fonts/truetype/msttcorefonts | wc -l) -ne 61 ]; \ then echo 'msttcorefonts failed to download'; exit 1; fi && \ diff --git a/run-document-server.sh b/run-document-server.sh index ddce1bd..e1b8f50 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -403,7 +403,7 @@ update_ds_settings(){ [ ! -f "${WOPI_PRIVATE_KEY}" ] && echo -n "Generating WOPI private key..." && openssl genpkey -algorithm RSA -outform PEM -out "${WOPI_PRIVATE_KEY}" >/dev/null 2>&1 && echo "Done" [ ! -f "${WOPI_PUBLIC_KEY}" ] && echo -n "Generating WOPI public key..." && openssl rsa -RSAPublicKey_out -in "${WOPI_PRIVATE_KEY}" -outform "MS PUBLICKEYBLOB" -out "${WOPI_PUBLIC_KEY}" >/dev/null 2>&1 && echo "Done" - WOPI_MODULUS=$(openssl rsa -pubin -inform "MS PUBLICKEYBLOB" -modulus -noout -in "${WOPI_PUBLIC_KEY}" | sed 's/Modulus=//') + WOPI_MODULUS=$(openssl rsa -pubin -inform "MS PUBLICKEYBLOB" -modulus -noout -in "${WOPI_PUBLIC_KEY}" | sed 's/Modulus=//' | xxd -r -p | openssl base64 -A) WOPI_EXPONENT=$(openssl rsa -pubin -inform "MS PUBLICKEYBLOB" -text -noout -in "${WOPI_PUBLIC_KEY}" | grep -oP '(?<=Exponent: )\d+') ${JSON} -I -e "if(this.wopi===undefined)this.wopi={};" From 080f06c9b6c2d1ce3c254e017d1812040d64b893 Mon Sep 17 00:00:00 2001 From: Elbakyan Shirak Date: Tue, 6 Aug 2024 17:33:06 +0400 Subject: [PATCH 02/12] Fix bug 67970 - SIGTERM processing (#753) --- run-document-server.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/run-document-server.sh b/run-document-server.sh index e1b8f50..7dca625 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -2,14 +2,21 @@ umask 0022 +start_process() { + "$@" & + CHILD=$!; wait "$CHILD"; CHILD=""; +} + function clean_exit { + [[ -z "$CHILD" ]] || kill -s SIGTERM "$CHILD" 2>/dev/null if [ ${ONLYOFFICE_DATA_CONTAINER} == "false" ] && \ [ ${ONLYOFFICE_DATA_CONTAINER_HOST} == "localhost" ]; then /usr/bin/documentserver-prepare4shutdown.sh fi + exit } -trap clean_exit SIGTERM +trap clean_exit SIGTERM SIGQUIT SIGABRT SIGINT # Define '**' behavior explicitly shopt -s globstar @@ -616,7 +623,7 @@ update_nginx_settings(){ sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF} fi - documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} -r false + start_process documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} -r false } update_log_settings(){ @@ -758,17 +765,16 @@ service nginx start if [ "${LETS_ENCRYPT_DOMAIN}" != "" -a "${LETS_ENCRYPT_MAIL}" != "" ]; then if [ ! -f "${SSL_CERTIFICATE_PATH}" -a ! -f "${SSL_KEY_PATH}" ]; then - documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN} + start_process documentserver-letsencrypt.sh ${LETS_ENCRYPT_MAIL} ${LETS_ENCRYPT_DOMAIN} fi fi # Regenerate the fonts list and the fonts thumbnails if [ "${GENERATE_FONTS}" == "true" ]; then - documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER} + start_process documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER} fi -documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER} +start_process documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER} echo "${JWT_MESSAGE}" -tail -f /var/log/${COMPANY_NAME}/**/*.log & -wait $! +start_process tail -f /var/log/${COMPANY_NAME}/**/*.log From fbc1868597d7dc3ab854b75ddf8fe3f8969ae899 Mon Sep 17 00:00:00 2001 From: Elbakyan Shirak Date: Wed, 14 Aug 2024 12:18:03 +0400 Subject: [PATCH 03/12] fix Bug 66631 - Correct RabbitMQ connections limit (#759) --- run-document-server.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/run-document-server.sh b/run-document-server.sh index 7dca625..8fccfee 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -104,7 +104,9 @@ NGINX_ONLYOFFICE_EXAMPLE_CONF="${NGINX_ONLYOFFICE_EXAMPLE_PATH}/includes/ds-exam NGINX_CONFIG_PATH="/etc/nginx/nginx.conf" NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1} # Limiting the maximum number of simultaneous connections due to possible memory shortage -[ $(ulimit -n) -gt 1048576 ] && NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-1048576} || NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$(ulimit -n)} +LIMIT=$(ulimit -n); [ $LIMIT -gt 1048576 ] && LIMIT=1048576 +NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-$LIMIT} +RABBIT_CONNECTIONS=${RABBIT_CONNECTIONS:-$LIMIT} JWT_ENABLED=${JWT_ENABLED:-true} @@ -699,6 +701,8 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then chmod 400 ${RABBITMQ_DATA}/.erlang.cookie fi + echo "ulimit -n $RABBIT_CONNECTIONS" >> /etc/default/rabbitmq-server + LOCAL_SERVICES+=("rabbitmq-server") # allow Rabbitmq startup after container kill rm -rf /var/run/rabbitmq From 76e9400bde1fb750d2fd348660beb55e51a8822a Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:21:19 +0500 Subject: [PATCH 04/12] fix Bug 69596 - Fix warning during Docker Compose execution (#765) --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6d92501..af3c028 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2' services: onlyoffice-documentserver: build: From 7de5df8df9e2b8953e6f9958223900cd1876503e Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:40:12 +0500 Subject: [PATCH 05/12] fix Bug 69609 - Fix issue with automatic updates (#766) --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f438a47..735cd49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,6 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ pwgen \ rabbitmq-server \ redis-server \ - software-properties-common \ sudo \ supervisor \ ttf-mscorefonts-installer \ From b8f413343446ab278843b9749e4d9faaf8ad4b91 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 5 Sep 2024 07:57:32 +0000 Subject: [PATCH 06/12] Add an optional option to enable plugins (#1) Co-authored-by: Evgeniy Antonyuk Co-committed-by: Evgeniy Antonyuk --- README.md | 1 + run-document-server.sh | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index dc2d4e8..6e0418e 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,7 @@ Below is the complete list of parameters that can be set using environment varia - **METRICS_PREFIX**: Defines StatsD metrics prefix for backend services. Defaults to `ds.`. - **LETS_ENCRYPT_DOMAIN**: Defines the domain for Let's Encrypt certificate. - **LETS_ENCRYPT_MAIL**: Defines the domain administator mail address for Let's Encrypt certificate. +- **PLUGINS_ENABLED**: Defines whether to enable default plugins. Defaults to `false`. ## Installing ONLYOFFICE Document Server integrated with Community and Mail Servers diff --git a/run-document-server.sh b/run-document-server.sh index 8fccfee..10f3817 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -32,6 +32,7 @@ DS_LIB_DIR="${LIB_DIR}/documentserver" CONF_DIR="/etc/${COMPANY_NAME}/documentserver" SUPERVISOR_CONF_DIR="/etc/supervisor/conf.d" IS_UPGRADE="false" +PLUGINS_ENABLED=${PLUGINS_ENABLED:-false} ONLYOFFICE_DATA_CONTAINER=${ONLYOFFICE_DATA_CONTAINER:-false} ONLYOFFICE_DATA_CONTAINER_HOST=${ONLYOFFICE_DATA_CONTAINER_HOST:-localhost} @@ -777,6 +778,13 @@ fi if [ "${GENERATE_FONTS}" == "true" ]; then start_process documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER} fi + +if [ "${PLUGINS_ENABLED}" = "true" ]; then + echo -n Installing plugins, please wait... + start_process documentserver-pluginsmanager.sh -r false --update=\"${APP_DIR}/sdkjs-plugins/plugin-list-default.json\" >/dev/null + echo Done +fi + start_process documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER} echo "${JWT_MESSAGE}" From cf34136b586235e01a81426fce9eec8eb5f1a889 Mon Sep 17 00:00:00 2001 From: danilapog Date: Mon, 16 Sep 2024 22:39:48 +0300 Subject: [PATCH 07/12] Fix bug 70234 - getTableColumnsError Error on damengdb connect --- tests/damengdb/damengdb.Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/damengdb/damengdb.Dockerfile b/tests/damengdb/damengdb.Dockerfile index a0a708c..f4f6cf1 100644 --- a/tests/damengdb/damengdb.Dockerfile +++ b/tests/damengdb/damengdb.Dockerfile @@ -32,6 +32,14 @@ wait_dm_ready EOF +COPY <<"EOF" /permissions.sql + +CREATE SYNONYM onlyoffice.DOC_CHANGES FOR sysdba.DOC_CHANGES; +CREATE SYNONYM onlyoffice.TASK_RESULT FOR sysdba.TASK_RESULT; +GRANT ALL PRIVILEGES ON sysdba.DOC_CHANGES TO onlyoffice; +GRANT ALL PRIVILEGES ON sysdba.TASK_RESULT TO onlyoffice; + +EOF RUN bash /opt/startup.sh > /dev/null 2>&1 \ & mkdir -p /schema/damengdb \ @@ -41,6 +49,9 @@ RUN bash /opt/startup.sh > /dev/null 2>&1 \ && cd ${DISQL_BIN} \ && ./disql $DM8_USER/$DM8_PASS@$DB_HOST:$DB_PORT -e \ "create user "onlyoffice" identified by "onlyoffice" password_policy 0;" \ + && ./disql $DM8_USER/$DM8_PASS@$DB_HOST:$DB_PORT -e \ + "GRANT SELECT ON DBA_TAB_COLUMNS TO onlyoffice;" \ && echo "EXIT" | tee -a /schema/dameng/createdb.sql \ && ./disql $DM8_USER/$DM8_PASS@$DB_HOST:$DB_PORT \`/schema/dameng/createdb.sql \ + && ./disql $DM8_USER/$DM8_PASS@$DB_HOST:$DB_PORT \`/permissions.sql \ && sleep 10 From 1581d5b3fb485320caed17c666bfdfec86ea3257 Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev Date: Wed, 18 Sep 2024 10:48:06 +0500 Subject: [PATCH 08/12] fix Bug 69800 - Fix warning in casing mismatch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ebe21f..f8d28f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_VERSION=22.04 ARG BASE_IMAGE=ubuntu:$BASE_VERSION -FROM ${BASE_IMAGE} as documentserver +FROM ${BASE_IMAGE} AS documentserver LABEL maintainer Ascensio System SIA ARG BASE_VERSION From e815a556875d7d98c87081e278c51e4a45882e2d Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Mon, 23 Sep 2024 12:28:19 +0700 Subject: [PATCH 09/12] Replace library symlinks with LD_LIBRARY_PATH env --- config/supervisor/ds/ds-converter.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/supervisor/ds/ds-converter.conf b/config/supervisor/ds/ds-converter.conf index 69285cd..21daf98 100644 --- a/config/supervisor/ds/ds-converter.conf +++ b/config/supervisor/ds/ds-converter.conf @@ -2,7 +2,7 @@ command=/var/www/COMPANY_NAME/documentserver/server/FileConverter/converter directory=/var/www/COMPANY_NAME/documentserver/server/FileConverter user=ds -environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/COMPANY_NAME/documentserver,NODE_DISABLE_COLORS=1,APPLICATION_NAME=COMPANY_NAME +environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/COMPANY_NAME/documentserver,NODE_DISABLE_COLORS=1,APPLICATION_NAME=COMPANY_NAME,LD_LIBRARY_PATH=/var/www/COMPANY_NAME/documentserver/server/FileConverter/bin stdout_logfile=/var/log/COMPANY_NAME/documentserver/converter/out.log stdout_logfile_backups=0 stdout_logfile_maxbytes=0 From a1b238d180a3e540c24aecdbbabafaf1ea623166 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Mon, 7 Oct 2024 16:28:19 +0700 Subject: [PATCH 10/12] Fix the option to enable plugins to true by default --- README.md | 2 +- run-document-server.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e0418e..298fe09 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ Below is the complete list of parameters that can be set using environment varia - **METRICS_PREFIX**: Defines StatsD metrics prefix for backend services. Defaults to `ds.`. - **LETS_ENCRYPT_DOMAIN**: Defines the domain for Let's Encrypt certificate. - **LETS_ENCRYPT_MAIL**: Defines the domain administator mail address for Let's Encrypt certificate. -- **PLUGINS_ENABLED**: Defines whether to enable default plugins. Defaults to `false`. +- **PLUGINS_ENABLED**: Defines whether to enable default plugins. Defaults to `true`. ## Installing ONLYOFFICE Document Server integrated with Community and Mail Servers diff --git a/run-document-server.sh b/run-document-server.sh index 10f3817..97a8a1d 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -32,7 +32,7 @@ DS_LIB_DIR="${LIB_DIR}/documentserver" CONF_DIR="/etc/${COMPANY_NAME}/documentserver" SUPERVISOR_CONF_DIR="/etc/supervisor/conf.d" IS_UPGRADE="false" -PLUGINS_ENABLED=${PLUGINS_ENABLED:-false} +PLUGINS_ENABLED=${PLUGINS_ENABLED:-true} ONLYOFFICE_DATA_CONTAINER=${ONLYOFFICE_DATA_CONTAINER:-false} ONLYOFFICE_DATA_CONTAINER_HOST=${ONLYOFFICE_DATA_CONTAINER_HOST:-localhost} From 84443a00953e215a4c64d588396a385a456d27c5 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Fri, 11 Oct 2024 15:43:44 +0700 Subject: [PATCH 11/12] fix Bug 70772 - Add the APPLICATION_NAME variable to ds-docservice --- config/supervisor/ds/ds-docservice.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/supervisor/ds/ds-docservice.conf b/config/supervisor/ds/ds-docservice.conf index 4afbc1b..7cb28f7 100644 --- a/config/supervisor/ds/ds-docservice.conf +++ b/config/supervisor/ds/ds-docservice.conf @@ -2,7 +2,7 @@ command=/var/www/COMPANY_NAME/documentserver/server/DocService/docservice directory=/var/www/COMPANY_NAME/documentserver/server/DocService user=ds -environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/COMPANY_NAME/documentserver,NODE_DISABLE_COLORS=1 +environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/COMPANY_NAME/documentserver,NODE_DISABLE_COLORS=1,APPLICATION_NAME=COMPANY_NAME stdout_logfile=/var/log/COMPANY_NAME/documentserver/docservice/out.log stdout_logfile_backups=0 stdout_logfile_maxbytes=0 From 510128a3cc92598725802bb08a5cf927d33ceba3 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Wed, 16 Oct 2024 16:01:14 +0700 Subject: [PATCH 12/12] Fix to resolve the `unknown "cache_tag" variable` error --- run-document-server.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run-document-server.sh b/run-document-server.sh index 97a8a1d..79fda7e 100644 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -764,6 +764,9 @@ if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then service cron start fi +# Fix to resolve the `unknown "cache_tag" variable` error +start_process documentserver-flush-cache.sh -r false + # nginx used as a proxy, and as data container status service. # it run in all cases. service nginx start