Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
caddy
Commits
50749b4e
Commit
50749b4e
authored
Feb 27, 2017
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
httpserver: Improve MITM tests for Chrome on iOS, BlueCoat connections
parent
06873175
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
168 additions
and
39 deletions
+168
-39
caddyhttp/httpserver/mitm.go
caddyhttp/httpserver/mitm.go
+49
-0
caddyhttp/httpserver/mitm_test.go
caddyhttp/httpserver/mitm_test.go
+119
-39
No files found.
caddyhttp/httpserver/mitm.go
View file @
50749b4e
...
@@ -58,6 +58,11 @@ func (h *tlsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
...
@@ -58,6 +58,11 @@ func (h *tlsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
else
if
strings
.
Contains
(
ua
,
"Chrome"
)
{
}
else
if
strings
.
Contains
(
ua
,
"Chrome"
)
{
checked
=
true
checked
=
true
mitm
=
!
info
.
looksLikeChrome
()
mitm
=
!
info
.
looksLikeChrome
()
}
else
if
strings
.
Contains
(
ua
,
"CriOS"
)
{
// Chrome on iOS sometimes uses iOS-provided TLS stack (which looks exactly like Safari)
// but for connections that don't render a web page (favicon, etc.) it uses its own...
checked
=
true
mitm
=
!
info
.
looksLikeChrome
()
&&
!
info
.
looksLikeSafari
()
}
else
if
strings
.
Contains
(
ua
,
"Firefox"
)
{
}
else
if
strings
.
Contains
(
ua
,
"Firefox"
)
{
checked
=
true
checked
=
true
mitm
=
!
info
.
looksLikeFirefox
()
mitm
=
!
info
.
looksLikeFirefox
()
...
@@ -338,6 +343,10 @@ func (info rawHelloInfo) looksLikeFirefox() bool {
...
@@ -338,6 +343,10 @@ func (info rawHelloInfo) looksLikeFirefox() bool {
}
}
}
}
if
hasGreaseCiphers
(
info
.
cipherSuites
)
{
return
false
}
// We check for order of cipher suites but not presence, since
// We check for order of cipher suites but not presence, since
// according to the paper, cipher suites may be not be added
// according to the paper, cipher suites may be not be added
// or reordered by the user, but they may be disabled.
// or reordered by the user, but they may be disabled.
...
@@ -412,6 +421,10 @@ func (info rawHelloInfo) looksLikeChrome() bool {
...
@@ -412,6 +421,10 @@ func (info rawHelloInfo) looksLikeChrome() bool {
}
}
}
}
if
!
hasGreaseCiphers
(
info
.
cipherSuites
)
{
return
false
}
return
true
return
true
}
}
...
@@ -449,6 +462,10 @@ func (info rawHelloInfo) looksLikeEdge() bool {
...
@@ -449,6 +462,10 @@ func (info rawHelloInfo) looksLikeEdge() bool {
}
}
}
}
if
hasGreaseCiphers
(
info
.
cipherSuites
)
{
return
false
}
return
true
return
true
}
}
...
@@ -483,6 +500,10 @@ func (info rawHelloInfo) looksLikeSafari() bool {
...
@@ -483,6 +500,10 @@ func (info rawHelloInfo) looksLikeSafari() bool {
return
false
return
false
}
}
if
hasGreaseCiphers
(
info
.
cipherSuites
)
{
return
false
}
// We check for order and presence of cipher suites
// We check for order and presence of cipher suites
expectedCipherSuiteOrder
:=
[]
uint16
{
expectedCipherSuiteOrder
:=
[]
uint16
{
tls
.
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
,
// 0xc02c
tls
.
TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
,
// 0xc02c
...
@@ -540,6 +561,34 @@ func assertPresenceAndOrdering(requiredItems, candidateList []uint16, requiredIs
...
@@ -540,6 +561,34 @@ func assertPresenceAndOrdering(requiredItems, candidateList []uint16, requiredIs
return
true
return
true
}
}
func
hasGreaseCiphers
(
cipherSuites
[]
uint16
)
bool
{
for
_
,
cipher
:=
range
cipherSuites
{
if
_
,
ok
:=
greaseCiphers
[
cipher
];
ok
{
return
true
}
}
return
false
}
var
greaseCiphers
=
map
[
uint16
]
struct
{}{
0x0A0A
:
{},
0x1A1A
:
{},
0x2A2A
:
{},
0x3A3A
:
{},
0x4A4A
:
{},
0x5A5A
:
{},
0x6A6A
:
{},
0x7A7A
:
{},
0x8A8A
:
{},
0x9A9A
:
{},
0xAAAA
:
{},
0xBABA
:
{},
0xCACA
:
{},
0xDADA
:
{},
0xEAEA
:
{},
0xFAFA
:
{},
}
const
(
const
(
extensionOCSPStatusRequest
=
5
extensionOCSPStatusRequest
=
5
extensionSupportedCurves
=
10
// also called "SupportedGroups"
extensionSupportedCurves
=
10
// also called "SupportedGroups"
...
...
caddyhttp/httpserver/mitm_test.go
View file @
50749b4e
This diff is collapsed.
Click to expand it.
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