kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(test) Interoperability tris with tris

Browse Source
This commit is contained in:
Henry Case 2018-03-29 12:03:14 +01:00 committed by Henry Dorsett Case
parent e5c37bded5
commit b7765d14c4
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
_dev/interop_test_runner
View File

@ -141,13 +141,14 @@ class ServerClientAuthMixin(object):
class ClientNominalMixin(object): class ClientNominalMixin(object):
def test_rsa(self): def test_rsa(self):
res = self.d.run_client(self.CLIENT_NAME, '-rsa=false '+self.server_ip+":2443") res = self.d.run_client(self.CLIENT_NAME, '-ecdsa=false '+self.server_ip+":1443")
self.assertEqual(res[0], 0) self.assertEqual(res[0], 0)
def test_ecdsa(self): def test_ecdsa(self):
res = self.d.run_client(self.CLIENT_NAME, '-ecdsa=false '+self.server_ip+":1443") res = self.d.run_client(self.CLIENT_NAME, '-rsa=false '+self.server_ip+":2443")
self.assertEqual(res[0], 0) self.assertEqual(res[0], 0)
class ClientClientAuthMixin(object): class ClientClientAuthMixin(object):
''' Client authentication testing - tris on client side ''' ''' Client authentication testing - tris on client side '''
@ -189,7 +190,7 @@ class InteropClient(object):
self.d = Docker() self.d = Docker()
self.server = self.d.run_server( self.server = self.d.run_server(
self.SERVER_NAME, self.SERVER_NAME,
ports={'1443/tcp': 1443, '2443/tcp': 2443, '6443/tcp': 6443}, ports={ '1443/tcp': 1443, '2443/tcp': 2443, '6443/tcp': 6443},
entrypoint="/server.sh") entrypoint="/server.sh")
@classmethod @classmethod
@ -239,5 +240,15 @@ class InteropClient_NSS(
unittest.TestCase unittest.TestCase
): SERVER_NAME = "tstclnt-localserver" ): SERVER_NAME = "tstclnt-localserver"
# TRIS as a client
class InteropServer_TRIS(ClientNominalMixin, InteropServer, unittest.TestCase):
CLIENT_NAME = 'tris-testclient'
def test_client_auth(self):
# I need to block TLS v1.2 as test server needs some rework
res = self.d.run_client(self.CLIENT_NAME, '-rsa=false -ecdsa=false -cliauth '+self.server_ip+":6443")
self.assertEqual(res[0], 0)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

4
_dev/tris-localserver/runner.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
./tris-localserver -b 0.0.0.0:1443 -palg=ecdsa -rtt0=n 2>&1 & # first port: ECDSA (and no 0-RTT) ./tris-localserver -b 0.0.0.0:1443 -palg=rsa -rtt0=n 2>&1 & # first port: ECDSA (and no 0-RTT)
./tris-localserver -b 0.0.0.0:2443 -palg=rsa -rtt0=a 2>&1 & # second port: RSA (and accept 0-RTT but not offer it) ./tris-localserver -b 0.0.0.0:2443 -palg=ecdsa -rtt0=a 2>&1 & # second port: RSA (and accept 0-RTT but not offer it)
./tris-localserver -b 0.0.0.0:3443 -palg=ecdsa -rtt0=o 2>&1 & # third port: offer and reject 0-RTT ./tris-localserver -b 0.0.0.0:3443 -palg=ecdsa -rtt0=o 2>&1 & # third port: offer and reject 0-RTT
./tris-localserver -b 0.0.0.0:4443 -palg=ecdsa -rtt0=oa 2>&1 & # fourth port: offer and accept 0-RTT ./tris-localserver -b 0.0.0.0:4443 -palg=ecdsa -rtt0=oa 2>&1 & # fourth port: offer and accept 0-RTT
./tris-localserver -b 0.0.0.0:5443 -palg=ecdsa -rtt0=oa -rtt0ack 2>&1 & # fifth port: offer and accept 0-RTT but confirm ./tris-localserver -b 0.0.0.0:5443 -palg=ecdsa -rtt0=oa -rtt0ack 2>&1 & # fifth port: offer and accept 0-RTT but confirm