Address a few more python setuptools upgrade issues

The current version of python setuptools no longer puts binary files
in the same name directory tree as the python libraries. As a result,
the eservice and pservice enclaves could not be found and loaded.

This commit addresses the problem with several changes:

1) the names of the enclave libraries are now unique
(libpdo-eservice-enclave.signed.so and
libpdo-pservice-enclave.signed.so)

2) the enclave libraries are installed into the PDO_HOME directory
tree (in the lib directory). This directory is now created when the
rest of the enviroment is created.

3) the search path used by the pservice and eservice python
modules reflect the new location.

4) cachetools is explicitly installed

Signed-off-by: Mic Bowman <mic.bowman@intel.com>

Author: cmickeyb

build/Makefile

@@ -89,6 +89,7 @@ $(DSTDIR) :
 	@mkdir -p $(DSTDIR)/opt/pdo/etc/keys/sgx
 	@mkdir -p $(DSTDIR)/opt/pdo/etc/keys/ledger
 	@mkdir -p $(DSTDIR)/opt/pdo/keys
+	@mkdir -p $(DSTDIR)/opt/pdo/lib
 	@mkdir -p $(DSTDIR)/opt/pdo/logs
 
 verify-pre-build :

build/python_requirements.txt

@@ -1,4 +1,5 @@
 build>=0.10.0
+cachetools>=5.5.2
 colorlog>=6.7.0
 importlib_resources>=6.0.0
 lmdb>=1.4.0

eservice/Makefile

@@ -25,7 +25,7 @@ endif
 
 EGG_FILE=dist/pdo_eservice-${MOD_VERSION}-py${PY_VERSION}-linux-x86_64.egg
 
-ENCLAVE_LIB=deps/bin/libpdo-enclave.signed.so
+ENCLAVE_LIB=deps/bin/libpdo-eservice-enclave.signed.so
 
 SWIG_SOURCES = \
 	pdo_enclave_internal.i\

eservice/lib/libpdo_enclave/CMakeLists.txt

@@ -14,7 +14,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)
 
-PROJECT(libpdo-enclave CXX C)
+PROJECT(libpdo-eservice-enclave CXX C)
 
 # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 # Source Code

eservice/pdo/eservice/pdo_enclave.py

@@ -66,7 +66,7 @@
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 def __find_enclave_library(config) :
-    enclave_file_name = 'libpdo-enclave.signed.so'
+    enclave_file_name = 'libpdo-eservice-enclave.signed.so'
     enclave_file_path = None
 
     if config :
@@ -78,18 +78,18 @@ def __find_enclave_library(config) :
         if os.path.exists(filep) :
             return filep
     else :
+        install_directory = os.environ.get('PDO_HOME', '/opt/pdo')
         script_directory = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+
         search_path = [
             script_directory,
-            os.path.abspath(os.path.join(script_directory, '..')),
-            os.path.abspath(os.path.join(script_directory, '..', 'lib')),
-            os.path.abspath(os.path.join(script_directory, '..', '..')),
-            os.path.abspath(os.path.join(script_directory, '..', '..', 'lib')),
-            os.path.abspath(os.path.join('/usr', 'lib'))
+            os.path.abspath(os.path.join(install_directory, 'lib')),
         ]
 
         return putils.find_file_in_path(enclave_file_name, search_path)
 
+    raise IOError("Could not find enclave shared object: {}".format(enclave_file_name))
+
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 def update_sig_rl():
@@ -149,7 +149,8 @@ def initialize_with_configuration(config) :
                 '{}'.format(
                     ', '.join(sorted(list(missing_keys)))))
 
-    NumberOfEnclaves = int(config.get('NumberOfEnclaves', 1))
+    # NumberOfEnclaves = int(config.get('NumberOfEnclaves', 1))
+    NumberOfEnclaves = 2
 
     try:
         spid = Path(os.path.join(config['sgx_key_root'], "sgx_spid.txt")).read_text().strip()
@@ -166,10 +167,16 @@ def initialize_with_configuration(config) :
 
     if not _pdo:
         signed_enclave = __find_enclave_library(config)
-        logger.debug("Attempting to load enclave at: %s", signed_enclave)
-        _pdo = enclave.pdo_enclave_info(signed_enclave, spid, NumberOfEnclaves)
-        logger.info("Basename: %s", get_enclave_basename())
-        logger.info("MRENCLAVE: %s", get_enclave_measurement())
+        logger.error("Attempting to load enclave at: %s", signed_enclave)
+        logger.error(f'SPID: {spid}, NumberOfEnclaves: {NumberOfEnclaves}')
+        try :
+            _pdo = enclave.pdo_enclave_info(signed_enclave, spid, NumberOfEnclaves)
+        except Exception as e:
+            logger.exception(e)
+            raise e
+
+        logger.error("Basename: %s", get_enclave_basename())
+        logger.error("MRENCLAVE: %s", get_enclave_measurement())
 
     sig_rl_updated = False
     while not sig_rl_updated:

eservice/setup.py

@@ -33,6 +33,7 @@
 bin_dir = os.path.join(install_root_dir, "bin")
 dat_dir = os.path.join(install_root_dir, "data")
 etc_dir = os.path.join(install_root_dir, "etc")
+lib_dir = os.path.join(install_root_dir, "lib")
 log_dir = os.path.join(install_root_dir, "logs")
 key_dir = os.path.join(install_root_dir, "keys")
 
@@ -44,11 +45,11 @@
     (etc_dir, []),
     (log_dir, []),
     (key_dir, []),
-    ('lib', [ os.path.join(script_dir, 'deps/bin/libpdo-enclave.signed.so')])
+    (lib_dir, [ os.path.join(script_dir, 'deps/bin/libpdo-eservice-enclave.signed.so')])
 ]
 
 ext_deps = [
-    'deps/bin/libpdo-enclave.signed.so'
+    'deps/bin/libpdo-eservice-enclave.signed.so'
 ]
 
 ## -----------------------------------------------------------------

pservice/Makefile

@@ -25,7 +25,7 @@ endif
 
 EGG_FILE=dist/pdo_pservice-${MOD_VERSION}-py${PY_VERSION}-linux-x86_64.egg
 
-ENCLAVE_LIB=deps/bin/libpdo-enclave.signed.so
+ENCLAVE_LIB=deps/bin/libpdo-pservice-enclave.signed.so
 
 SWIG_SOURCES = \
 	pdo_enclave_internal.i\

pservice/lib/libpdo_enclave/CMakeLists.txt

@@ -14,7 +14,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)
 
-PROJECT(libpdo-enclave C CXX)
+PROJECT(libpdo-pservice-enclave C CXX)
 
 # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 # Source Code

pservice/pdo/pservice/pdo_enclave.py

@@ -25,6 +25,7 @@
 from pdo.pservice.utility import ias_client
 
 import pdo.common.crypto as crypto
+import pdo.common.utility as putils
 import pdo.pservice.enclave.pdo_enclave_internal as enclave
 
 import logging
@@ -59,30 +60,29 @@
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 def __find_enclave_library(config) :
-    enclave_file_name = config.get('enclave_library', 'libpdo-enclave.signed.so')
-    enclave_file_path = config.get('enclave_library_path')
+    enclave_file_name = 'libpdo-pservice-enclave.signed.so'
+    enclave_file_path = None
+
+    if config :
+        enclave_file_name = config.get('enclave_library', enclave_file_name)
+        enclave_file_path = config.get('enclave_library_path', enclave_file_path)
 
     if enclave_file_path :
         enclave_file = os.path.join(enclave_file_path, enclave_file_name);
         if os.path.exists(enclave_file) :
             return enclave_file
     else :
+        install_directory = os.environ.get('PDO_HOME', '/opt/pdo')
         script_directory = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+
         search_path = [
             script_directory,
-            os.path.abspath(os.path.join(script_directory, '..')),
-            os.path.abspath(os.path.join(script_directory, '..', 'lib')),
-            os.path.abspath(os.path.join(script_directory, '..', '..')),
-            os.path.abspath(os.path.join(script_directory, '..', '..', 'lib')),
-            os.path.abspath(os.path.join('/usr', 'lib'))
+            os.path.abspath(os.path.join(install_directory, 'lib')),
         ]
 
-        for path in search_path :
-            enclave_file = os.path.join(path, enclave_file_name)
-            if os.path.exists(enclave_file) :
-                return enclave_file
+        return putils.find_file_in_path(enclave_file_name, search_path)
 
-    raise IOError("Could not find enclave shared object")
+    raise IOError("Could not find enclave shared object: {}".format(enclave_file_name))
 
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------

pservice/setup.py

@@ -33,6 +33,7 @@
 bin_dir = os.path.join(install_root_dir, "bin")
 dat_dir = os.path.join(install_root_dir, "data")
 etc_dir = os.path.join(install_root_dir, "etc")
+lib_dir = os.path.join(install_root_dir, "lib")
 log_dir = os.path.join(install_root_dir, "logs")
 key_dir = os.path.join(install_root_dir, "keys")
 
@@ -42,11 +43,11 @@
     (etc_dir, [ 'etc/sample_pservice.toml' ]),
     (log_dir, []),
     (key_dir, []),
-    ('lib', [ os.path.join(script_dir, 'deps/bin/libpdo-enclave.signed.so')])
+    (lib_dir, [ os.path.join(script_dir, 'deps/bin/libpdo-pservice-enclave.signed.so')])
 ]
 
 ext_deps = [
-    'deps/bin/libpdo-enclave.signed.so'
+    'deps/bin/libpdo-pservice-enclave.signed.so'
 ]
 
 ## -----------------------------------------------------------------