Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

update translations

Browse Source
This commit is contained in:
Luke Pulverenti 2016-12-01 13:23:47 -05:00
parent 3e9f655899
commit 77a6eafe15
2 changed files with 66 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Emby.Server.Implementations/Security/MBLicenseFile.cs
View File

@ -39,7 +39,7 @@ namespace Emby.Server.Implementations.Security
} }
} }
private readonly ConcurrentDictionary<Guid, DateTime> _updateRecords = new ConcurrentDictionary<Guid, DateTime>(); private readonly ConcurrentDictionary<Guid, FeatureRegInfo> _updateRecords = new ConcurrentDictionary<Guid, FeatureRegInfo>();
private readonly object _fileLock = new object(); private readonly object _fileLock = new object();
private string _regKey; private string _regKey;
@ -52,7 +52,7 @@ namespace Emby.Server.Implementations.Security
Load(); Load();
} }
private void SetUpdateRecord(Guid key, DateTime value) private void SetUpdateRecord(Guid key, FeatureRegInfo value)
{ {
_updateRecords.AddOrUpdate(key, value, (k, v) => value); _updateRecords.AddOrUpdate(key, value, (k, v) => value);
} }
@ -62,10 +62,14 @@ namespace Emby.Server.Implementations.Security
return new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId))); return new Guid(_cryptographyProvider.ComputeMD5(Encoding.Unicode.GetBytes(featureId)));
} }
public void AddRegCheck(string featureId) public void AddRegCheck(string featureId, DateTime expirationDate)
{ {
var key = GetKey(featureId); var key = GetKey(featureId);
var value = DateTime.UtcNow; var value = new FeatureRegInfo
{
ExpirationDate = expirationDate,
LastChecked = DateTime.UtcNow
};
SetUpdateRecord(key, value); SetUpdateRecord(key, value);
Save(); Save();
@ -74,21 +78,26 @@ namespace Emby.Server.Implementations.Security
public void RemoveRegCheck(string featureId) public void RemoveRegCheck(string featureId)
{ {
var key = GetKey(featureId); var key = GetKey(featureId);
DateTime val; FeatureRegInfo val;
_updateRecords.TryRemove(key, out val); _updateRecords.TryRemove(key, out val);
Save(); Save();
} }
public DateTime LastChecked(string featureId) public FeatureRegInfo GetRegInfo(string featureId)
{ {
var key = GetKey(featureId); var key = GetKey(featureId);
DateTime last; FeatureRegInfo info = null;
_updateRecords.TryGetValue(key, out last); _updateRecords.TryGetValue(key, out info);
if (info == null)
{
return null;
}
// guard agains people just putting a large number in the file // guard agains people just putting a large number in the file
return last < DateTime.UtcNow ? last : DateTime.MinValue; return info.LastChecked < DateTime.UtcNow ? info : null;
} }
private void Load() private void Load()
@ -105,7 +114,7 @@ namespace Emby.Server.Implementations.Security
{ {
lock (_fileLock) lock (_fileLock)
{ {
_fileSystem.WriteAllBytes(licenseFile, new byte[] {}); _fileSystem.WriteAllBytes(licenseFile, new byte[] { });
} }
} }
catch (IOException) catch (IOException)
@ -139,7 +148,23 @@ namespace Emby.Server.Implementations.Security
Guid feat; Guid feat;
if (Guid.TryParse(line, out feat)) if (Guid.TryParse(line, out feat))
{ {
SetUpdateRecord(feat, new DateTime(Convert.ToInt64(contents[i + 1]))); var lineParts = contents[i + 1].Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
long ticks;
if (long.TryParse(lineParts[0], out ticks))
{
var info = new FeatureRegInfo
{
LastChecked = new DateTime(ticks)
};
if (lineParts.Length > 1 && long.TryParse(lineParts[1], out ticks))
{
info.ExpirationDate = new DateTime(ticks);
}
SetUpdateRecord(feat, info);
}
} }
} }
} }
@ -160,7 +185,11 @@ namespace Emby.Server.Implementations.Security
.ToList()) .ToList())
{ {
lines.Add(pair.Key.ToString()); lines.Add(pair.Key.ToString());
lines.Add(pair.Value.Ticks.ToString(CultureInfo.InvariantCulture));
var dateLine = pair.Value.LastChecked.Ticks.ToString(CultureInfo.InvariantCulture) + "|" +
pair.Value.ExpirationDate.Ticks.ToString(CultureInfo.InvariantCulture);
lines.Add(dateLine);
} }
var licenseFile = Filename; var licenseFile = Filename;
@ -171,4 +200,15 @@ namespace Emby.Server.Implementations.Security
} }
} }
} }
internal class FeatureRegInfo
{
public DateTime ExpirationDate { get; set; }
public DateTime LastChecked { get; set; }
public FeatureRegInfo()
{
ExpirationDate = DateTime.MinValue;
}
}
} }

17
Emby.Server.Implementations/Security/PluginSecurityManager.cs
View File

@ -245,13 +245,24 @@ namespace Emby.Server.Implementations.Security
string mb2Equivalent = null, string mb2Equivalent = null,
string version = null) string version = null)
{ {
var lastChecked = LicenseFile.LastChecked(feature); var regInfo = LicenseFile.GetRegInfo(feature);
var lastChecked = regInfo == null ? DateTime.MinValue : regInfo.LastChecked;
var expDate = regInfo == null ? DateTime.MinValue : regInfo.ExpirationDate;
var maxCacheDays = 14;
var nextCheckDate = new [] { expDate, lastChecked.AddDays(maxCacheDays) }.Min();
if (nextCheckDate > DateTime.UtcNow.AddDays(maxCacheDays))
{
nextCheckDate = DateTime.MinValue;
}
//check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho //check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
var reg = new RegRecord var reg = new RegRecord
{ {
// Cache the result for up to a week // Cache the result for up to a week
registered = lastChecked > DateTime.UtcNow.AddDays(-7) registered = regInfo != null && nextCheckDate >= DateTime.UtcNow,
expDate = expDate
}; };
var success = reg.registered; var success = reg.registered;
@ -291,7 +302,7 @@ namespace Emby.Server.Implementations.Security
if (reg.registered) if (reg.registered)
{ {
LicenseFile.AddRegCheck(feature); LicenseFile.AddRegCheck(feature, reg.expDate);
} }
else else
{ {