chore: remove duplicate code and file

Use the files in demo(dh, fixnemu), and auto create ca, cert, key file

demo/fixnemu.py

@@ -17,9 +17,11 @@
 # Nemu.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
+import os
 from new import function
 from nemu.iproute import backticks, get_if_data, route, \
     get_addr_data, get_all_route_data, interface
+from nemu.interface import Switch, Interface
 
 def _get_all_route_data():
     ipdata = backticks([IP_PATH, "-o", "route", "list"]) # "table", "all"
@@ -69,3 +71,17 @@ def _get_addr_data():
     byidx, bynam = get_addr_data.orig()
     return byidx, {name.split('@',1)[0]: a for name, a in bynam.iteritems()}
 get_addr_data.func_code = _get_addr_data.func_code
+
+@staticmethod
+def _gen_if_name():
+    n = Interface._gen_next_id()
+    # Max 15 chars
+    return "NETNSif-%.4x%.3x" % (os.getpid() % 0xffff, n)
+Interface._gen_if_name = _gen_if_name
+
+@staticmethod
+def _gen_br_name():
+    n = Switch._gen_next_id()
+    # Max 15 chars
+    return "NETNSbr-%.4x%.3x" % (os.getpid() % 0xffff, n)
+Switch._gen_br_name = _gen_br_name

re6st/tests/dh2048.pem

------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAoXvAhNiPPi9WTYjDhkrLfSGV7lQdAnKJHohSdsR85SdH8u9whvlb
-a4Jt2aEJCFqL1LMziF8Dy3ipcUe/xYbmZJ+w1wNAnuzzeJWH5z57duZy6jPvPxsW
-uLTsnjlUn+nYG7vrkmWEqgzQDLY2aV9maPREmqAvxorIdffWXKsh6wyBhVuOghC/
-8pqxDY5C+VewBMkqibZnNtQ8IWMw+6SmPKx4bLA44P1VlfpF+3VBNgs3JD26djFX
-vJs+Pd4+j0GM2hPlxTSIB12cKSiDix0YXdHrVQtnatsnG3wyzVSTKbvxQRMEFM1X
-BnUtiqlB3IlGCg6RWXRGcdEZ50blLQZ0kwIBAg==
------END DH PARAMETERS-----

re6st/tests/registry.json

 {
     "verbose": 1,
-    "ca": "root.crt",
     "port": 9090,
     "anonymous_prefix_length": null,
     "smtp_pwd": null,
@@ -16,10 +15,8 @@
     "smtp_starttls": false,
     "run": "run",
     "bind4": "0.0.0.0",
-    "dh": "dh2048.pem",
     "db": "registry.db",
     "mailhost": "miku@miku.com",
-    "key": "registry.key",
     "encrypt": false,
     "logfile": "registry.log",
     "max_clients": null,

re6st/tests/registry.key

------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA2yS7SlkxfMc8ydVbFPv8kZFQQp1dyda4Dt41P3+klO01TE0k
-JY25pvpBcYFz3tbADB/m6zJlvuA9eVTy7cxodioRaYiUCZjgUbXZ2/BziUIGygDL
-WcYbvf0A1aX7qGYPx1cLwLxvwZlHa+tVB/MKgRDC+L/qRAftRc6+uMrdjddUaKbC
-B2k8GPxUWPpKeSB4ymXDXeuey0nHZ7KgjHqRcHKVEK24eBR9NR38Epm4bAkp8GAT
-wA9qhDLlKJZXqMJCl3VilOaRpwoO9dmTvIPEHx0R9DNFFRUlc4DPq60UIYsfvUkp
-467PfpJH7aXLM7PIyvU0aZ5QHtdcKHXnsRc+yQIDAQABAoIBACvgpOd0CGaVdeRr
-pbsD4UQ8NjfAToEVTvEbKMo4AnoXLK7EW1JxmBSI0wWpB8w8b2N+F7xL8PdQ6r4a
-djGK1fei4K2ivRFW3MM/iAlzkY6P+9ACbLTi57cYq0wb2dGT7eDZ2u6STEYVLKm9
-Ct92mEnTU1Z/Bqbsd2Ocy68wX0AA2Ho/ktpL3hGhlBTOm9PwMV/aj/99YjEN+iLD
-Q2e/YGNOslHvil4YErC01g6WR2SMujhQ/42ValYpacIVlirajaYgKdQ0PctwB1es
-6Miwbwt/BrA8yH8gDCpHdqrfjAnb1J1xr5idu3i09Dt1F3FxHLKfU8DOng2WQD9v
-HCNNaIkCgYEA7XllFs490pd7fraEde3IIRUVd/fXu/1qWjjpbijaMirtH9zWOE8b
-JSklLrjYDXd6OS1dDft4DeRHbKOj3qe51Ux6kt/Zw1WdTfo3UtNjcK+EETpJuKyG
-ctQHQG8HiQtgN36mkVUnc0W5IsURUnjNFO51r9V9U5ItYcBon5bGIUsCgYEA7D1A
-3fMoDKbZzVrtDue9h+UmyCPCJgZASTt6iEm98guswbSQ/Qa1C94YbmQXAGO4NPwS
-b/b78/JK6VTZpuuPB97m/antq1MlI8iNwomp1QR9m7jKg7WHui+nvSewh1o35B90
-GstfIWmm6Pvqw0iu8UgSTEW7y3/SK51nEknPp7sCgYEAy4hiNfuqTRZ8SAxS12hn
-QMN7VQldI8h9ILrqhvoImTrlZYu3JyfV0jHDppnSwygF33+b4+IF8ZIYDWrrhmgn
-BEO6QqwNTjfQzQaJ6Dk5X1lvTfyxNtDXow9K79S5lqHjY2zvglyDpW660Kwqvo6+
-5xPCVmQaOEhvEPsCMNXfFqUCgYEAjztINAm0c49KKNcDOfFJmbZXACumEBXkLkKQ
-tUc4kiN/9+X5rl+9r1dWKsAmrgbH7eATca0m764suzHF0Q2rJ9N+67d2sVR1BTAY
-uyVqQgw5+AtfReHvS/SO2AHTZw1NK9PiOkiqAgEjwMjUeth7sTDIX1Q8W1LBY85I
-au8zpvcCgYEA2ZpA8QsbU6mijBsrc4aOSqnP4VBiqS5aLNqwOcxwlYtSn5/8xTvb
-eI1imNQf5Js4l9/7fRTuxSYhZIPM8SLbHWCkesJubiiKc+R+m7uBZ+0h7W6ZtlY3
-avFFoiUUtviOdvqBketnWkIiwzL8lzjHOwjYvdRiGv9Fkoty0SKXbp8=
------END RSA PRIVATE KEY-----

re6st/tests/root.crt

------BEGIN CERTIFICATE-----
-MIID4jCCAsqgAwIBAgIHASABDbgAQjANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
-BhMCRlIxDjAMBgNVBAgMBUxJTExFMQ4wDAYDVQQHDAVMSUxMRTEhMB8GA1UECgwY
-SW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQwwCgYDVQQDDANIWkYxJjAkBgkqhkiG
-9w0BCQEWF3poaWZhbi5odWFuZ0BuZXhlZGkuY29tMB4XDTIyMDIxNDA4NDQxN1oX
-DTMyMDIxMjA4NDQxN1owgYYxCzAJBgNVBAYTAkZSMQ4wDAYDVQQIDAVMSUxMRTEO
-MAwGA1UEBwwFTElMTEUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
-ZDEMMAoGA1UEAwwDSFpGMSYwJAYJKoZIhvcNAQkBFhd6aGlmYW4uaHVhbmdAbmV4
-ZWRpLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvG4CCFLEJ8
-vl9KiCXkfqrPhlSwktKs0PrT2kxncIJGwlkMdVlgKY5AG41ayf3+ZhpXKOWA7CDw
-D653ugPc6JADh9fxWCAxzeXyvkBVMRBZ1zADDdiLKrTox8pCPu0wVPnxdsq+4TZW
-lB3CGkn2wxPNenI4aFiK6J79C35kX6pMupDgbwOUuh4e+Z+fTe2ouAGRlG/s69F5
-5ehjChUpNKRrIekKdFzVF76XK5twH9N2x6Iyd+dFfrQ0qiAhDugKWbqVxD1bdPlQ
-rtU4LpQ9z1c3cXVGViopL7CMZN3qT4x9bA/j41ISDpdRm9cwJGLuEo+bWTf+nFaM
-jzQAoPbyPpMCAwEAAaNTMFEwHQYDVR0OBBYEFOMXLeN2qnczE67jRn6PTAarT/nO
-MB8GA1UdIwQYMBaAFOMXLeN2qnczE67jRn6PTAarT/nOMA8GA1UdEwEB/wQFMAMB
-Af8wDQYJKoZIhvcNAQELBQADggEBAEfYZF1NijKxcB8dU58mJWUtvx3LNUfOlasB
-4ykaEzDsA2zpnJ31msJ86G4VHy5umA4bbX80Eo1fBXT4W7GmfakbYIahb5A05Vrf
-b1lggQAGsVEptfAAFgRynaPOCgyBmor55izPBt64jnZOS1Hgx8kmSowDYR+CVqc6
-Ur+9e71jmkTv2LQwOl0fRD77vw2QZMV68C7y3SY32ErPb2anGuBzdrlrGHFy4Jam
-FdiYcw7uEkdrJX3eXRI9gUBcIuljTiYQv2NZzhmeL+qbWDb/DI0NXNvZ8oe0ZHOd
-UKfcEWjnPMyZHpuyPOeV6ywTLOdHXG9GqwTgAfln+vOhoKQ8fkE=
------END CERTIFICATE-----

re6st/tests/test_network/fixnemu.py

-# -*- coding: utf-8 -*-
-
-# Copyright 2010, 2011 INRIA
-# Copyright 2011 Martín Ferrari <martin.ferrari@gmail.com>
-#
-# This file is contains patches to Nemu.
-#
-# Nemu is free software: you can redistribute it and/or modify it under the
-# terms of the GNU General Public License version 2, as published by the Free
-# Software Foundation.
-#
-# Nemu is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Nemu.  If not, see <http://www.gnu.org/licenses/>.
-
-import re
-from new import function
-from nemu.iproute import backticks, get_if_data, route, \
-    get_addr_data, get_all_route_data, interface
-from nemu.interface import Switch, Interface
-import os
-
-def _get_all_route_data():
-    ipdata = backticks([IP_PATH, "-o", "route", "list"]) # "table", "all"
-    ipdata += backticks([IP_PATH, "-o", "-f", "inet6", "route", "list"])
-
-    ifdata = get_if_data()[1]
-    ret = []
-    for line in ipdata.split("\n"):
-        if line == "":
-            continue
-        # PATCH: parse 'from'
-        # PATCH: 'dev' is missing on 'unreachable' ipv4 routes
-        match = re.match('(?:(unicast|local|broadcast|multicast|throw|'
-            r'unreachable|prohibit|blackhole|nat) )?(\S+)(?: from (\S+))?'
-            r'(?: via (\S+))?(?: dev (\S+))?.*(?: metric (\d+))?', line)
-        if not match:
-            raise RuntimeError("Invalid output from `ip route': `%s'" % line)
-        tipe = match.group(1) or "unicast"
-        prefix = match.group(2)
-        #src = match.group(3)
-        nexthop = match.group(4)
-        interface = ifdata[match.group(5) or "lo"]
-        metric = match.group(6)
-        if prefix == "default" or re.search(r'/0$', prefix):
-            prefix = None
-            prefix_len = 0
-        else:
-            match = re.match(r'([0-9a-f:.]+)(?:/(\d+))?$', prefix)
-            prefix = match.group(1)
-            prefix_len = int(match.group(2) or 32)
-        ret.append(route(tipe, prefix, prefix_len, nexthop, interface.index,
-            metric))
-    return ret
-
-get_all_route_data.func_code = _get_all_route_data.func_code
-
-interface__init__ = interface.__init__
-def __init__(self, *args, **kw):
-    interface__init__(self, *args, **kw)
-    if self.name:
-        self.name = self.name.split('@',1)[0]
-interface.__init__ = __init__
-
-get_addr_data.orig = function(get_addr_data.func_code,
-                              get_addr_data.func_globals)
-def _get_addr_data():
-    byidx, bynam = get_addr_data.orig()
-    return byidx, {name.split('@',1)[0]: a for name, a in bynam.iteritems()}
-get_addr_data.func_code = _get_addr_data.func_code
-
-@staticmethod
-def _gen_if_name():
-    n = Interface._gen_next_id()
-    # Max 15 chars
-    return "NETNSif-" + ("%.4x%.3x" % (os.getpid(), n))[-7:]
-Interface._gen_if_name = _gen_if_name
-
-@staticmethod
-def _gen_br_name():
-    n = Switch._gen_next_id()
-    # Max 15 chars
-    return "NETNSbr-" + ("%.4x%.3x" % (os.getpid(), n))[-7:]
-Switch._gen_br_name = _gen_br_name
-

re6st/tests/test_network/network_build.py

@@ -6,7 +6,8 @@ import logging
 from subprocess import PIPE
 from pathlib2 import Path
 
-fix_file =  Path(__file__).parent.resolve() / "fixnemu.py"
+DEMO_PATH = Path(__file__).resolve().parent.parent.parent.parent / "demo"
+fix_file = DEMO_PATH / "fixnemu.py"
 execfile(str(fix_file))
 IPTABLES = 'iptables-nft'
 

re6st/tests/test_unit/test_conf.py

@@ -8,9 +8,10 @@ import unittest
 from shutil import rmtree
 from StringIO import StringIO
 from mock import patch
+from OpenSSL import crypto
 
 from re6st.cli import conf
-from re6st.tests.tools import generate_cert, serial2prefix
+from re6st.tests.tools import generate_cert, serial2prefix, create_ca_file
 
 
 # gloable value from conf.py
@@ -33,11 +34,11 @@ class TestConf(unittest.TestCase):
         if not os.path.exists(cls.work_dir):
             os.makedirs(cls.work_dir)
 
-        # mocked service cert and pkey
-        with open("root.crt") as f:
-            cls.cert = f.read()
-        with open("registry.key") as f:
-            cls.pkey = f.read()
+        # mocked server cert and pkey
+        cls.pkey, cls.cert = create_ca_file(os.devnull, os.devnull)
+        cls.fingerprint = "".join( cls.cert.digest("sha1").split(":"))
+        # client.getCa should return a string form cert
+        cls.cert = crypto.dump_certificate(crypto.FILETYPE_PEM, cls.cert)
 
         cls.command = "re6st-conf --registry http://localhost/" \
             " --dir %s" % cls.work_dir
@@ -80,7 +81,7 @@ class TestConf(unittest.TestCase):
         token = "a_token"
         mock_raw_input.side_effect = [mail, token]
         command = self.command \
-            + " --fingerprint sha1:a1861330f1299b98b529fa52c3d8e5d1a94dc63a" \
+            + " --fingerprint sha1:%s" % self.fingerprint \
             + " --req L lille"
         sys.argv = command.split()
 

re6st/tests/test_unit/test_registry.py

@@ -9,9 +9,11 @@ import unittest
 import hmac
 import hashlib
 import time
+import tempfile
 from argparse import Namespace
 from OpenSSL import crypto
 from mock import Mock, patch
+from pathlib2 import Path
 
 from re6st import registry
 from re6st.tests.tools import *
@@ -19,10 +21,19 @@ from re6st.tests.tools import *
 # TODO test for request_dump, requestToken, getNetworkConfig, getBoostrapPeer
 # getIPV4Information, versions
 
+DEMO_PATH = Path(__file__).parent.parent.parent.parent / "demo"
 
 def load_config(filename="registry.json"):
     with open(filename) as f:
         config = json.load(f)
+    config["dh"] = DEMO_PATH / "dh2048.pem"
+
+    fd, config["ca"] = tempfile.mkstemp()
+    os.close(fd)
+    fd, config["key"] = tempfile.mkstemp()
+    os.close(fd)
+    create_ca_file(config["key"], config["ca"])
+
     return Namespace(**config)
 
 
@@ -59,8 +70,9 @@ class TestRegistryServer(unittest.TestCase):
     @classmethod
     def tearDownClass(cls):
         # remove database
+        for file in [cls.config.db, cls.config.ca, cls.config.key]:
             try:
-            os.unlink(cls.config.db)
+                os.unlink(file)
             except Exception:
                 pass