michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed wrapping of HeaderNames fields

Browse Source
This commit is contained in:
VooDooS 2019-04-12 15:25:18 +02:00
parent bb807554e2
commit ba12d96d23
3 changed files with 14 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
View File

@ -4,13 +4,13 @@ using System.Globalization;
using System.IO;
using System.Net;
using System.Text;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Services;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Primitives;
using Microsoft.Net.Http.Headers;
using HeaderNames = MediaBrowser.Common.Net.MoreHeaderNames;
using IHttpFile = MediaBrowser.Model.Services.IHttpFile;
using IHttpRequest = MediaBrowser.Model.Services.IHttpRequest;
using IResponse = MediaBrowser.Model.Services.IResponse;
@ -57,9 +57,9 @@ namespace Emby.Server.Implementations.SocketSharp
// "Real" remote ip might be in X-Forwarded-For of X-Real-Ip
// (if the server is behind a reverse proxy for example)
if (!IPAddress.TryParse(GetHeader(HeaderNames.XForwardedFor), out ip))
if (!IPAddress.TryParse(GetHeader(CustomHeaderNames.XForwardedFor), out ip))
{
if (!IPAddress.TryParse(GetHeader(HeaderNames.XRealIP), out ip))
if (!IPAddress.TryParse(GetHeader(CustomHeaderNames.XRealIP), out ip))
{
ip = request.HttpContext.Connection.RemoteIpAddress;
}

11
MediaBrowser.Common/Net/CustomHeaderNames.cs Normal file
View File

@ -0,0 +1,11 @@
namespace MediaBrowser.Common.Net
{
public static class CustomHeaderNames
{
// Other Headers
public const string XForwardedFor = "X-Forwarded-For";
public const string XForwardedPort = "X-Forwarded-Port";
public const string XForwardedProto = "X-Forwarded-Proto";
public const string XRealIP = "X-Real-IP";
}
}

83
MediaBrowser.Common/Net/MoreHeaderNames.cs
View File

@ -1,83 +0,0 @@
using HN = Microsoft.Net.Http.Headers.HeaderNames;
namespace MediaBrowser.Common.Net
{
public static class MoreHeaderNames
{
// Other Headers
public const string XForwardedFor = "X-Forwarded-For";
public const string XForwardedPort = "X-Forwarded-Port";
public const string XForwardedProto = "X-Forwarded-Proto";
public const string XRealIP = "X-Real-IP";
// Headers from Microsoft.Net.Http.Headers.HeaderNames
public const string Accept = HN.Accept;
public const string AcceptCharset = HN.AcceptCharset;
public const string AcceptEncoding = HN.AcceptEncoding;
public const string AcceptLanguage = HN.AcceptLanguage;
public const string AcceptRanges = HN.AcceptRanges;
public const string AccessControlAllowCredentials = HN.AccessControlAllowCredentials;
public const string AccessControlAllowHeaders = HN.AccessControlAllowHeaders;
public const string AccessControlAllowMethods = HN.AccessControlAllowMethods;
public const string AccessControlAllowOrigin = HN.AccessControlAllowOrigin;
public const string AccessControlExposeHeaders = HN.AccessControlExposeHeaders;
public const string AccessControlMaxAge = HN.AccessControlMaxAge;
public const string AccessControlRequestHeaders = HN.AccessControlRequestHeaders;
public const string AccessControlRequestMethod = HN.AccessControlRequestMethod;
public const string Age = HN.Age;
public const string Allow = HN.Allow;
public const string Authority = HN.Authority;
public const string Authorization = HN.Authorization;
public const string CacheControl = HN.CacheControl;
public const string Connection = HN.Connection;
public const string ContentDisposition = HN.ContentDisposition;
public const string ContentEncoding = HN.ContentEncoding;
public const string ContentLanguage = HN.ContentLanguage;
public const string ContentLength = HN.ContentLength;
public const string ContentLocation = HN.ContentLocation;
public const string ContentMD5 = HN.ContentMD5;
public const string ContentRange = HN.ContentRange;
public const string ContentSecurityPolicy = HN.ContentSecurityPolicy;
public const string ContentSecurityPolicyReportOnly = HN.ContentSecurityPolicyReportOnly;
public const string ContentType = HN.ContentType;
public const string Cookie = HN.Cookie;
public const string Date = HN.Date;
public const string ETag = HN.ETag;
public const string Expires = HN.Expires;
public const string Expect = HN.Expect;
public const string From = HN.From;
public const string Host = HN.Host;
public const string IfMatch = HN.IfMatch;
public const string IfModifiedSince = HN.IfModifiedSince;
public const string IfNoneMatch = HN.IfNoneMatch;
public const string IfRange = HN.IfRange;
public const string IfUnmodifiedSince = HN.IfUnmodifiedSince;
public const string LastModified = HN.LastModified;
public const string Location = HN.Location;
public const string MaxForwards = HN.MaxForwards;
public const string Method = HN.Method;
public const string Origin = HN.Origin;
public const string Path = HN.Path;
public const string Pragma = HN.Pragma;
public const string ProxyAuthenticate = HN.ProxyAuthenticate;
public const string ProxyAuthorization = HN.ProxyAuthorization;
public const string Range = HN.Range;
public const string Referer = HN.Referer;
public const string RetryAfter = HN.RetryAfter;
public const string Scheme = HN.Scheme;
public const string Server = HN.Server;
public const string SetCookie = HN.SetCookie;
public const string Status = HN.Status;
public const string StrictTransportSecurity = HN.StrictTransportSecurity;
public const string TE = HN.TE;
public const string Trailer = HN.Trailer;
public const string TransferEncoding = HN.TransferEncoding;
public const string Upgrade = HN.Upgrade;
public const string UserAgent = HN.UserAgent;
public const string Vary = HN.Vary;
public const string Via = HN.Via;
public const string Warning = HN.Warning;
public const string WebSocketSubProtocols = HN.WebSocketSubProtocols;
public const string WWWAuthenticate = HN.WWWAuthenticate;
}
}