strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsd: fix: use only alias_groups entries when defined

Browse source 
ignore wopi.storage.host entries when storage.wopi.alias_groups entry is defined in config

Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I7ea73f147e283077b02bdacb37f8850f7613c0c3
This commit is contained in:
Rash419 2022-06-20 15:50:32 +05:30 committed by Pranam Lashkari
parent 04eafaf323
commit 04f81f8590
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wsd/HostUtil.cpp
View file

@ -59,6 +59,8 @@ bool HostUtil::allowedWopiHost(const std::string& host)
void HostUtil::parseAliases(Poco::Util::LayeredConfiguration& conf)
{
WopiEnabled = conf.getBool("storage.wopi[@allow]", false);
//set alias_groups mode to compat
if (!conf.has("storage.wopi.alias_groups"))
{

6
wsd/Storage.cpp
View file

@ -90,7 +90,11 @@ void StorageBase::initialize()
const auto& app = Poco::Util::Application::instance();
FilesystemEnabled = app.config().getBool("storage.filesystem[@allow]", false);
HostUtil::parseWopiHost(app.config());
//parse wopi.storage.host only when there is no storage.wopi.alias_groups entry in config
if (!app.config().has("storage.wopi.alias_groups"))
{
HostUtil::parseWopiHost(app.config());
}
#ifdef ENABLE_FEATURE_LOCK
CommandControl::LockManager::parseLockedHost(app.config());