Merge pull request #441 from ONLYOFFICE/fix/pre611

Fix/pre611

Common/3dParty/html/htmltoxhtml.h

@@ -43,10 +43,14 @@ static std::wstring htmlToXhtml(std::string& sFileContent)
     if (posEncoding != std::string::npos)
     {
         posEncoding = sFileContent.find("=", posEncoding) + 1;
-        if(sFileContent[posEncoding] == '\"')
+        char quoteSymbol = '\"';
+        if(sFileContent[posEncoding] == '\"' || sFileContent[posEncoding] == '\'')
+        {
+            quoteSymbol = sFileContent[posEncoding];
             posEncoding += 1;
+        }
 
-        size_t posEnd = sFileContent.find("\"", posEncoding);
+        size_t posEnd = sFileContent.find(quoteSymbol, posEncoding);
         if (std::string::npos != posEnd)
         {
             std::string sEncoding = sFileContent.substr(posEncoding, posEnd - posEncoding);

Common/FileDownloader/FileDownloader_curl.cpp

@@ -44,123 +44,7 @@
 
 #else
 
-#include <unistd.h>
-#include <sys/wait.h>
-
-std::string wget_url_validate(const std::string& url)
-{
-    std::string::size_type pos = 0;
-    const char* url_ptr = url.c_str();
-    while ('-' == *url_ptr++) // '\0' => break
-        ++pos;
-    if (*url_ptr == '\0')
-        return "";
-
-    return url.substr(pos);
-}
-
-int download_external(const std::wstring& sUrl, const std::wstring& sOutput)
-{
-    int nReturnCode = -1;
-
-    std::string sUrlA = U_TO_UTF8(sUrl);
-    //sUrlA =("\"" + sUrlA + "\"");
-    std::string sOutputA = U_TO_UTF8(sOutput);
-    //sOutputA =("\"" + sOutputA + "\"");
-
-    if (0 != nReturnCode && NSFile::CFileBinary::Exists(L"/usr/bin/curl"))
-    {
-        pid_t pid = fork(); // create child process
-        int status;
-
-        switch (pid)
-        {
-        case -1: // error
-            break;
-
-        case 0: // child process
-        {
-            const char* nargs[10];
-            nargs[0] = "/usr/bin/curl";
-            nargs[1] = "--url";
-            nargs[2] = sUrlA.c_str();
-            nargs[3] = "--output";
-            nargs[4] = sOutputA.c_str();
-            nargs[5] = "--silent";
-            nargs[6] = "-L";
-            nargs[7] = "--connect-timeout";
-            nargs[8] = "10";
-            nargs[9] = NULL;
-
-            const char* nenv[3];
-            nenv[0] = "LD_PRELOAD=";
-            nenv[1] = "LD_LIBRARY_PATH=";
-            nenv[2] = NULL;
-
-            execve("/usr/bin/curl", (char * const *)nargs, (char * const *)nenv);
-            exit(EXIT_SUCCESS);
-            break;
-        }
-        default: // parent process, pid now contains the child pid
-            while (-1 == waitpid(pid, &status, 0)); // wait for child to complete
-            if (WIFEXITED(status))
-            {
-                nReturnCode =  WEXITSTATUS(status);
-            }
-            break;
-        }
-    }
-
-    if (0 != nReturnCode && NSFile::CFileBinary::Exists(L"/usr/bin/wget"))
-    {
-        std::string sUrlValidateA = wget_url_validate(sUrlA);
-
-        pid_t pid = fork(); // create child process
-        int status;
-
-        switch (pid)
-        {
-        case -1: // error
-            break;
-
-        case 0: // child process
-        {
-            const char* nargs[8];
-            nargs[0] = "/usr/bin/wget";
-            nargs[1] = sUrlValidateA.c_str();
-            nargs[2] = "-O";
-            nargs[3] = sOutputA.c_str();
-            nargs[4] = "-q";
-            nargs[5] = "--connect-timeout=10";
-            nargs[6] = "--tries=2";
-            nargs[7] = NULL;
-
-            const char* nenv[2];
-            nenv[0] = "LD_PRELOAD=";
-            nenv[1] = NULL;
-
-            execve("/usr/bin/wget", (char * const *)nargs, (char * const *)nenv);
-            exit(EXIT_SUCCESS);
-            break;
-        }
-        default: // parent process, pid now contains the child pid
-            while (-1 == waitpid(pid, &status, 0)); // wait for child to complete
-            if (WIFEXITED(status))
-            {
-                nReturnCode =  WEXITSTATUS(status);
-            }
-            break;
-        }
-    }
-
-    if (0 == nReturnCode)
-    {
-        if (!NSFile::CFileBinary::Exists(sOutput))
-            nReturnCode = -1;
-    }
-
-    return nReturnCode;
-}
+#include "download_external.h"
 
 #endif
 

Common/FileDownloader/FileDownloader_mac.mm

@@ -1,5 +1,6 @@
 #include "FileDownloader_private.h"
 #include "FileDownloader.h"
+#include "download_external.h"
 
 #if _IOS
     #import <Foundation/Foundation.h>
@@ -15,7 +16,6 @@ static NSString* StringWToNSString ( const std::wstring& Str )
                          encoding : CFStringConvertEncodingToNSStringEncoding ( kCFStringEncodingUTF32LE ) ];
     return pString;
 }
-
 class CFileDownloaderBaseCocoa : public CFileDownloaderBase
 {
 public :
@@ -36,6 +36,10 @@ public :
                 NSFile::CFileBinary::Remove(m_sFilePath);
         }
 
+        int nExternalDownload = download_external(m_sFileUrl, m_sFilePath);
+        if (0 == nExternalDownload)
+            return 0;
+
         NSString* stringURL = StringWToNSString(m_sFileUrl);
         NSString *escapedURL = [stringURL stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
         NSURL  *url = [NSURL URLWithString:escapedURL];
@@ -55,7 +59,7 @@ public :
             if (!CFileDownloader::GetARCEnabled())
             {
                 [stringURL release];
-                [url release];
+                //[url release];
                 [urlData release];
             }
 #endif
@@ -70,7 +74,7 @@ public :
         if (!CFileDownloader::GetARCEnabled())
         {
             [stringURL release];
-            [url release];
+            //[url release];
         }
 #endif
 #endif

Common/FileDownloader/download_external.h

@@ -0,0 +1,157 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include <iostream>
+#include <unistd.h>
+#include "../../DesktopEditor/common/Directory.h"
+
+#ifdef USE_EXTERNAL_DOWNLOAD
+
+#include <unistd.h>
+#include <sys/wait.h>
+
+std::string wget_url_validate(const std::string& url)
+{
+    std::string::size_type pos = 0;
+    const char* url_ptr = url.c_str();
+    while ('-' == *url_ptr++) // '\0' => break
+        ++pos;
+    if (*url_ptr == '\0')
+        return "";
+
+    return url.substr(pos);
+}
+
+int download_external(const std::wstring& sUrl, const std::wstring& sOutput)
+{
+    int nReturnCode = -1;
+
+    std::string sUrlA = U_TO_UTF8(sUrl);
+    //sUrlA =("\"" + sUrlA + "\"");
+    std::string sOutputA = U_TO_UTF8(sOutput);
+    //sOutputA =("\"" + sOutputA + "\"");
+
+    if (0 != nReturnCode && NSFile::CFileBinary::Exists(L"/usr/bin/curl"))
+    {
+        pid_t pid = fork(); // create child process
+        int status;
+
+        switch (pid)
+        {
+        case -1: // error
+            break;
+
+        case 0: // child process
+        {
+            const char* nargs[10];
+            nargs[0] = "/usr/bin/curl";
+            nargs[1] = "--url";
+            nargs[2] = sUrlA.c_str();
+            nargs[3] = "--output";
+            nargs[4] = sOutputA.c_str();
+            nargs[5] = "--silent";
+            nargs[6] = "-L";
+            nargs[7] = "--connect-timeout";
+            nargs[8] = "10";
+            nargs[9] = NULL;
+
+            const char* nenv[3];
+            nenv[0] = "LD_PRELOAD=";
+            nenv[1] = "LD_LIBRARY_PATH=";
+            nenv[2] = NULL;
+
+            execve("/usr/bin/curl", (char * const *)nargs, (char * const *)nenv);
+            exit(EXIT_SUCCESS);
+            break;
+        }
+        default: // parent process, pid now contains the child pid
+            while (-1 == waitpid(pid, &status, 0)); // wait for child to complete
+            if (WIFEXITED(status))
+            {
+                nReturnCode =  WEXITSTATUS(status);
+            }
+            break;
+        }
+    }
+
+    if (0 != nReturnCode && NSFile::CFileBinary::Exists(L"/usr/bin/wget"))
+    {
+        std::string sUrlValidateA = wget_url_validate(sUrlA);
+
+        pid_t pid = fork(); // create child process
+        int status;
+
+        switch (pid)
+        {
+        case -1: // error
+            break;
+
+        case 0: // child process
+        {
+            const char* nargs[8];
+            nargs[0] = "/usr/bin/wget";
+            nargs[1] = sUrlValidateA.c_str();
+            nargs[2] = "-O";
+            nargs[3] = sOutputA.c_str();
+            nargs[4] = "-q";
+            nargs[5] = "--connect-timeout=10";
+            nargs[6] = "--tries=2";
+            nargs[7] = NULL;
+
+            const char* nenv[2];
+            nenv[0] = "LD_PRELOAD=";
+            nenv[1] = NULL;
+
+            execve("/usr/bin/wget", (char * const *)nargs, (char * const *)nenv);
+            exit(EXIT_SUCCESS);
+            break;
+        }
+        default: // parent process, pid now contains the child pid
+            while (-1 == waitpid(pid, &status, 0)); // wait for child to complete
+            if (WIFEXITED(status))
+            {
+                nReturnCode =  WEXITSTATUS(status);
+            }
+            break;
+        }
+    }
+
+    if (0 == nReturnCode)
+    {
+        if (!NSFile::CFileBinary::Exists(sOutput))
+            nReturnCode = -1;
+    }
+
+    return nReturnCode;
+}
+
+#endif

Common/kernel.pro

@@ -28,7 +28,8 @@ include(../DesktopEditor/xml/build/qt/libxml2.pri)
 # DOWNLOADER
 HEADERS += \
     ./FileDownloader/FileDownloader.h \
-    ./FileDownloader/FileDownloader_private.h
+    ./FileDownloader/FileDownloader_private.h \
+    ./FileDownloader/download_external.h
 
 SOURCES += ./FileDownloader/FileDownloader.cpp
 
@@ -54,6 +55,7 @@ core_linux {
         ./FileDownloader/FileDownloader_curl.cpp
 }
 core_mac {
+    DEFINES += USE_EXTERNAL_DOWNLOAD
     OBJECTIVE_SOURCES += \
         ./FileDownloader/FileDownloader_mac.mm