pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request '[bug] Fix reading of tenant secret.key; Fix bug 77558' (#81) from fix/bug-ten-sec into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/server/pulls/81
This commit is contained in:
Oleg Korshul
2025-10-12 16:21:06 +00:00
parent 4f1f430502 6ed6c0a33d
commit 0dc8dbf0fa
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Common/sources/tenantManager.js
View File

@ -166,19 +166,23 @@ function getTenantSecret(ctx, type) {
return co(function* () {
let cfgTenant;
//check config
switch (type) {
case commonDefines.c_oAscSecretType.Browser:
case commonDefines.c_oAscSecretType.Inbox:
cfgTenant = ctx.getCfg('services.CoAuthoring.secret.inbox', undefined);
break;
case commonDefines.c_oAscSecretType.Outbox:
cfgTenant = ctx.getCfg('services.CoAuthoring.secret.outbox', undefined);
break;
case commonDefines.c_oAscSecretType.Session:
cfgTenant = ctx.getCfg('services.CoAuthoring.secret.session', undefined);
break;
const tenantConfig = yield getTenantConfig(ctx);
if (tenantConfig) {
switch (type) {
case commonDefines.c_oAscSecretType.Browser:
case commonDefines.c_oAscSecretType.Inbox:
cfgTenant = tenantConfig?.services?.CoAuthoring?.secret?.inbox;
break;
case commonDefines.c_oAscSecretType.Outbox:
cfgTenant = tenantConfig?.services?.CoAuthoring?.secret?.outbox;
break;
case commonDefines.c_oAscSecretType.Session:
cfgTenant = tenantConfig?.services?.CoAuthoring?.secret?.session;
break;
}
}
if (undefined !== cfgTenant) {
if (cfgTenant) {
return utils.getSecretByElem(cfgTenant);
}
let res = undefined;