Changeset b2546f0 in mod_gnutls for test/mgstest/softhsm.py

Timestamp:

Jan 9, 2020, 5:44:38 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

20a3915

Parents:

221ffe5

Message:

mgstest.softhsm: Include type when searching object URLs

The p11tool documentation notes that some tokens require the same
label to be used for a certificate and its private key. That isn't the
case for SoftHSM, but I still want to support the case where a key
pair shares a label.

File:

• test/mgstest/softhsm.py (modified) (5 diffs)

test/mgstest/softhsm.py

@@ -20 +20 @@
 import subprocess
 import tempfile
+from enum import Enum, auto
 from pathlib import Path
 
@@ -35 +36 @@
 tokendir_re = re.compile(r'^directories\.tokendir\s*=\s*(.*)$')
 
-test_key_label = 'privkey'
-test_cert_label = 'certificate'
+test_label = 'test_server'
+
+class ObjectType(Enum):
+    """Types that may occur in PKCS#11 URIs (type=...).
+
+    See: https://tools.ietf.org/html/rfc7512#section-2.3
+
+    """
+    CERT = 'cert'
+    DATA = 'data'
+    PRIVATE = 'private'
+    PUBLIC = 'public'
+    SECRET_KEY = 'secret-key'
+
+    def __init__(self, uri_type):
+        self.uri_type = uri_type
+
+    def __str__(self):
+        """
+        >>> str(ObjectType.CERT)
+        'type=cert'
+        """
+        return f'type={self.uri_type}'
+
+    def __repr__(self):
+        """
+        >>> repr(ObjectType.PRIVATE)
+        'ObjectType.PRIVATE'
+        """
+        return f'{self.__class__.__name__!s}.{self.name}'
 
 class Token:
@@ -116 +145 @@
         self._object_listing = None
 
-    def get_object_url(self, label):
+    def get_object_url(self, label, type):
         """Get the PKCS#11 URL for an object in this token, selected by
         label."""
@@ -128 +157 @@
         for line in self._object_listing:
             m = object_re.fullmatch(line)
-            if m:
+            if m and str(type) in m.group(1):
                 return m.group(1)
 
@@ -139 +168 @@
             'SOFTHSM_LIB': str(Path(self.softhsm_lib).resolve()),
             'P11_PIN': self.pin,
-            'P11_CERT_URL': self.get_object_url(test_cert_label),
-            'P11_KEY_URL': self.get_object_url(test_key_label)
+            'P11_CERT_URL': self.get_object_url(test_label, ObjectType.CERT),
+            'P11_KEY_URL': self.get_object_url(test_label, ObjectType.PRIVATE)
         }