Commit 02aa8d29 authored by Honfika's avatar Honfika

Use int type for response code. Parse requesr/response first lines in a single place

parent 81975c47
......@@ -191,7 +191,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
//if (!e.ProxySession.Request.Host.Equals("medeczane.sgk.gov.tr")) return;
if (e.WebSession.Request.Method == "GET" || e.WebSession.Request.Method == "POST")
{
if (e.WebSession.Response.ResponseStatusCode == "200")
if (e.WebSession.Response.ResponseStatusCode == (int)HttpStatusCode.OK)
{
if (e.WebSession.Response.ContentType != null && e.WebSession.Response.ContentType.Trim().ToLower().Contains("text/html"))
{
......
......@@ -100,7 +100,8 @@ namespace Titanium.Web.Proxy.Examples.Wpf
{
var request = SessionArgs.WebSession.Request;
var response = SessionArgs.WebSession.Response;
StatusCode = response?.ResponseStatusCode ?? "-";
int statusCode = response?.ResponseStatusCode ?? 0;
StatusCode = statusCode == 0 ? "-" : statusCode.ToString();
Protocol = request.RequestUri.Scheme;
if (SessionArgs is TunnelConnectSessionEventArgs)
......
......@@ -57,9 +57,9 @@ namespace Titanium.Web.Proxy.EventArguments
get { return reRequest; }
set
{
if (WebSession.Response.ResponseStatusCode == null)
if (WebSession.Response.ResponseStatusCode == 0)
{
throw new Exception("Response status code is null. Cannot request again a request " + "which was never send to server.");
throw new Exception("Response status code is empty. Cannot request again a request " + "which was never send to server.");
}
reRequest = value;
......
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using Titanium.Web.Proxy.Models;
......@@ -114,18 +115,21 @@ namespace Titanium.Web.Proxy.Http
{
if (Request.ExpectContinue)
{
var httpResult = (await ServerConnection.StreamReader.ReadLineAsync()).Split(ProxyConstants.SpaceSplit, 3);
string responseStatusCode = httpResult[1].Trim();
string responseStatusDescription = httpResult[2].Trim();
string httpStatus = await ServerConnection.StreamReader.ReadLineAsync();
Version version;
int responseStatusCode;
string responseStatusDescription;
Response.ParseResponseLine(httpStatus, out version, out responseStatusCode, out responseStatusDescription);
//find if server is willing for expect continue
if (responseStatusCode.Equals("100")
if (responseStatusCode == (int)HttpStatusCode.Continue
&& responseStatusDescription.Equals("continue", StringComparison.CurrentCultureIgnoreCase))
{
Request.Is100Continue = true;
await ServerConnection.StreamReader.ReadLineAsync();
}
else if (responseStatusCode.Equals("417")
else if (responseStatusCode == (int)HttpStatusCode.ExpectationFailed
&& responseStatusDescription.Equals("expectation failed", StringComparison.CurrentCultureIgnoreCase))
{
Request.ExpectationFailed = true;
......@@ -142,54 +146,49 @@ namespace Titanium.Web.Proxy.Http
internal async Task ReceiveResponse()
{
//return if this is already read
if (Response.ResponseStatusCode != null)
if (Response.ResponseStatusCode != 0)
return;
string line = await ServerConnection.StreamReader.ReadLineAsync();
if (line == null)
string httpStatus = await ServerConnection.StreamReader.ReadLineAsync();
if (httpStatus == null)
{
throw new IOException();
}
var httpResult = line.Split(ProxyConstants.SpaceSplit, 3);
if (string.IsNullOrEmpty(httpResult[0]))
if (httpStatus == string.Empty)
{
//Empty content in first-line, try again
httpResult = (await ServerConnection.StreamReader.ReadLineAsync()).Split(ProxyConstants.SpaceSplit, 3);
httpStatus = await ServerConnection.StreamReader.ReadLineAsync();
}
string httpVersion = httpResult[0];
var version = HttpHeader.Version11;
if (string.Equals(httpVersion, "HTTP/1.0", StringComparison.OrdinalIgnoreCase))
{
version = HttpHeader.Version10;
}
Version version;
int statusCode;
string statusDescription;
Response.ParseResponseLine(httpStatus, out version, out statusCode, out statusDescription);
Response.HttpVersion = version;
Response.ResponseStatusCode = httpResult[1].Trim();
Response.ResponseStatusDescription = httpResult[2].Trim();
Response.ResponseStatusCode = statusCode;
Response.ResponseStatusDescription = statusDescription;
//For HTTP 1.1 comptibility server may send expect-continue even if not asked for it in request
if (Response.ResponseStatusCode.Equals("100")
if (Response.ResponseStatusCode == (int)HttpStatusCode.Continue
&& Response.ResponseStatusDescription.Equals("continue", StringComparison.CurrentCultureIgnoreCase))
{
//Read the next line after 100-continue
Response.Is100Continue = true;
Response.ResponseStatusCode = null;
Response.ResponseStatusCode = 0;
await ServerConnection.StreamReader.ReadLineAsync();
//now receive response
await ReceiveResponse();
return;
}
if (Response.ResponseStatusCode.Equals("417")
if (Response.ResponseStatusCode == (int)HttpStatusCode.ExpectationFailed
&& Response.ResponseStatusDescription.Equals("expectation failed", StringComparison.CurrentCultureIgnoreCase))
{
//read next line after expectation failed response
Response.ExpectationFailed = true;
Response.ResponseStatusCode = null;
Response.ResponseStatusCode = 0;
await ServerConnection.StreamReader.ReadLineAsync();
//now receive response
await ReceiveResponse();
......
......@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using Titanium.Web.Proxy.Extensions;
using Titanium.Web.Proxy.Models;
using Titanium.Web.Proxy.Shared;
namespace Titanium.Web.Proxy.Http
{
......@@ -228,6 +230,57 @@ namespace Titanium.Web.Proxy.Http
}
}
internal static void ParseRequestLine(string httpCmd, out string httpMethod, out string httpUrl, out Version version)
{
//break up the line into three components (method, remote URL & Http Version)
var httpCmdSplit = httpCmd.Split(ProxyConstants.SpaceSplit, 3);
if (httpCmdSplit.Length < 2)
{
throw new Exception("Invalid HTTP request line: " + httpCmd);
}
//Find the request Verb
httpMethod = httpCmdSplit[0];
if (!IsAllUpper(httpMethod))
{
//method should be upper cased: https://tools.ietf.org/html/rfc7231#section-4
//todo: create protocol violation message
//fix it
httpMethod = httpMethod.ToUpper();
}
httpUrl = httpCmdSplit[1];
//parse the HTTP version
version = HttpHeader.Version11;
if (httpCmdSplit.Length == 3)
{
string httpVersion = httpCmdSplit[2].Trim();
if (string.Equals(httpVersion, "HTTP/1.0", StringComparison.OrdinalIgnoreCase))
{
version = HttpHeader.Version10;
}
}
}
private static bool IsAllUpper(string input)
{
for (int i = 0; i < input.Length; i++)
{
char ch = input[i];
if (ch < 'A' || ch > 'Z')
{
return false;
}
}
return true;
}
/// <summary>
/// Constructor.
/// </summary>
......
......@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using Titanium.Web.Proxy.Extensions;
using Titanium.Web.Proxy.Models;
using Titanium.Web.Proxy.Shared;
namespace Titanium.Web.Proxy.Http
{
......@@ -15,7 +16,7 @@ namespace Titanium.Web.Proxy.Http
/// <summary>
/// Response Status Code.
/// </summary>
public string ResponseStatusCode { get; set; }
public int ResponseStatusCode { get; set; }
/// <summary>
/// Response Status description.
......@@ -208,6 +209,26 @@ namespace Titanium.Web.Proxy.Http
}
}
internal static void ParseResponseLine(string httpStatus, out Version version, out int statusCode, out string statusDescription)
{
var httpResult = httpStatus.Split(ProxyConstants.SpaceSplit, 3);
if (httpResult.Length != 3)
{
throw new Exception("Invalid HTTP status line: " + httpStatus);
}
string httpVersion = httpResult[0];
version = HttpHeader.Version11;
if (string.Equals(httpVersion, "HTTP/1.0", StringComparison.OrdinalIgnoreCase))
{
version = HttpHeader.Version10;
}
statusCode = int.Parse(httpResult[1]);
statusDescription = httpResult[2];
}
/// <summary>
/// Constructor.
/// </summary>
......
......@@ -13,7 +13,10 @@ namespace Titanium.Web.Proxy.Http.Responses
/// <param name="status"></param>
public GenericResponse(HttpStatusCode status)
{
ResponseStatusCode = ((int)status).ToString();
ResponseStatusCode = (int)status;
//todo: this is not really correct, status description should contain spaces, too
//see: https://tools.ietf.org/html/rfc7231#section-6.1
ResponseStatusDescription = status.ToString();
}
......@@ -22,7 +25,7 @@ namespace Titanium.Web.Proxy.Http.Responses
/// </summary>
/// <param name="statusCode"></param>
/// <param name="statusDescription"></param>
public GenericResponse(string statusCode, string statusDescription)
public GenericResponse(int statusCode, string statusDescription)
{
ResponseStatusCode = statusCode;
ResponseStatusDescription = statusDescription;
......
namespace Titanium.Web.Proxy.Http.Responses
using System.Net;
namespace Titanium.Web.Proxy.Http.Responses
{
/// <summary>
/// 200 Ok response
......@@ -10,8 +12,8 @@
/// </summary>
public OkResponse()
{
ResponseStatusCode = "200";
ResponseStatusDescription = "Ok";
ResponseStatusCode = (int)HttpStatusCode.OK;
ResponseStatusDescription = "OK";
}
}
}
namespace Titanium.Web.Proxy.Http.Responses
using System.Net;
namespace Titanium.Web.Proxy.Http.Responses
{
/// <summary>
/// Redirect response
......@@ -10,7 +12,7 @@
/// </summary>
public RedirectResponse()
{
ResponseStatusCode = "302";
ResponseStatusCode = (int)HttpStatusCode.Found;
ResponseStatusDescription = "Found";
}
}
......
......@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using Titanium.Web.Proxy.EventArguments;
......@@ -68,7 +69,7 @@ namespace Titanium.Web.Proxy
var response = new Response
{
HttpVersion = HttpHeader.Version11,
ResponseStatusCode = "407",
ResponseStatusCode = (int)HttpStatusCode.ProxyAuthenticationRequired,
ResponseStatusDescription = description
};
......
......@@ -56,25 +56,12 @@ namespace Titanium.Web.Proxy
return;
}
//break up the line into three components (method, remote URL & Http Version)
var httpCmdSplit = httpCmd.Split(ProxyConstants.SpaceSplit, 3);
string httpMethod;
string httpUrl;
Version version;
Request.ParseRequestLine(httpCmd, out httpMethod, out httpUrl, out version);
//Find the request Verb
string httpVerb = httpCmdSplit[0].ToUpper();
httpRemoteUri = httpVerb == "CONNECT" ? new Uri("http://" + httpCmdSplit[1]) : new Uri(httpCmdSplit[1]);
//parse the HTTP version
var version = HttpHeader.Version11;
if (httpCmdSplit.Length == 3)
{
string httpVersion = httpCmdSplit[2].Trim();
if (string.Equals(httpVersion, "HTTP/1.0", StringComparison.OrdinalIgnoreCase))
{
version = HttpHeader.Version10;
}
}
httpRemoteUri = httpMethod == "CONNECT" ? new Uri("http://" + httpUrl) : new Uri(httpUrl);
//filter out excluded host names
bool excluded = false;
......@@ -92,13 +79,13 @@ namespace Titanium.Web.Proxy
ConnectRequest connectRequest = null;
//Client wants to create a secure tcp tunnel (probably its a HTTPS or Websocket request)
if (httpVerb == "CONNECT")
if (httpMethod == "CONNECT")
{
connectRequest = new ConnectRequest
{
RequestUri = httpRemoteUri,
HttpVersion = version,
Method = httpVerb,
Method = httpMethod,
};
await HeaderParser.ReadHeaders(clientStreamReader, connectRequest.RequestHeaders);
......@@ -139,7 +126,7 @@ namespace Titanium.Web.Proxy
if (!excluded && isClientHello)
{
httpRemoteUri = new Uri("https://" + httpCmdSplit[1]);
httpRemoteUri = new Uri("https://" + httpUrl);
SslStream sslStream = null;
......@@ -297,34 +284,22 @@ namespace Titanium.Web.Proxy
try
{
//break up the line into three components (method, remote URL & Http Version)
var httpCmdSplit = httpCmd.Split(ProxyConstants.SpaceSplit, 3);
string httpMethod = httpCmdSplit[0].ToUpper();
//find the request HTTP version
var httpVersion = HttpHeader.Version11;
if (httpCmdSplit.Length == 3)
{
string httpVersionString = httpCmdSplit[2].Trim();
if (string.Equals(httpVersionString, "HTTP/1.0", StringComparison.OrdinalIgnoreCase))
{
httpVersion = HttpHeader.Version10;
}
}
string httpMethod;
string httpUrl;
Version version;
Request.ParseRequestLine(httpCmd, out httpMethod, out httpUrl, out version);
//Read the request headers in to unique and non-unique header collections
await HeaderParser.ReadHeaders(clientStreamReader, args.WebSession.Request.RequestHeaders);
var httpRemoteUri = new Uri(httpsConnectHostname == null
? httpCmdSplit[1]
: string.Concat("https://", args.WebSession.Request.Host ?? httpsConnectHostname, httpCmdSplit[1]));
? httpUrl
: string.Concat("https://", args.WebSession.Request.Host ?? httpsConnectHostname, httpUrl));
args.WebSession.Request.RequestUri = httpRemoteUri;
args.WebSession.Request.Method = httpMethod;
args.WebSession.Request.HttpVersion = httpVersion;
args.WebSession.Request.HttpVersion = version;
args.ProxyClient.ClientStream = clientStream;
args.ProxyClient.ClientStreamReader = clientStreamReader;
args.ProxyClient.ClientStreamWriter = clientStreamWriter;
......@@ -399,12 +374,25 @@ namespace Titanium.Web.Proxy
}
string httpStatus = await connection.StreamReader.ReadLineAsync();
//todo: parse status
Version responseVersion;
int responseStatusCode;
string responseStatusDescription;
Response.ParseResponseLine(httpStatus, out responseVersion, out responseStatusCode, out responseStatusDescription);
args.WebSession.Response.HttpVersion = responseVersion;
args.WebSession.Response.ResponseStatusCode = responseStatusCode;
args.WebSession.Response.ResponseStatusDescription = responseStatusDescription;
await HeaderParser.ReadHeaders(connection.StreamReader, args.WebSession.Response.ResponseHeaders);
await clientStreamWriter.WriteLineAsync(httpStatus);
await WriteResponseHeaders(clientStreamWriter, args.WebSession.Response);
await WriteResponse(args.WebSession.Response, clientStreamWriter);
//If user requested call back then do it
if (BeforeResponse != null && !args.WebSession.Response.ResponseLocked)
{
await BeforeResponse.InvokeParallelAsync(this, args, ExceptionFunc);
}
await TcpHelper.SendRaw(clientStream, connection,
(buffer, offset, count) => { args.OnDataSent(buffer, offset, count); }, (buffer, offset, count) => { args.OnDataReceived(buffer, offset, count); });
......@@ -478,12 +466,12 @@ namespace Titanium.Web.Proxy
{
if (args.WebSession.Request.Is100Continue)
{
await WriteResponseStatus(args.WebSession.Response.HttpVersion, "100", "Continue", args.ProxyClient.ClientStreamWriter);
await WriteResponseStatus(args.WebSession.Response.HttpVersion, (int)HttpStatusCode.Continue, "Continue", args.ProxyClient.ClientStreamWriter);
await args.ProxyClient.ClientStreamWriter.WriteLineAsync();
}
else if (args.WebSession.Request.ExpectationFailed)
{
await WriteResponseStatus(args.WebSession.Response.HttpVersion, "417", "Expectation Failed", args.ProxyClient.ClientStreamWriter);
await WriteResponseStatus(args.WebSession.Response.HttpVersion, (int)HttpStatusCode.ExpectationFailed, "Expectation Failed", args.ProxyClient.ClientStreamWriter);
await args.ProxyClient.ClientStreamWriter.WriteLineAsync();
}
}
......@@ -616,7 +604,7 @@ namespace Titanium.Web.Proxy
var response = new ConnectResponse
{
HttpVersion = httpVersion,
ResponseStatusCode = "200",
ResponseStatusCode = (int)HttpStatusCode.OK,
ResponseStatusDescription = "Connection established"
};
......
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using Titanium.Web.Proxy.Compression;
......@@ -37,7 +38,7 @@ namespace Titanium.Web.Proxy
//check for windows authentication
if (EnableWinAuth
&& !RunTime.IsRunningOnMono
&& response.ResponseStatusCode == "401")
&& response.ResponseStatusCode == (int)HttpStatusCode.Unauthorized)
{
bool disposed = await Handle401UnAuthorized(args);
......@@ -71,18 +72,17 @@ namespace Titanium.Web.Proxy
//Write back to client 100-conitinue response if that's what server returned
if (response.Is100Continue)
{
await WriteResponseStatus(response.HttpVersion, "100", "Continue", args.ProxyClient.ClientStreamWriter);
await WriteResponseStatus(response.HttpVersion, (int)HttpStatusCode.Continue, "Continue", args.ProxyClient.ClientStreamWriter);
await args.ProxyClient.ClientStreamWriter.WriteLineAsync();
}
else if (response.ExpectationFailed)
{
await WriteResponseStatus(response.HttpVersion, "417", "Expectation Failed", args.ProxyClient.ClientStreamWriter);
await WriteResponseStatus(response.HttpVersion, (int)HttpStatusCode.ExpectationFailed, "Expectation Failed", args.ProxyClient.ClientStreamWriter);
await args.ProxyClient.ClientStreamWriter.WriteLineAsync();
}
//Write back response status to client
await WriteResponseStatus(response.HttpVersion, response.ResponseStatusCode,
response.ResponseStatusDescription, args.ProxyClient.ClientStreamWriter);
await WriteResponseStatus(response.HttpVersion, response.ResponseStatusCode, response.ResponseStatusDescription, args.ProxyClient.ClientStreamWriter);
if (response.ResponseBodyRead)
{
......@@ -166,7 +166,7 @@ namespace Titanium.Web.Proxy
/// <param name="description"></param>
/// <param name="responseWriter"></param>
/// <returns></returns>
private async Task WriteResponseStatus(Version version, string code, string description, StreamWriter responseWriter)
private async Task WriteResponseStatus(Version version, int code, string description, StreamWriter responseWriter)
{
await responseWriter.WriteLineAsync($"HTTP/{version.Major}.{version.Minor} {code} {description}");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment