Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ekaterina
slapos
Commits
e4e5824f
Commit
e4e5824f
authored
Nov 28, 2018
by
Łukasz Nowak
Committed by
Łukasz Nowak
Dec 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend/test: Assert real QUIC access
parent
9c691cc0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
44 additions
and
40 deletions
+44
-40
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+44
-40
No files found.
software/caddy-frontend/test/test.py
View file @
e4e5824f
...
@@ -90,19 +90,21 @@ def createKey():
...
@@ -90,19 +90,21 @@ def createKey():
return
key
,
key_pem
return
key
,
key_pem
def
createSelfSignedCertificate
(
common_name
):
def
createSelfSignedCertificate
(
name_list
):
key
,
key_pem
=
createKey
()
key
,
key_pem
=
createKey
()
subject_alternative_name_list
=
x509
.
SubjectAlternativeName
(
[
x509
.
DNSName
(
unicode
(
q
))
for
q
in
name_list
]
)
subject
=
issuer
=
x509
.
Name
([
subject
=
issuer
=
x509
.
Name
([
x509
.
NameAttribute
(
NameOID
.
COUNTRY_NAME
,
u"XX"
),
x509
.
NameAttribute
(
NameOID
.
COMMON_NAME
,
u'Test Self Signed Certificate'
),
x509
.
NameAttribute
(
NameOID
.
STATE_OR_PROVINCE_NAME
,
u"YY"
),
x509
.
NameAttribute
(
NameOID
.
LOCALITY_NAME
,
u"Xx Yy"
),
x509
.
NameAttribute
(
NameOID
.
ORGANIZATION_NAME
,
u"Xyx Yxy"
),
x509
.
NameAttribute
(
NameOID
.
COMMON_NAME
,
unicode
(
common_name
)),
])
])
certificate
=
x509
.
CertificateBuilder
().
subject_name
(
certificate
=
x509
.
CertificateBuilder
().
subject_name
(
subject
subject
).
issuer_name
(
).
issuer_name
(
issuer
issuer
).
add_extension
(
subject_alternative_name_list
,
critical
=
False
,
).
public_key
(
).
public_key
(
key
.
public_key
()
key
.
public_key
()
).
serial_number
(
).
serial_number
(
...
@@ -183,6 +185,17 @@ def isHTTP2(domain, ip):
...
@@ -183,6 +185,17 @@ def isHTTP2(domain, ip):
return
'Using HTTP2, server supports multi-use'
in
err
return
'Using HTTP2, server supports multi-use'
in
err
def
getQUIC
(
url
,
ip
,
port
):
quic_client_command
=
'quic_client --disable-certificate-verification '
\
'--port=%(port)s --host=%(host)s %(url)s'
%
dict
(
port
=
port
,
host
=
ip
,
url
=
url
)
try
:
return
True
,
subprocess
.
check_output
(
quic_client_command
.
split
(),
stderr
=
subprocess
.
STDOUT
)
except
subprocess
.
CalledProcessError
as
e
:
return
False
,
e
.
output
class
TestDataMixin
(
object
):
class
TestDataMixin
(
object
):
@
staticmethod
@
staticmethod
def
generateHashFromFiles
(
file_list
):
def
generateHashFromFiles
(
file_list
):
...
@@ -515,7 +528,12 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
...
@@ -515,7 +528,12 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
@
classmethod
@
classmethod
def
createWildcardExampleComCertificate
(
cls
):
def
createWildcardExampleComCertificate
(
cls
):
_
,
cls
.
key_pem
,
_
,
cls
.
certificate_pem
=
createSelfSignedCertificate
(
_
,
cls
.
key_pem
,
_
,
cls
.
certificate_pem
=
createSelfSignedCertificate
(
'*.example.com'
)
[
'*.customdomain.example.com'
,
'*.example.com'
,
'*.nginx.example.com'
,
'*.alias1.example.com'
,
])
@
classmethod
@
classmethod
def
setUpClass
(
cls
):
def
setUpClass
(
cls
):
...
@@ -704,7 +722,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -704,7 +722,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'customdomainsslcrtsslkeysslcacrt.example.com'
)
'customdomainsslcrtsslkeysslcacrt.example.com'
)
_
,
cls
.
customdomain_ca_certificate_pem
=
cls
.
ca
.
signCSR
(
csr
)
_
,
cls
.
customdomain_ca_certificate_pem
=
cls
.
ca
.
signCSR
(
csr
)
_
,
cls
.
customdomain_key_pem
,
_
,
cls
.
customdomain_certificate_pem
=
\
_
,
cls
.
customdomain_key_pem
,
_
,
cls
.
customdomain_certificate_pem
=
\
createSelfSignedCertificate
(
'customdomainsslcrtsslkey.example.com'
)
createSelfSignedCertificate
(
[
'customdomainsslcrtsslkey.example.com'
]
)
super
(
TestSlave
,
cls
).
setUpSlaves
()
super
(
TestSlave
,
cls
).
setUpSlaves
()
@
classmethod
@
classmethod
...
@@ -1404,14 +1422,9 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -1404,14 +1422,9 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
parameter_dict
parameter_dict
)
)
result = self.fakeHTTPSResult(
with self.assertRaises(requests.exceptions.SSLError):
parameter_dict['
domain
'], parameter_dict['
public
-
ipv4
'], '
test
-
path
')
self.fakeHTTPSResult(
parameter_dict['
domain
'], parameter_dict['
public
-
ipv4
'], '
test
-
path
')
self.assertEqual(
self.customdomain_ca_certificate_pem,
der2pem(result.peercert))
self.assertEqualResultJson(result, '
Path
', '
/
test
-
path
')
def test_ssl_ca_crt_does_not_match(self):
def test_ssl_ca_crt_does_not_match(self):
parameter_dict = self.parseSlaveParameterDict('
ssl_ca_crt_does_not_match
')
parameter_dict = self.parseSlaveParameterDict('
ssl_ca_crt_does_not_match
')
...
@@ -3205,35 +3218,26 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin):
...
@@ -3205,35 +3218,26 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertKeyWithPop('
Date
', result.headers)
self.assertKeyWithPop('
Date
', result.headers)
self.assertKeyWithPop('
Content
-
Length
', result.headers)
self.assertKeyWithPop('
Content
-
Length
', result.headers)
self.assertEqual(
quic_status, quic_result = getQUIC(
{'
Content
-
Encoding
': '
gzip
',
'
https
:
//%
s
/%
s
' % (parameter_dict['
domain
'], '
test
-
path
'),
'
Alt
-
Svc
': '
quic
=
":11443"
;
ma
=
2592000
;
v
=
"39"', # QUIC advertises
parameter_dict['
public
-
ipv4
'],
'
Set
-
Cookie
': '
secured
=
value
;
secure
,
nonsecured
=
value
',
HTTPS_PORT
'
Vary
': '
Accept
-
Encoding
',
'
Server
': '
Caddy
,
BaseHTTP
/
0.3
Python
/
2.7
.
14
',
'
Content
-
Type
': '
application
/
json
'},
result.headers
)
)
result_http = self.fakeHTTPResult(
self.assertTrue(quic_status, quic_result)
parameter_dict['
domain
'], parameter_dict['
public
-
ipv4
'], '
test
-
path
')
self.assertEqualResultJson(result_http, '
Path
', '
/
test
-
path
')
try:
try:
j = result_http.json()
quic_jsoned = quic_result.split('
body
:
')[2].split('
trailers
')[0]
except Exception:
except Exception:
raise ValueError('
JSON
decode
problem
in
:
\
n
%
s
' % (result.text,))
raise ValueError('
JSON
not
found
at
all
in
QUIC
result
:
\
n
%
s
' % (
self.assertFalse('
remote_user
' in j['
Incoming
Headers
'].keys())
quic_result,))
try:
self.assertEqual(
j = json.loads(quic_jsoned)
'
gzip
',
except Exception:
result_http.headers['
Content
-
Encoding
']
raise ValueError('
JSON
decode
problem
in
:
\
n
%
s
' % (quic_jsoned,))
)
key = '
Path
'
self.assertTrue(key in j, '
No
key
%
r
in
%
s
' % (key, j))
self.assertEqual(
self.assertEqual('
/
test
-
path
', j[key])
'
secured
=
value
;
secure
,
nonsecured
=
value
',
result_http.headers['
Set
-
Cookie
']
)
class TestSlaveBadParameters(SlaveHttpFrontendTestCase, TestDataMixin):
class TestSlaveBadParameters(SlaveHttpFrontendTestCase, TestDataMixin):
...
...
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