Merge pull request #89 from iExecBlockchainComputing/upload-result

Upload result

Author: zguesmi

src/main/java/com/iexec/worker/chain/IexecHubService.java

@@ -2,10 +2,10 @@
 
 
 import com.iexec.common.chain.*;
-import com.iexec.common.config.PublicConfiguration;
 import com.iexec.common.contract.generated.App;
 import com.iexec.common.contract.generated.IexecClerkABILegacy;
 import com.iexec.common.contract.generated.IexecHubABILegacy;
+import com.iexec.worker.config.PublicConfigurationService;
 import com.iexec.worker.feign.CustomFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,17 +39,14 @@ public class IexecHubService {
 
     @Autowired
     public IexecHubService(CredentialsService credentialsService,
-                           CustomFeignClient customFeignClient) {
+                           CustomFeignClient customFeignClient,
+                           PublicConfigurationService publicConfigurationService) {
         this.credentialsService = credentialsService;
-        PublicConfiguration publicConfiguration = customFeignClient.getPublicConfiguration();
-        this.web3j = ChainUtils.getWeb3j(publicConfiguration.getBlockchainURL());
-        this.iexecHub = ChainUtils.loadHubContract(
-                credentialsService.getCredentials(),
-                this.web3j,
-                publicConfiguration.getIexecHubAddress());
+        this.web3j = ChainUtils.getWeb3j(publicConfigurationService.getBlockchainURL());
+        this.iexecHub = ChainUtils.loadHubContract(credentialsService.getCredentials(),
+                this.web3j, publicConfigurationService.getIexecHubAddress());
         this.iexecClerk = ChainUtils.loadClerkContract(credentialsService.getCredentials(),
-                this.web3j,
-                publicConfiguration.getIexecHubAddress());
+                this.web3j, publicConfigurationService.getIexecHubAddress());
         this.executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(1);
     }
 

src/main/java/com/iexec/worker/config/PublicConfigurationService.java

@@ -4,13 +4,36 @@
 import com.iexec.worker.feign.CustomFeignClient;
 import org.springframework.stereotype.Service;
 
-@Service("publicConfigurationService")
+@Service
 public class PublicConfigurationService {
 
-    public long askForReplicatePeriod;
+    private PublicConfiguration publicConfiguration;
 
     public PublicConfigurationService(CustomFeignClient customFeignClient){
-        PublicConfiguration publicConfiguration = customFeignClient.getPublicConfiguration();
-        askForReplicatePeriod = publicConfiguration.getAskForReplicatePeriod();
+        this.publicConfiguration = customFeignClient.getPublicConfiguration();
     }
+
+    public Integer getChainId() {
+        return publicConfiguration.getChainId();
+    }
+
+    public String getBlockchainURL() {
+        return publicConfiguration.getBlockchainURL();
+    }
+
+    public String getIexecHubAddress() {
+        return publicConfiguration.getIexecHubAddress();
+    }
+
+    public String getWorkerPoolAddress() {
+        return publicConfiguration.getWorkerPoolAddress();
+    }
+    public String getSchedulerPublicAddress() {
+        return publicConfiguration.getSchedulerPublicAddress();
+    }
+
+    public long getAskForReplicatePeriod() {
+        return publicConfiguration.getAskForReplicatePeriod();
+    }
+
 }

src/main/java/com/iexec/worker/feign/CustomFeignClient.java

@@ -166,7 +166,7 @@ private String getToken() {
         if (currentToken.isEmpty()) {
             String workerAddress = credentialsService.getCredentials().getAddress();
             String challenge = getChallenge(workerAddress);
-            currentToken = TOKEN_PREFIX + login(workerAddress, signatureService.createSignature(challenge));
+            currentToken = TOKEN_PREFIX + login(workerAddress, signatureService.hashAndSign(challenge));
         }
         return currentToken;
     }

src/main/java/com/iexec/worker/feign/ResultRepoClient.java

@@ -1,16 +1,26 @@
 package com.iexec.worker.feign;
 
-
 import com.iexec.common.result.ResultModel;
+import com.iexec.common.result.eip712.Eip712Challenge;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import feign.FeignException;
 
 @FeignClient(name = "ResultRepoClient", url = "http://${core.host}:${core.port}")
 public interface ResultRepoClient {
 
+    @GetMapping("/results/challenge")
+    Eip712Challenge getChallenge(@RequestParam(name = "chainId") Integer chainId) throws FeignException;
+
     @PostMapping("/results")
-    ResponseEntity addResult(@RequestBody ResultModel resultModel);
+    ResponseEntity uploadResult(@RequestHeader("Authorization") String customToken,
+                                @RequestBody ResultModel resultModel);
 
 }

src/main/java/com/iexec/worker/pubsub/SubscriptionService.java

@@ -4,9 +4,12 @@
 import com.iexec.common.result.TaskNotificationType;
 import com.iexec.worker.chain.RevealService;
 import com.iexec.worker.config.CoreConfigurationService;
+import com.iexec.worker.config.PublicConfigurationService;
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.feign.CustomFeignClient;
 import com.iexec.worker.feign.ResultRepoClient;
+import com.iexec.common.result.eip712.Eip712Challenge;
+import com.iexec.worker.result.Eip712ChallengeService;
 import com.iexec.worker.result.ResultService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;
@@ -37,6 +40,8 @@ public class SubscriptionService extends StompSessionHandlerAdapter {
     private ResultService resultService;
     private RevealService revealService;
     private CustomFeignClient feignClient;
+    private Eip712ChallengeService eip712ChallengeService;
+    private PublicConfigurationService publicConfigurationService;
     // internal components
     private StompSession session;
     private Map<String, StompSession.Subscription> chainTaskIdToSubscription;
@@ -48,11 +53,15 @@ public SubscriptionService(CoreConfigurationService coreConfigurationService,
                                ResultRepoClient resultRepoClient,
                                ResultService resultService,
                                RevealService revealService,
-                               CustomFeignClient feignClient) {
+                               CustomFeignClient feignClient,
+                               Eip712ChallengeService eip712ChallengeService,
+                               PublicConfigurationService publicConfigurationService) {
         this.resultRepoClient = resultRepoClient;
         this.resultService = resultService;
         this.revealService = revealService;
         this.feignClient = feignClient;
+        this.eip712ChallengeService = eip712ChallengeService;
+        this.publicConfigurationService = publicConfigurationService;
 
         this.coreHost = coreConfigurationService.getHost();
         this.corePort = coreConfigurationService.getPort();
@@ -85,7 +94,8 @@ public void afterConnected(StompSession session, StompHeaders connectedHeaders)
     @Override
     public void handleException(StompSession session, @Nullable StompCommand command,
                                 StompHeaders headers, byte[] payload, Throwable exception) {
-        log.info("Received handleException [session: {}, isConnected: {}]", session.getSessionId(), session.isConnected());
+        log.error("Received handleException [session: {}, isConnected: {}, Exception: {}]",
+                session.getSessionId(), session.isConnected(), exception.getMessage());
         this.connectStomp();
     }
 
@@ -95,7 +105,6 @@ public void handleTransportError(StompSession session, Throwable exception) {
         this.connectStomp();
     }
 
-
     public void subscribeToTaskNotifications(String chainTaskId) {
         if (chainTaskIdToSubscription.containsKey(chainTaskId)) {
             log.info("Already subscribed to TaskNotification [chainTaskId:{}]", chainTaskId);
@@ -185,7 +194,9 @@ private void abortContributionTimeout(String chainTaskId) {
 
     private void uploadResult(String chainTaskId) {
         feignClient.updateReplicateStatus(chainTaskId, RESULT_UPLOADING);
-        resultRepoClient.addResult(resultService.getResultModelWithZip(chainTaskId));
+        Eip712Challenge eip712Challenge = resultRepoClient.getChallenge(publicConfigurationService.getChainId());
+        String authorizationToken = eip712ChallengeService.buildAuthorizationToken(eip712Challenge);
+        resultRepoClient.uploadResult(authorizationToken, resultService.getResultModelWithZip(chainTaskId));
         feignClient.updateReplicateStatus(chainTaskId, RESULT_UPLOADED);
     }
 

src/main/java/com/iexec/worker/result/Eip712ChallengeService.java

@@ -0,0 +1,34 @@
+package com.iexec.worker.result;
+
+import com.iexec.worker.config.WorkerConfigurationService;
+import com.iexec.worker.security.SignatureService;
+import com.iexec.common.result.eip712.Eip712Challenge;
+import com.iexec.common.result.eip712.Eip712ChallengeUtils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class Eip712ChallengeService {
+
+    private SignatureService signatureService;
+    private WorkerConfigurationService workerConfigurationService;
+
+    Eip712ChallengeService(SignatureService signatureService,
+                           WorkerConfigurationService workerConfigurationService) {
+        this.signatureService = signatureService;
+        this.workerConfigurationService = workerConfigurationService;
+    }
+
+    public String buildAuthorizationToken(Eip712Challenge eip712Challenge) {
+        String walletAddress = workerConfigurationService.getWorkerWalletAddress();
+
+        String challengeString = Eip712ChallengeUtils.getEip712ChallengeString(eip712Challenge);
+        String signatureString = signatureService.signAsString(challengeString);
+
+        String authoriaztionToken = String.join("_", challengeString, signatureString, walletAddress);
+
+        return authoriaztionToken;
+    }
+}

src/main/java/com/iexec/worker/security/SignatureService.java

@@ -7,6 +7,7 @@
 import org.web3j.crypto.ECKeyPair;
 import org.web3j.crypto.Hash;
 import org.web3j.crypto.Sign;
+import org.web3j.utils.Numeric;
 
 @Service
 public class SignatureService {
@@ -17,7 +18,7 @@ public SignatureService(CredentialsService credentialsService) {
         this.credentialsService = credentialsService;
     }
 
-    public Signature createSignature(String stringToSign) {
+    public Signature hashAndSign(String stringToSign) {
         byte[] message = Hash.sha3(BytesUtils.stringToBytes(stringToSign));
 
         ECKeyPair keyPair = credentialsService.getCredentials().getEcKeyPair();
@@ -30,4 +31,30 @@ public Signature createSignature(String stringToSign) {
                 .signV(sign.getV())
                 .build();
     }
+
+    public String hashAndSignAsString(String stringToSign) {
+        byte[] message = Hash.sha3(BytesUtils.stringToBytes(stringToSign));
+
+        ECKeyPair keyPair = credentialsService.getCredentials().getEcKeyPair();
+        Sign.SignatureData sign = Sign.signMessage(message, keyPair, false);
+
+        return createStringFromSignature(sign);
+    }
+
+    public String signAsString(String stringToSign) {
+        byte[] message = Numeric.hexStringToByteArray(stringToSign);
+
+        ECKeyPair keyPair = credentialsService.getCredentials().getEcKeyPair();
+        Sign.SignatureData sign = Sign.signMessage(message, keyPair, false);
+
+        return createStringFromSignature(sign);
+    }
+
+    private String createStringFromSignature(Sign.SignatureData  sign) {
+        String r = Numeric.toHexString(sign.getR());
+        String s = Numeric.toHexString(sign.getS());
+        String v = Integer.toHexString(sign.getV());
+
+        return String.join("", r, Numeric.cleanHexPrefix(s), v);
+    }
 }