Merge pull request #53 from c00kiemon5ter/feature-fix-pykcs11-tests

Do not skip pykcs11 tests

Author: leifj

.travis.yml

@@ -1,23 +1,29 @@
+sudo: false
 language: python
-sudo: require
-python: 
-   - "2.7"
+python:
+  - 2.7
+
 addons:
-   apt:
-      packages:
-         - libxml2-dev
-         - libxslt-dev
-         - libsofthsm
-         - softhsm
-         - opensc
-         - libengine-pkcs11-openssl
-before_install: 
-   - sudo apt-get -qq update 
-   - sudo apt-get -y install libxml2-dev libxslt-dev libsofthsm softhsm opensc libengine-pkcs11-openssl
-   - pip install .
-   - pip install nose
-   - sh scripts/install-pykcs11.sh
-   - pip install coveralls
-script: "coverage run --source=xmlsec setup.py nosetests"
+  apt:
+    sources:
+      - sourceline: ppa:pkg-opendnssec/ppa
+    packages:
+      - xmlsec1
+      - libxml2-dev
+      - libxslt-dev
+      - libsofthsm2
+      - softhsm2
+      - opensc
+      - libengine-pkcs11-openssl
+      - swig
+
+install:
+  - pip install pykcs11
+  - pip install nose
+  - pip install coveralls
+
+script:
+  - coverage run --source=xmlsec setup.py nosetests -vv -d
+
 after_success:
-   coveralls
+  - coveralls

scripts/install-pykcs11.sh

@@ -30,4 +30,10 @@ def run_cmd(args, softhsm_conf=None):
         logging.debug(out)
     rv = proc.wait()
     if rv:
-        raise RuntimeError("command exited with code != 0: %d" % rv)
+        with open(softhsm_conf) as f:
+            conf = f.read()
+        msg = '[cmd: {cmd}] [code: {code}] [stdout: {out}] [stderr: {err}] [config: {conf}]'
+        msg = msg.format(
+            cmd=" ".join(args), code=rv, out=out.strip(), err=err.strip(), conf=conf,
+        )
+        raise RuntimeError(msg)

src/xmlsec/test/__init__.py

@@ -13,7 +13,6 @@
 import shutil
 import tempfile
 
-from defusedxml import lxml
 from lxml import etree
 
 import xmlsec
@@ -37,27 +36,23 @@
 
 component_default_paths = {
     'P11_MODULE': [
-        '/usr/lib/libsofthsm.so',
-        '/usr/lib/softhsm/libsofthsm.so',
         '/usr/lib/softhsm/libsofthsm2.so',
+        '/usr/lib/softhsm/libsofthsm.so',
     ],
     'P11_ENGINE': [
         '/usr/lib/ssl/engines/libpkcs11.so',
         '/usr/lib/engines/engine_pkcs11.so',
         '/usr/lib/x86_64-linux-gnu/engines-1.1/pkcs11.so',
     ],
-    'P11_SPY': [
-        '/usr/lib/pkcs11/pkcs11-spy.so',
-    ],
     'PKCS11_TOOL': [
         '/usr/bin/pkcs11-tool',
     ],
     'OPENSC_TOOL': [
         '/usr/bin/opensc-tool',
     ],
     'SOFTHSM': [
-        '/usr/bin/softhsm',
         '/usr/bin/softhsm2-util',
+        '/usr/bin/softhsm',
     ],
     'OPENSSL': [
         '/usr/bin/openssl',
@@ -80,9 +75,13 @@
     raise unittest.SkipTest("Required components missing: {}".format(missing))
 
 softhsm_version = 1
-if component_path['SOFTHSM'] == '/usr/bin/softhsm2-util':
+if component_path['SOFTHSM'].endswith('softhsm2-util'):
     softhsm_version = 2
 
+openssl_version = subprocess.check_output([component_path['OPENSSL'],
+                                          'version']
+                                          )[8:11]
+
 p11_test_files = []
 softhsm_conf = None
 server_cert_pem = None
@@ -117,11 +116,18 @@ def setup():
         with open(softhsm_conf, "w") as f:
             if softhsm_version == 2:
                 softhsm_db = _td()
-                f.write("#Generated by pyXMLSecurity test\ndirectories.tokendir = %s\nobjectstore.backend = file\nlog.level = DEBUG\n"%softhsm_db)
-
+                f.write("""
+# Generated by pyXMLSecurity test
+directories.tokendir = %s
+objectstore.backend = file
+log.level = DEBUG
+""" % softhsm_db)
             else:
                 softhsm_db = _tf()
-                f.write("#Generated by pyXMLSecurity test\n0:%s\n" % softhsm_db)
+                f.write("""
+# Generated by pyXMLSecurity test
+0:%s
+""" % softhsm_db)
 
         logging.debug("Initializing the token")
         run_cmd([component_path['SOFTHSM'],
@@ -150,27 +156,27 @@ def setup():
         openssl_conf = _tf()
         logging.debug("Generating OpenSSL config")
         with open(openssl_conf, "w") as f:
-            f.write("""
-openssl_conf = openssl_def
-
-[openssl_def]
-engines = engine_section
-
-[engine_section]
-pkcs11 = pkcs11_section
-
-[pkcs11_section]
-engine_id = pkcs11
-dynamic_path = %s
-MODULE_PATH = %s
-PIN = secret1
-init = 0
-
-[req]
-distinguished_name = req_distinguished_name
-
-[req_distinguished_name]
-""" % (component_path['P11_ENGINE'], component_path['P11_MODULE']))
+            dynamic_path = (
+                "dynamic_path = %s" % component_path['P11_ENGINE']
+                if openssl_version == "1.0"
+                else ""
+            )
+            f.write("\n".join([
+                "openssl_conf = openssl_def",
+                "[openssl_def]",
+                "engines = engine_section",
+                "[engine_section]",
+                "pkcs11 = pkcs11_section",
+                "[req]",
+                "distinguished_name = req_distinguished_name",
+                "[req_distinguished_name]",
+                "[pkcs11_section]",
+                "engine_id = pkcs11",
+                dynamic_path,
+                "MODULE_PATH = %s" % component_path['P11_MODULE'],
+                "PIN = secret1",
+                "init = 0",
+            ]))
 
         signer_cert_der = _tf()
 
@@ -182,7 +188,7 @@ def setup():
                  '-engine', 'pkcs11',
                  '-config', openssl_conf,
                  '-keyform', 'engine',
-                 '-key', 'pkcs11:token=test',
+                 '-key', 'label_test',
                  '-passin', 'pass:secret1',
                  '-out', signer_cert_pem], softhsm_conf=softhsm_conf)
 
@@ -269,7 +275,8 @@ def test_open_session_no_pin(self):
             if session is not None:
                 pk11._close_session(session)
 
-    @unittest.skipIf(component_path['P11_MODULE'] is None, "SoftHSM PKCS11 module not installed")
+    # @unittest.skipIf(component_path['P11_MODULE'] is None, "SoftHSM PKCS11 module not installed")
+    @unittest.skip("SoftHSM PKCS11 module does not support 2 sessions")
     def test_two_sessions(self):
         session1 = None
         session2 = None