Merge pull request #246 from bdovaz/allow-port-override

Allow port override

Author: 9p4

SSO-Auth/Api/SSOController.cs

@@ -106,7 +106,7 @@ public async Task<ActionResult> OidPost(
                 Authority = config.OidEndpoint?.Trim(),
                 ClientId = config.OidClientId?.Trim(),
                 ClientSecret = config.OidSecret?.Trim(),
-                RedirectUri = GetRequestBase(config.SchemeOverride) + $"/sso/OID/{(Request.Path.Value.Contains("/start/", StringComparison.InvariantCultureIgnoreCase) ? "redirect" : "r")}/" + provider,
+                RedirectUri = GetRequestBase(config.SchemeOverride, config.PortOverride) + $"/sso/OID/{(Request.Path.Value.Contains("/start/", StringComparison.InvariantCultureIgnoreCase) ? "redirect" : "r")}/" + provider,
                 Scope = string.Join(" ", scopes.Prepend("openid profile")),
                 DisablePushedAuthorization = config.DisablePushedAuthorization,
             };
@@ -276,7 +276,7 @@ public async Task<ActionResult> OidPost(
             if (StateManager[state].Valid)
             {
                 _logger.LogInformation($"Is request linking: {isLinking}");
-                return Content(WebResponse.Generator(data: state, provider: provider, baseUrl: GetRequestBase(config.SchemeOverride), mode: "OID", isLinking: isLinking), MediaTypeNames.Text.Html);
+                return Content(WebResponse.Generator(data: state, provider: provider, baseUrl: GetRequestBase(config.SchemeOverride, config.PortOverride), mode: "OID", isLinking: isLinking), MediaTypeNames.Text.Html);
             }
             else
             {
@@ -324,7 +324,7 @@ public async Task<ActionResult> OidChallenge(string provider, [FromQuery] bool i
                 config.NewPath = newPath;
             }
 
-            string redirectUri = GetRequestBase(config.SchemeOverride) + $"/sso/OID/{(newPath ? "redirect" : "r")}/" + provider;
+            string redirectUri = GetRequestBase(config.SchemeOverride, config.PortOverride) + $"/sso/OID/{(newPath ? "redirect" : "r")}/" + provider;
 
             var options = new OidcClientOptions
             {
@@ -524,7 +524,7 @@ public ActionResult SamlPost(string provider, [FromQuery] string relayState = nu
                         WebResponse.Generator(
                             data: Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(samlResponse.Xml)),
                             provider: provider,
-                            baseUrl: GetRequestBase(config.SchemeOverride),
+                            baseUrl: GetRequestBase(config.SchemeOverride, config.PortOverride),
                             mode: "SAML",
                             isLinking: isLinking),
                         MediaTypeNames.Text.Html);
@@ -570,7 +570,7 @@ public RedirectResult SamlChallenge(string provider, [FromQuery] bool isLinking
                 config.NewPath = newPath;
             }
 
-            string redirectUri = GetRequestBase(config.SchemeOverride) + $"/sso/SAML/{(newPath ? "post" : "p")}/" + provider;
+            string redirectUri = GetRequestBase(config.SchemeOverride, config.PortOverride) + $"/sso/SAML/{(newPath ? "post" : "p")}/" + provider;
             string relayState = null;
             if (isLinking)
             {
@@ -1148,9 +1148,19 @@ private void Invalidate()
         }
     }
 
-    private string GetRequestBase(string schemeOverride = null)
+    private string GetRequestBase(string schemeOverride = null, int? portOverride = null)
+    {
+        int requestPort;
+
+        if (portOverride != null)
+        {
+            requestPort = portOverride.Value;
+        }
+        else
         {
-        int requestPort = Request.Host.Port ?? -1;
+            requestPort = Request.Host.Port ?? -1;
+        }
+
         if ((requestPort == 80 && string.Equals(Request.Scheme, "http", StringComparison.OrdinalIgnoreCase)) || (requestPort == 443 && string.Equals(Request.Scheme, "https", StringComparison.OrdinalIgnoreCase)))
         {
             requestPort = -1;

SSO-Auth/Config/PluginConfiguration.cs

@@ -131,6 +131,11 @@ public class SamlConfig
     /// </summary>
     public string SchemeOverride { get; set; }
 
+    /// <summary>
+    /// Gets or sets the redirect port override.
+    /// </summary>
+    public int? PortOverride { get; set; }
+
     /// <summary>
     /// Gets or sets a value indicating whether the new, more descriptive paths are to be used.
     /// </summary>
@@ -265,6 +270,11 @@ public class OidConfig
     /// </summary>
     public string SchemeOverride { get; set; }
 
+    /// <summary>
+    /// Gets or sets the redirect port override.
+    /// </summary>
+    public int? PortOverride { get; set; }
+
     /// <summary>
     /// Gets or sets a value indicating whether the new, more descriptive paths are to be used.
     /// </summary>

SSO-Auth/Config/configPage.html

@@ -651,6 +651,18 @@ <h2 class="sectionTitle">SSO Settings:</h2>
                   </div>
                 </div>
 
+                <div class="inputContainer">
+                    <label class="inputLabel inputLabelUnfocused" for="RoleClaim">Port Override</label>
+                    <input is="emby-input"
+                            id="PortOverride"
+                            type="text"
+                            class="sso-text" />
+                    <div class="fieldDescription">
+                        If the plugin is redirecting to an incorrect port, set this to
+                        the appropiate port
+                    </div>
+                </div>
+
                 <button
                   id="SaveProvider"
                   is="emby-button"