Improve impress templates

common/JailUtil.cpp

@@ -426,7 +426,9 @@ void setupChildRoot(bool bindMount, const std::string& childRoot, const std::str
 {
     // Start with a clean slate.
     cleanupJails(childRoot);
-    createJailPath(childRoot + CHILDROOT_TMP_INCOMING_PATH);
+
+    createJailPath(childRoot + CHILDROOT_TMP_INCOMING_PATH + "/fonts");
+    createJailPath(childRoot + CHILDROOT_TMP_INCOMING_PATH + "/templates");
 
     disableBindMounting(); // Clear to avoid surprises.
 

coolwsd.xml.in

@@ -323,6 +323,10 @@
         <url desc="URL of optional JSON file that lists fonts to be included in Online" type="string" default=""></url>
     </remote_font_config>
 
+    <remote_asset_config>
+        <url desc="URL of optional JSON file that lists fonts and impress template to be included in Online" type="string" default=""></url>
+    </remote_asset_config>
+
     <home_mode>
         <enable desc="Enable more configuration options for home users" type="bool" default="false">false</enable>
     </home_mode>

kit/Kit.cpp

@@ -3254,6 +3254,10 @@ void lokit_main(
             const std::string tmpSubDir = Poco::Path(tempRoot, "cool-" + jailId).toString();
             const std::string jailTmpDir = Poco::Path(jailPath, "tmp").toString();
 
+            const std::string tmpIncoming = Poco::Path(childRoot, JailUtil::CHILDROOT_TMP_INCOMING_PATH).toString();
+            const std::string sharedTemplate = Poco::Path(tmpIncoming, "templates").toString();
+            const std::string loJailDestImpressTemplatePath = Poco::Path(loJailDestPath, "share/template/common/presnt").toString();
+
             const std::string sysTemplateSubDir = Poco::Path(tempRoot, "systemplate-" + jailId).toString();
             const std::string jailEtcDir = Poco::Path(jailPath, "etc").toString();
 
@@ -3313,6 +3317,34 @@ void lokit_main(
                     return false;
                 }
 
+                // copy default tempates from 'common' dir to shared templates dir
+                // TODO: maybe I shouldn't copy if whole point to mounting is that we don't require copying.
+                auto defaultTemplates = FileUtil::getDirEntries(loJailDestImpressTemplatePath);
+                for (auto& name : defaultTemplates)
+                {
+                    std::string sourcePath = loJailDestImpressTemplatePath;
+                    sourcePath.append("/");
+                    sourcePath.append(name);
+                    std::string destPath = sharedTemplate;
+                    destPath.append("/");
+                    destPath.append(name);
+                    if (!FileUtil::copy(sourcePath, destPath, false, false))
+                    {
+                        LOG_WRN("Failed to copy default impress template from ["
+                                << sourcePath << "] to [" << sharedTemplate << ']');
+                    }
+                }
+
+                // mount the shared templates over the lo shared templates' 'common' dir
+                if (!JailUtil::bind(sharedTemplate, loJailDestImpressTemplatePath) ||
+                    !JailUtil::remountReadonly(sharedTemplate, loJailDestImpressTemplatePath))
+                {
+                    // TODO: actually do this link on failure
+                    LOG_WRN("Failed to mount [" << sharedTemplate << "] -> [" << sharedTemplate
+                                                << "], will link contents");
+                    return false;
+                }
+
                 // tmpdir inside the jail for added sercurity.
                 Poco::File(tmpSubDir).createDirectories();
                 LOG_INF("Mounting random temp dir " << tmpSubDir << " -> " << jailTmpDir);

wsd/COOLWSD.cpp

@@ -676,6 +676,7 @@ std::string COOLWSD::ServerName;
 std::string COOLWSD::FileServerRoot;
 std::string COOLWSD::ServiceRoot;
 std::string COOLWSD::TmpFontDir;
+std::string COOLWSD::TmpTemplateDir;
 std::string COOLWSD::LOKitVersion;
 std::string COOLWSD::ConfigFile = COOLWSD_CONFIGDIR "/coolwsd.xml";
 std::string COOLWSD::ConfigDir = COOLWSD_CONFIGDIR "/conf.d";
@@ -1346,6 +1347,8 @@ void COOLWSD::innerInitialize(Poco::Util::Application& self)
         { "extra_export_formats.impress_png", "false" },
         { "extra_export_formats.impress_svg", "false" },
         { "extra_export_formats.impress_tiff", "false" },
+        { "remote_template_config.url", ""},
+        { "remote_font_config.url", ""},
     };
 
     // Set default values, in case they are missing from the config file.
@@ -3619,7 +3622,8 @@ int COOLWSD::innerMain()
     assert(Server && "The COOLWSDServer instance does not exist.");
     Server->findClientPort();
 
-    TmpFontDir = ChildRoot + JailUtil::CHILDROOT_TMP_INCOMING_PATH;
+    TmpFontDir = ChildRoot + JailUtil::CHILDROOT_TMP_INCOMING_PATH + "/fonts";
+    TmpTemplateDir = ChildRoot + JailUtil::CHILDROOT_TMP_INCOMING_PATH + "/templates";
 
     // Start the internal prisoner server and spawn forkit,
     // which in turn forks first child.
@@ -3679,17 +3683,40 @@ int COOLWSD::innerMain()
         LOG_ERR("Log level is set very high to '" << LogLevel << "' this will have a "
                 "significant performance impact. Do not use this in production.");
 
-    // Start the remote font downloading polling thread.
-    std::unique_ptr<RemoteFontConfigPoll> remoteFontConfigThread;
+    std::string uriConfigKey;
+    const std::string& fontConfigKey = "remote_font_config.url";
+    const std::string& assetConfigKey = "remote_asset_config.url";
+    bool remoteFontDefined = !ConfigUtil::getConfigValue<std::string>(fontConfigKey, "").empty();
+    bool remoteAssetDefined = !ConfigUtil::getConfigValue<std::string>(assetConfigKey, "").empty();
+    // Both defined: warn and use assetConfigKey
+    if (remoteFontDefined && remoteAssetDefined)
+    {
+        LOG_WRN("Both remote_font_config.url and remote_asset_config.url are defined, "
+                "remote_asset_config.url is overriden on remote_font_config.url");
+        uriConfigKey = assetConfigKey;
+    }
+    // only font defined: use fontConfigKey
+    else if (remoteFontDefined && !remoteAssetDefined)
+    {
+        uriConfigKey = fontConfigKey;
+    }
+    // only asset defined: use assetConfigKey
+    else if (!remoteFontDefined && remoteAssetDefined)
+    {
+        uriConfigKey = assetConfigKey;
+    }
+
+    // Start the remote asset downloading polling thread.
+    std::unique_ptr<RemoteAssetConfigPoll> remoteAssetConfigThread;
     try
     {
-        // Fetch font settings from server if configured
-        remoteFontConfigThread = std::make_unique<RemoteFontConfigPoll>(config());
-        remoteFontConfigThread->start();
+        // Fetch font and/or templates settings from server if configured
+        remoteAssetConfigThread = std::make_unique<RemoteAssetConfigPoll>(config(), uriConfigKey);
+        remoteAssetConfigThread->start();
     }
     catch (const Poco::Exception&)
     {
-        LOG_DBG("No remote_font_config");
+        LOG_DBG("No remote_asset_config");
     }
 #endif
 

wsd/COOLWSD.hpp

@@ -82,6 +82,7 @@ class COOLWSD final : public Poco::Util::ServerApplication,
     static std::string FileServerRoot;
     static std::string ServiceRoot; ///< There are installations that need prefixing every page with some path.
     static std::string TmpFontDir;
+    static std::string TmpTemplateDir;
     static std::string LOKitVersion;
     static bool EnableTraceEventLogging;
     static bool EnableAccessibility;