AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nightly Issues (#2618)

Browse source
This commit is contained in:
Joe Milazzo 2024-01-18 08:35:54 -06:00 • committed by GitHub
parent 0ff6d4a6fc
commit d145dca0e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 138 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Kavita.Common/Configuration.cs
View file

@ -13,7 +13,6 @@ public static class Configuration
public const string DefaultBaseUrl = "/";
public const int DefaultHttpPort = 5000;
public const int DefaultTimeOutSecs = 90;
public const string DefaultXFrameOptions = "SAMEORIGIN";
public const long DefaultCacheMemory = 75;
private static readonly string AppSettingsFilename = Path.Join("config", GetAppSettingFilename());
@ -49,7 +48,7 @@ public static class Configuration
set => SetCacheSize(GetAppSettingFilename(), value);
}
public static string XFrameOptions => GetXFrameOptions(GetAppSettingFilename());
public static bool AllowIFraming => GetAllowIFraming(GetAppSettingFilename());
private static string GetAppSettingFilename()
{
@ -293,26 +292,21 @@ public static class Configuration
#endregion
#region XFrameOrigins
private static string GetXFrameOptions(string filePath)
#region AllowIFraming
private static bool GetAllowIFraming(string filePath)
{
if (OsInfo.IsDocker)
{
return DefaultBaseUrl;
}
try
{
var json = File.ReadAllText(filePath);
var jsonObj = JsonSerializer.Deserialize<AppSettings>(json);
return !string.IsNullOrEmpty(jsonObj.XFrameOrigins) ? jsonObj.XFrameOrigins : DefaultXFrameOptions;
return jsonObj.AllowIFraming;
}
catch (Exception ex)
{
Console.WriteLine("Error reading app settings: " + ex.Message);
}
return DefaultXFrameOptions;
return false;
}
#endregion
@ -328,6 +322,6 @@ public static class Configuration
// ReSharper disable once MemberHidesStaticFromOuterClass
public long Cache { get; set; } = DefaultCacheMemory;
// ReSharper disable once MemberHidesStaticFromOuterClass
public string XFrameOrigins { get; set; } = DefaultXFrameOptions;
public bool AllowIFraming { get; set; } = false;
}
}