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
ad784227
Unverified
Commit
ad784227
authored
Mar 28, 2018
by
honfika
Committed by
GitHub
Mar 28, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #397 from justcoding121/develop
merge to beta
parents
a007c1c0
fce1aa51
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
9 deletions
+11
-9
ProxyServer.cs
Titanium.Web.Proxy/ProxyServer.cs
+1
-1
RequestHandler.cs
Titanium.Web.Proxy/RequestHandler.cs
+6
-1
ResponseHandler.cs
Titanium.Web.Proxy/ResponseHandler.cs
+2
-1
WinAuthHandler.cs
Titanium.Web.Proxy/WinAuthHandler.cs
+2
-6
No files found.
Titanium.Web.Proxy/ProxyServer.cs
View file @
ad784227
...
@@ -316,7 +316,7 @@ namespace Titanium.Web.Proxy
...
@@ -316,7 +316,7 @@ namespace Titanium.Web.Proxy
bool
isHttp
=
(
protocolType
&
ProxyProtocolType
.
Http
)
>
0
;
bool
isHttp
=
(
protocolType
&
ProxyProtocolType
.
Http
)
>
0
;
bool
isHttps
=
(
protocolType
&
ProxyProtocolType
.
Https
)
>
0
;
bool
isHttps
=
(
protocolType
&
ProxyProtocolType
.
Https
)
>
0
;
if
(
isHttps
)
if
(
isHttps
)
{
{
if
(!
endPoint
.
EnableSsl
)
if
(!
endPoint
.
EnableSsl
)
...
...
Titanium.Web.Proxy/RequestHandler.cs
View file @
ad784227
...
@@ -97,7 +97,12 @@ namespace Titanium.Web.Proxy
...
@@ -97,7 +97,12 @@ namespace Titanium.Web.Proxy
await
clientStreamWriter
.
WriteResponseAsync
(
response
);
await
clientStreamWriter
.
WriteResponseAsync
(
response
);
var
clientHelloInfo
=
await
SslTools
.
PeekClientHello
(
clientStream
);
ClientHelloInfo
clientHelloInfo
=
null
;
if
(
endPoint
.
EnableSsl
)
{
clientHelloInfo
=
await
SslTools
.
PeekClientHello
(
clientStream
);
}
bool
isClientHello
=
clientHelloInfo
!=
null
;
bool
isClientHello
=
clientHelloInfo
!=
null
;
if
(
isClientHello
)
if
(
isClientHello
)
{
{
...
...
Titanium.Web.Proxy/ResponseHandler.cs
View file @
ad784227
...
@@ -28,6 +28,7 @@ namespace Titanium.Web.Proxy
...
@@ -28,6 +28,7 @@ namespace Titanium.Web.Proxy
await
args
.
WebSession
.
ReceiveResponse
();
await
args
.
WebSession
.
ReceiveResponse
();
var
response
=
args
.
WebSession
.
Response
;
var
response
=
args
.
WebSession
.
Response
;
args
.
ReRequest
=
false
;
//check for windows authentication
//check for windows authentication
if
(
isWindowsAuthenticationEnabledAndSupported
&&
response
.
StatusCode
==
(
int
)
HttpStatusCode
.
Unauthorized
)
if
(
isWindowsAuthenticationEnabledAndSupported
&&
response
.
StatusCode
==
(
int
)
HttpStatusCode
.
Unauthorized
)
...
@@ -35,7 +36,7 @@ namespace Titanium.Web.Proxy
...
@@ -35,7 +36,7 @@ namespace Titanium.Web.Proxy
await
Handle401UnAuthorized
(
args
);
await
Handle401UnAuthorized
(
args
);
}
}
args
.
ReRequest
=
false
;
response
.
OriginalHasBody
=
response
.
HasBody
;
//if user requested call back then do it
//if user requested call back then do it
if
(!
response
.
Locked
)
if
(!
response
.
Locked
)
...
...
Titanium.Web.Proxy/WinAuthHandler.cs
View file @
ad784227
...
@@ -130,12 +130,8 @@ namespace Titanium.Web.Proxy
...
@@ -130,12 +130,8 @@ namespace Titanium.Web.Proxy
//Should we cache all Set-Cokiee headers from server during auth process
//Should we cache all Set-Cokiee headers from server during auth process
//and send it to client after auth?
//and send it to client after auth?
//clear current server response
// Let ResponseHandler send the updated request
await
args
.
ClearResponse
();
args
.
ReRequest
=
true
;
//request again with updated authorization header
//and server cookies
await
HandleHttpSessionRequestInternal
(
args
.
WebSession
.
ServerConnection
,
args
);
}
}
}
}
}
}
...
...
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