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

[bug] Fix crash with timeLimited=false license; Fix bug 64367

Browse Source
This commit is contained in:
Sergey Konovalov
2023-09-27 12:09:34 +03:00
parent 5977f643e8
commit 7c768c8f43
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Common/sources/tenantManager.js
View File

@ -42,7 +42,6 @@ const utils = require('./../../Common/sources/utils');
const { readFile } = require('fs/promises');
const path = require('path');
const oPackageType = config.get('license.packageType');
const cfgTenantsBaseDomain = config.get('tenants.baseDomain');
const cfgTenantsBaseDir = config.get('tenants.baseDir');
const cfgTenantsFilenameSecret = config.get('tenants.filenameSecret');
@ -344,7 +343,7 @@ async function readLicenseTenant(ctx, licenseFile, baseVerifiedLicense) {
const timeLimited = 0 !== (res.mode & c_LM.Limited);
const checkDate = ((res.mode & c_LM.Trial) || timeLimited) ? new Date() : oBuildDate;
const checkDate = ((res.mode & c_LM.Trial) || timeLimited) ? new Date() : licenseInfo.buildDate;
//Calendar check of start_date allows to issue a license for old versions
const checkStartDate = new Date();
if (startDate <= checkStartDate && checkDate <= endDate && (!oLicense.hasOwnProperty('version') || 2 <= oLicense['version'])) {
@ -399,7 +398,7 @@ async function readLicenseTenant(ctx, licenseFile, baseVerifiedLicense) {
}
return [res, oLicense];
};
}
exports.getDefautTenant = getDefautTenant;
exports.getTenantByConnection = getTenantByConnection;