Various updates for 6.0.0.105

Wrong ordering created a backup copy we don't need.

Dockerfile

@@ -1,37 +1,45 @@
-ARG oo_version=5.5.0.165
-FROM onlyoffice/documentserver:$oo_version
+ARG product_version=6.0.0
+ARG build_number=105
+
+FROM onlyoffice/documentserver:${product_version}.${build_number}
+ARG product_version
+ARG build_number
+
+RUN sed -si \
+  's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
+  /var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/mobile/app.js \
+  /var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/mobile/app.js \
+  /var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/mobile/app.js
 
 
-RUN sed -is \
-    's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
-    /var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/mobile/app.js
-
-RUN sed -is \
-    's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
-    /var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/mobile/app.js
-
-RUN sed -is \
-    's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
-    /var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/mobile/app.js
+# source patching and compilation
+RUN apt update && apt install -y git curl \
+  && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && apt install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
 
 
-RUN apt-get update && apt-get install -y \
-    python3-pip \
-  && rm -rf /var/lib/apt/lists/* \
-  && pip3 install pycryptodome
+ARG tag=v${product_version}.${build_number}
+RUN  mkdir /build \
+  && git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/build_tools.git  /build/build_tools \
+  && git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/server.git       /build/server
 
+COPY license.patch /build/
 
-COPY license.py /tmp/
-RUN python3 /tmp/license.py
+WORKDIR /build/server
 
-RUN pip3 uninstall -y pycryptodome \
-    && apt-get purge -y python3-pip \
-    && apt-get purge -y --autoremove \
-    && rm -rf /var/lib/apt/lists/*
+ENV PRODUCT_VERSION=${product_version}
+ENV BUILD_NUMBER=${build_number}
 
+RUN  npm install -g pkg grunt grunt-cli \
+  && git apply /build/license.patch \
+  && make \
+  && pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/FileConverter --targets=node10-linux -o /build/converter \
+  && pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/DocService --targets=node10-linux --options max_old_space_size=4096 -o /build/docservice \
+  && cp /build/converter /var/www/onlyoffice/documentserver/server/FileConverter/converter \
+  && cp /build/docservice /var/www/onlyoffice/documentserver/server/DocService/docservice \
+  && npm uninstall -g pkg grunt grunt-cli \
+  && rm -rf /root/.cache /root/.config/ /root/.npm/ /root/.pkg-cache \
+  && rm -rf /build
 
-COPY run-oo.sh /usr/local/bin/run-oo.sh
-RUN chmod a+x /usr/local/bin/run-oo.sh
-
-
-ENTRYPOINT [ "/usr/local/bin/run-oo.sh" ]
+WORKDIR /

README.md

@@ -1,21 +1,78 @@
 # OnlyOffice Community server with license
 
+
 ## Usage
 
+### Podman CLI
+
+```sh
+podman run \
+    --name=onlyoffice \
+    --detach \
+    --publish=80:80 \
+    docker.io/alehoho/oo-ce-docker-license
+```
+
+### Docker CLI
+
+```sh
+docker run \
+    --name=onlyoffice \
+    --detach \
+    --publish=80:80 \
+    alehoho/oo-ce-docker-license
+```
+
+### docker-compose.yml
+
+```yml
+services:
+  onlyoffice:
+    container_name: onlyoffice
+    image: alehoho/oo-ce-docker-license
+    ports:
+      - "80"
+```
+
+
+## Build
+
+### Buildah CLI
+
+```sh
+buildah build-using-dockerfile \
+    --tag=onlyoffice-patched \
+    https://github.com/aleho/onlyoffice-ce-docker-license.git
+```
+
+### Docker CLI
+
 ```sh
 docker build \
     --tag=onlyoffice-patched \
     https://github.com/aleho/onlyoffice-ce-docker-license.git
 ```
 
-```sh
-docker run \
-    --name=onlyoffice \
-    --detach \
-    --volume=$(pwd)/ooData:/var/www/onlyoffice/Data onlyoffice-patched \
-    onlyoffice-patched
+
+### docker-compose.yml
+
+```yml
+services:
+  onlyoffice:
+    container_name: onlyoffice
+    image: onlyoffice-patched
+    build:
+      context: https://github.com/aleho/onlyoffice-ce-docker-license.git
+    …
 ```
 
+### Verify
+
+To verify that the container is running successfully open
+`[server-url]/healthcheck` (has to return `true`) and for the version number open
+`[server-url]/web-apps/apps/api/documents/api.js` and check the header comment.
+
+
 ## Background
 Recently, just about a month after Nextcloud announced their partnership with
 Ascensio and featuring a community version of OnlyOffice, the latter decided
@@ -27,10 +84,10 @@ feature. Only after some outcries Ascensio deigned to release a statement and
 a new, albeit "limited", offer of €90 for home servers.
 
 In my opinion these deceptive practices are unacceptable for a company
-advertising itself and their product as open source .
+advertising itself and their product as open source.
 
 
 ## Thanks
 
-This repo is heavily inspired by the works of
+This repo was heavily inspired by the works of
 [Zegorax/OnlyOffice-Unlimited](https://github.com/Zegorax/OnlyOffice-Unlimited).

license.patch

@@ -0,0 +1,181 @@
+From bfd54caaf3a89d1b2aea5c38ed42c78c113ac7c1 Mon Sep 17 00:00:00 2001
+From: Alexander Hofbauer <alex@derhofbauer.at>
+Date: Sun, 18 Oct 2020 15:17:44 +0200
+Subject: [PATCH] Patch for license
+
+---
+ Common/sources/commondefines.js          |  4 +-
+ Common/sources/license.js                | 66 +++++++++---------------
+ DocService/sources/DocsCoServer.js       |  5 +-
+ DocService/sources/server.js             |  1 -
+ FileConverter/sources/convertermaster.js |  1 -
+ Makefile                                 |  2 +-
+ 6 files changed, 30 insertions(+), 49 deletions(-)
+
+diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
+index 694a13a..6f8a07b 100644
+--- a/Common/sources/commondefines.js
++++ b/Common/sources/commondefines.js
+@@ -975,8 +975,8 @@ const c_oAscUnlockRes = {
+   Empty: 2
+ };
+ 
+-const buildVersion = '4.1.2';
+-const buildNumber = 37;
++const buildVersion = '6.0.0';
++const buildNumber = 105;
+ 
+ exports.TaskQueueData = TaskQueueData;
+ exports.CMailMergeSendData = CMailMergeSendData;
+diff --git a/Common/sources/license.js b/Common/sources/license.js
+index 290d85d..655df27 100644
+--- a/Common/sources/license.js
++++ b/Common/sources/license.js
+@@ -32,53 +32,35 @@
+ 
+ 'use strict';
+ 
+-const config = require('config');
+-const configL = config.get('license');
+-const constants = require('./constants');
+ const logger = require('./logger');
+-const editorDataStorage = require('./../../DocService/sources/' + config.get('services.CoAuthoring.server.editorDataStorage'));
++const constants = require('./constants');
+ 
+-const buildDate = '6/29/2016';
+-const oBuildDate = new Date(buildDate);
+-const oPackageType = configL.get('packageType');
++const LICENSE = {
++	count: 9999,
++	type: constants.LICENSE_RESULT.Success,
++	light: false,
++	packageType: constants.PACKAGE_TYPE_I,
++	mode: constants.LICENSE_MODE.None,
++	branding: false,
++	connections: 9999,
++	customization: false,
++	usersCount: 9999,
++	usersExpire: new Date("2099-01-01T23:59:59.000Z").getTime() / 1000,
++	hasLicense: true,
++	plugins: true,
++	buildDate: "2020-10-15T14:07:00.000Z",
++	endDate: "2099-01-01T23:59:59.000Z"
++};
+ 
+-const cfgRedisPrefix = config.get('services.CoAuthoring.redis.prefix');
+-const redisKeyLicense = cfgRedisPrefix + constants.REDIS_KEY_LICENSE;
++function getLicense() {
++	logger.debug('Injecting fake license', LICENSE)
+ 
+-let editorData = new editorDataStorage();
++	return { ...LICENSE };
++}
+ 
+ exports.readLicense = function*() {
+-	const c_LR = constants.LICENSE_RESULT;
+-	const res = {
+-		count: 1,
+-		type: c_LR.Error,
+-		light: false,
+-		packageType: oPackageType,
+-		mode: constants.LICENSE_MODE.None,
+-		branding: false,
+-		connections: constants.LICENSE_CONNECTIONS,
+-		customization: false,
+-		usersCount: 0,
+-		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
+-		hasLicense: false,
+-		plugins: false,
+-		buildDate: oBuildDate,
+-		endDate: null
+-	};
+-
+-	if (yield* _getFileState()) {
+-		res.type = c_LR.ExpiredTrial;
+-	}
+-
+-	if (res.type === c_LR.Expired || res.type === c_LR.ExpiredTrial) {
+-		res.count = 1;
+-		logger.error('License: License Expired!!!');
+-	}
+-
+-	return res;
++	return getLicense();
+ };
+-exports.packageType = oPackageType;
+ 
+-function* _getFileState() {
+-	return yield editorData.getLicense(redisKeyLicense);
+-}
++exports.getLicense = getLicense;
++exports.packageType = constants.PACKAGE_TYPE_I;
+diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
+index be22d80..fb19abe 100644
+--- a/DocService/sources/DocsCoServer.js
++++ b/DocService/sources/DocsCoServer.js
+@@ -103,6 +103,7 @@ const pubsubService = require('./pubsubRabbitMQ');
+ const queueService = require('./../../Common/sources/taskqueueRabbitMQ');
+ const rabbitMQCore = require('./../../Common/sources/rabbitMQCore');
+ const activeMQCore = require('./../../Common/sources/activeMQCore');
++const license = require('./../../Common/sources/license');
+ 
+ const editorDataStorage = require('./' + configCommon.get('services.CoAuthoring.server.editorDataStorage'));
+ let cfgEditor = JSON.parse(JSON.stringify(config.get('editor')));
+@@ -162,7 +163,7 @@ let connections = []; // Активные соединения
+ let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
+ let pubsub;
+ let queue;
+-let licenseInfo = {type: constants.LICENSE_RESULT.Error, light: false, branding: false, customization: false, plugins: false};
++let licenseInfo = license.getLicense();
+ let shutdownFlag = false;
+ 
+ const MIN_SAVE_EXPIRATION = 60000;
+@@ -3013,7 +3014,7 @@ exports.install = function(server, callbackFunction) {
+   });
+ };
+ exports.setLicenseInfo = function(data) {
+-  licenseInfo = data;
++  logger.debug('Not updating license info', data)
+ };
+ exports.getLicenseInfo = function() {
+   return licenseInfo;
+diff --git a/DocService/sources/server.js b/DocService/sources/server.js
+index db085bb..7d76d34 100644
+--- a/DocService/sources/server.js
++++ b/DocService/sources/server.js
+@@ -129,7 +129,6 @@ try {
+ } catch (e) {
+ 	logger.warn('Failed to subscribe to plugin folder updates. When changing the list of plugins, you must restart the server. https://nodejs.org/docs/latest/api/fs.html#fs_availability');
+ }
+-fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
+ setInterval(updateLicense, 86400000);
+ 
+ // Если захочется использовать 'development' и 'production',
+diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
+index c246bb8..9fe3d41 100644
+--- a/FileConverter/sources/convertermaster.js
++++ b/FileConverter/sources/convertermaster.js
+@@ -85,7 +85,6 @@ if (cluster.isMaster) {
+ 
+   updateLicense();
+ 
+-  fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
+   setInterval(updateLicense, 86400000);
+ } else {
+   const converter = require('./converter');
+diff --git a/Makefile b/Makefile
+index 40bf93e..1df9c10 100644
+--- a/Makefile
++++ b/Makefile
+@@ -83,7 +83,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
+ .PHONY: all clean install uninstall build-date
+ 
+ .NOTPARALLEL:
+-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(LICENSE) $(WELCOME) $(INFO) build-date
++all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date
+ 
+ build-date: $(GRUNT_FILES)
+ 	sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
+-- 
+2.28.0
+

license.py

@@ -1,87 +0,0 @@
-#!/usr/bin/env python3
-
-from Crypto.Hash import SHA, SHA256
-from Crypto.Signature import PKCS1_v1_5
-from Crypto.PublicKey import RSA
-from shutil import copyfile
-import json
-import codecs
-
-
-
-def gen_keys():
-    privKey = RSA.generate(1024)
-    publKey = privKey.publickey().exportKey('PEM')
-
-    f = open("/var/www/onlyoffice/license_key.pub", "w+")
-    f.write(publKey.decode('utf-8'))
-    f.close()
-
-    return publKey, privKey
-
-
-
-def write_license(publKey, privKey):
-    license = {
-        "branding": False,
-        "connections": 9999,
-        "customization": False,
-        "end_date": "2099-01-01T23:59:59.000Z",
-        "light": "False",
-        "mode": "",
-        "portal_count": "0",
-        "process": 2,
-        "ssbranding": False,
-        "test": "False",
-        "trial": "False",
-        "user_quota": "0",
-        "users_count": 9999,
-        "users_expire": 99999,
-        "whiteLabel": False,
-        "customer_id": "customerID",
-        "start_date": "2020-01-01T00:00:00.000Z",
-        "users": [],
-        "version": 2
-    }
-
-    jsonData = codecs.encode(json.dumps(license, separators=(',', ':')), encoding='utf-8')
-
-    digest = SHA.new(jsonData)
-    signer = PKCS1_v1_5.new(privKey)
-    signature = signer.sign(digest)
-    finalSignature = signature.hex()
-
-    license['signature'] = finalSignature
-
-    f = open("/var/www/onlyoffice/license.lic", "w+")
-    f.write(json.dumps(license))
-    f.close
-
-
-
-def patch_files():
-    basePath = "/var/www/onlyoffice/documentserver/server/"
-    files = ["DocService/docservice", "FileConverter/converter"]
-
-    for file in files:
-        f = open(basePath + file, 'rb')
-        data = f.read()
-        f.close()
-
-        replacedData = data.replace(b"-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDRhGF7X4A0ZVlEg594WmODVVUI\niiPQs04aLmvfg8SborHss5gQXu0aIdUT6nb5rTh5hD2yfpF2WIW6M8z0WxRhwicg\nXwi80H1aLPf6lEPPLvN29EhQNjBpkFkAJUbS8uuhJEeKw0cE49g80eBBF4BCqSL6\nPFQbP9/rByxdxEoAIQIDAQAB\n-----END PUBLIC KEY-----", bytes(publKey))
-
-        f = open(basePath + file, 'wb')
-        f.write(replacedData)
-        f.close()
-
-
-
-
-print("Generating and exporting key pair...")
-publKey, privKey = gen_keys()
-
-print("Writing license file...")
-write_license(publKey, privKey)
-
-print("Patching document server and converter...")
-patch_files()

run-oo.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-
-echo "Providing license"
-cp -f /var/www/onlyoffice/license.lic /var/www/onlyoffice/Data/license.lic
-
-echo "Starting server"
-/app/ds/run-document-server.sh
-