Merge pull request #149 from iExecBlockchainComputing/proxy-conf

Proxy conf

Author: james-toussaint

Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:8u171-jre-alpine
 
 ADD build/libs/iexec-worker-@[email protected] iexec-worker.jar
+COPY build/resources/main/entrypoint.sh entrypoint.sh
+RUN chmod +x entrypoint.sh
 
-ENTRYPOINT ["java","-jar","/iexec-worker.jar"]
+ENTRYPOINT ["./entrypoint.sh"]

build.gradle

@@ -164,3 +164,16 @@ task pushImage(type: Exec) {
 
 pushImage.dependsOn buildImage
 pushImage.enabled = isMasterBranch && project.hasProperty("nexusUser") && project.hasProperty("nexusPassword")
+
+//gradle bootRun -PproxyHost=192.168.XX.XXX -PproxyPort=3128
+project.ext.getJvmArgs = {
+    if (project.hasProperty("proxyHost") && project.hasProperty("proxyPort")) {
+        return ["-Dhttp.proxyHost="+project.proxyHost, "-Dhttp.proxyPort="+project.proxyPort]
+    } else {
+        return  []
+    }
+}
+
+bootRun {
+    jvmArgs = project.ext.getJvmArgs()
+}

src/main/java/com/iexec/worker/Application.java

@@ -1,8 +1,6 @@
 package com.iexec.worker;
 
 
-import java.util.List;
-
 import com.iexec.common.config.WorkerConfigurationModel;
 import com.iexec.worker.amnesia.AmnesiaRecoveryService;
 import com.iexec.worker.chain.CredentialsService;
@@ -21,6 +19,8 @@
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.List;
+
 
 @SpringBootApplication
 @EnableFeignClients
@@ -71,11 +71,13 @@ public void run(String... args) {
                 .teeEnabled(workerConfig.isTeeEnabled())
                 .build();
 
-
         log.info("Number of tasks that can run in parallel on this machine [tasks:{}]", workerConfig.getNbCPU() / 2);
         log.info("Address of the core [address:{}]", "http://" + coreHost + ":" + corePort);
         log.info("Version of the core [version:{}]", customFeignClient.getCoreVersion());
         log.info("Get configuration of the core [config:{}]", customFeignClient.getPublicConfiguration());
+        if (workerConfig.getHttpProxyHost() != null && workerConfig.getHttpProxyPort() != null) {
+            log.info("Running with proxy [proxyHost:{}, proxyPort:{}]", workerConfig.getHttpProxyHost(), workerConfig.getHttpProxyPort());
+        }
 
         if (!iexecHubService.hasEnoughGas()) {
             log.error("No enough gas, please refill your wallet!");

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

@@ -1,8 +1,13 @@
 package com.iexec.worker.config;
 
 import com.iexec.worker.chain.CredentialsService;
+import org.apache.http.HttpHost;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.io.File;
 
@@ -79,4 +84,25 @@ public boolean isTeeEnabled() {
     public String getOverrideBlockchainNodeAddress() {
         return overrideBlockchainNodeAddress;
     }
+
+    public String getHttpProxyHost() {
+        return System.getProperty("http.proxyHost");
+    }
+
+    public Integer getHttpProxyPort() {
+        String proxyPort = System.getProperty("http.proxyPort");
+        return proxyPort != null && !proxyPort.isEmpty() ? Integer.valueOf(proxyPort) : null;
+    }
+
+    @Bean
+    private RestTemplate restTemplate() {
+        HttpClientBuilder clientBuilder = HttpClientBuilder.create();
+        if (getHttpProxyHost() != null && getHttpProxyPort() != null) {
+            HttpHost myProxy = new HttpHost(getHttpProxyHost(), getHttpProxyPort());
+            clientBuilder.setProxy(myProxy);
+        }
+        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
+        factory.setHttpClient(clientBuilder.build());
+        return new RestTemplate(factory);
+    }
 }

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

@@ -2,30 +2,29 @@
 
 import com.iexec.common.notification.TaskNotification;
 import com.iexec.common.notification.TaskNotificationType;
-import com.iexec.worker.chain.CredentialsService;
-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.executor.TaskExecutorService;
-import com.iexec.worker.feign.CustomFeignClient;
-import com.iexec.worker.feign.ResultRepoClient;
-import com.iexec.worker.result.ResultService;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.messaging.simp.stomp.*;
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.socket.client.WebSocketClient;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import org.springframework.web.socket.messaging.WebSocketStompClient;
+import org.springframework.web.socket.sockjs.client.RestTemplateXhrTransport;
+import org.springframework.web.socket.sockjs.client.SockJsClient;
+import org.springframework.web.socket.sockjs.client.Transport;
+import org.springframework.web.socket.sockjs.client.WebSocketTransport;
 
 import javax.annotation.PostConstruct;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -38,7 +37,7 @@ public class SubscriptionService extends StompSessionHandlerAdapter {
     private final String coreHost;
     private final int corePort;
     private final String workerWalletAddress;
-
+    private RestTemplate restTemplate;
     // external services
     private TaskExecutorService taskExecutorService;
 
@@ -50,21 +49,17 @@ public class SubscriptionService extends StompSessionHandlerAdapter {
 
     public SubscriptionService(CoreConfigurationService coreConfigurationService,
                                WorkerConfigurationService workerConfigurationService,
-                               ResultRepoClient resultRepoClient,
-                               ResultService resultService,
-                               RevealService revealService,
-                               CustomFeignClient feignClient,
-                               PublicConfigurationService publicConfigurationService,
-                               CredentialsService credentialsService,
-                               TaskExecutorService taskExecutorService) {
+                               TaskExecutorService taskExecutorService,
+                               RestTemplate restTemplate) {
         this.taskExecutorService = taskExecutorService;
 
         this.coreHost = coreConfigurationService.getHost();
         this.corePort = coreConfigurationService.getPort();
         this.workerWalletAddress = workerConfigurationService.getWorkerWalletAddress();
+        this.restTemplate = restTemplate;
 
         chainTaskIdToSubscription = new ConcurrentHashMap<>();
-        url = "ws://" + coreHost + ":" + corePort + "/connect";
+        url = "http://" + coreHost + ":" + corePort + "/connect";
     }
 
     @PostConstruct
@@ -75,7 +70,11 @@ private void run() {
     private void restartStomp() {
         log.info("Starting STOMP");
         WebSocketClient webSocketClient = new StandardWebSocketClient();
-        this.stompClient = new WebSocketStompClient(webSocketClient);
+        List<Transport> webSocketTransports = Arrays.asList(new WebSocketTransport(webSocketClient),
+                new RestTemplateXhrTransport(restTemplate));
+        SockJsClient sockJsClient = new SockJsClient(webSocketTransports);
+        this.stompClient = new WebSocketStompClient(sockJsClient);//without SockJS: new WebSocketStompClient(webSocketClient);
+        this.stompClient.setAutoStartup(true);
         this.stompClient.setMessageConverter(new MappingJackson2MessageConverter());
         this.stompClient.setTaskScheduler(new ConcurrentTaskScheduler());
         this.stompClient.connect(url, this);

src/main/resources/application.yml

@@ -12,7 +12,6 @@ worker:
   gasPriceCap: ${IEXEC_GAS_PRICE_CAP:22000000000} #in Wei, will be used for txs if networkGasPrice*gasPriceMultiplier > gasPriceCap
   teeEnabled: ${IEXEC_TEE_ENABLED:false}
   overrideBlockchainNodeAddress: ${IEXEC_WORKER_OVERRIDE_BLOCKCHAIN_NODE_ADDRESS:} #will use it if set, else will use the one given by the core
-
 wallet:
   encryptedFilePath: ${IEXEC_WORKER_WALLET_PATH:./src/main/resources/wallet/encrypted-wallet_worker1.json}
   password: ${IEXEC_WORKER_WALLET_PASSWORD:whatever}

src/main/resources/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ ! -z $IEXEC_HTTP_PROXY_HOST ] && [ ! -z  $IEXEC_HTTP_PROXY_PORT ]; then
+	java -Dhttp.proxyHost=$IEXEC_HTTP_PROXY_HOST -Dhttp.proxyPort=$IEXEC_HTTP_PROXY_PORT -jar /iexec-worker.jar
+fi
+
+java -jar /iexec-worker.jar