Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void shouldGenerateTdxSessionWithPreCompute() throws TeeSessionGenerationExcepti
final TdxSession tdxSession = tdxSessionMakerService.generateSession(request);
final List<TdxSession.Service> 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)
Expand All @@ -118,7 +118,7 @@ void shouldGenerateTdxSessionWithoutPreCompute() throws TeeSessionGenerationExce
.thenReturn(secretSessionBase);
final TdxSession tdxSession = tdxSessionMakerService.generateSession(request);
final List<TdxSession.Service> 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)
Expand Down