diff --git a/.gitignore b/.gitignore index 17dcab0..a8ebcf4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,348 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser *.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- Backup*.rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + .vscode -.vs \ No newline at end of file diff --git a/Examples/CliClient/CliClient.csproj b/Examples/CliClient/CliClient.csproj index c2720e0..ae9e79a 100644 --- a/Examples/CliClient/CliClient.csproj +++ b/Examples/CliClient/CliClient.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp1.1 + netcoreapp2.2 diff --git a/Examples/CliClient/Program.cs b/Examples/CliClient/Program.cs index 6d93704..ee3b609 100644 --- a/Examples/CliClient/Program.cs +++ b/Examples/CliClient/Program.cs @@ -1,9 +1,13 @@ using System; +using System.Collections.Generic; using System.Diagnostics; +using System.IO; using System.Linq; using System.Net; +using System.Net.Security; using System.Net.Sockets; using System.Text; +using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.Logging; @@ -143,8 +147,8 @@ public void Run(string[] args) throw new Exception("Invalid number of concurrent requests"); } - if (scheme != "http") - throw new Exception("Only http scheme is supported"); + if (scheme != "http" && scheme != "https") + throw new Exception("Only http and https schemes are supported"); if (isBenchmark) { @@ -173,7 +177,7 @@ async Task RunSingleRequest() var sw = new System.Diagnostics.Stopwatch(); sw.Start(); - var conn = await CreateConnection(host, port); + var conn = await CreateConnection(scheme, host, port); await PerformRequest(conn); await conn.GoAwayAsync(ErrorCode.NoError, true); @@ -206,7 +210,7 @@ async Task RunBenchmark() tasks[i] = Task.Run(async () => { var requestTasks = new Task[concurrentRequests]; - var conn = await CreateConnection(host, port); + var conn = await CreateConnection(scheme, host, port); var remainingRequests = requestsPerCore; while (remainingRequests > 0) @@ -289,13 +293,50 @@ async Task PerformRequest(Connection conn) } /// Create a HTTP/2 connection to the remote peer - Task CreateConnection(string host, int port) + Task CreateConnection(string scheme, string host, int port) { - if (useHttp1Upgrade) return CreateUpgradeConnection(host, port); - else return CreateDirectConnection(host, port); + if (useHttp1Upgrade) return CreateUpgradeConnection(scheme, host, port); + else return CreateDirectConnection(scheme, host, port); } - async Task CreateDirectConnection(string host, int port) + async Task<(IReadableByteStream, IWriteAndCloseableByteStream)> CreateStreams(string scheme, string host, int port) + { + // Create a TCP connection + logger.LogInformation($"Starting to connect to {scheme}://{host}:{port}"); + var tcpClient = new TcpClient(); + await tcpClient.ConnectAsync(host, port); + logger.LogInformation("Connected to remote"); + tcpClient.Client.NoDelay = true; + if (scheme == "https") + { + var stream = new SslStream(tcpClient.GetStream()); + logger.LogInformation("Negotiating SSL..."); + var options = new SslClientAuthenticationOptions + { + TargetHost = host, + ApplicationProtocols = new List + { + SslApplicationProtocol.Http2 + }, + }; + await stream.AuthenticateAsClientAsync(options, default(CancellationToken)); + if (stream.NegotiatedApplicationProtocol != SslApplicationProtocol.Http2) + { + throw new NotSupportedException("HTTP2 is not supported by the remote host."); + } + logger.LogInformation("SSL Authenticated"); + var result = stream.CreateStreams(); + return (result.ReadableStream, result.WriteableStream); + } + else + { + // Create HTTP/2 stream abstraction on top of the socket + var result = tcpClient.Client.CreateStreams(); + return (result.ReadableStream, result.WriteableStream); + } + } + + async Task CreateDirectConnection(string scheme, string host, int port) { // HTTP/2 settings var config = @@ -304,19 +345,12 @@ async Task CreateDirectConnection(string host, int port) .UseHuffmanStrategy(HuffmanStrategy.IfSmaller) .Build(); - // Create a TCP connection - logger.LogInformation($"Starting to connect to {host}:{port}"); - var tcpClient = new TcpClient(); - await tcpClient.ConnectAsync(host, port); - logger.LogInformation("Connected to remote"); - tcpClient.Client.NoDelay = true; - // Create HTTP/2 stream abstraction on top of the socket - var wrappedStreams = tcpClient.Client.CreateStreams(); + var (readableStream, writeableStream) = await CreateStreams(scheme, host, port); // Build a HTTP connection on top of the stream abstraction var connLogger = verbose ? logProvider.CreateLogger("HTTP2Conn") : null; var conn = new Connection( - config, wrappedStreams.ReadableStream, wrappedStreams.WriteableStream, + config, readableStream, writeableStream, options: new Connection.Options { Logger = connLogger, @@ -325,8 +359,12 @@ async Task CreateDirectConnection(string host, int port) return conn; } - async Task CreateUpgradeConnection(string host, int port) + async Task CreateUpgradeConnection(string scheme, string host, int port) { + if (scheme == "https") + { + throw new NotSupportedException("Upgrade is not supported when using HTTPS"); + } // HTTP/2 settings var config = new ConnectionConfigurationBuilder(false) @@ -340,30 +378,24 @@ async Task CreateUpgradeConnection(string host, int port) .SetHttp2Settings(config.Settings) .Build(); - // Create a TCP connection - logger.LogInformation($"Starting to connect to {host}:{port}"); - var tcpClient = new TcpClient(); - await tcpClient.ConnectAsync(host, port); - tcpClient.Client.NoDelay = true; - logger.LogInformation("Connected to remote"); - - // Create HTTP/2 stream abstraction on top of the socket - var wrappedStreams = tcpClient.Client.CreateStreams(); - var upgradeReadStream = new UpgradeReadStream(wrappedStreams.ReadableStream); + var (readableStream, writeableStream) = await CreateStreams(scheme, host, port); + var upgradeReadStream = new UpgradeReadStream(readableStream); var needExplicitStreamClose = true; try { + // Upgrades are only possible for non-encrypted connections. + var upgradeValue = "h2"; // Send a HTTP/1.1 upgrade request with the necessary fields var upgradeHeader = "OPTIONS / HTTP/1.1\r\n" + "Host: " + host + "\r\n" + "Connection: Upgrade, HTTP2-Settings\r\n" + - "Upgrade: h2c\r\n" + + $"Upgrade: {upgradeValue}\r\n" + "HTTP2-Settings: " + upgrade.Base64EncodedSettings + "\r\n\r\n"; logger.LogInformation("Sending upgrade request:\n" + upgradeHeader); var encodedHeader = Encoding.ASCII.GetBytes(upgradeHeader); - await wrappedStreams.WriteableStream.WriteAsync( + await writeableStream.WriteAsync( new ArraySegment(encodedHeader)); // Wait for the upgrade response @@ -388,16 +420,16 @@ await wrappedStreams.WriteableStream.WriteAsync( !response.Headers.Any(hf => hf.Key == "upgrade" && hf.Value == "h2c")) throw new Exception("Upgrade failed"); - logger.LogInformation("Connection upgrade succesful!"); + logger.LogInformation("Connection upgrade successful!"); - // If we get here then the connection will be reponsible for closing + // If we get here then the connection will be responsible for closing // the stream needExplicitStreamClose = false; // Build a HTTP connection on top of the stream abstraction var connLogger = verbose ? logProvider.CreateLogger("HTTP2Conn") : null; var conn = new Connection( - config, upgradeReadStream, wrappedStreams.WriteableStream, + config, upgradeReadStream, writeableStream, options: new Connection.Options { Logger = connLogger, @@ -416,7 +448,7 @@ await wrappedStreams.WriteableStream.WriteAsync( { if (needExplicitStreamClose) { - await wrappedStreams.WriteableStream.CloseAsync(); + await writeableStream.CloseAsync(); } } }