Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
dd29dc75
Commit
dd29dc75
authored
Aug 24, 2016
by
Jehonathan
Committed by
GitHub
Aug 24, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #110 from TBulbaDB/master
Root Cert Name, Headers support for SessionEventArgs.Ok()
parents
cdf61217
b1e64102
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
8 deletions
+40
-8
SessionEventArgs.cs
Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
+32
-4
ProxyServer.cs
Titanium.Web.Proxy/ProxyServer.cs
+8
-4
No files found.
Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
View file @
dd29dc75
using
System
;
using
System.Collections.Generic
;
using
System.IO
;
using
System.Text
;
using
Titanium.Web.Proxy.Exceptions
;
...
...
@@ -9,6 +10,7 @@ using Titanium.Web.Proxy.Extensions;
using
System.Threading.Tasks
;
using
Titanium.Web.Proxy.Network
;
using
System.Net
;
using
Titanium.Web.Proxy.Models
;
namespace
Titanium.Web.Proxy.EventArguments
{
...
...
@@ -331,7 +333,6 @@ namespace Titanium.Web.Proxy.EventArguments
return
await
decompressor
.
Decompress
(
responseBodyStream
,
bufferSize
);
}
/// <summary>
/// Before request is made to server
/// Respond with the specified HTML string to client
...
...
@@ -339,6 +340,18 @@ namespace Titanium.Web.Proxy.EventArguments
/// </summary>
/// <param name="html"></param>
public
async
Task
Ok
(
string
html
)
{
await
Ok
(
html
,
null
);
}
/// <summary>
/// Before request is made to server
/// Respond with the specified HTML string to client
/// and ignore the request
/// </summary>
/// <param name="html"></param>
/// <param name="headers"></param>
public
async
Task
Ok
(
string
html
,
Dictionary
<
string
,
HttpHeader
>
headers
)
{
if
(
WebSession
.
Request
.
RequestLocked
)
{
...
...
@@ -352,7 +365,7 @@ namespace Titanium.Web.Proxy.EventArguments
var
result
=
Encoding
.
Default
.
GetBytes
(
html
);
await
Ok
(
result
);
await
Ok
(
result
,
headers
);
}
/// <summary>
...
...
@@ -360,11 +373,26 @@ namespace Titanium.Web.Proxy.EventArguments
/// Respond with the specified byte[] to client
/// and ignore the request
/// </summary>
/// <param name="
body
"></param>
/// <param name="
result
"></param>
public
async
Task
Ok
(
byte
[]
result
)
{
var
response
=
new
OkResponse
();
await
Ok
(
result
,
null
);
}
/// <summary>
/// Before request is made to server
/// Respond with the specified byte[] to client
/// and ignore the request
/// </summary>
/// <param name="result"></param>
/// <param name="headers"></param>
public
async
Task
Ok
(
byte
[]
result
,
Dictionary
<
string
,
HttpHeader
>
headers
)
{
var
response
=
new
OkResponse
();
if
(
headers
!=
null
&&
headers
.
Count
>
0
)
{
response
.
ResponseHeaders
=
headers
;
}
response
.
HttpVersion
=
WebSession
.
Request
.
HttpVersion
;
response
.
ResponseBody
=
result
;
...
...
Titanium.Web.Proxy/ProxyServer.cs
View file @
dd29dc75
...
...
@@ -118,8 +118,12 @@ namespace Titanium.Web.Proxy
/// <summary>
/// Constructor
/// </summary>
public
ProxyServer
()
public
ProxyServer
()
:
this
(
null
,
null
)
{
}
public
ProxyServer
(
string
rootCertificateName
,
string
rootCertificateIssuerName
)
{
RootCertificateName
=
rootCertificateName
;
RootCertificateIssuerName
=
rootCertificateIssuerName
;
//default values
ConnectionTimeOutSeconds
=
120
;
CertificateCacheTimeOutMinutes
=
60
;
...
...
@@ -379,11 +383,11 @@ namespace Titanium.Web.Proxy
}
if
(
tcpClient
!=
null
)
{
{
Task
.
Run
(
async
()
=>
{
try
{
{
if
(
endPoint
.
GetType
()
==
typeof
(
TransparentProxyEndPoint
))
{
await
HandleClient
(
endPoint
as
TransparentProxyEndPoint
,
tcpClient
);
...
...
@@ -392,7 +396,7 @@ namespace Titanium.Web.Proxy
{
await
HandleClient
(
endPoint
as
ExplicitProxyEndPoint
,
tcpClient
);
}
}
finally
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment