diff --git a/gradle.properties b/gradle.properties index d245f53d..a0cc1cf6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # x-release-please-start-version version=9.2.2 # x-release-please-end -iexecCommonsPocoVersion=5.3.1 +iexecCommonsPocoVersion=5.4.0 iexecCommonVersion=9.2.0 nexusUser diff --git a/src/main/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerService.java b/src/main/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerService.java index d8a1f2f9..c5f15bb1 100644 --- a/src/main/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerService.java +++ b/src/main/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerService.java @@ -46,8 +46,7 @@ public TdxSession generateSession(final TeeSessionRequest request) throws TeeSes if (baseSession.getPreCompute() != null) { tdxEnclaves.add(toTdxEnclave(baseSession.getPreCompute(), request.getTeeServicesProperties().getPreComputeProperties())); } - // FIXME fingerprint should be dapp checksum from TaskDescription after commons-poco update - tdxEnclaves.add(toTdxEnclave(baseSession.getAppCompute(), request.getTaskDescription().getAppUri(), "")); + tdxEnclaves.add(toTdxEnclave(baseSession.getAppCompute(), request.getTaskDescription().getAppUri(), request.getTaskDescription().getAppChecksum())); tdxEnclaves.add(toTdxEnclave(baseSession.getPostCompute(), request.getTeeServicesProperties().getPostComputeProperties())); return new TdxSession(request.getSessionId(), TDX_SESSION_VERSION, List.copyOf(tdxEnclaves)); } diff --git a/src/test/java/com/iexec/sms/tee/session/TeeSessionTestUtils.java b/src/test/java/com/iexec/sms/tee/session/TeeSessionTestUtils.java index 9b10cd2b..cb101fc6 100644 --- a/src/test/java/com/iexec/sms/tee/session/TeeSessionTestUtils.java +++ b/src/test/java/com/iexec/sms/tee/session/TeeSessionTestUtils.java @@ -60,6 +60,7 @@ public class TeeSessionTestUtils { public static final String REQUESTER_SECRET_KEY_2 = "requesterSecretKey2"; public static final String REQUESTER_SECRET_VALUE_2 = "requesterSecretValue2"; public static final String APP_URI = "appUri"; + public static final String APP_CHECKSUM = "appChecksum"; public static final String APP_FINGERPRINT = "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b"; public static final String APP_ENTRYPOINT = "appEntrypoint"; public static final String ARGS = "args"; @@ -150,6 +151,7 @@ public static TaskDescription.TaskDescriptionBuilder createTaskDescription(final .workerpoolOwner(workerpoolAddress) .appUri(APP_URI) .appAddress(appAddress) + .appChecksum(APP_CHECKSUM) .appEnclaveConfiguration(enclaveConfig) .datasetAddress(BytesUtils.EMPTY_ADDRESS) .tag(OrderTag.TEE_SCONE.getValue()) diff --git a/src/test/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerServiceTests.java b/src/test/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerServiceTests.java index c29bf158..f2c018ea 100644 --- a/src/test/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerServiceTests.java +++ b/src/test/java/com/iexec/sms/tee/session/tdx/TdxSessionMakerServiceTests.java @@ -91,7 +91,7 @@ void shouldGenerateTdxSessionWithPreCompute() throws TeeSessionGenerationExcepti final TdxSession tdxSession = tdxSessionMakerService.generateSession(request); final List services = List.of( new TdxSession.Service(preCompute.getName(), "pre-compute-image", "pre-compute-fingerprint", Map.of("PRE_COMPUTE", "PRE_COMPUTE")), - new TdxSession.Service(appCompute.getName(), APP_URI, "", Map.of("APP_COMPUTE", "APP_COMPUTE")), + new TdxSession.Service(appCompute.getName(), APP_URI, APP_CHECKSUM, Map.of("APP_COMPUTE", "APP_COMPUTE")), new TdxSession.Service(postCompute.getName(), "post-compute-image", "post-compute-fingerprint", Map.of("POST_COMPUTE", "POST_COMPUTE")) ); assertThat(tdxSession) @@ -118,7 +118,7 @@ void shouldGenerateTdxSessionWithoutPreCompute() throws TeeSessionGenerationExce .thenReturn(secretSessionBase); final TdxSession tdxSession = tdxSessionMakerService.generateSession(request); final List services = List.of( - new TdxSession.Service(appCompute.getName(), APP_URI, "", Map.of("APP_COMPUTE", "APP_COMPUTE")), + new TdxSession.Service(appCompute.getName(), APP_URI, APP_CHECKSUM, Map.of("APP_COMPUTE", "APP_COMPUTE")), new TdxSession.Service(postCompute.getName(), "post-compute-image", "post-compute-fingerprint", Map.of("POST_COMPUTE", "POST_COMPUTE")) ); assertThat(tdxSession)