huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ServerAddress.FromUrl() should throw for invalid url (#875)

This commit is contained in:
Mike Harder 2016-05-27 12:02:30 -07:00
parent 8df6fbc500
commit 2453047fe2
4 changed files with 58 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs
View File

@ -107,81 +107,74 @@ namespace Microsoft.AspNetCore.Server.Kestrel
foreach (var address in _serverAddresses.Addresses.ToArray()) foreach (var address in _serverAddresses.Addresses.ToArray())
{ {
var parsedAddress = ServerAddress.FromUrl(address); var parsedAddress = ServerAddress.FromUrl(address);
if (parsedAddress == null) atLeastOneListener = true;
if (!parsedAddress.Host.Equals("localhost", StringComparison.OrdinalIgnoreCase))
{ {
throw new FormatException("Unrecognized listening address: " + address); _disposables.Push(engine.CreateServer(
parsedAddress));
} }
else else
{ {
atLeastOneListener = true; if (parsedAddress.Port == 0)
if (!parsedAddress.Host.Equals("localhost", StringComparison.OrdinalIgnoreCase))
{ {
_disposables.Push(engine.CreateServer( throw new InvalidOperationException("Dynamic port binding is not supported when binding to localhost. You must either bind to 127.0.0.1:0 or [::1]:0, or both.");
parsedAddress));
} }
else
var ipv4Address = parsedAddress.WithHost("127.0.0.1");
var exceptions = new List<UvException>();
try
{ {
if (parsedAddress.Port == 0) _disposables.Push(engine.CreateServer(ipv4Address));
}
catch (AggregateException ex)
{
var uvException = ex.InnerException as UvException;
if (uvException != null && uvException.StatusCode != Constants.EADDRINUSE)
{ {
throw new InvalidOperationException("Dynamic port binding is not supported when binding to localhost. You must either bind to 127.0.0.1:0 or [::1]:0, or both."); _logger.LogWarning(0, ex, $"Unable to bind to {parsedAddress.ToString()} on the IPv4 loopback interface.");
exceptions.Add(uvException);
} }
else
var ipv4Address = parsedAddress.WithHost("127.0.0.1");
var exceptions = new List<UvException>();
try
{ {
_disposables.Push(engine.CreateServer(ipv4Address)); throw;
}
catch (AggregateException ex)
{
var uvException = ex.InnerException as UvException;
if (uvException != null && uvException.StatusCode != Constants.EADDRINUSE)
{
_logger.LogWarning(0, ex, $"Unable to bind to {parsedAddress.ToString()} on the IPv4 loopback interface.");
exceptions.Add(uvException);
}
else
{
throw;
}
}
var ipv6Address = parsedAddress.WithHost("[::1]");
try
{
_disposables.Push(engine.CreateServer(ipv6Address));
}
catch (AggregateException ex)
{
var uvException = ex.InnerException as UvException;
if (uvException != null && uvException.StatusCode != Constants.EADDRINUSE)
{
_logger.LogWarning(0, ex, $"Unable to bind to {parsedAddress.ToString()} on the IPv6 loopback interface.");
exceptions.Add(uvException);
}
else
{
throw;
}
}
if (exceptions.Count == 2)
{
var ex = new AggregateException(exceptions);
_logger.LogError(0, ex, $"Unable to bind to {parsedAddress.ToString()} on any loopback interface.");
throw ex;
} }
} }
// If requested port was "0", replace with assigned dynamic port. var ipv6Address = parsedAddress.WithHost("[::1]");
_serverAddresses.Addresses.Remove(address);
_serverAddresses.Addresses.Add(parsedAddress.ToString()); try
{
_disposables.Push(engine.CreateServer(ipv6Address));
}
catch (AggregateException ex)
{
var uvException = ex.InnerException as UvException;
if (uvException != null && uvException.StatusCode != Constants.EADDRINUSE)
{
_logger.LogWarning(0, ex, $"Unable to bind to {parsedAddress.ToString()} on the IPv6 loopback interface.");
exceptions.Add(uvException);
}
else
{
throw;
}
}
if (exceptions.Count == 2)
{
var ex = new AggregateException(exceptions);
_logger.LogError(0, ex, $"Unable to bind to {parsedAddress.ToString()} on any loopback interface.");
throw ex;
}
} }
// If requested port was "0", replace with assigned dynamic port.
_serverAddresses.Addresses.Remove(address);
_serverAddresses.Addresses.Add(parsedAddress.ToString());
} }
if (!atLeastOneListener) if (!atLeastOneListener)

2
src/Microsoft.AspNetCore.Server.Kestrel/ServerAddress.cs
View File

@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
int schemeDelimiterStart = url.IndexOf("://", StringComparison.Ordinal); int schemeDelimiterStart = url.IndexOf("://", StringComparison.Ordinal);
if (schemeDelimiterStart < 0) if (schemeDelimiterStart < 0)
{ {
return null; throw new FormatException($"Invalid URL: {url}");
} }
int schemeDelimiterEnd = schemeDelimiterStart + "://".Length; int schemeDelimiterEnd = schemeDelimiterStart + "://".Length;

2
test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
View File

@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var exception = Assert.Throws<FormatException>(() => StartDummyApplication(server)); var exception = Assert.Throws<FormatException>(() => StartDummyApplication(server));
Assert.Contains("Unrecognized listening address", exception.Message); Assert.Contains("Invalid URL", exception.Message);
} }
[Fact] [Fact]

4
test/Microsoft.AspNetCore.Server.KestrelTests/ServerAddressTests.cs
View File

@ -14,9 +14,9 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
[InlineData("")] [InlineData("")]
[InlineData("5000")] [InlineData("5000")]
[InlineData("//noscheme")] [InlineData("//noscheme")]
public void FromUriReturnsNullForSchemelessUrls(string url) public void FromUriThrowsForSchemelessUrls(string url)
{ {
Assert.Null(ServerAddress.FromUrl(url)); Assert.Throws<FormatException>(() => ServerAddress.FromUrl(url));
} }
[Theory] [Theory]