nodejs: max key length - 120

java: send jwt token in body
node: fix Bug 36489 - Files with non ascii symbols were unable to download
2026-04-07 14:06:11 +08:00 · 2019-02-22 15:54:07 +03:00 · 2019-02-21 14:27:59 +03:00 · 2019-02-21 11:47:51 +03:00 · 2019-02-20 14:55:35 +03:00 · 2019-02-20 14:50:38 +03:00
80 changed files with 1429 additions and 106 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Content/editor.css
+++ b/web/documentserver-example/csharp-mvc/Content/editor.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css
+++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs
+++ b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Global.asax.cs
+++ b/web/documentserver-example/csharp-mvc/Global.asax.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/LICENSE.txt
+++ b/web/documentserver-example/csharp-mvc/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs
+++ b/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs
@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExampleMVC")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js
+++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -61,7 +61,7 @@
                console.log(message);
        };

-        var onReady = function () {
+        var onAppReady = function () {
            innerAlert("Document editor ready");
        };

@ -136,7 +136,7 @@
                        },
                    },
                    events: {
-                        'onReady': onReady,
+                        'onAppReady': onAppReady,
                        'onDocumentStateChange': onDocumentStateChange,
                        'onRequestEditRights': onRequestEditRights,
                        'onError': onError,
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/App_Themes/stylesheet.css
+++ b/web/documentserver-example/csharp/App_Themes/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@ -53,7 +53,7 @@
                console.log(message);
        };

-        var onReady = function () {
+        var onAppReady = function () {
            innerAlert("Document editor ready");
        };

@ -128,7 +128,7 @@
                        },
                    },
                    events: {
-                        'onReady': onReady,
+                        'onAppReady': onAppReady,
                        'onDocumentStateChange': onDocumentStateChange,
                        'onRequestEditRights': onRequestEditRights,
                        'onError': onError,
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/DocumentConverter.cs
+++ b/web/documentserver-example/csharp/DocumentConverter.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/LICENSE.txt
+++ b/web/documentserver-example/csharp/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/csharp/Properties/AssemblyInfo.cs
+++ b/web/documentserver-example/csharp/Properties/AssemblyInfo.cs
@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExample")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/web/documentserver-example/csharp/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp/WebEditor.ashx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/script/jscript.js
+++ b/web/documentserver-example/csharp/script/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/Dockerfile
+++ b/web/documentserver-example/java/Dockerfile
@ -1,9 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y software-properties-common \
-                                         python-software-properties
-RUN add-apt-repository -y ppa:webupd8team/java
-RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
-RUN apt-get update && apt-get install -y oracle-java8-installer \
-                                         maven
-COPY . /java
-CMD mvn -f /java package
--- a/web/documentserver-example/java/LICENSE.txt
+++ b/web/documentserver-example/java/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/java/README.md
+++ b/web/documentserver-example/java/README.md
@ -55,7 +55,6 @@ files.docservice.url.preloader=https://documentserver/web-apps/apps/api/document

 Run next command in java example directory:
 ```
-docker build . -t java-example
-docker run -it -v $PWD/target:/java/target java-example
+docker-compose up
 ```
 After it, all bin files will be passed to `./target` folder
--- a/web/documentserver-example/java/docker-compose.yml
+++ b/web/documentserver-example/java/docker-compose.yml
@ -0,0 +1,7 @@
+version: '3'
+services:
+  build:
+    image: maven:3.6
+    volumes:
+      - .:/java
+    command: mvn -f /java package
--- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/controllers/GlobalServletContextListener.java
+++ b/web/documentserver-example/java/src/main/java/controllers/GlobalServletContextListener.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -27,6 +27,7 @@

 package controllers;

+import helpers.ConfigManager;
 import helpers.DocumentManager;
 import helpers.ServiceConverter;
 import java.io.File;
@ -35,6 +36,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.net.URL;
+import java.util.LinkedHashMap;
 import java.util.Scanner;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.MultipartConfig;
@ -54,6 +56,8 @@ import org.primeframework.jwt.domain.JWT;
@MultipartConfig
 public class IndexServlet extends HttpServlet
 {
+    private static final String DocumentJwtHeader = ConfigManager.GetProperty("files.docservice.header");
+
    protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
    {
        String action = request.getParameter("type");
@ -255,6 +259,11 @@ public class IndexServlet extends HttpServlet
        {
            String token = (String) jsonObj.get("token");

+            if (token == null) {
+                String header = (String) request.getHeader(DocumentJwtHeader == "" ? "Authorization" : DocumentJwtHeader);
+                token = header.startsWith("Bearer ") ? header.substring(7) : header;
+            }
+
            JWT jwt = DocumentManager.ReadToken(token);
            if (jwt == null)
            {
@ -262,6 +271,19 @@ public class IndexServlet extends HttpServlet
                return;
            }

+            if (jwt.getObject("payload") != null) {
+                try {
+                    @SuppressWarnings("unchecked") LinkedHashMap<String, Object> payload =
+                        (LinkedHashMap<String, Object>)jwt.getObject("payload");
+
+                    jwt.claims = payload;
+                }
+                catch (Exception ex) {
+                    writer.write("Wrong payload");
+                    return;
+                }
+            }
+
            status = jwt.getInteger("status");
            downloadUri = jwt.getString("url");
        }
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/entities/FileType.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileType.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/ConfigManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/ConfigManager.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
+++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java
+++ b/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -49,6 +49,7 @@ public class ServiceConverter
 {
    private static int ConvertTimeout = 120000;
    private static final String DocumentConverterUrl = ConfigManager.GetProperty("files.docservice.url.converter");
+    private static final String DocumentJwtHeader = ConfigManager.GetProperty("files.docservice.header");

    public static class ConvertBody
    {
@ -96,6 +97,26 @@ public class ServiceConverter
        if (isAsync)
            body.async = true;

+        String headerToken = "";
+        if (DocumentManager.TokenEnabled())
+        {
+            HashMap<String, Object> map = new HashMap<String, Object>();
+            map.put("url", body.url);
+            map.put("outputtype", body.outputtype);
+            map.put("filetype", body.filetype);
+            map.put("title", body.title);
+            map.put("key", body.key);
+            if (isAsync)
+                map.put("async", body.async);
+
+            String token = DocumentManager.CreateToken(map);
+            body.token = token;
+
+            Map<String, Object> payloadMap = new HashMap<String, Object>();
+            payloadMap.put("payload", map);
+            headerToken = DocumentManager.CreateToken(payloadMap);
+        }
+
        Gson gson = new Gson();
        String bodyString = gson.toJson(body);

@ -112,10 +133,7 @@ public class ServiceConverter

        if (DocumentManager.TokenEnabled())
        {
-            Map<String, Object> map = new HashMap<>();
-            map.put("payload", body);
-            String token = DocumentManager.CreateToken(map);
-            connection.setRequestProperty("Authorization", "Bearer " + token);
+            connection.setRequestProperty(DocumentJwtHeader == "" ? "Authorization" : DocumentJwtHeader, "Bearer " + headerToken);
        }

        connection.connect();
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@ -11,3 +11,4 @@ files.docservice.url.tempstorage=https://documentserver/ResourceService.ashx
 files.docservice.url.api=https://documentserver/web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=https://documentserver/web-apps/apps/api/documents/cache-scripts.html
 files.docservice.secret=
+files.docservice.header=Authorization
--- a/web/documentserver-example/java/src/main/webapp/css/editor.css
+++ b/web/documentserver-example/java/src/main/webapp/css/editor.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
+++ b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -48,7 +48,7 @@
                console.log(message);
        };

-        var onReady = function () {
+        var onAppReady = function () {
            innerAlert("Document editor ready");
        };

@ -71,11 +71,11 @@
        };

        var сonnectEditor = function () {
-            var config = <%= FileModel.Serialize(Model) %>;
+            var config = JSON.parse('<%= FileModel.Serialize(Model) %>');
            config.width = "100%";
            config.height = "100%";
            config.events = {
-                    "onReady": onReady,
+                    "onAppReady": onAppReady,
                    "onDocumentStateChange": onDocumentStateChange,
                    'onRequestEditRights': onRequestEditRights,
                    "onError": onError,
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
+++ b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/js/LICENSE.txt
+++ b/web/documentserver-example/js/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/js/OnlineEditorsExampleJS.html
+++ b/web/documentserver-example/js/OnlineEditorsExampleJS.html
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/js/init.js
+++ b/web/documentserver-example/js/init.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/js/stylesheet.css
+++ b/web/documentserver-example/js/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/LICENSE.txt
+++ b/web/documentserver-example/nodejs/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@ -1,7 +1,7 @@
 "use strict";
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -132,7 +132,7 @@ app.get("/download", function(req, res) {
    res.setHeader("Content-Length", fileSystem.statSync(path).size);
    res.setHeader("Content-Type", mime.lookup(path));

-    res.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
+    res.setHeader("Content-Disposition", "attachment; filename*=UTF-8\'\'" + encodeURIComponent(fileName));

    var filestream = fileSystem.createReadStream(path);
    filestream.pipe(res);
@ -532,6 +532,11 @@ app.get("/editor", function (req, res) {

        var userAddress = docManager.curUserHostAddress();
        var fileName = fileUtility.getFileName(req.query.fileName);
+        if (!docManager.existsSync(docManager.storagePath(fileName, userAddress))) {
+            throw { 
+                "message": "File not found: " + fileName
+            };
+        }
        var key = docManager.getKey(fileName);
        var url = docManager.getFileUri(fileName);
        var mode = req.query.mode || "edit"; //mode: view/edit/review/comment/fillForms/embedded
--- a/web/documentserver-example/nodejs/helpers/cacheManager.js
+++ b/web/documentserver-example/nodejs/helpers/cacheManager.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/helpers/docManager.js
+++ b/web/documentserver-example/nodejs/helpers/docManager.js
@ -1,7 +1,7 @@
 "use strict";
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/helpers/documentService.js
+++ b/web/documentserver-example/nodejs/helpers/documentService.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -93,13 +93,14 @@ documentService.getConvertedUri = function (documentUri, fromExtension, toExtens
 };

 documentService.generateRevisionId = function (expectedKey) {
-    if (expectedKey.length > 20) {
+    let maxKeyLength = 128;
+    if (expectedKey.length > maxKeyLength) {
        expectedKey = expectedKey.hashCode().toString();
    }

    var key = expectedKey.replace(new RegExp("[^0-9-.a-zA-Z_=]", "g"), "_");

-    return key.substring(0, Math.min(key.length, 20));
+    return key.substring(0, Math.min(key.length, maxKeyLength));
 };

 documentService.processConvertServiceResponceError = function (errorCode) {
--- a/web/documentserver-example/nodejs/helpers/fileUtility.js
+++ b/web/documentserver-example/nodejs/helpers/fileUtility.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/helpers/guidManager.js
+++ b/web/documentserver-example/nodejs/helpers/guidManager.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/package-lock.json
+++ b/web/documentserver-example/nodejs/package-lock.json
--- a/web/documentserver-example/nodejs/public/javascripts/jscript.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/public/stylesheets/editor.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/editor.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -53,7 +53,7 @@
                console.log(message);
        };

-        var onReady = function () {
+        var onAppReady = function () {
            innerAlert("Document editor ready");
        };

@ -100,7 +100,7 @@

            docEditor = new DocsAPI.DocEditor("iframeEditor", {<% include config %>,
                    events: {
-                        "onReady": onReady,
+                        "onAppReady": onAppReady,
                        "onDocumentStateChange": onDocumentStateChange,
                        'onRequestEditRights': onRequestEditRights,
                        "onError": onError,
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -244,7 +244,7 @@

    <span id="loadScripts" data-docs="<%= preloaderUrl %>"></span>

-    <footer>&copy; Ascensio Systems Inc 2018. All rights reserved.</footer>
+    <footer>&copy; Ascensio Systems SIA 2019. All rights reserved.</footer>

    <script type="text/javascript" src="javascripts/jquery-1.8.2.js"></script>
    <script type="text/javascript" src="javascripts/jquery-ui.js"></script>
--- a/web/documentserver-example/php/LICENSE.txt
+++ b/web/documentserver-example/php/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/php/ajax.php
+++ b/web/documentserver-example/php/ajax.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/common.php
+++ b/web/documentserver-example/php/common.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/css/stylesheet.css
+++ b/web/documentserver-example/php/css/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -128,7 +128,7 @@
                console.log(message);
        };

-        var onReady = function () {
+        var onAppReady = function () {
            innerAlert("Document editor ready");
        };

@ -213,7 +213,7 @@
                        },
                    },
                    events: {
-                        'onReady': onReady,
+                        'onAppReady': onAppReady,
                        'onDocumentStateChange': onDocumentStateChange,
                        'onRequestEditRights': onRequestEditRights,
                        'onError': onError,
--- a/web/documentserver-example/php/functions.php
+++ b/web/documentserver-example/php/functions.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/js/jscript.js
+++ b/web/documentserver-example/php/js/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/ruby/LICENSE.txt
+++ b/web/documentserver-example/ruby/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
+++ b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
@ -1,5 +1,5 @@
 /*
-    Copyright (c) Ascensio System SIA 2018. All rights reserved.
+    Copyright (c) Ascensio System SIA 2019. All rights reserved.
    http://www.onlyoffice.com
 */
 if (typeof jQuery != "undefined") {
--- a/web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
@ -1,5 +1,5 @@
 /*
-    Copyright (c) Ascensio System SIA 2018. All rights reserved.
+    Copyright (c) Ascensio System SIA 2019. All rights reserved.
    http://www.onlyoffice.com
 */
 html {
--- a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
@ -1,5 +1,5 @@
 /*
-    Copyright (c) Ascensio System SIA 2018. All rights reserved.
+    Copyright (c) Ascensio System SIA 2019. All rights reserved.
    http://www.onlyoffice.com
 */
 html {
--- a/web/documentserver-example/ruby/app/views/home/editor.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb
@ -16,7 +16,7 @@
            console.log(message);
    };

-    var onReady = function () {
+    var onAppReady = function () {
        innerAlert("Document editor ready");
    };

@ -91,7 +91,7 @@
                        },
                    },
                    events: {
-                        'onReady': onReady,
+                        'onAppReady': onAppReady,
                        'onDocumentStateChange': onDocumentStateChange,
                        'onError': onError,
                        'onOutdatedVersion': onOutdatedVersion,
--- a/web/welcome/css/stylesheet.css
+++ b/web/welcome/css/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
--- a/web/welcome/index.html
+++ b/web/welcome/index.html
@ -3,7 +3,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
 *
 * The MIT License (MIT)
 *
@ -90,6 +90,6 @@ onlyoffice4enterprise/documentserver-ee</pre>
        </div>
    </div>

-    <footer>© Ascensio Systems Inc 2018. All rights reserved.</footer>
+    <footer>© Ascensio Systems SIA 2019. All rights reserved.</footer>
 </body>
 </html>
Author	SHA1	Message	Date
Sergey Linnik	a536fdf6ab	nodejs: max key length - 120	2019-02-22 15:54:07 +03:00
Andrey Panov	71103b802e	java: send jwt token in body	2019-02-21 14:27:59 +03:00
Andrey Panov	0b33ce14f7	node: fix Bug 36489 - Files with non ascii symbols were unable to download	2019-02-21 11:47:51 +03:00
Andrey Panov	a945870c6a	java: jwt in headers	2019-02-20 14:55:35 +03:00
Andrey Panov	cafaa27e92	java: json passed to docserver contained escaped parameters	2019-02-20 14:50:38 +03:00
Sergey Linnik	d22d2ace22	Merge pull request #57 from flaminestone/feature/delete_dockerfile Delete dockerfile, and move building to docker-compose	2019-02-13 16:27:48 +03:00
Dmitriy Rotatyy	430a16b543	Delete dockerfile, and move building to docker-compose	2019-02-13 16:17:41 +03:00
Sergey Linnik	d2a89f4a5f	Merge pull request #56 from flaminestone/feature/add_docker_compose_for_java Add docker-compose file for easy building	2019-02-13 13:43:35 +03:00
Dmitriy Rotatyy	efda987b55	Add docker-compose file for easy building	2019-02-13 13:34:20 +03:00
Alexey Golubev	20827e4d76	v5.2.8	2019-02-05 16:23:22 +03:00
Sergey Linnik	16473b4e06	2019	2019-01-22 18:17:07 +03:00
Sergey Linnik	30d26df97d	Merge remote-tracking branch 'remotes/origin/hotfix/v5.2.8' into develop	2019-01-22 09:28:29 +03:00
Sergey Linnik	9fb0289af4	onAppReady (Fixed #54 )	2019-01-22 09:23:29 +03:00
Alexander.Trofimov	fa8e2cf975	[[copyright] Update Copyright 2018 -> 2019. Limited -> SIA	2019-01-17 17:32:01 +03:00
Sergey Linnik	68f6be2e43	nodejs: check file existence	2018-12-03 18:38:33 +03:00
Alexey Golubev	87381123e3	v5.2.3	2018-10-30 13:01:36 +03:00
Alexey Golubev	7d79efe1f1	release/v5.2.0	2018-09-27 19:07:46 +03:00