haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wsd: quarantine: absolute-path and better logging 

The quarantine path should be an absolute path.

Unfortunately, because we had relative=true in
the path config, we couldn't detect empty configs.
This is because with relative=true the getter
would create a path based on the current directory
and the config value, which would default to
"quarantine" when empty.
This would result in /opt/cool/quarantine or
/usr/bin/quarantine when in fact the path is
really empty.

Now, the config has relative=false and
there is no default. In addition, we
warn if the path is no absolute.

Change-Id: I1b3eb5e76866a12d214b47e6556942715a210e54
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
pull/7915/head
Ashod Nakashian 2023-12-27 06:37:01 -05:00 committed by Andras Timar
parent fb067faae4
commit 29cfaa7682
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coolwsd.xml.in
View File

@ -284,7 +284,7 @@
<quarantine_files desc="Files are stored here to be examined later in cases of crashes or similar situation." default="false" enable="false">
<limit_dir_size_mb desc="Maximum directory size. On exceeding the specified limit, older files will be deleted." default="250" type="uint"></limit_dir_size_mb>
<max_versions_to_maintain desc="How many versions of the same file to keep." default="2" type="uint"></max_versions_to_maintain>
<path desc="Path to directory under which quarantined files will be stored" type="path" relative="true" default="quarantine"></path>
<path desc="Absolute path of the directory under which quarantined files will be stored. Do not use a relative path." type="path" relative="false"></path>
<expiry_min desc="Time in mins after quarantined files will be deleted." type="int" default="30"></expiry_min>
</quarantine_files>

9
wsd/COOLWSD.cpp
View File

@ -2698,6 +2698,7 @@ void COOLWSD::innerInitialize(Application& self)
if (getConfigValue<bool>(conf, "quarantine_files[@enable]", false))
{
std::string path = Util::trimmed(getPathFromConfig("quarantine_files.path"));
LOG_INF("Quarantine path is set to [" << path << "] in config");
if (path.empty())
{
LOG_WRN("Quarantining is enabled via quarantine_files config, but no path is set in "
@ -2708,6 +2709,10 @@ void COOLWSD::innerInitialize(Application& self)
if (path[path.size() - 1] != '/')
path += '/';
if (path[0] != '/')
LOG_WRN("Quarantine path is relative. Please use an absolute path for better "
"reliability");
Poco::File p(path);
try
{
@ -2729,6 +2734,10 @@ void COOLWSD::innerInitialize(Application& self)
}
}
}
else
{
LOG_INF("Quarantine is disabled in config");
}
NumPreSpawnedChildren = getConfigValue<int>(conf, "num_prespawn_children", 1);
if (NumPreSpawnedChildren < 1)

2
wsd/QuarantineUtil.cpp
View File

@ -79,7 +79,7 @@ void Quarantine::initialize(const std::string& path)
});
std::vector<StringToken> tokens;
for (const auto& file : files)
for (const std::string& file : files)
{
StringVector::tokenize(file.c_str(), file.size(), Delimiter, tokens);
if (tokens.size() >= 3)