Refactor EPID changes

- Worker specific swig files for attestation
- Created ias folder under common/verify_report_utils and moved all the files
- Renamed verify-report files to verify-ias-report
- Moved common function code block for VerifyEnclaveInfo to epid_signup_helper.cpp

This PR changes are pre-requisite for DCAP related changes

Signed-off-by: manju956 <[email protected]>

Author: manju956

ci/docker-compose-direct-model.yaml

@@ -46,6 +46,7 @@ services:
         - ENCLAVE_TYPE=singleton
         - IMAGE=$IMAGE
         - DISTRO=$DISTRO
+        - ATTESTATION_TYPE=epid
     command: |
       bash -c "
         enclave_manager --lmdb_url http://avalon-lmdb:9090

common/cpp/verify_ias_report/ias_attestation_util.cpp

@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "ias_attestation_util.h"
-#include "verify-report.h"
+#include "verify-ias-report.h"
 #include "tcf_error.h"
 #include "parson.h"
 #include "jsonvalue.h"

common/cpp/verify_ias_report/verify-report.cpp renamed to common/cpp/verify_ias_report/verify-ias-report.cpp

@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "verify-report.h"
+#include "verify-ias-report.h"
 #include "verify_certificate.h"
 #include "verify_signature.h"
 #include "c11_support.h"

common/cpp/verify_ias_report/verify-report.h renamed to common/cpp/verify_ias_report/verify-ias-report.h

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 PY_VERSION=${shell python3 --version | sed 's/Python \(3\.[0-9]\).*/\1/' | tr -d .}
-MOD_VERSION=${shell ../../bin/get_version}
+MOD_VERSION=${shell ../../../bin/get_version}
 
 # Format of wheel package is <pkg_name>-{python-tag}-{abi-tag}-{platform}
-WHEEL_FILE=dist/avalon_verify_report_utils-${MOD_VERSION}-cp${PY_VERSION}-cp${PY_VERSION}m-linux_x86_64.whl
+WHEEL_FILE=dist/avalon_verify_ias_report_utils-${MOD_VERSION}-cp${PY_VERSION}-cp${PY_VERSION}m-linux_x86_64.whl
 SOURCE_DIR=$(shell pwd)
 
 

common/verify_report_utils/Makefile renamed to common/verify_report_utils/ias/Makefile

@@ -27,7 +27,7 @@
     sys.exit(1)
 
 
-tcf_root_dir = os.environ.get('TCF_HOME', '../..')
+tcf_root_dir = os.environ.get('TCF_HOME', '../../..')
 
 version = subprocess.check_output(
     os.path.join(tcf_root_dir, 'bin/get_version')).decode('ascii').strip()
@@ -83,7 +83,7 @@
 ]
 
 verify_report_module = Extension(
-    'verify_report._verify_report',
+    'verify_report._ias_verify_report',
     verify_report_modulefiles,
     swig_opts=['-c++'] + ['-I%s' % i for i in verify_report_include_dirs],
     extra_compile_args=compile_args,
@@ -93,9 +93,9 @@
 
 # -----------------------------------------------------------------
 setup(
-    name='avalon_verify_report_utils',
+    name='avalon_verify_ias_report_utils',
     version=version,
-    description='Avalon Verify Report Utils Library',
+    description='Avalon Verify IAS Report Utils Library',
     author='Hyperledger Avalon',
     url='https://github.com/hyperledger/avalon',
     packages=find_packages(),

common/verify_report_utils/setup.py renamed to common/verify_report_utils/ias/setup.py

@@ -14,7 +14,7 @@
 
 import json
 import logging
-import verify_report.verify_report as verify_report_util
+import verify_report.ias_verify_report as verify_report_util
 from error_code.error_status import QuoteStatus
 
 logger = logging.getLogger(__name__)

common/verify_report_utils/verify_report/__init__.py renamed to common/verify_report_utils/ias/verify_report/__init__.py

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-%module verify_report 
+%module ias_verify_report
 
 %{
 #include "types.h"

common/verify_report_utils/verify_report/verify_attestation_report.py renamed to common/verify_report_utils/ias/verify_report/verify_attestation_report.py

@@ -196,11 +196,11 @@ WORKDIR /project/avalon/common/crypto_utils
 RUN echo "Building Avalon Common Crypto Python\n" \
  && make
 
-COPY ./common/verify_report_utils /project/avalon/common/verify_report_utils
+COPY ./common/verify_report_utils/ias /project/avalon/common/verify_report_utils/ias
 
-WORKDIR /project/avalon/common/verify_report_utils
+WORKDIR /project/avalon/common/verify_report_utils/ias
 
-RUN echo "Building Avalon Verify Report Utils\n" \
+RUN echo "Building Avalon Verify IAS Report Utils\n" \
  && make
 
 # -------------=== Avalon SDK build ===-------------
@@ -276,7 +276,7 @@ COPY ./sdk/avalon_sdk/connector/blockchains/ethereum/contracts /project/avalon/s
 # Copy Python build artifacts
 COPY --from=common_python_image /project/avalon/common/python/dist/*.whl dist/
 COPY --from=common_crypto_utils_image /project/avalon/common/crypto_utils/dist/*.whl dist/
-COPY --from=common_crypto_utils_image /project/avalon/common/verify_report_utils/dist/*.whl dist/
+COPY --from=common_crypto_utils_image /project/avalon/common/verify_report_utils/ias/dist/*.whl dist/
 COPY --from=avalon_sdk_image /project/avalon/sdk/dist/*.whl dist/
 
 # Installing wheel file requires python3-pip package.