Merge branch 'develop' into feature/data-migration

config/appsettings.json

@@ -42,6 +42,9 @@
     "server-root": "",
     "username": {
       "regex": "^[\\p{L}\\p{M}' \\-]+$"
+    },
+    "tenantname": {
+      "regex": "^\\D*$"
     }
   },
   "license": {
@@ -235,7 +238,7 @@
       "img": ["'self'", "data:", "blob:"],
       "frame": ["'self'"],
       "fonts": ["'self'", "data:"],
-      "connect": ["'self'", "data:"],
+      "connect": ["'self'", "data:", "ws:"],
       "media": ["'self'"]
     },
     "zendesk": {

config/nlog.config

@@ -6,6 +6,7 @@
 	<extensions>
 		<add assembly="NLog.Web.AspNetCore"/>
 		<add assembly="NLog.AWS.Logger" />
+        <add assembly="NLog.Targets.ElasticSearch"/>
 	</extensions>
 
 	<variable name="dir" value="..\Logs\"/>
@@ -41,6 +42,9 @@
 				<attribute name="commandText" layout="${replace:inner=${event-properties:item=commandText}:searchFor=\\r\\n|\\s:replaceWith= :regex=true}" />
 			</layout>
 		</target>
+		<target name="elastic" xsi:type="BufferingWrapper" flushTimeout="5000">
+		  <target xsi:type="ElasticSearch" includeAllProperties="true" />
+		</target>
 	</targets>
 	<rules>
 		<logger name="ASC.SQL" minlevel="Debug" writeTo="sql" final="true" />

install/deb/debian/rules

@@ -77,7 +77,7 @@ override_dh_auto_build: check_archives
 	sed -i "s#\$$public_root#/var/www/${PRODUCT}/public/#g" ${BUILDTOOLS_PATH}/config/nginx/onlyoffice.conf
 	sed 's/teamlab.info/onlyoffice.com/g' -i ${BUILDTOOLS_PATH}/config/autofac.consumers.json
 	json -I -f ${CLENT_PATH}/public/scripts/config.json -e "this.wrongPortalNameUrl=\"\""
-	sed -e 's/$$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's_includes_/etc/openresty/includes_g' -i ${BUILDTOOLS_PATH}/install/docker/config/nginx/onlyoffice-proxy*.conf
+	sed -e 's/$$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's/the_port/server_port/g' -e 's_includes_/etc/openresty/includes_g' -i ${BUILDTOOLS_PATH}/install/docker/config/nginx/onlyoffice-proxy*.conf
 	sed "s_\(.*root\).*;_\1 \"/var/www/${PRODUCT}\";_g" -i ${BUILDTOOLS_PATH}/install/docker/config/nginx/letsencrypt.conf
 	sed -e '/.pid/d' -e '/temp_path/d' -e 's_etc/nginx_etc/openresty_g' -e 's/\.log/-openresty.log/g' -i ${BUILDTOOLS_PATH}/install/docker/config/nginx/templates/nginx.conf.template
 	mv -f ${BUILDTOOLS_PATH}/install/docker/config/nginx/onlyoffice-proxy-ssl.conf ${BUILDTOOLS_PATH}/install/docker/config/nginx/onlyoffice-proxy-ssl.conf.template

install/docker/config/nginx/onlyoffice-proxy-ssl.conf

@@ -3,6 +3,7 @@ proxy_set_header Connection $proxy_connection;
 proxy_set_header Host $the_host;
 proxy_set_header X-Forwarded-Host $the_host;
 proxy_set_header X-Forwarded-Proto $the_scheme;
+proxy_set_header X-Forwarded-Port $the_port;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_hide_header 'Server';
 proxy_hide_header 'X-Powered-By';

install/docker/config/nginx/onlyoffice-proxy.conf

@@ -3,6 +3,7 @@ proxy_set_header Connection $proxy_connection;
 proxy_set_header Host $the_host;
 proxy_set_header X-Forwarded-Host $the_host;
 proxy_set_header X-Forwarded-Proto $the_scheme;
+proxy_set_header X-Forwarded-Port $the_port;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_hide_header 'Server';
 proxy_hide_header 'X-Powered-By';

install/docker/config/nginx/templates/proxy.upstream.conf.template

@@ -15,9 +15,9 @@ map $http_x_forwarded_host $the_host {
   "" $host;
 }
 
-map $http_x_forwarded_port $proxy_x_forwarded_port {
-  default $http_x_forwarded_port;
-  '' $server_port;
+map $http_x_forwarded_port $the_port {
+  default $EXTERNAL_PORT;
+  ~^(.*)$ $1;
 }
 
 map $http_upgrade $proxy_connection {

install/docker/proxy-ssl.yml

@@ -20,6 +20,7 @@ services:
       - 443:443
     environment:
       - ROUTER_HOST=${ROUTER_HOST}
+      - EXTERNAL_PORT=${EXTERNAL_PORT}
     volumes:
       - webroot_path:/letsencrypt
       - proxy_log:/var/log/nginx

install/docker/proxy.yml

@@ -19,6 +19,7 @@ services:
       - ${EXTERNAL_PORT}:80
     environment:
       - ROUTER_HOST=${ROUTER_HOST}
+      - EXTERNAL_PORT=${EXTERNAL_PORT}
     volumes:
       - webroot_path:/letsencrypt
       - proxy_log:/var/log/nginx

install/rpm/SPECS/build.spec

@@ -26,7 +26,7 @@ sed 's/teamlab.info/onlyoffice.com/g' -i config/autofac.consumers.json
 
 sed -e 's_etc/nginx_etc/openresty_g' -e 's/listen\s\+\([0-9]\+\);/listen 127.0.0.1:\1;/g' -i config/nginx/*.conf
 sed -i "s#\$public_root#/var/www/%{product}/public/#g" config/nginx/onlyoffice.conf
-sed -e 's/$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's_includes_/etc/openresty/includes_g' -i install/docker/config/nginx/onlyoffice-proxy*.conf
+sed -e 's/$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's/the_port/server_port/g' -e 's_includes_/etc/openresty/includes_g' -i install/docker/config/nginx/onlyoffice-proxy*.conf
 sed -e '/.pid/d' -e '/temp_path/d' -e 's_etc/nginx_etc/openresty_g' -e 's/\.log/-openresty.log/g' -i install/docker/config/nginx/templates/nginx.conf.template
 sed -i "s_\(.*root\).*;_\1 \"/var/www/%{product}\";_g" -i install/docker/config/nginx/letsencrypt.conf
 

install/win/build-batch.bat

@@ -51,6 +51,7 @@ rmdir buildtools\install\win\publish /s /q
 
 REM echo ######## SSL configs ########
 %sed% -i "s/the_host/host/g" buildtools\install\win\Files\nginx\conf\onlyoffice-proxy.conf buildtools\install\win\Files\nginx\conf\onlyoffice-proxy.conf.tmpl buildtools\install\win\Files\nginx\conf\onlyoffice-proxy-ssl.conf.tmpl
+%sed% -i "s/the_port/server_port/g" buildtools\install\win\Files\nginx\conf\onlyoffice-proxy.conf buildtools\install\win\Files\nginx\conf\onlyoffice-proxy.conf.tmpl buildtools\install\win\Files\nginx\conf\onlyoffice-proxy-ssl.conf.tmpl
 %sed% -i "s/the_scheme/scheme/g" buildtools\install\win\Files\nginx\conf\onlyoffice-proxy.conf buildtools\install\win\Files\nginx\conf\onlyoffice-proxy.conf.tmpl buildtools\install\win\Files\nginx\conf\onlyoffice-proxy-ssl.conf.tmpl
 %sed% -i "s/ssl_dhparam \/etc\/ssl\/certs\/dhparam.pem;/#ssl_dhparam \/etc\/ssl\/certs\/dhparam.pem;/" buildtools\install\win\Files\nginx\conf\onlyoffice-proxy-ssl.conf.tmpl
 %sed% -i "s_\(.*root\).*;_\1 \"{APPDIR}letsencrypt\";_g" -i buildtools\install\win\Files\nginx\conf\includes\letsencrypt.conf