Adapt this Makefile to FreeBSD

Common/config/default.json

@@ -168,6 +168,10 @@
 				"useforrequest": false,
 				"errorcode": 403
 			},
+			"request-filtering-agent" : {
+				"allowPrivateIPAddress": true,
+				"allowMetaIPAddress": true
+			},
 			"secret": {
 				"browser": {"string": "secret", "file": "", "tenants": {}},
 				"inbox": {"string": "secret", "file": "", "tenants": {}},
@@ -254,6 +258,7 @@
 			"x2tPath": "null",
 			"docbuilderPath": "null",
 			"docbuilderAllFontsPath": "null",
+			"docbuilderCoreFontsPath": "",
 			"args": "",
 			"spawnOptions": {},
 			"errorfiles": "",

Common/config/development-linux.json

@@ -1,31 +1,31 @@
 {
   "log": {
-    "filePath": "../../Common/config/log4js/development.json"
+    "filePath": "../Common/config/log4js/development.json"
   },
   "storage": {
     "fs": {
-      "folderPath": "../../App_Data"
+      "folderPath": "../App_Data"
     }
   },
   "services": {
     "CoAuthoring": {
       "server": {
-        "port": 8001,
+        "port": 8000,
         "static_content": {
           "/fonts": {
-            "path": "../../../fonts"
+            "path": "../../fonts"
           },
           "/sdkjs": {
-            "path": "../../../sdkjs"
+            "path": "../../sdkjs"
           },
           "/web-apps": {
-            "path": "../../../web-apps"
+            "path": "../../web-apps"
           },
           "/sdkjs-plugins": {
-            "path": "../../../sdkjs-plugins"
+            "path": "../../sdkjs-plugins"
           },
           "/dictionaries": {
-            "path": "../../../dictionaries"
+            "path": "../../dictionaries"
           },
           "/info": {
             "path": "../branding/info"
@@ -35,28 +35,33 @@
       "utils": {
         "utils_common_fontdir": "/usr/share/fonts"
       },
+      "request-filtering-agent" : {
+        "allowPrivateIPAddress": true,
+        "allowMetaIPAddress": true
+      },
       "sockjs": {
         "sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js"
       }
     }
   },
   "license": {
-    "license_file": "./../../license.lic",
+    "license_file": "./../license.lic",
     "warning_limit_percents": 70,
     "packageType": 0
   },
   "FileConverter": {
     "converter": {
       "fontDir": "/usr/share/fonts",
-      "presentationThemesDir": "../../../sdkjs/slide/themes",
-      "x2tPath": "../../FileConverter/bin/x2t",
-      "docbuilderPath": "../../FileConverter/bin/docbuilder",
-      "docbuilderAllFontsPath": "../../App_Data/docbuilder/AllFonts.js"
+      "presentationThemesDir": "../../sdkjs/slide/themes",
+      "x2tPath": "../FileConverter/bin/x2t",
+      "docbuilderPath": "../FileConverter/bin/docbuilder",
+      "docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
+      "docbuilderCoreFontsPath": "../../core-fonts"
     }
   },
   "SpellChecker": {
     "server": {
-      "dictDir": "../../../dictionaries"
+      "dictDir": "../../dictionaries"
     }
   }
 }

Common/config/development-mac.json

@@ -1,34 +1,34 @@
 {
   "log": {
-    "filePath": "../../Common/config/log4js/development.json"
+    "filePath": "../Common/config/log4js/development.json"
   },
   "storage": {
     "fs": {
-      "folderPath": "../../App_Data"
+      "folderPath": "../App_Data"
     }
   },
   "services": {
     "CoAuthoring": {
       "server": {
-        "port": 8001,
+        "port": 8000,
         "static_content": {
           "/fonts": {
-            "path": "../../../fonts"
+            "path": "../../fonts"
           },
           "/sdkjs": {
-            "path": "../../../sdkjs"
+            "path": "../../sdkjs"
           },
           "/web-apps": {
-            "path": "../../../web-apps"
+            "path": "../../web-apps"
           },
           "/sdkjs-plugins": {
-            "path": "../../../sdkjs-plugins"
+            "path": "../../sdkjs-plugins"
           },
           "/dictionaries": {
-            "path": "../../../dictionaries"
+            "path": "../../dictionaries"
           },
           "/info": {
-            "path": "../../branding/info"
+            "path": "../branding/info"
           }
         }
       },
@@ -41,29 +41,34 @@
         "dbUser": "root",
         "dbPass": "onlyoffice"
       },
+      "request-filtering-agent" : {
+        "allowPrivateIPAddress": true,
+        "allowMetaIPAddress": true
+      },
       "sockjs": {
-        "sockjs_url": "/office/vendor/sockjs/sockjs.min.js"
+        "sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js"
       }
     }
   },
   "license": {
-    "license_file": "./../../license.lic",
+    "license_file": "./../license.lic",
     "warning_limit_percents": 70,
     "packageType": 0
   },
   "FileConverter": {
     "converter": {
       "fontDir": "",
-      "presentationThemesDir": "../../../OfficeWeb/PowerPoint/themes",
-      "x2tPath": "../../FileConverter/bin/x2t",
-      "docbuilderPath": "../../FileConverter/Bin/docbuilder",
-      "docbuilderAllFontsPath": "../../App_Data/docbuilder/AllFonts.js",
+      "presentationThemesDir": "../../sdkjs/slide/themes",
+      "x2tPath": "../FileConverter/bin/x2t",
+      "docbuilderPath": "../FileConverter/Bin/docbuilder",
+      "docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
+      "docbuilderCoreFontsPath": "../../core-fonts",
       "errorfiles": "error"
     }
   },
   "SpellChecker": {
     "server": {
-      "dictDir": "../../../dictionaries"
+      "dictDir": "../../dictionaries"
     }
   }
 }

Common/config/development-windows.json

@@ -1,34 +1,34 @@
 {
   "log": {
-    "filePath": "../../Common/config/log4js/development.json"
+    "filePath": "../Common/config/log4js/development.json"
   },
   "storage": {
     "fs": {
-      "folderPath": "../../App_Data"
+      "folderPath": "../App_Data"
     }
   },
   "services": {
     "CoAuthoring": {
       "server": {
-        "port": 8001,
+        "port": 8000,
         "static_content": {
           "/fonts": {
-            "path": "../../../fonts"
+            "path": "../../fonts"
           },
           "/sdkjs": {
-            "path": "../../../sdkjs"
+            "path": "../../sdkjs"
           },
           "/web-apps": {
-            "path": "../../../web-apps"
+            "path": "../../web-apps"
           },
           "/sdkjs-plugins": {
-            "path": "../../../sdkjs-plugins"
+            "path": "../../sdkjs-plugins"
           },
           "/dictionaries": {
-            "path": "../../../dictionaries"
+            "path": "../../dictionaries"
           },
           "/info": {
-            "path": "../../branding/info"
+            "path": "../branding/info"
           }
         }
       },
@@ -41,29 +41,34 @@
         "dbUser": "root",
         "dbPass": "onlyoffice"
       },
+      "request-filtering-agent" : {
+        "allowPrivateIPAddress": true,
+        "allowMetaIPAddress": true
+      },
       "sockjs": {
         "sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js"
       }
     }
   },
   "license": {
-    "license_file": "./../../license.lic",
+    "license_file": "./../license.lic",
     "warning_limit_percents": 70,
     "packageType": 0
   },
   "FileConverter": {
     "converter": {
       "fontDir": "",
-      "presentationThemesDir": "../../../sdkjs/slide/themes",
-      "x2tPath": "../../FileConverter/Bin/x2t.exe",
-      "docbuilderPath": "../../FileConverter/Bin/docbuilder.exe",
-      "docbuilderAllFontsPath": "../../App_Data/docbuilder/AllFonts.js",
+      "presentationThemesDir": "../../sdkjs/slide/themes",
+      "x2tPath": "../FileConverter/Bin/x2t.exe",
+      "docbuilderPath": "../FileConverter/Bin/docbuilder.exe",
+      "docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
+      "docbuilderCoreFontsPath": "../../core-fonts",
       "errorfiles": "error"
     }
   },
   "SpellChecker": {
     "server": {
-      "dictDir": "../../../dictionaries"
+      "dictDir": "../../dictionaries"
     }
   }
 }

Common/config/production-linux.json

@@ -60,7 +60,8 @@
       "presentationThemesDir": "/var/www/onlyoffice/documentserver/sdkjs/slide/themes",
       "x2tPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/x2t",
       "docbuilderPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/docbuilder",
-      "docbuilderAllFontsPath": "/var/lib/onlyoffice/documentserver/App_Data/docbuilder/AllFonts.js"
+      "docbuilderAllFontsPath": "/var/lib/onlyoffice/documentserver/App_Data/docbuilder/AllFonts.js",
+      "docbuilderCoreFontsPath": "/var/www/onlyoffice/documentserver/core-fonts"
     }
   },
   "FileStorage": {

Common/config/production-windows.json

@@ -60,7 +60,8 @@
       "presentationThemesDir": "../../sdkjs/slide/themes",
       "x2tPath": "../FileConverter/bin/x2t.exe",
       "docbuilderPath": "../FileConverter/bin/docbuilder.exe",
-      "docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js"
+      "docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
+      "docbuilderCoreFontsPath": "../../core-fonts"
     }
   },
   "SpellChecker": {

Common/package.json

@@ -23,6 +23,7 @@
     "node-statsd": "^0.1.1",
     "openpgp": "^4.10.8",
     "request": "^2.88.0",
+    "request-filtering-agent": "^1.0.5",
     "rhea": "^0.3.9",
     "uri-js": "^4.2.2"
   }

Common/sources/commondefines.js

@@ -37,6 +37,8 @@ const constants = require('./constants');
 function InputCommand(data, copyExplicit) {
   //must be set explicitly to prevent vulnerability(downloadAs(with url) creates request to integrator with authorization)
   this['withAuthorization'] = undefined;//bool
+  this['isbuilder'] = undefined;//bool
+  this['externalChangeInfo'] = undefined;//zero DB changes case: set password, undo all changes
   if (data) {
     this['c'] = data['c'];
     this['id'] = data['id'];
@@ -88,17 +90,19 @@ function InputCommand(data, copyExplicit) {
     this['inline'] = data['inline'];
     this['password'] = data['password'];
     this['savepassword'] = data['savepassword'];
+    this['withoutPassword'] = data['withoutPassword'];
     this['outputurls'] = data['outputurls'];
     this['closeonerror'] = data['closeonerror'];
     this['serverVersion'] = data['serverVersion'];
     this['rediskey'] = data['rediskey'];
     this['nobase64'] = data['nobase64'];
     this['forgotten'] = data['forgotten'];
-    this['isbuilder'] = data['isbuilder'];
     this['status_info_in'] = data['status_info_in'];
     this['attempt'] = data['attempt'];
     if (copyExplicit) {
       this['withAuthorization'] = data['withAuthorization'];
+      this['isbuilder'] = data['isbuilder'];
+      this['externalChangeInfo'] = data['externalChangeInfo'];
     }
   } else {
     this['c'] = undefined;//string command
@@ -143,13 +147,13 @@ function InputCommand(data, copyExplicit) {
     this['inline'] = undefined;//content disposition
     this['password'] = undefined;
     this['savepassword'] = undefined;
+    this['withoutPassword'] = undefined;
     this['outputurls'] = undefined;
     this['closeonerror'] = undefined;
     this['serverVersion'] = undefined;
     this['rediskey'] = undefined;
     this['nobase64'] = true;
     this['forgotten'] = undefined;
-    this['isbuilder'] = undefined;
     this['status_info_in'] = undefined;
     this['attempt'] = undefined;
   }
@@ -377,6 +381,12 @@ InputCommand.prototype = {
   setSavePassword: function(data) {
     this['savepassword'] = data;
   },
+  getWithoutPassword: function() {
+    return this['withoutPassword'];
+  },
+  setWithoutPassword: function(data) {
+    this['withoutPassword'] = data;
+  },
   setOutputUrls: function(data) {
     this['outputurls'] = data;
   },
@@ -430,6 +440,12 @@ InputCommand.prototype = {
   },
   setWithAuthorization: function(data) {
     this['withAuthorization'] = data;
+  },
+  getExternalChangeInfo: function() {
+    return this['externalChangeInfo'];
+  },
+  setExternalChangeInfo: function(data) {
+    this['externalChangeInfo'] = data;
   }
 };
 

Common/sources/license.js

@@ -56,4 +56,5 @@ exports.readLicense = function*() {
 		endDate: null
 	};
 };
+
 exports.packageType = constants.PACKAGE_TYPE_OS;