Skip to content

S
slapos.libnetworkcache
Commit ad6e4d5c authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Simplify importing + pep8.

parent 5da0eddc
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 34 deletions
slapos/libnetworkcachetests.py
View file @ ad6e4d5c
...@@ -12,9 +12,8 @@ import tempfile ...@@ -12,9 +12,8 @@ import tempfile
import threading import threading
import time import time
import unittest import unittest
from slapos.libnetworkcache import NetworkcacheClient, UploadError, DirectoryNotFound import slapos.libnetworkcache
from slapos.signature import parseArgument, \ import slapos.signature
createPrivateKeyAndCertificateFile
class NCHandler(BaseHTTPServer.BaseHTTPRequestHandler): class NCHandler(BaseHTTPServer.BaseHTTPRequestHandler):
...@@ -30,7 +29,7 @@ class NCHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -30,7 +29,7 @@ class NCHandler(BaseHTTPServer.BaseHTTPRequestHandler):
def do_GET(self): def do_GET(self):
path = os.path.abspath(os.path.join(self.tree, *self.path.split('/'))) path = os.path.abspath(os.path.join(self.tree, *self.path.split('/')))
if not ( if not (
((path == self.tree) or path.startswith(self.tree+os.path.sep)) ((path == self.tree) or path.startswith(self.tree + os.path.sep))
and and
os.path.exists(path) os.path.exists(path)
): ):
...@@ -91,11 +90,13 @@ class NCHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -91,11 +90,13 @@ class NCHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.wfile.write(cksum) self.wfile.write(cksum)
return return
class NCHandlerPOST200(NCHandler): class NCHandlerPOST200(NCHandler):
def do_POST(self): def do_POST(self):
self.send_response(200) self.send_response(200)
return return
class NCHandlerReturnWrong(NCHandler): class NCHandlerReturnWrong(NCHandler):
def do_POST(self): def do_POST(self):
cksum = 'incorrect' cksum = 'incorrect'
...@@ -106,12 +107,14 @@ class NCHandlerReturnWrong(NCHandler): ...@@ -106,12 +107,14 @@ class NCHandlerReturnWrong(NCHandler):
self.wfile.write(cksum) self.wfile.write(cksum)
return return
class Server(BaseHTTPServer.HTTPServer): class Server(BaseHTTPServer.HTTPServer):
def __init__(self, tree, *args): def __init__(self, tree, *args):
BaseHTTPServer.HTTPServer.__init__(self, *args) BaseHTTPServer.HTTPServer.__init__(self, *args)
self.tree = os.path.abspath(tree) self.tree = os.path.abspath(tree)
__run = True __run = True
def serve_forever(self): def serve_forever(self):
while self.__run: while self.__run:
self.handle_request() self.handle_request()
...@@ -119,21 +122,26 @@ class Server(BaseHTTPServer.HTTPServer): ...@@ -119,21 +122,26 @@ class Server(BaseHTTPServer.HTTPServer):
def handle_error(self, *_): def handle_error(self, *_):
self.__run = False self.__run = False
def _run_nc(tree, host, port): def _run_nc(tree, host, port):
server_address = (host, port) server_address = (host, port)
httpd = Server(tree, server_address, NCHandler) httpd = Server(tree, server_address, NCHandler)
httpd.serve_forever() httpd.serve_forever()
class OfflineTest(unittest.TestCase): class OfflineTest(unittest.TestCase):
def test_download_offline(self): def test_download_offline(self):
nc = NetworkcacheClient('http://127.0.0.1:0', 'http://127.0.0.1:0') nc = slapos.libnetworkcache.NetworkcacheClient('http://127.0.0.1:0',
'http://127.0.0.1:0')
self.assertRaises(IOError, nc.download, 'sha512sum') self.assertRaises(IOError, nc.download, 'sha512sum')
def test_upload_offline(self): def test_upload_offline(self):
content = tempfile.TemporaryFile() content = tempfile.TemporaryFile()
nc = NetworkcacheClient('http://127.0.0.1:0', 'http://127.0.0.1:0') nc = slapos.libnetworkcache.NetworkcacheClient('http://127.0.0.1:0',
'http://127.0.0.1:0')
self.assertRaises(IOError, nc.upload, content) self.assertRaises(IOError, nc.upload, content)
def wait(host, port): def wait(host, port):
addr = host, port addr = host, port
for i in range(120): for i in range(120):
...@@ -150,6 +158,7 @@ def wait(host, port): ...@@ -150,6 +158,7 @@ def wait(host, port):
else: else:
raise raise
class OnlineMixin: class OnlineMixin:
def _start_nc(self): def _start_nc(self):
self.thread = threading.Thread(target=_run_nc, args=(self.tree, self.thread = threading.Thread(target=_run_nc, args=(self.tree,
...@@ -187,21 +196,22 @@ class OnlineMixin: ...@@ -187,21 +196,22 @@ class OnlineMixin:
self.thread.join() self.thread.join()
shutil.rmtree(self.tree) shutil.rmtree(self.tree)
class OnlineTest(OnlineMixin, unittest.TestCase): class OnlineTest(OnlineMixin, unittest.TestCase):
"""Online tests against real HTTP server""" """Online tests against real HTTP server"""
def test_upload(self): def test_upload(self):
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
nc.upload(self.test_data) nc.upload(self.test_data)
def test_upload_shadir(self): def test_upload_shadir(self):
"""Check scenario with shadir used""" """Check scenario with shadir used"""
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
urlmd5 = str(random.random()) urlmd5 = str(random.random())
nc.upload(self.test_data, 'mykey', urlmd5=urlmd5, file_name='my file') nc.upload(self.test_data, 'mykey', urlmd5=urlmd5, file_name='my file')
def test_upload_shadir_select(self): def test_upload_shadir_select(self):
"""Check scenario with shadir used""" """Check scenario with shadir used"""
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
urlmd5 = str(random.random()) urlmd5 = str(random.random())
key = 'somekey' + str(random.random()) key = 'somekey' + str(random.random())
nc.upload(self.test_data, key, urlmd5=urlmd5, file_name='my file') nc.upload(self.test_data, key, urlmd5=urlmd5, file_name='my file')
...@@ -210,7 +220,7 @@ class OnlineTest(OnlineMixin, unittest.TestCase): ...@@ -210,7 +220,7 @@ class OnlineTest(OnlineMixin, unittest.TestCase):
def test_upload_shadir_select_not_exists(self): def test_upload_shadir_select_not_exists(self):
"""Check scenario with shadir used""" """Check scenario with shadir used"""
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
urlmd5 = str(random.random()) urlmd5 = str(random.random())
key = 'somekey' + str(random.random()) key = 'somekey' + str(random.random())
nc.upload(self.test_data, key, urlmd5=urlmd5, file_name='my file') nc.upload(self.test_data, key, urlmd5=urlmd5, file_name='my file')
...@@ -221,13 +231,13 @@ class OnlineTest(OnlineMixin, unittest.TestCase): ...@@ -221,13 +231,13 @@ class OnlineTest(OnlineMixin, unittest.TestCase):
def test_upload_shadir_no_filename(self): def test_upload_shadir_no_filename(self):
"""Check scenario with shadir used, but not filename passed""" """Check scenario with shadir used, but not filename passed"""
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
urlmd5 = str(random.random()) urlmd5 = str(random.random())
self.assertRaises(ValueError, nc.upload, self.test_data, 'somekey', self.assertRaises(ValueError, nc.upload, self.test_data, 'somekey',
urlmd5) urlmd5)
def test_upload_twice_same(self): def test_upload_twice_same(self):
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
nc.upload(self.test_data) nc.upload(self.test_data)
self.test_data.seek(0) self.test_data.seek(0)
nc.upload(self.test_data) nc.upload(self.test_data)
...@@ -235,7 +245,7 @@ class OnlineTest(OnlineMixin, unittest.TestCase): ...@@ -235,7 +245,7 @@ class OnlineTest(OnlineMixin, unittest.TestCase):
def test_download(self): def test_download(self):
# prepare some test data # prepare some test data
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
# upload them # upload them
nc.upload(self.test_data) nc.upload(self.test_data)
...@@ -247,17 +257,19 @@ class OnlineTest(OnlineMixin, unittest.TestCase): ...@@ -247,17 +257,19 @@ class OnlineTest(OnlineMixin, unittest.TestCase):
self.assertEqual(result.read(), self.test_string) self.assertEqual(result.read(), self.test_string)
def test_download_not_exists(self): def test_download_not_exists(self):
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
try: try:
nc.download(self.test_shasum) nc.download(self.test_shasum)
except urllib2.HTTPError, error: except urllib2.HTTPError, error:
self.assertEqual(error.code, httplib.NOT_FOUND) self.assertEqual(error.code, httplib.NOT_FOUND)
def _run_nc_POST200(tree, host, port): def _run_nc_POST200(tree, host, port):
server_address = (host, port) server_address = (host, port)
httpd = Server(tree, server_address, NCHandlerPOST200) httpd = Server(tree, server_address, NCHandlerPOST200)
httpd.serve_forever() httpd.serve_forever()
class OnlineTestPOST200(OnlineMixin, unittest.TestCase): class OnlineTestPOST200(OnlineMixin, unittest.TestCase):
def _start_nc(self): def _start_nc(self):
self.thread = threading.Thread(target=_run_nc_POST200, args=(self.tree, self.thread = threading.Thread(target=_run_nc_POST200, args=(self.tree,
...@@ -268,14 +280,17 @@ class OnlineTestPOST200(OnlineMixin, unittest.TestCase): ...@@ -268,14 +280,17 @@ class OnlineTestPOST200(OnlineMixin, unittest.TestCase):
def test_upload_wrong_return_code(self): def test_upload_wrong_return_code(self):
"""Check reaction on HTTP return code different then 201""" """Check reaction on HTTP return code different then 201"""
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
self.assertRaises(UploadError, nc.upload, self.test_data) self.assertRaises(slapos.libnetworkcache.UploadError, nc.upload,
self.test_data)
def _run_nc_POSTWrongChecksum(tree, host, port): def _run_nc_POSTWrongChecksum(tree, host, port):
server_address = (host, port) server_address = (host, port)
httpd = Server(tree, server_address, NCHandlerReturnWrong) httpd = Server(tree, server_address, NCHandlerReturnWrong)
httpd.serve_forever() httpd.serve_forever()
class OnlineTestWrongChecksum(OnlineMixin, unittest.TestCase): class OnlineTestWrongChecksum(OnlineMixin, unittest.TestCase):
def _start_nc(self): def _start_nc(self):
self.thread = threading.Thread(target=_run_nc_POSTWrongChecksum, self.thread = threading.Thread(target=_run_nc_POSTWrongChecksum,
...@@ -286,8 +301,10 @@ class OnlineTestWrongChecksum(OnlineMixin, unittest.TestCase): ...@@ -286,8 +301,10 @@ class OnlineTestWrongChecksum(OnlineMixin, unittest.TestCase):
def test_upload_wrong_return_sha(self): def test_upload_wrong_return_sha(self):
"""Check reaction in case of wrong sha returned""" """Check reaction in case of wrong sha returned"""
nc = NetworkcacheClient(self.shacache, self.shadir) nc = slapos.libnetworkcache.NetworkcacheClient(self.shacache, self.shadir)
self.assertRaises(UploadError, nc.upload, self.test_data) self.assertRaises(slapos.libnetworkcache.UploadError, nc.upload,
self.test_data)
class LibNetworkCacheMixin(unittest.TestCase): class LibNetworkCacheMixin(unittest.TestCase):
...@@ -307,8 +324,10 @@ class LibNetworkCacheMixin(unittest.TestCase): ...@@ -307,8 +324,10 @@ class LibNetworkCacheMixin(unittest.TestCase):
'--organization-unit-name', 'Dev', '--organization-unit-name', 'Dev',
'--common-name', 'R500.com', '--common-name', 'R500.com',
'--email', 'test@example.com') '--email', 'test@example.com')
self.option_dict = parseArgument(*self.signature_creation_argument_list) self.option_dict = slapos.signature.parseArgument(
self.cert_as_text = createPrivateKeyAndCertificateFile(**self.option_dict) *self.signature_creation_argument_list)
self.cert_as_text = slapos.signature.createPrivateKeyAndCertificateFile(
**self.option_dict)
def tearDown(self): def tearDown(self):
''' Remove the files which have been created during the test. ''' ''' Remove the files which have been created during the test. '''
...@@ -333,13 +352,13 @@ class GenerateSignatureScriptTest(LibNetworkCacheMixin): ...@@ -333,13 +352,13 @@ class GenerateSignatureScriptTest(LibNetworkCacheMixin):
'signature_private_key_file': 'private.pem', 'signature_private_key_file': 'private.pem',
'signature_certificate_file': 'public.pem', 'signature_certificate_file': 'public.pem',
'email': ''} 'email': ''}
self.assertEquals(default_dict, parseArgument()) self.assertEquals(default_dict, slapos.signature.parseArgument())
def test_parse_argument(self): def test_parse_argument(self):
''' '''
Check if the argument is properly set. Check if the argument is properly set.
''' '''
size_argument_list = len(self.signature_creation_argument_list)/2 size_argument_list = len(self.signature_creation_argument_list) / 2
size_option_dict = len(self.option_dict) size_option_dict = len(self.option_dict)
self.assertEquals(size_argument_list, size_option_dict, self.assertEquals(size_argument_list, size_option_dict,
"Argument list should have the same size of option dict.") "Argument list should have the same size of option dict.")
...@@ -359,7 +378,7 @@ class GenerateSignatureScriptTest(LibNetworkCacheMixin): ...@@ -359,7 +378,7 @@ class GenerateSignatureScriptTest(LibNetworkCacheMixin):
class TestNetworkcacheClient(LibNetworkCacheMixin): class TestNetworkcacheClient(LibNetworkCacheMixin):
""" """
Class to test the NetworkcacheClient implementation. Class to test the slapos.libnetworkcache.NetworkcacheClient implementation.
""" """
def setUp(self): def setUp(self):
...@@ -375,7 +394,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -375,7 +394,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
def test_init_backward_compatible(self): def test_init_backward_compatible(self):
"""Checks that invocation with minimal parameter works fine""" """Checks that invocation with minimal parameter works fine"""
nc = NetworkcacheClient(shacache=self.shacache_url, nc = slapos.libnetworkcache.NetworkcacheClient(shacache=self.shacache_url,
shadir=self.shadir_url) shadir=self.shadir_url)
self.assertEqual(nc.shacache_url, self.shacache_url) self.assertEqual(nc.shacache_url, self.shacache_url)
self.assertTrue(nc.shadir_host in self.shadir_url) self.assertTrue(nc.shadir_host in self.shadir_url)
...@@ -384,7 +403,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -384,7 +403,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
""" """
Check if the init method is setting the attributes correctly. Check if the init method is setting the attributes correctly.
""" """
nc = NetworkcacheClient(shacache=self.shacache_url, nc = slapos.libnetworkcache.NetworkcacheClient(shacache=self.shacache_url,
shadir=self.shadir_url) shadir=self.shadir_url)
self.assertEquals({'Content-Type': 'application/json'}, \ self.assertEquals({'Content-Type': 'application/json'}, \
nc.shacache_header_dict) nc.shacache_header_dict)
...@@ -404,7 +423,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -404,7 +423,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
Without the private key file, it is not possible to create the Without the private key file, it is not possible to create the
signature so it must return an empty string. signature so it must return an empty string.
""" """
nc = NetworkcacheClient(shacache=self.shacache_url, nc = slapos.libnetworkcache.NetworkcacheClient(shacache=self.shacache_url,
shadir=self.shadir_url) shadir=self.shadir_url)
self.assertEquals('', nc._getSignatureString()) self.assertEquals('', nc._getSignatureString())
...@@ -412,7 +431,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -412,7 +431,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
""" """
Check if the signature creation does not have any error. Check if the signature creation does not have any error.
""" """
nc = NetworkcacheClient( nc = slapos.libnetworkcache.NetworkcacheClient(
shacache=self.shacache_url, shacache=self.shacache_url,
shadir=self.shadir_url, shadir=self.shadir_url,
signature_private_key_file=self.signature_private_key_file) signature_private_key_file=self.signature_private_key_file)
...@@ -424,7 +443,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -424,7 +443,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
verify if the signature if trusted or not. verify if the signature if trusted or not.
So, the _verifySignatureInCertificateList should return False. So, the _verifySignatureInCertificateList should return False.
""" """
nc = NetworkcacheClient( nc = slapos.libnetworkcache.NetworkcacheClient(
shacache=self.shacache_url, shacache=self.shacache_url,
shadir=self.shadir_url, shadir=self.shadir_url,
signature_private_key_file=self.signature_private_key_file) signature_private_key_file=self.signature_private_key_file)
...@@ -440,7 +459,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -440,7 +459,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
if the signature_string is valid and it should return False if the if the signature_string is valid and it should return False if the
signature_string is not correct. signature_string is not correct.
""" """
nc = NetworkcacheClient( nc = slapos.libnetworkcache.NetworkcacheClient(
shacache=self.shacache_url, shacache=self.shacache_url,
shadir=self.shadir_url, shadir=self.shadir_url,
signature_private_key_file=self.signature_private_key_file, signature_private_key_file=self.signature_private_key_file,
...@@ -456,14 +475,14 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -456,14 +475,14 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
# SimpleHTTPServer? Because actually it gonna just throw an IOError. # SimpleHTTPServer? Because actually it gonna just throw an IOError.
def test_verification_with_signature_certificate_file_list_url(self): def test_verification_with_signature_certificate_file_list_url(self):
""" """
NetworkcacheClient supports to have the certification file under an HTTP slapos.libnetworkcache.NetworkcacheClient supports to have the
server. certification file under an HTTP server.
During the _verifySignatureInCertificateList method, it'll try to During the _verifySignatureInCertificateList method, it'll try to
download the certification from the given URL and check if the signature download the certification from the given URL and check if the signature
is valid. is valid.
""" """
nc = NetworkcacheClient( nc = slapos.libnetworkcache.NetworkcacheClient(
shacache=self.shacache_url, shacache=self.shacache_url,
shadir=self.shadir_url, shadir=self.shadir_url,
signature_private_key_file=self.signature_private_key_file, signature_private_key_file=self.signature_private_key_file,
...@@ -477,7 +496,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin): ...@@ -477,7 +496,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
During the signature vefirication, the filesystem path has priority over During the signature vefirication, the filesystem path has priority over
urls. So, if the public key is urls. So, if the public key is
""" """
nc = NetworkcacheClient( nc = slapos.libnetworkcache.NetworkcacheClient(
shacache=self.shacache_url, shacache=self.shacache_url,
shadir=self.shadir_url, shadir=self.shadir_url,
signature_private_key_file=self.signature_private_key_file, signature_private_key_file=self.signature_private_key_file,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7