Cwinter ext attest

.clang-format

@@ -24,5 +24,7 @@ ObjCSpaceBeforeProtocolList: false
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyReturnTypeOnItsOwnLine: 300
 PointerAlignment: Left
+SpacesInContainerLiterals: false
+SpacesInSquareBrackets: false
 TabWidth: 4
 ...

.jenkins/Dockerfile.deploy

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Open Enclave SDK contributors.
 # Licensed under the MIT License.
 
 FROM ubuntu:18.04
@@ -20,7 +20,7 @@ RUN apt-get update && \
     apt-key add microsoft.asc && \
     apt-get update && \
     apt-get -y install apt-transport-https azure-cli unzip && \
-    curl https://oejenkins.blob.core.windows.net/oejenkins/oe-engine -o /usr/bin/oe-engine  && \
+    curl https://oejenkinsciartifacts.blob.core.windows.net/oe-engine/latest/bin/oe-engine -o /usr/bin/oe-engine && \
     chmod +x /usr/bin/oe-engine && \
     wget https://releases.hashicorp.com/packer/1.4.2/packer_1.4.2_linux_amd64.zip && \
     unzip packer_1.4.2_linux_amd64.zip -d /usr/sbin && \

.jenkins/Dockerfile.full

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Open Enclave SDK contributors.
 # Licensed under the MIT License.
 
 #

.jenkins/Dockerfile.minimal

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Open Enclave SDK contributors.
 # Licensed under the MIT License.
 
 ARG ubuntu_version=18.04

.jenkins/Packaging.Jenkinsfile

@@ -1,10 +1,14 @@
+// Copyright (c) Open Enclave SDK contributors.
+// Licensed under the MIT License.
+
 @Library("OpenEnclaveCommon") _
 oe = new jenkins.common.Openenclave()
 
 GLOBAL_TIMEOUT_MINUTES = 240
 CTEST_TIMEOUT_SECONDS = 480
+GLOBAL_ERROR = null
 
-def packageUpload(String version, String build_type) {
+def LinuxPackaging(String version, String build_type) {
     stage("Ubuntu${version} SGX1FLC Package ${build_type}") {
         node("ACC-${version}") {
             timeout(GLOBAL_TIMEOUT_MINUTES) {
@@ -14,7 +18,8 @@ def packageUpload(String version, String build_type) {
                            cmake ${WORKSPACE} -DCMAKE_BUILD_TYPE=${build_type} -DCMAKE_INSTALL_PREFIX:PATH='/opt/openenclave' -DCPACK_GENERATOR=DEB
                            make
                            ctest --output-on-failure --timeout ${CTEST_TIMEOUT_SECONDS}
-                           make package
+                           cpack
+                           cpack -D CPACK_DEB_COMPONENT_INSTALL=ON -DCPACK_COMPONENTS_ALL=OEHOSTVERIFY
                            """
                 oe.Run("clang-7", task)
                 azureUpload(storageCredentialId: 'oe_jenkins_storage_account', filesPath: 'build/*.deb', storageType: 'blobstorage', virtualPath: "master/${BUILD_NUMBER}/ubuntu/${version}/${build_type}/SGX1FLC/", containerName: 'oejenkins')
@@ -24,28 +29,44 @@ def packageUpload(String version, String build_type) {
     }
 }
 
-def WindowsUpload() {
-    stage('Windows Release') {
-        node('SGXFLC-Windows') {
+def WindowsPackaging(String build_type) {
+    stage('Windows SGX1FLC ${build_type}') {
+        node('SGXFLC-Windows-DCAP') {
             timeout(GLOBAL_TIMEOUT_MINUTES) {
                 cleanWs()
                 checkout scm
                 dir('build') {
-                    bat """vcvars64.bat x64 && \
-                           cmake.exe ${WORKSPACE} -G \"Visual Studio 15 2017 Win64\" && \
-                           msbuild tools\\oeedger8r\\oeedger8r_target.vcxproj -p:Configuration=Release"""
+                    bat """
+                        vcvars64.bat x64 && \
+                        cmake.exe ${WORKSPACE} -G Ninja -DCMAKE_BUILD_TYPE=${build_type} -DBUILD_ENCLAVES=ON -DHAS_QUOTE_PROVIDER=ON -DNUGET_PACKAGE_PATH=C:/oe_prereqs -DCPACK_GENERATOR=NuGet -Wdev && \
+                        ninja.exe && \
+                        ctest.exe -V -C RELEASE --timeout ${CTEST_TIMEOUT_SECONDS} && \
+                        cpack && \
+                        cpack -D CPACK_NUGET_COMPONENT_INSTALL=ON -DCPACK_COMPONENTS_ALL=OEHOSTVERIFY
+                        """
                 }
-                azureUpload(storageCredentialId: 'oe_jenkins_storage_account', filesPath: 'build/tools/oeedger8r/oeedger8r.exe', storageType: 'blobstorage', virtualPath: "master/${BUILD_NUMBER}/windows/", containerName: 'oejenkins')
-                azureUpload(storageCredentialId: 'oe_jenkins_storage_account', filesPath: 'build/tools/oeedger8r/oeedger8r.exe', storageType: 'blobstorage', virtualPath: "master/latest/windows/", containerName: 'oejenkins')
+                azureUpload(storageCredentialId: 'oe_jenkins_storage_account', filesPath: 'build/*.nupkg', storageType: 'blobstorage', virtualPath: "master/${BUILD_NUMBER}/windows/${build_type}/SGX1FLC/", containerName: 'oejenkins')
+                azureUpload(storageCredentialId: 'oe_jenkins_storage_account', filesPath: 'build/*.nupkg', storageType: 'blobstorage', virtualPath: "master/latest/windows/${build_type}/SGX1FLC/", containerName: 'oejenkins')
             }
         }
     }
 }
 
-parallel "1604 SGX1FLC Package Debug" :          { packageUpload('1604', 'Debug') },
-         "1604 SGX1FLC Package Release" :        { packageUpload('1604', 'Release') },
-         "1604 SGX1FLC Package RelWithDebInfo" : { packageUpload('1604', 'RelWithDebInfo') },
-         "1804 SGX1FLC Package Debug" :          { packageUpload('1804', 'Debug') },
-         "1804 SGX1FLC Package Release" :        { packageUpload('1804', 'Release') },
-         "1804 SGX1FLC Package RelWithDebInfo" : { packageUpload('1804', 'RelWithDebInfo') },
-         "Windows Release" :                     { WindowsUpload() }
+try{
+    oe.emailJobStatus('STARTED')
+    parallel "1604 SGX1FLC Package Debug" :          { LinuxPackaging('1604', 'Debug') },
+         "1604 SGX1FLC Package Release" :        { LinuxPackaging('1604', 'Release') },
+         "1604 SGX1FLC Package RelWithDebInfo" : { LinuxPackaging('1604', 'RelWithDebInfo') },
+         "1804 SGX1FLC Package Debug" :          { LinuxPackaging('1804', 'Debug') },
+         "1804 SGX1FLC Package Release" :        { LinuxPackaging('1804', 'Release') },
+         "1804 SGX1FLC Package RelWithDebInfo" : { LinuxPackaging('1804', 'RelWithDebInfo') },
+         "Windows Debug" :                       { WindowsPackaging('DEBUG') },
+         "Windows Release" :                     { WindowsPackaging('RELEASE') }
+} catch(Exception e) {
+    println "Caught global pipeline exception :" + e
+    GLOBAL_ERROR = e
+    throw e
+} finally {
+    currentBuild.result = (GLOBAL_ERROR != null) ? 'FAILURE' : "SUCCESS"
+    oe.emailJobStatus(currentBuild.result)
+}

.jenkins/build_vhd.Jenkinsfile

@@ -5,35 +5,37 @@ GLOBAL_TIMEOUT_MINUTES = 240
 
 def buildVHD(String os_type, String version, String imageName) {
     node("nonSGX") {
-        timeout(GLOBAL_TIMEOUT_MINUTES) {
-            cleanWs()
-            checkout scm
+        stage("${os_type}-${version}") {
+            timeout(GLOBAL_TIMEOUT_MINUTES) {
+                cleanWs()
+                checkout scm
 
-            withCredentials([azureStorage(credentialsId: 'oe_jenkins_storage_account',
-                                          storageAccountKeyVariable: 'EASTUS_STORAGE_ACCOUNT_KEY',
-                                          storageAccountNameVariable: 'EASTUS_STORAGE_ACCOUNT_NAME'),
-                             azureStorage(credentialsId: 'oe_jenkins_storage_account_westeurope',
-                                          storageAccountKeyVariable: 'WESTEUROPE_STORAGE_ACCOUNT_KEY',
-                                          storageAccountNameVariable: 'WESTEUROPE_STORAGE_ACCOUNT_NAME')]) {
-                withEnv(["REGION=eastus", "DEST_VHD_NAME=${VHD_NAME_PREFIX}-${os_type}-${version}.vhd", "CONTAINER_NAME=disks"]) {
-                    dir("${WORKSPACE}/.jenkins/provision") {
-                        oe.azureEnvironment("""
-                                            packer build -var-file=templates/packer/${os_type}-${version}-variables.json templates/packer/packer-${os_type}.json 2>&1 | tee packer.log
-                                            export SOURCE_URI=\$(cat packer.log | grep OSDiskUri: | awk '{print \$2}')
-                                            az storage blob copy start --source-uri \$SOURCE_URI --destination-blob \$DEST_VHD_NAME --destination-container \$CONTAINER_NAME --account-key \$EASTUS_STORAGE_ACCOUNT_KEY --account-name \$EASTUS_STORAGE_ACCOUNT_NAME
-                                            az storage blob copy start --source-uri \$SOURCE_URI --destination-blob \$DEST_VHD_NAME --destination-container \$CONTAINER_NAME --account-key \$WESTEUROPE_STORAGE_ACCOUNT_KEY --account-name \$WESTEUROPE_STORAGE_ACCOUNT_NAME
-                                            blob_status=\$(az storage blob show --name \$DEST_VHD_NAME --container-name \$CONTAINER_NAME \
-                                              --account-key \$WESTEUROPE_STORAGE_ACCOUNT_KEY --account-name \$WESTEUROPE_STORAGE_ACCOUNT_NAME \
-                                              --output json | jq -r .properties.copy.status)
-                                            while [ "\${blob_status}" != "success" ]
-                                            do
-                                            echo Waiting for \$DEST_VHD_NAME to finish copying ...
-                                            sleep 10
-                                            blob_status=\$(az storage blob show --name \$DEST_VHD_NAME --container-name \$CONTAINER_NAME \
-                                              --account-key \$WESTEUROPE_STORAGE_ACCOUNT_KEY --account-name \$WESTEUROPE_STORAGE_ACCOUNT_NAME \
-                                              --output json | jq -r .properties.copy.status)
-                                            done
-                                            """, imageName)
+                withCredentials([azureStorage(credentialsId: 'oe_jenkins_storage_account',
+                                              storageAccountKeyVariable: 'EASTUS_STORAGE_ACCOUNT_KEY',
+                                              storageAccountNameVariable: 'EASTUS_STORAGE_ACCOUNT_NAME'),
+                                 azureStorage(credentialsId: 'oe_jenkins_storage_account_westeurope',
+                                              storageAccountKeyVariable: 'WESTEUROPE_STORAGE_ACCOUNT_KEY',
+                                              storageAccountNameVariable: 'WESTEUROPE_STORAGE_ACCOUNT_NAME')]) {
+                    withEnv(["REGION=eastus", "DEST_VHD_NAME=${VHD_NAME_PREFIX}-${os_type}-${version}.vhd", "CONTAINER_NAME=disks"]) {
+                        dir("${WORKSPACE}/.jenkins/provision") {
+                            oe.azureEnvironment("""
+                                                packer build -var-file=templates/packer/${os_type}-${version}-variables.json templates/packer/packer-${os_type}.json 2>&1 | tee packer.log
+                                                export SOURCE_URI=\$(cat packer.log | grep OSDiskUri: | awk '{print \$2}')
+                                                az storage blob copy start --source-uri \$SOURCE_URI --destination-blob \$DEST_VHD_NAME --destination-container \$CONTAINER_NAME --account-key \$EASTUS_STORAGE_ACCOUNT_KEY --account-name \$EASTUS_STORAGE_ACCOUNT_NAME
+                                                az storage blob copy start --source-uri \$SOURCE_URI --destination-blob \$DEST_VHD_NAME --destination-container \$CONTAINER_NAME --account-key \$WESTEUROPE_STORAGE_ACCOUNT_KEY --account-name \$WESTEUROPE_STORAGE_ACCOUNT_NAME
+                                                blob_status=\$(az storage blob show --name \$DEST_VHD_NAME --container-name \$CONTAINER_NAME \
+                                                  --account-key \$WESTEUROPE_STORAGE_ACCOUNT_KEY --account-name \$WESTEUROPE_STORAGE_ACCOUNT_NAME \
+                                                  --output json | jq -r .properties.copy.status)
+                                                while [ "\${blob_status}" != "success" ]
+                                                do
+                                                echo Waiting for \$DEST_VHD_NAME to finish copying ...
+                                                sleep 10
+                                                blob_status=\$(az storage blob show --name \$DEST_VHD_NAME --container-name \$CONTAINER_NAME \
+                                                  --account-key \$WESTEUROPE_STORAGE_ACCOUNT_KEY --account-name \$WESTEUROPE_STORAGE_ACCOUNT_NAME \
+                                                  --output json | jq -r .properties.copy.status)
+                                                done
+                                                """, imageName)
+                        }
                     }
                 }
             }
@@ -42,4 +44,6 @@ def buildVHD(String os_type, String version, String imageName) {
 }
 
 parallel "Build Ubuntu 16.04" : { buildVHD("ubuntu", "16.04", OE_DEPLOY_IMAGE) },
-         "Build Ubuntu 18.04" : { buildVHD("ubuntu", "18.04", OE_DEPLOY_IMAGE) }
+         "Build Ubuntu 18.04" : { buildVHD("ubuntu", "18.04", OE_DEPLOY_IMAGE) },
+         "Build Windows 2016" : { buildVHD("win", "2016", OE_DEPLOY_IMAGE) },
+         "Build Windows 2016 DCAP" : { buildVHD("win", "dcap", OE_DEPLOY_IMAGE) }

.jenkins/custom_label.Jenkinsfile

@@ -32,27 +32,30 @@ def ACCContainerTest(String label, String version) {
                            ninja -v
                            ctest --output-on-failure --timeout ${CTEST_TIMEOUT_SECONDS}
                            """
-                oe.ContainerRun("oetools-full-${version}", "clang-7", task, "--cap-add=SYS_PTRACE --device /dev/sgx:/dev/sgx")
+                oe.ContainerRun("oetools-full-${version}:${DOCKER_TAG}", "clang-7", task, "--cap-add=SYS_PTRACE --device /dev/sgx:/dev/sgx")
             }
         }
     }
 }
 
-def win2016CrossCompile(String build_type, String use_libsgx = 'OFF') {
-    stage("Windows ${build_type} with SGX ${use_libsgx}") {
-        node(WINDOWS_2016_CUSTOM_LABEL) {
+def win2016CrossCompile(String build_type, String has_quote_provider = 'OFF') {
+    def node_label = WINDOWS_2016_CUSTOM_LABEL
+    if (has_quote_provider == "ON") {
+        node_label = WINDOWS_DCAP_CUSTOM_LABEL
+    }
+    stage("Windows ${build_type} with SGX ${has_quote_provider}") {
+        node(node_label) {
             timeout(GLOBAL_TIMEOUT_MINUTES) {
                 cleanWs()
                 checkout scm
                 dir("build/X64-${build_type}") {
 
                   /* We need to copy nuget into the expected location
-                  https://github.com/microsoft/openenclave/blob/a982b46cf440def8fb66e94f2622a4f81e2b350b/host/CMakeLists.txt#L188-L197 */
-                  powershell 'Copy-Item -Recurse C:\\openenclave\\prereqs\\nuget ${env:WORKSPACE}\\prereqs'
+                  https://github.com/openenclave/openenclave/blob/a982b46cf440def8fb66e94f2622a4f81e2b350b/host/CMakeLists.txt#L188-L197 */
 
                   bat """
                       vcvars64.bat x64 && \
-                      cmake.exe ${WORKSPACE} -G Ninja -DCMAKE_BUILD_TYPE=${build_type} -DBUILD_ENCLAVES=ON -DUSE_LIBSGX=${use_libsgx} -Wdev && \
+                      cmake.exe ${WORKSPACE} -G Ninja -DCMAKE_BUILD_TYPE=${build_type} -DBUILD_ENCLAVES=ON -DHAS_QUOTE_PROVIDER=${has_quote_provider} -DNUGET_PACKAGE_PATH=C:/oe_prereqs -Wdev && \
                       ninja.exe && \
                       ctest.exe -V -C ${build_type} --timeout ${CTEST_TIMEOUT_SECONDS}
                       """
@@ -62,14 +65,57 @@ def win2016CrossCompile(String build_type, String use_libsgx = 'OFF') {
     }
 }
 
+def win2016LinuxElfBuild(String version, String compiler, String build_type) {
+    def ubuntu_label = UBUNTU_1604_CUSTOM_LABEL
+    if ( version == "18.04" ) {
+      ubuntu_label = UBUNTU_1804_CUSTOM_LABEL
+    }
+    stage("Ubuntu ${version} SGX1 ${compiler} ${build_type}}") {
+        node(ubuntu_label) {
+            timeout(GLOBAL_TIMEOUT_MINUTES) {
+                cleanWs()
+                checkout scm
+                def task = """
+                           cmake ${WORKSPACE} -G Ninja -DCMAKE_BUILD_TYPE=${build_type} -DHAS_QUOTE_PROVIDER=ON -Wdev
+                           ninja -v
+                           """
+                oe.ContainerRun("oetools-full-${version}:${DOCKER_TAG}", compiler, task, "--cap-add=SYS_PTRACE")
+                stash includes: 'build/tests/**', name: "linux-${compiler}-${build_type}-${version}-${BUILD_NUMBER}"
+            }
+        }
+    }
+    stage("Windows ${build_type}") {
+        node(WINDOWS_DCAP_CUSTOM_LABEL) {
+            timeout(GLOBAL_TIMEOUT_MINUTES) {
+                cleanWs()
+                checkout scm
+                unstash "linux-${compiler}-${build_type}-${version}-${BUILD_NUMBER}"
+                bat 'move build linuxbin'
+                dir('build') {
+                  bat """
+                      vcvars64.bat x64 && \
+                      cmake.exe ${WORKSPACE} -G Ninja -DADD_WINDOWS_ENCLAVE_TESTS=ON -DBUILD_ENCLAVES=OFF -DHAS_QUOTE_PROVIDER=ON -DCMAKE_BUILD_TYPE=${build_type} -DLINUX_BIN_DIR=${WORKSPACE}\\linuxbin\\tests -DNUGET_PACKAGE_PATH=C:/oe_prereqs -Wdev && \
+                      ninja -v && \
+                      ctest.exe -V -C ${build_type} --timeout ${CTEST_TIMEOUT_SECONDS}
+                      """
+                }
+            }
+        }
+    }
+}
 
 properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '90',
                                       artifactNumToKeepStr: '180',
                                       daysToKeepStr: '90',
                                       numToKeepStr: '180')),
             [$class: 'JobRestrictionProperty']])
 
-parallel "ACC1604 clang-7 RelWithDebInfo" :                     { ACCTest(UBUNTU_1604_CUSTOM_LABEL, 'clang-7', 'RelWithDebInfo') },
+parallel "Win2016 Release Cross Compile with DCAP libs" :       { win2016CrossCompile('Release', 'ON') },
+         "Win2016 Debug Cross Compile" :                        { win2016CrossCompile('Debug') },
+         "Win2016 Ubuntu1604 clang-7 Debug Linux-Elf-build" :   { win2016LinuxElfBuild('16.04', 'clang-7', 'Debug') },
+         "Win2016 Ubuntu1804 clang-7 Release Linux-Elf-build" : { win2016LinuxElfBuild('18.04', 'clang-7', 'Release') },
+         "Win2016 Ubuntu1804 gcc Debug Linux-Elf-build" :       { win2016LinuxElfBuild('18.04', 'gcc', 'Debug') },
+         "ACC1604 clang-7 RelWithDebInfo" :                     { ACCTest(UBUNTU_1604_CUSTOM_LABEL, 'clang-7', 'RelWithDebInfo') },
          "ACC1604 gcc RelWithDebInfo" :                         { ACCTest(UBUNTU_1604_CUSTOM_LABEL, 'gcc', 'RelWithDebInfo') },
          "ACC1604 Container RelWithDebInfo" :                   { ACCContainerTest(UBUNTU_1604_CUSTOM_LABEL, '16.04') },
          "ACC1804 clang-7 RelWithDebInfo" :                     { ACCTest(UBUNTU_1804_CUSTOM_LABEL, 'clang-7', 'RelWithDebInfo') },

.jenkins/deploy_agent.Jenkinsfile

@@ -55,6 +55,9 @@ def generateVariablesFile() {
          echo ansible_ssh_private_key_file: inventory/id-rsa-oe-test
          } > ${var_file} """
     }
+    if (DCAP_TESTING_NODE == "true") {
+      sh "echo dcap_testing_node: true >> ${var_file}"
+    }
 }
 
 def registerJenkinsSlave() {