Issue 553

src/Titanium.Web.Proxy/.editorconfig

@@ -0,0 +1,124 @@
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+############################### 
+# Core EditorConfig Options   # 
+############################### 
+root = true 
+# All files 
+[*] 
+indent_style = space 
+# Code files 
+[*.{cs,csx,vb,vbx}] 
+indent_size = 4 
+insert_final_newline = true 
+charset = utf-8-bom 
+############################### 
+# .NET Coding Conventions     # 
+############################### 
+[*.{cs,vb}] 
+# Organize usings 
+dotnet_sort_system_directives_first = true 
+# this. preferences 
+dotnet_style_qualification_for_field = false:silent 
+dotnet_style_qualification_for_property = false:silent 
+dotnet_style_qualification_for_method = false:silent 
+dotnet_style_qualification_for_event = false:silent 
+# Language keywords vs BCL types preferences 
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent 
+dotnet_style_predefined_type_for_member_access = true:silent 
+# Parentheses preferences 
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent 
+# Modifier preferences 
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent 
+dotnet_style_readonly_field = true:suggestion 
+# Expression-level preferences 
+dotnet_style_object_initializer = true:suggestion 
+dotnet_style_collection_initializer = true:suggestion 
+dotnet_style_explicit_tuple_names = true:suggestion 
+dotnet_style_null_propagation = true:suggestion 
+dotnet_style_coalesce_expression = true:suggestion 
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent 
+dotnet_prefer_inferred_tuple_names = true:suggestion 
+dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion 
+dotnet_style_prefer_auto_properties = true:silent 
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent 
+dotnet_style_prefer_conditional_expression_over_return = true:silent 
+############################### 
+# Naming Conventions          # 
+############################### 
+# Style Definitions 
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case 
+# Use PascalCase for constant fields   
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion 
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields 
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style 
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field 
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = * 
+dotnet_naming_symbols.constant_fields.required_modifiers          = const 
+############################### 
+# C# Coding Conventions       # 
+############################### 
+[*.cs] 
+# var preferences 
+csharp_style_var_for_built_in_types = true:silent 
+csharp_style_var_when_type_is_apparent = true:silent 
+csharp_style_var_elsewhere = true:silent 
+# Expression-bodied members 
+csharp_style_expression_bodied_methods = false:silent 
+csharp_style_expression_bodied_constructors = false:silent 
+csharp_style_expression_bodied_operators = false:silent 
+csharp_style_expression_bodied_properties = true:silent 
+csharp_style_expression_bodied_indexers = true:silent 
+csharp_style_expression_bodied_accessors = true:silent 
+# Pattern matching preferences 
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion 
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion 
+# Null-checking preferences 
+csharp_style_throw_expression = true:suggestion 
+csharp_style_conditional_delegate_call = true:suggestion 
+# Modifier preferences 
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion 
+# Expression-level preferences 
+csharp_prefer_braces = true:silent 
+csharp_style_deconstructed_variable_declaration = true:suggestion 
+csharp_prefer_simple_default_expression = true:suggestion 
+csharp_style_pattern_local_over_anonymous_function = true:suggestion 
+csharp_style_inlined_variable_declaration = true:suggestion 
+############################### 
+# C# Formatting Rules         # 
+############################### 
+# New line preferences 
+csharp_new_line_before_open_brace = all 
+csharp_new_line_before_else = true 
+csharp_new_line_before_catch = true 
+csharp_new_line_before_finally = true 
+csharp_new_line_before_members_in_object_initializers = true 
+csharp_new_line_before_members_in_anonymous_types = true 
+csharp_new_line_between_query_expression_clauses = true 
+# Indentation preferences 
+csharp_indent_case_contents = true 
+csharp_indent_switch_labels = true 
+csharp_indent_labels = flush_left 
+# Space preferences 
+csharp_space_after_cast = false 
+csharp_space_after_keywords_in_control_flow_statements = true 
+csharp_space_between_method_call_parameter_list_parentheses = false 
+csharp_space_between_method_declaration_parameter_list_parentheses = false 
+csharp_space_between_parentheses = false 
+csharp_space_before_colon_in_inheritance_clause = true 
+csharp_space_after_colon_in_inheritance_clause = true 
+csharp_space_around_binary_operators = before_and_after 
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false 
+csharp_space_between_method_call_name_and_opening_parenthesis = false 
+csharp_space_between_method_call_empty_parameter_list_parentheses = false 
+# Wrapping preferences 
+csharp_preserve_single_line_statements = true 
+csharp_preserve_single_line_blocks = true 
+############################### 
+# VB Coding Conventions       # 
+############################### 
+[*.vb] 
+# Modifier preferences 
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion 

src/Titanium.Web.Proxy/Http/HttpWebClient.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -127,40 +127,18 @@ await writer.WriteLineAsync(Request.CreateRequestLine(Request.Method,
 
             await writer.WriteAsync(headerBuilder.ToString(), cancellationToken);
 
-            if (enable100ContinueBehaviour)
+            if (enable100ContinueBehaviour && Request.ExpectContinue)
             {
-                if (Request.ExpectContinue)
+                // wait for expectation response from server
+                await ReceiveResponse(cancellationToken);
+
+                if (Response.StatusCode == (int)HttpStatusCode.Continue)
+                {
+                    Request.ExpectationSucceeded = true;
+                }
+                else
                 {
-                    string httpStatus;
-                    try
-                    {
-                        httpStatus = await Connection.Stream.ReadLineAsync(cancellationToken);
-                        if (httpStatus == null)
-                        {
-                            throw new ServerConnectionException("Server connection was closed.");
-                        }
-                    }
-                    catch (Exception e) when (!(e is ServerConnectionException))
-                    {
-                        throw new ServerConnectionException("Server connection was closed.");
-                    }
-
-                    Response.ParseResponseLine(httpStatus, out _, out int responseStatusCode,
-                        out string responseStatusDescription);
-
-                    // find if server is willing for expect continue
-                    if (responseStatusCode == (int)HttpStatusCode.Continue
-                        && responseStatusDescription.EqualsIgnoreCase("continue"))
-                    {
-                        Request.Is100Continue = true;
-                        await Connection.Stream.ReadLineAsync(cancellationToken);
-                    }
-                    else if (responseStatusCode == (int)HttpStatusCode.ExpectationFailed
-                             && responseStatusDescription.EqualsIgnoreCase("expectation failed"))
-                    {
-                        Request.ExpectationFailed = true;
-                        await Connection.Stream.ReadLineAsync(cancellationToken);
-                    }
+                    Request.ExpectationFailed = true;
                 }
             }
         }
@@ -202,33 +180,6 @@ internal async Task ReceiveResponse(CancellationToken cancellationToken)
             Response.StatusCode = statusCode;
             Response.StatusDescription = statusDescription;
 
-            // For HTTP 1.1 comptibility server may send expect-continue even if not asked for it in request
-            if (Response.StatusCode == (int)HttpStatusCode.Continue
-                && Response.StatusDescription.EqualsIgnoreCase("continue"))
-            {
-                // Read the next line after 100-continue 
-                Response.Is100Continue = true;
-                Response.StatusCode = 0;
-                await Connection.Stream.ReadLineAsync(cancellationToken);
-
-                // now receive response
-                await ReceiveResponse(cancellationToken);
-                return;
-            }
-
-            if (Response.StatusCode == (int)HttpStatusCode.ExpectationFailed
-                && Response.StatusDescription.EqualsIgnoreCase("expectation failed"))
-            {
-                // read next line after expectation failed response
-                Response.ExpectationFailed = true;
-                Response.StatusCode = 0;
-                await Connection.Stream.ReadLineAsync(cancellationToken);
-
-                // now receive response 
-                await ReceiveResponse(cancellationToken);
-                return;
-            }
-
             // Read the response headers in to unique and non-unique header collections
             await HeaderParser.ReadHeaders(Connection.Stream, Response.Headers, cancellationToken);
         }

src/Titanium.Web.Proxy/Http/Request.cs

@@ -123,12 +123,12 @@ public bool UpgradeToWebSocket
         }
 
         /// <summary>
-        ///     Did server responsed positively for 100 continue request?
+        ///     Did server respond positively for 100 continue request?
         /// </summary>
-        public bool Is100Continue { get; internal set; }
+        public bool ExpectationSucceeded { get; internal set; }
 
         /// <summary>
-        ///     Did server responsed negatively for the request for 100 continue?
+        ///     Did server respond negatively for 100 continue request?
         /// </summary>
         public bool ExpectationFailed { get; internal set; }
 

src/Titanium.Web.Proxy/Http/Response.cs

@@ -92,16 +92,6 @@ public bool KeepAlive
             }
         }
 
-        /// <summary>
-        ///     Is response 100-continue
-        /// </summary>
-        public bool Is100Continue { get; internal set; }
-
-        /// <summary>
-        ///     expectation failed returned by server?
-        /// </summary>
-        public bool ExpectationFailed { get; internal set; }
-
         /// <summary>
         ///     Gets the header text.
         /// </summary>

src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs

@@ -279,7 +279,7 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost
                 };
 
                 //linux has a bug with socket reuse in .net core.
-                if (proxyServer.ReuseSocket && RunTime.IsWindows || RunTime.IsRunningOnMono)
+                if (proxyServer.ReuseSocket && (RunTime.IsWindows || RunTime.IsRunningOnMono))
                 {
                     tcpClient.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
                 }

src/Titanium.Web.Proxy/Properties/AssemblyInfo.cs

@@ -20,6 +20,12 @@
                               "de7f3ba0bdad35ec2d6057ee1846091b34be2abc3f97dc7e72c16fd4958c15126b12923df76964" +
                               "7d84922c3f4f3b80ee0ae8e4cb40bc1973b782afb90bb00519fd16adf960f217e23696e7c31654" +
                               "01d0acd6")]
+[assembly: InternalsVisibleTo("Titanium.Web.Proxy.IntegrationTests, PublicKey=" +
+                              "0024000004800000940000000602000000240000525341310004000001000100e7368e0ccc717e" +
+                              "eb4d57d35ad6a8305cbbed14faa222e13869405e92c83856266d400887d857005f1393ffca2b92" +
+                              "de7f3ba0bdad35ec2d6057ee1846091b34be2abc3f97dc7e72c16fd4958c15126b12923df76964" +
+                              "7d84922c3f4f3b80ee0ae8e4cb40bc1973b782afb90bb00519fd16adf960f217e23696e7c31654" +
+                              "01d0acd6")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 

src/Titanium.Web.Proxy/ProxyServer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -152,7 +152,7 @@ public ProxyServer(string rootCertificateName, string rootCertificateIssuerName,
 
         /// <summary>
         ///     Does this proxy uses the HTTP protocol 100 continue behaviour strictly?
-        ///     Broken 100 contunue implementations on server/client may cause problems if enabled.
+        ///     Broken 100 continue implementations on server/client may cause problems if enabled.
         ///     Defaults to false.
         /// </summary>
         public bool Enable100ContinueBehaviour { get; set; }

src/Titanium.Web.Proxy/RequestHandler.cs

@@ -169,8 +169,11 @@ await clientStreamWriter.WriteResponseAsync(args.HttpClient.Response,
 
                             if (request.CancelRequest)
                             {
-                                // syphon out the request body from client before setting the new body
-                                await args.SyphonOutBodyAsync(true, cancellationToken);
+                                if (!(Enable100ContinueBehaviour && request.ExpectContinue))
+                                {
+                                    // syphon out the request body from client before setting the new body
+                                    await args.SyphonOutBodyAsync(true, cancellationToken);
+                                }
 
                                 await handleHttpSessionResponse(args);
 
@@ -318,71 +321,42 @@ private async Task handleHttpSessionRequest(TcpServerConnection connection, Sess
 
             var body = request.CompressBodyAndUpdateContentLength();
 
-            // if expect continue is enabled then send the headers first 
-            // and see if server would return 100 conitinue
-            if (request.ExpectContinue)
-            {
-                args.HttpClient.SetConnection(connection);
-                await args.HttpClient.SendRequest(Enable100ContinueBehaviour, args.IsTransparent,
-                    cancellationToken);
-            }
+            // set the connection and send request headers
+            args.HttpClient.SetConnection(connection);
+            await args.HttpClient.SendRequest(Enable100ContinueBehaviour, args.IsTransparent,
+                cancellationToken);
 
-            // If 100 continue was the response inform that to the client
-            if (Enable100ContinueBehaviour)
+            // If a successful 100 continue request was made, inform that to the client and reset response
+            if (request.ExpectationSucceeded)
             {
                 var clientStreamWriter = args.ProxyClient.ClientStreamWriter;
-
-                if (request.Is100Continue)
-                {
-                    await clientStreamWriter.WriteResponseStatusAsync(args.HttpClient.Response.HttpVersion,
-                        (int)HttpStatusCode.Continue, "Continue", cancellationToken);
-                    await clientStreamWriter.WriteLineAsync(cancellationToken);
-                }
-                else if (request.ExpectationFailed)
-                {
-                    await clientStreamWriter.WriteResponseStatusAsync(args.HttpClient.Response.HttpVersion,
-                        (int)HttpStatusCode.ExpectationFailed, "Expectation Failed", cancellationToken);
-                    await clientStreamWriter.WriteLineAsync(cancellationToken);
-                }
+                var response = args.HttpClient.Response;
+                await clientStreamWriter.WriteResponseStatusAsync(response.HttpVersion, response.StatusCode,
+                    response.StatusDescription, cancellationToken);
+                await clientStreamWriter.WriteHeadersAsync(response.Headers, cancellationToken: cancellationToken);
+                await args.ClearResponse(cancellationToken);
             }
 
-            // If expect continue is not enabled then set the connectio and send request headers
-            if (!request.ExpectContinue)
-            {
-                args.HttpClient.SetConnection(connection);
-                await args.HttpClient.SendRequest(Enable100ContinueBehaviour, args.IsTransparent,
-                    cancellationToken);
-            }
-
-            // check if content-length is > 0
-            if (request.ContentLength > 0)
+            // send body to server if available
+            if (request.HasBody)
             {
                 if (request.IsBodyRead)
                 {
                     var writer = args.HttpClient.Connection.StreamWriter;
                     await writer.WriteBodyAsync(body, request.IsChunked, cancellationToken);
                 }
-                else
+                else if (!request.ExpectationFailed)
                 {
-                    if (!request.ExpectationFailed)
-                    {
-                        if (request.HasBody)
-                        {
-                            HttpWriter writer = args.HttpClient.Connection.StreamWriter;
-                            await args.CopyRequestBodyAsync(writer, TransformationMode.None, cancellationToken);
-                        }
-                    }
+                    // get the request body unless an unsuccessful 100 continue request was made
+                    HttpWriter writer = args.HttpClient.Connection.StreamWriter;
+                    await args.CopyRequestBodyAsync(writer, TransformationMode.None, cancellationToken);
                 }
             }
 
             args.TimeLine["Request Sent"] = DateTime.Now;
 
-            // If not expectation failed response was returned by server then parse response
-            if (!request.ExpectationFailed)
-            {
-                await handleHttpSessionResponse(args);
-            }
-
+            // parse and send response
+            await handleHttpSessionResponse(args);
         }
 
         /// <summary>