Skip to content
This repository was archived by the owner on Jul 9, 2023. It is now read-only.

Commit 9136f87

Browse files
committed
comments update
1 parent a7cab15 commit 9136f87

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Sample request and response event handlers
126126

127127
private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
128128
{
129-
string hostname = e.WebSession.Request.RequestUri.Host;
129+
string hostname = e.HttpClient.Request.RequestUri.Host;
130130

131131
if (hostname.Contains("dropbox.com"))
132132
{
@@ -139,12 +139,12 @@ private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSess
139139

140140
public async Task OnRequest(object sender, SessionEventArgs e)
141141
{
142-
Console.WriteLine(e.WebSession.Request.Url);
142+
Console.WriteLine(e.HttpClient.Request.Url);
143143

144144
////read request headers
145-
var requestHeaders = e.WebSession.Request.RequestHeaders;
145+
var requestHeaders = e.HttpClient.Request.RequestHeaders;
146146

147-
var method = e.WebSession.Request.Method.ToUpper();
147+
var method = e.HttpClient.Request.Method.ToUpper();
148148
if ((method == "POST" || method == "PUT" || method == "PATCH"))
149149
{
150150
//Get/Set request body bytes
@@ -157,12 +157,12 @@ public async Task OnRequest(object sender, SessionEventArgs e)
157157

158158
//store request
159159
//so that you can find it from response handler
160-
e.UserData = e.WebSession.Request;
160+
e.UserData = e.HttpClient.Request;
161161
}
162162

163163
//To cancel a request with a custom HTML content
164164
//Filter URL
165-
if (e.WebSession.Request.RequestUri.AbsoluteUri.Contains("google.com"))
165+
if (e.HttpClient.Request.RequestUri.AbsoluteUri.Contains("google.com"))
166166
{
167167
e.Ok("<!DOCTYPE html>" +
168168
"<html><body><h1>" +
@@ -173,7 +173,7 @@ public async Task OnRequest(object sender, SessionEventArgs e)
173173
"</html>");
174174
}
175175
//Redirect example
176-
if (e.WebSession.Request.RequestUri.AbsoluteUri.Contains("wikipedia.org"))
176+
if (e.HttpClient.Request.RequestUri.AbsoluteUri.Contains("wikipedia.org"))
177177
{
178178
e.Redirect("https://www.paypal.com");
179179
}
@@ -183,14 +183,14 @@ public async Task OnRequest(object sender, SessionEventArgs e)
183183
public async Task OnResponse(object sender, SessionEventArgs e)
184184
{
185185
//read response headers
186-
var responseHeaders = e.WebSession.Response.ResponseHeaders;
186+
var responseHeaders = e.HttpClient.Response.ResponseHeaders;
187187

188188
//if (!e.ProxySession.Request.Host.Equals("medeczane.sgk.gov.tr")) return;
189-
if (e.WebSession.Request.Method == "GET" || e.WebSession.Request.Method == "POST")
189+
if (e.HttpClient.Request.Method == "GET" || e.HttpClient.Request.Method == "POST")
190190
{
191-
if (e.WebSession.Response.ResponseStatusCode == "200")
191+
if (e.HttpClient.Response.ResponseStatusCode == "200")
192192
{
193-
if (e.WebSession.Response.ContentType!=null && e.WebSession.Response.ContentType.Trim().ToLower().Contains("text/html"))
193+
if (e.HttpClient.Response.ContentType!=null && e.HttpClient.Response.ContentType.Trim().ToLower().Contains("text/html"))
194194
{
195195
byte[] bodyBytes = await e.GetResponseBody();
196196
await e.SetResponseBody(bodyBytes);

examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,20 @@ private async Task OnRequest(object sender, SessionEventArgs e)
145145
// It can be a simple integer, Guid, or any type
146146
//e.UserData = new CustomUserData()
147147
//{
148-
// RequestHeaders = e.WebSession.Request.Headers,
149-
// RequestBody = e.WebSession.Request.HasBody ? e.WebSession.Request.Body:null,
150-
// RequestBodyString = e.WebSession.Request.HasBody? e.WebSession.Request.BodyString:null
148+
// RequestHeaders = e.HttpClient.Request.Headers,
149+
// RequestBody = e.HttpClient.Request.HasBody ? e.HttpClient.Request.Body:null,
150+
// RequestBodyString = e.HttpClient.Request.HasBody? e.HttpClient.Request.BodyString:null
151151
//};
152152

153153
////This sample shows how to get the multipart form data headers
154-
//if (e.WebSession.Request.Host == "mail.yahoo.com" && e.WebSession.Request.IsMultipartFormData)
154+
//if (e.HttpClient.Request.Host == "mail.yahoo.com" && e.HttpClient.Request.IsMultipartFormData)
155155
//{
156156
// e.MultipartRequestPartSent += MultipartRequestPartSent;
157157
//}
158158

159159
// To cancel a request with a custom HTML content
160160
// Filter URL
161-
//if (e.WebSession.Request.RequestUri.AbsoluteUri.Contains("yahoo.com"))
161+
//if (e.HttpClient.Request.RequestUri.AbsoluteUri.Contains("yahoo.com"))
162162
//{
163163
// e.Ok("<!DOCTYPE html>" +
164164
// "<html><body><h1>" +
@@ -170,7 +170,7 @@ private async Task OnRequest(object sender, SessionEventArgs e)
170170
//}
171171

172172
////Redirect example
173-
//if (e.WebSession.Request.RequestUri.AbsoluteUri.Contains("wikipedia.org"))
173+
//if (e.HttpClient.Request.RequestUri.AbsoluteUri.Contains("wikipedia.org"))
174174
//{
175175
// e.Redirect("https://www.paypal.com");
176176
//}
@@ -194,7 +194,7 @@ private async Task OnResponse(object sender, SessionEventArgs e)
194194
string ext = System.IO.Path.GetExtension(e.HttpClient.Request.RequestUri.AbsolutePath);
195195

196196
//access user data set in request to do something with it
197-
//var userData = e.WebSession.UserData as CustomUserData;
197+
//var userData = e.HttpClient.UserData as CustomUserData;
198198

199199
//if (ext == ".gif" || ext == ".png" || ext == ".jpg")
200200
//{
@@ -207,21 +207,21 @@ private async Task OnResponse(object sender, SessionEventArgs e)
207207
// "</html>");
208208

209209
// var response = new OkResponse(btBody);
210-
// response.HttpVersion = e.WebSession.Request.HttpVersion;
210+
// response.HttpVersion = e.HttpClient.Request.HttpVersion;
211211

212212
// e.Respond(response);
213213
// e.TerminateServerConnection();
214214
//}
215215

216216
//// print out process id of current session
217-
////WriteToConsole($"PID: {e.WebSession.ProcessId.Value}");
217+
////WriteToConsole($"PID: {e.HttpClient.ProcessId.Value}");
218218

219219
////if (!e.ProxySession.Request.Host.Equals("medeczane.sgk.gov.tr")) return;
220-
//if (e.WebSession.Request.Method == "GET" || e.WebSession.Request.Method == "POST")
220+
//if (e.HttpClient.Request.Method == "GET" || e.HttpClient.Request.Method == "POST")
221221
//{
222-
// if (e.WebSession.Response.StatusCode == (int)HttpStatusCode.OK)
222+
// if (e.HttpClient.Response.StatusCode == (int)HttpStatusCode.OK)
223223
// {
224-
// if (e.WebSession.Response.ContentType != null && e.WebSession.Response.ContentType.Trim().ToLower().Contains("text/html"))
224+
// if (e.HttpClient.Response.ContentType != null && e.HttpClient.Response.ContentType.Trim().ToLower().Contains("text/html"))
225225
// {
226226
// var bodyBytes = await e.GetResponseBody();
227227
// await e.SetResponseBody(bodyBytes);
@@ -283,7 +283,7 @@ private async Task WriteToConsole(string message, bool useRedColor = false)
283283

284284
///// <summary>
285285
///// User data object as defined by user.
286-
///// User data can be set to each SessionEventArgs.WebSession.UserData property
286+
///// User data can be set to each SessionEventArgs.HttpClient.UserData property
287287
///// </summary>
288288
//public class CustomUserData
289289
//{

examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private SessionListItem CreateSessionListItem(SessionEventArgsBase e)
203203
var item = new SessionListItem
204204
{
205205
Number = lastSessionNumber,
206-
WebSession = e.HttpClient,
206+
HttpClient = e.HttpClient,
207207
IsTunnelConnect = isTunnelConnect
208208
};
209209

@@ -240,7 +240,7 @@ private void ListViewSessions_OnKeyDown(object sender, KeyEventArgs e)
240240
foreach (var item in selectedItems.Cast<SessionListItem>().ToArray())
241241
{
242242
Sessions.Remove(item);
243-
sessionDictionary.Remove(item.WebSession);
243+
sessionDictionary.Remove(item.HttpClient);
244244
}
245245
}
246246
}
@@ -254,7 +254,7 @@ private void SelectedSessionChanged()
254254

255255
const int truncateLimit = 1024;
256256

257-
var session = SelectedSession.WebSession;
257+
var session = SelectedSession.HttpClient;
258258
var request = session.Request;
259259
var data = (request.IsBodyRead ? request.Body : null) ?? new byte[0];
260260
bool truncated = data.Length > truncateLimit;

examples/Titanium.Web.Proxy.Examples.Wpf/SessionListItem.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class SessionListItem : INotifyPropertyChanged
2020

2121
public int Number { get; set; }
2222

23-
public HttpWebClient WebSession { get; set; }
23+
public HttpWebClient HttpClient { get; set; }
2424

2525
public bool IsTunnelConnect { get; set; }
2626

@@ -97,8 +97,8 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
9797

9898
public void Update()
9999
{
100-
var request = WebSession.Request;
101-
var response = WebSession.Response;
100+
var request = HttpClient.Request;
101+
var response = HttpClient.Response;
102102
int statusCode = response?.StatusCode ?? 0;
103103
StatusCode = statusCode == 0 ? "-" : statusCode.ToString();
104104
Protocol = request.RequestUri.Scheme;
@@ -132,7 +132,7 @@ public void Update()
132132
BodySize = responseSize;
133133
}
134134

135-
Process = GetProcessDescription(WebSession.ProcessId.Value);
135+
Process = GetProcessDescription(HttpClient.ProcessId.Value);
136136
}
137137

138138
private string GetProcessDescription(int processId)

src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected SessionEventArgsBase(ProxyServer server, ProxyEndPoint endPoint,
8383

8484
/// <summary>
8585
/// Returns a user data for this request/response session which is
86-
/// same as the user data of WebSession.
86+
/// same as the user data of HttpClient.
8787
/// </summary>
8888
public object UserData
8989
{

0 commit comments

Comments
 (0)