From 90174f68e2b477e613d756d78cbfd89c2a33f30a Mon Sep 17 00:00:00 2001
From: Fredrik Lindberg <fli@shapeshifter.se>
Date: Tue, 31 Aug 2021 22:22:55 +0200
Subject: Dynamically populate LocalAddress based on HTTP request

Support populating the LocalAddress field in the system info
endpoint based on the x-forwarded-host and x-forwarded-proto header.

The x-forwarded-host header must contain both the host and port for
the url to be properly constructed.

Behind network configuration option that is disabled by default.
---
 Jellyfin.Networking/Configuration/NetworkConfiguration.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Jellyfin.Networking/Configuration')

diff --git a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
index faf814c060..61db223d92 100644
--- a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
+++ b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
@@ -226,5 +226,10 @@ namespace Jellyfin.Networking.Configuration
         /// Gets or sets the known proxies. If the proxy is a network, it's added to the KnownNetworks.
         /// </summary>
         public string[] KnownProxies { get; set; } = Array.Empty<string>();
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests.
+        /// </summary>
+        public bool EnablePublishedServerUriByRequest { get; set; } = false;
     }
 }
-- 
cgit v1.2.3


From 0485ff189948e4c0b6532e835b9f6740e89d0d40 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Wed, 24 Nov 2021 13:42:14 +0100
Subject: Create a store key constant for network

---
 Emby.Dlna/Main/DlnaEntryPoint.cs                   |  2 +-
 Jellyfin.Api/Controllers/StartupController.cs      |  2 +-
 .../Configuration/NetworkConfigurationFactory.cs   |  6 +-----
 .../Configuration/NetworkConfigurationStore.cs     | 24 ++++++++++++++++++++++
 Jellyfin.Networking/Manager/NetworkManager.cs      |  2 +-
 5 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 Jellyfin.Networking/Configuration/NetworkConfigurationStore.cs

(limited to 'Jellyfin.Networking/Configuration')

diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index f35d90f21c..08f639d932 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -124,7 +124,7 @@ namespace Emby.Dlna.Main
                 config);
             Current = this;
 
-            var netConfig = config.GetConfiguration<NetworkConfiguration>("network");
+            var netConfig = config.GetConfiguration<NetworkConfiguration>(NetworkConfigurationStore.StoreKey);
             _disabled = appHost.ListenWithHttps && netConfig.RequireHttps;
 
             if (_disabled && _config.GetDlnaConfiguration().EnableServer)
diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs
index a01a617fc0..c49bde93f1 100644
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -93,7 +93,7 @@ namespace Jellyfin.Api.Controllers
             NetworkConfiguration settings = _config.GetNetworkConfiguration();
             settings.EnableRemoteAccess = startupRemoteAccessDto.EnableRemoteAccess;
             settings.EnableUPnP = startupRemoteAccessDto.EnableAutomaticPortMapping;
-            _config.SaveConfiguration("network", settings);
+            _config.SaveConfiguration(NetworkConfigurationStore.StoreKey, settings);
             return NoContent();
         }
 
diff --git a/Jellyfin.Networking/Configuration/NetworkConfigurationFactory.cs b/Jellyfin.Networking/Configuration/NetworkConfigurationFactory.cs
index ac0485d871..14726565aa 100644
--- a/Jellyfin.Networking/Configuration/NetworkConfigurationFactory.cs
+++ b/Jellyfin.Networking/Configuration/NetworkConfigurationFactory.cs
@@ -16,11 +16,7 @@ namespace Jellyfin.Networking.Configuration
         {
             return new[]
             {
-                new ConfigurationStore
-                {
-                    Key = "network",
-                    ConfigurationType = typeof(NetworkConfiguration)
-                }
+                new NetworkConfigurationStore()
             };
         }
     }
diff --git a/Jellyfin.Networking/Configuration/NetworkConfigurationStore.cs b/Jellyfin.Networking/Configuration/NetworkConfigurationStore.cs
new file mode 100644
index 0000000000..a268ebb68f
--- /dev/null
+++ b/Jellyfin.Networking/Configuration/NetworkConfigurationStore.cs
@@ -0,0 +1,24 @@
+using MediaBrowser.Common.Configuration;
+
+namespace Jellyfin.Networking.Configuration
+{
+    /// <summary>
+    /// A configuration that stores network related settings.
+    /// </summary>
+    public class NetworkConfigurationStore : ConfigurationStore
+    {
+        /// <summary>
+        /// The name of the configuration in the storage.
+        /// </summary>
+        public const string StoreKey = "network";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NetworkConfigurationStore"/> class.
+        /// </summary>
+        public NetworkConfigurationStore()
+        {
+            ConfigurationType = typeof(NetworkConfiguration);
+            Key = StoreKey;
+        }
+    }
+}
diff --git a/Jellyfin.Networking/Manager/NetworkManager.cs b/Jellyfin.Networking/Manager/NetworkManager.cs
index cf002dc738..58b30ad2d2 100644
--- a/Jellyfin.Networking/Manager/NetworkManager.cs
+++ b/Jellyfin.Networking/Manager/NetworkManager.cs
@@ -727,7 +727,7 @@ namespace Jellyfin.Networking.Manager
 
         private void ConfigurationUpdated(object? sender, ConfigurationUpdateEventArgs evt)
         {
-            if (evt.Key.Equals("network", StringComparison.Ordinal))
+            if (evt.Key.Equals(NetworkConfigurationStore.StoreKey, StringComparison.Ordinal))
             {
                 UpdateSettings((NetworkConfiguration)evt.NewConfiguration);
             }
-- 
cgit v1.2.3