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
c5a8e98b
Commit
c5a8e98b
authored
Jun 29, 2017
by
Honfika
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stream writer should not close the stream
parent
77ecb585
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
29 deletions
+16
-29
HttpRequestWriter.cs
Titanium.Web.Proxy/Helpers/HttpRequestWriter.cs
+1
-5
HttpResponseWriter.cs
Titanium.Web.Proxy/Helpers/HttpResponseWriter.cs
+1
-5
HttpWriter.cs
Titanium.Web.Proxy/Helpers/HttpWriter.cs
+1
-6
TcpConnectionFactory.cs
Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
+1
-1
RequestHandler.cs
Titanium.Web.Proxy/RequestHandler.cs
+0
-2
ResponseHandler.cs
Titanium.Web.Proxy/ResponseHandler.cs
+12
-10
No files found.
Titanium.Web.Proxy/Helpers/HttpRequestWriter.cs
View file @
c5a8e98b
...
...
@@ -10,11 +10,7 @@ namespace Titanium.Web.Proxy.Helpers
{
sealed
class
HttpRequestWriter
:
HttpWriter
{
public
HttpRequestWriter
(
Stream
stream
)
:
base
(
stream
)
{
}
public
HttpRequestWriter
(
Stream
stream
,
bool
leaveOpen
)
:
base
(
stream
,
leaveOpen
)
public
HttpRequestWriter
(
Stream
stream
)
:
base
(
stream
,
true
)
{
}
}
...
...
Titanium.Web.Proxy/Helpers/HttpResponseWriter.cs
View file @
c5a8e98b
...
...
@@ -13,11 +13,7 @@ namespace Titanium.Web.Proxy.Helpers
{
sealed
class
HttpResponseWriter
:
HttpWriter
{
public
HttpResponseWriter
(
Stream
stream
)
:
base
(
stream
)
{
}
public
HttpResponseWriter
(
Stream
stream
,
bool
leaveOpen
)
:
base
(
stream
,
leaveOpen
)
public
HttpResponseWriter
(
Stream
stream
)
:
base
(
stream
,
true
)
{
}
...
...
Titanium.Web.Proxy/Helpers/HttpWriter.cs
View file @
c5a8e98b
...
...
@@ -11,12 +11,7 @@ namespace Titanium.Web.Proxy.Helpers
{
abstract
class
HttpWriter
:
StreamWriter
{
public
HttpWriter
(
Stream
stream
)
:
base
(
stream
,
Encoding
.
ASCII
)
{
NewLine
=
ProxyConstants
.
NewLine
;
}
public
HttpWriter
(
Stream
stream
,
bool
leaveOpen
)
:
base
(
stream
,
Encoding
.
ASCII
,
1024
,
leaveOpen
)
protected
HttpWriter
(
Stream
stream
,
bool
leaveOpen
)
:
base
(
stream
,
Encoding
.
ASCII
,
1024
,
leaveOpen
)
{
NewLine
=
ProxyConstants
.
NewLine
;
}
...
...
Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
View file @
c5a8e98b
...
...
@@ -67,7 +67,7 @@ namespace Titanium.Web.Proxy.Network.Tcp
if
(
isHttps
)
{
using
(
var
writer
=
new
HttpRequestWriter
(
stream
,
true
))
using
(
var
writer
=
new
HttpRequestWriter
(
stream
))
{
await
writer
.
WriteLineAsync
(
$"CONNECT
{
remoteHostName
}
:
{
remotePort
}
HTTP/
{
httpVersion
}
"
);
await
writer
.
WriteLineAsync
(
$"Host:
{
remoteHostName
}
:
{
remotePort
}
"
);
...
...
Titanium.Web.Proxy/RequestHandler.cs
View file @
c5a8e98b
...
...
@@ -92,8 +92,6 @@ namespace Titanium.Web.Proxy
connectArgs
.
WebSession
.
Request
=
connectRequest
;
connectArgs
.
ProxyClient
.
TcpClient
=
tcpClient
;
connectArgs
.
ProxyClient
.
ClientStream
=
clientStream
;
connectArgs
.
ProxyClient
.
ClientStreamReader
=
clientStreamReader
;
connectArgs
.
ProxyClient
.
ClientStreamWriter
=
clientStreamWriter
;
if
(
TunnelConnectRequest
!=
null
)
{
...
...
Titanium.Web.Proxy/ResponseHandler.cs
View file @
c5a8e98b
...
...
@@ -69,20 +69,22 @@ namespace Titanium.Web.Proxy
response
.
ResponseLocked
=
true
;
var
clientStreamWriter
=
args
.
ProxyClient
.
ClientStreamWriter
;
//Write back to client 100-conitinue response if that's what server returned
if
(
response
.
Is100Continue
)
{
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteResponseStatusAsync
(
response
.
HttpVersion
,
(
int
)
HttpStatusCode
.
Continue
,
"Continue"
);
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteLineAsync
();
await
c
lientStreamWriter
.
WriteResponseStatusAsync
(
response
.
HttpVersion
,
(
int
)
HttpStatusCode
.
Continue
,
"Continue"
);
await
c
lientStreamWriter
.
WriteLineAsync
();
}
else
if
(
response
.
ExpectationFailed
)
{
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteResponseStatusAsync
(
response
.
HttpVersion
,
(
int
)
HttpStatusCode
.
ExpectationFailed
,
"Expectation Failed"
);
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteLineAsync
();
await
c
lientStreamWriter
.
WriteResponseStatusAsync
(
response
.
HttpVersion
,
(
int
)
HttpStatusCode
.
ExpectationFailed
,
"Expectation Failed"
);
await
c
lientStreamWriter
.
WriteLineAsync
();
}
//Write back response status to client
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteResponseStatusAsync
(
response
.
HttpVersion
,
response
.
ResponseStatusCode
,
response
.
ResponseStatusDescription
);
await
c
lientStreamWriter
.
WriteResponseStatusAsync
(
response
.
HttpVersion
,
response
.
ResponseStatusCode
,
response
.
ResponseStatusDescription
);
response
.
ResponseHeaders
.
FixProxyHeaders
();
if
(
response
.
ResponseBodyRead
)
...
...
@@ -104,22 +106,22 @@ namespace Titanium.Web.Proxy
}
}
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteHeadersAsync
(
response
.
ResponseHeaders
);
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteResponseBodyAsync
(
response
.
ResponseBody
,
isChunked
);
await
c
lientStreamWriter
.
WriteHeadersAsync
(
response
.
ResponseHeaders
);
await
c
lientStreamWriter
.
WriteResponseBodyAsync
(
response
.
ResponseBody
,
isChunked
);
}
else
{
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteHeadersAsync
(
response
.
ResponseHeaders
);
await
c
lientStreamWriter
.
WriteHeadersAsync
(
response
.
ResponseHeaders
);
//Write body if exists
if
(
response
.
HasBody
)
{
await
args
.
ProxyClient
.
C
lientStreamWriter
.
WriteResponseBodyAsync
(
BufferSize
,
args
.
WebSession
.
ServerConnection
.
StreamReader
,
await
c
lientStreamWriter
.
WriteResponseBodyAsync
(
BufferSize
,
args
.
WebSession
.
ServerConnection
.
StreamReader
,
response
.
IsChunked
,
response
.
ContentLength
);
}
}
await
args
.
ProxyClient
.
ClientStream
.
FlushAsync
();
await
clientStreamWriter
.
FlushAsync
();
}
catch
(
Exception
e
)
{
...
...
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