zotan/AutheliaMultiDomainProxy
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use string interpolation everywhere, harden host checks

Browse source
This commit is contained in:
Laura Hausmann 2023-03-28 23:46:47 +02:00
parent 327aabaf46
commit f2dd8d8335
Signed by: zotan
GPG key ID: D044E84C5BE01605
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Backend/AuthHelpers.cs
View file

@ -19,7 +19,7 @@ public class AuthHelpers {
var client = new HttpClient();
client.DefaultRequestHeaders.Add("cookie", $"authelia_session={HttpUtility.UrlDecode(cookie)}");
client.DefaultRequestHeaders.Add("x-forwarded-proto", "https");
client.DefaultRequestHeaders.Add("Host", Vars.AutheliaSubdomain + "." + Vars.UpstreamPrimaryDomain);
client.DefaultRequestHeaders.Add("Host", $"{Vars.AutheliaSubdomain}.{Vars.UpstreamPrimaryDomain}");
var response = client.GetAsync($"http://127.0.0.1:9091/api/verify");
return response.Result;
}
@ -32,7 +32,7 @@ public class AuthHelpers {
client.DefaultRequestHeaders.Add(header.Key, (IEnumerable<string?>)header.Value);
}
client.DefaultRequestHeaders.Host = headers["Host"] + ".amdp." + Vars.UpstreamPrimaryDomain;
client.DefaultRequestHeaders.Host = $"{headers["Host"]}.amdp.{Vars.UpstreamPrimaryDomain}";
if (!string.IsNullOrWhiteSpace(cookie))
client.DefaultRequestHeaders.Add("cookie", $"authelia_session={HttpUtility.UrlDecode(cookie)}");

4
Controllers/CookieProxyController.cs
View file

@ -12,7 +12,7 @@ public class CookieProxyController : Controller {
[Route("/api/cookieproxy_stage_one")]
public IActionResult StageOne([FromQuery] string dstDomain, [FromQuery] string tgt) {
// Check if we are on the correct domain
if (Request.Host.Host != Vars.AuthProxySubdomain + "." + Vars.UpstreamPrimaryDomain)
if (Request.Host.Host != $"{Vars.AuthProxySubdomain}.{Vars.UpstreamPrimaryDomain}")
return StatusCode(StatusCodes.Status421MisdirectedRequest);
if (!Request.Cookies.ContainsKey("authelia_session")
@ -34,7 +34,7 @@ public class CookieProxyController : Controller {
[Route("/api/cookieproxy_stage_two")]
public IActionResult StageTwo([FromQuery] string dstDomain, [FromQuery] string tgt, [FromForm] string cookie) {
// Check if we are on an allowed domain
if (!Request.Host.Host.StartsWith(Vars.AuthProxySubdomain + ".") || !Vars.PermittedDomains.Any(p => Request.Host.Host.EndsWith("." + p)))
if (Vars.PermittedDomains.All(p => Request.Host.Host != $"{Vars.AuthProxySubdomain}.{p}"))
return StatusCode(StatusCodes.Status421MisdirectedRequest);
if (string.IsNullOrWhiteSpace(dstDomain)

4
Controllers/LogoutController.cs
View file

@ -10,13 +10,13 @@ public class LogoutController : Controller {
[Produces("text/html")]
public ActionResult Post([FromQuery] string rd) {
// Check if we are on an allowed domain
if (!Request.Host.Host.StartsWith(Vars.AuthProxySubdomain + ".") || !Vars.PermittedDomains.Any(p => Request.Host.Host.EndsWith("." + p)))
if (Vars.PermittedDomains.All(p => Request.Host.Host != $"{Vars.AuthProxySubdomain}.{p}"))
return StatusCode(StatusCodes.Status421MisdirectedRequest);
if (string.IsNullOrWhiteSpace(rd))
rd = "/";
Response.Cookies.Delete(Vars.CookieName, new CookieOptions { Secure = true, SameSite = SameSiteMode.Lax, HttpOnly = true, Domain = Request.Host.Host.Replace(Vars.AuthProxySubdomain + ".", "")});
Response.Cookies.Delete(Vars.CookieName, new CookieOptions { Secure = true, SameSite = SameSiteMode.Lax, HttpOnly = true, Domain = Request.Host.Host.Replace($"{Vars.AuthProxySubdomain}.", "")});
Response.ContentType = "text/html";
Response.Redirect(rd);
return Content($"Cookie cleared. Redirecting... <a href=\"{rd}\">Click here if you are not redirected automatically</a>", "text/html");

2
Controllers/RedirectController.cs
View file

@ -9,7 +9,7 @@ namespace AutheliaMultiDomainProxy.Controllers;
public class RedirectController : Controller {
public IActionResult Get([FromQuery] string dstDomain, [FromQuery] string tgt) {
// Check if we are on an allowed domain
if (!Vars.PermittedDomains.Any(p => Request.Host.Host.EndsWith("." + p))) {
if (!Vars.PermittedDomains.Any(p => Request.Host.Host.EndsWith($".{p}"))) {
Response.StatusCode = 421;
return StatusCode(StatusCodes.Status421MisdirectedRequest);
}

2
Controllers/VerifyController.cs
View file

@ -8,7 +8,7 @@ namespace AutheliaMultiDomainProxy.Controllers;
public class VerifyController : Controller {
public string Get() {
// Check if we are on an allowed domain
if (!Vars.PermittedDomains.Any(p => Request.Host.Host.EndsWith("." + p))) {
if (!Vars.PermittedDomains.Any(p => Request.Host.Host.EndsWith($".{p}"))) {
Response.StatusCode = 421;
return "421 Misdirected Request";
}

4
Pages/Index.cshtml
View file

@ -4,7 +4,7 @@
@model IndexModel
@{
// Check if we are on an allowed domain
if (!Request.Host.Host.StartsWith(Vars.AuthProxySubdomain + ".") || !Vars.PermittedDomains.Any(p => Request.Host.Host.EndsWith("." + p))) {
if (Vars.PermittedDomains.All(p => Request.Host.Host != $"{Vars.AuthProxySubdomain}.{p}"))
Layout = null;
Response.Clear();
Response.StatusCode = StatusCodes.Status421MisdirectedRequest;
@ -32,6 +32,6 @@
}
else {
<p>You are currently <span class="badge bg-danger">not authenticated</span></p>
<a href="https://@Vars.AutheliaSubdomain.@Vars.UpstreamPrimaryDomain/?rd=@(HttpUtility.UrlEncode($"https://{Vars.AuthProxySubdomain}.{Vars.UpstreamPrimaryDomain}/api/cookieproxy_stage_one?dstDomain={Request.Host.Host.Replace(Vars.AuthProxySubdomain + ".", "")}&tgt=https://{Request.Host.Host}"))" class="btn btn-success">Log in</a>
<a href="https://@Vars.AutheliaSubdomain.@Vars.UpstreamPrimaryDomain/?rd=@HttpUtility.UrlEncode($"https://{Vars.AuthProxySubdomain}.{Vars.UpstreamPrimaryDomain}/api/cookieproxy_stage_one?dstDomain={Request.Host.Host.Replace($"{Vars.AuthProxySubdomain}.", "")}&tgt=https://{Request.Host.Host}")" class="btn btn-success">Log in</a>
}
</div>