Fix several issues raised by SonarQube Cloud (#642)

jbern0rd · web-flow · commit 144c54ac689f · 2025-03-27T14:02:04.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - Replace deprecated `connect` with `connectAsync` in `StompClientService`. (#627)
 - Remove redundant blockchain calls to diminish pressure on Ethereum JSON-RPC API. (#632)
 - Stop using `TestUtils` in `ContributionServiceTests`. (#640)
+- Fix several issues raised by SonarQube Cloud. (#642)
 
 ### Breaking API changes
 
diff --git a/src/main/java/com/iexec/worker/chain/EnclaveAuthorizationService.java b/src/main/java/com/iexec/worker/chain/EnclaveAuthorizationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,15 @@
 package com.iexec.worker.chain;
 
 import com.iexec.commons.poco.security.Signature;
-import com.iexec.commons.poco.tee.TeeEnclaveChallengeSignature;
 import com.iexec.commons.poco.utils.BytesUtils;
 import com.iexec.commons.poco.utils.EthAddress;
+import com.iexec.commons.poco.utils.HashUtils;
 import com.iexec.commons.poco.utils.SignatureUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import static com.iexec.commons.poco.utils.SignatureUtils.isExpectedSignerOnSignedMessageHash;
 
-
 @Slf4j
 @Service
 public class EnclaveAuthorizationService {
@@ -59,9 +58,7 @@ public boolean isVerifiedEnclaveSignature(String chainTaskId,
             return false;
         }
 
-        String messageHash =
-                TeeEnclaveChallengeSignature.getMessageHash(resultHash,
-                        resultSeal);
+        final String messageHash = HashUtils.concatenateAndHash(resultHash, resultSeal);
 
         return isExpectedSignerOnSignedMessageHash(messageHash,
                 new Signature(enclaveSignature), enclaveChallenge);
diff --git a/src/main/java/com/iexec/worker/config/WorkerConfigurationService.java b/src/main/java/com/iexec/worker/config/WorkerConfigurationService.java
@@ -23,6 +23,7 @@
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.util.Objects;
 
 import static java.lang.management.ManagementFactory.getOperatingSystemMXBean;
 
@@ -137,16 +138,13 @@ public String getCPU() {
      * get max(numberOfJvmCpus -1, 1).
      */
     public int getCpuCount() {
-        int defaultAvailableCpuCount = Math.max(Runtime.getRuntime().availableProcessors() - 1, 1);
-        if (overrideAvailableCpuCount == null) {
-            return defaultAvailableCpuCount;
-        }
-        return overrideAvailableCpuCount;
+        final int defaultAvailableCpuCount = Math.max(Runtime.getRuntime().availableProcessors() - 1, 1);
+        return Objects.requireNonNullElse(overrideAvailableCpuCount, defaultAvailableCpuCount);
     }
 
     public int getMemorySize() {
-        com.sun.management.OperatingSystemMXBean os = (com.sun.management.OperatingSystemMXBean) getOperatingSystemMXBean();
-        return Long.valueOf(os.getTotalPhysicalMemorySize() / (1024 * 1024 * 1024)).intValue();//in GB
+        final com.sun.management.OperatingSystemMXBean os = (com.sun.management.OperatingSystemMXBean) getOperatingSystemMXBean();
+        return (int) os.getTotalMemorySize() / (1024 * 1024 * 1024); // conversion to GB
     }
 
     public String getHttpProxyHost() {
diff --git a/src/main/java/com/iexec/worker/feign/BaseFeignClient.java b/src/main/java/com/iexec/worker/feign/BaseFeignClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,9 @@
 import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import java.util.function.Function;
 
-
 @Slf4j
 public abstract class BaseFeignClient {
 
@@ -93,15 +91,6 @@ private String toHttpStatus(int status) {
         return HttpStatus.valueOf(status).toString();
     }
 
-    boolean is2xxSuccess(ResponseEntity<?> response) {
-        int status = response.getStatusCodeValue();
-        return status > 0 && HttpStatus.valueOf(status).is2xxSuccessful();
-    }
-
-    boolean is2xxSuccess(int status) {
-        return status > 0 && HttpStatus.valueOf(status).is2xxSuccessful();
-    }
-
     private void sleep(int millis) {
         try {
             Thread.sleep(millis);
diff --git a/src/main/java/com/iexec/worker/result/ResultService.java b/src/main/java/com/iexec/worker/result/ResultService.java
@@ -347,7 +347,6 @@ public boolean writeComputedFile(final ComputedFile computedFile) {
                     chainTaskId, computedFile);
             return false;
         }
-        // TODO replace with fast getChainDeal access, only 1 on-chain read instead of 4
         final ChainDeal chainDeal = iexecHubService.getChainDeal(chainTask.getDealid()).orElse(null);
         if (chainDeal == null || !TeeUtils.isTeeTag(chainDeal.getTag())) {
             log.error("Cannot write computed file if task is not of TEE type [chainTaskId:{}, computedFile:{}]",
diff --git a/src/main/java/com/iexec/worker/utils/ExecutorUtils.java b/src/main/java/com/iexec/worker/utils/ExecutorUtils.java
@@ -1,18 +1,18 @@
 /*
-* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 package com.iexec.worker.utils;
 
@@ -26,8 +26,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ExecutorUtils {
 
-    public static Executor
-            newSingleThreadExecutorWithFixedSizeQueue(int queueSize, String threadNamePrefix) {
+    public static Executor newSingleThreadExecutorWithFixedSizeQueue(final int queueSize, final String threadNamePrefix) {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(1);
         executor.setMaxPoolSize(1);
diff --git a/src/main/java/com/iexec/worker/utils/LoggingUtils.java b/src/main/java/com/iexec/worker/utils/LoggingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,10 @@
 
 package com.iexec.worker.utils;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class LoggingUtils {
 
     public static String getHighlightedMessage(String message) {
diff --git a/src/test/java/com/iexec/worker/TestUtils.java b/src/test/java/com/iexec/worker/TestUtils.java
@@ -1,18 +1,18 @@
 /*
-* Copyright 2020 IEXEC BLOCKCHAIN TECH
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 package com.iexec.worker;
 
diff --git a/src/test/java/com/iexec/worker/chain/EnclaveAuthorizationServiceTests.java b/src/test/java/com/iexec/worker/chain/EnclaveAuthorizationServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package com.iexec.worker.chain;
 
 import com.iexec.commons.poco.security.Signature;
-import com.iexec.commons.poco.tee.TeeEnclaveChallengeSignature;
+import com.iexec.commons.poco.utils.HashUtils;
 import com.iexec.commons.poco.utils.SignatureUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -41,77 +41,77 @@ class EnclaveAuthorizationServiceTests {
 
     @Test
     void isVerifiedEnclaveSignature() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
-        String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
-        String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
-        String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
+        final String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
+        final String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
+        final String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
 
-        String messageHash = TeeEnclaveChallengeSignature.getMessageHash(resultHash, resultSeal);
-        Credentials credentials = Credentials.create(Keys.createEcKeyPair());
+        final String messageHash = HashUtils.concatenateAndHash(resultHash, resultSeal);
+        final Credentials credentials = Credentials.create(Keys.createEcKeyPair());
 
-        String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
-        Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
+        final String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
+        final Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
 
-        boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), credentials.getAddress());
+        final boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), credentials.getAddress());
         assertThat(isVerifiedEnclaveSignature).isTrue();
     }
 
     @Test
     void isNotVerifiedEnclaveSignatureSinceWrongResultHash() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
-        String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
-        String resultHash = "0x1";
-        String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
+        final String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
+        final String resultHash = "0x1";
+        final String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
 
-        String messageHash = TeeEnclaveChallengeSignature.getMessageHash(resultHash, resultSeal);
-        Credentials credentials = Credentials.create(Keys.createEcKeyPair());
+        final String messageHash = HashUtils.concatenateAndHash(resultHash, resultSeal);
+        final Credentials credentials = Credentials.create(Keys.createEcKeyPair());
 
-        String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
-        Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
+        final String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
+        final Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
 
-        boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), credentials.getAddress());
+        final boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), credentials.getAddress());
         assertThat(isVerifiedEnclaveSignature).isFalse();
     }
 
     @Test
     void isNotVerifiedEnclaveSignatureSinceWrongResultSeal() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
-        String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
-        String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
-        String resultSeal = "0x3";
+        final String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
+        final String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
+        final String resultSeal = "0x3";
 
-        String messageHash = TeeEnclaveChallengeSignature.getMessageHash(resultHash, resultSeal);
-        Credentials credentials = Credentials.create(Keys.createEcKeyPair());
+        final String messageHash = HashUtils.concatenateAndHash(resultHash, resultSeal);
+        final Credentials credentials = Credentials.create(Keys.createEcKeyPair());
 
-        String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
-        Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
+        final String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
+        final Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
 
-        boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), credentials.getAddress());
+        final boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), credentials.getAddress());
         assertThat(isVerifiedEnclaveSignature).isFalse();
     }
 
     @Test
     void isNotVerifiedEnclaveSignatureSinceWrongEnclaveChallenge() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
-        String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
-        String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
-        String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
+        final String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
+        final String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
+        final String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
 
-        String messageHash = TeeEnclaveChallengeSignature.getMessageHash(resultHash, resultSeal);
-        Credentials credentials = Credentials.create(Keys.createEcKeyPair());
+        final String messageHash = HashUtils.concatenateAndHash(resultHash, resultSeal);
+        final Credentials credentials = Credentials.create(Keys.createEcKeyPair());
 
-        String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
-        Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
+        final String hexPrivateKey = Numeric.toHexStringWithPrefix(credentials.getEcKeyPair().getPrivateKey());
+        final Signature signature = SignatureUtils.signMessageHashAndGetSignature(messageHash, hexPrivateKey);
 
-        boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), "0x1");
+        final boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, signature.getValue(), "0x1");
         assertThat(isVerifiedEnclaveSignature).isFalse();
     }
 
     @Test
     void isNotVerifiedEnclaveSignatureSinceWrongEnclaveSignature() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
-        String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
-        String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
-        String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
+        final String chainTaskId = "0x0000000000000000000000000000000000000000000000000000000000000001";
+        final String resultHash = "0x0000000000000000000000000000000000000000000000000000000000000002";
+        final String resultSeal = "0x0000000000000000000000000000000000000000000000000000000000000003";
 
-        Credentials credentials = Credentials.create(Keys.createEcKeyPair());
+        final Credentials credentials = Credentials.create(Keys.createEcKeyPair());
 
-        boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, "0x1", credentials.getAddress());
+        final boolean isVerifiedEnclaveSignature = enclaveAuthorizationService.isVerifiedEnclaveSignature(chainTaskId, resultHash, resultSeal, "0x1", credentials.getAddress());
         assertThat(isVerifiedEnclaveSignature).isFalse();
     }
 }
diff --git a/src/test/java/com/iexec/worker/chain/WebSocketBlockchainListenerTests.java b/src/test/java/com/iexec/worker/chain/WebSocketBlockchainListenerTests.java
@@ -80,7 +80,7 @@ private static String getServiceUrl(String serviceHost, int servicePort) {
     @Test
     void shouldConnect() {
         await().atMost(10L, TimeUnit.SECONDS)
-                .until(() -> Objects.requireNonNull(meterRegistry.find(LATEST_BLOCK_METRIC_NAME).gauge()).value() != 0.0);
+                .until(() -> web3jService.getLatestBlockNumber() != 0);
         assertThat(meterRegistry.find(TX_COUNT_METRIC_NAME).tag("block", "latest").gauge())
                 .isNotNull()
                 .extracting(Gauge::value)
diff --git a/src/test/java/com/iexec/worker/config/WorkerConfigurationServiceTests.java b/src/test/java/com/iexec/worker/config/WorkerConfigurationServiceTests.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 IEXEC BLOCKCHAIN TECH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.iexec.worker.config;
+
+import org.junit.jupiter.api.Test;
+
+import static java.lang.management.ManagementFactory.getOperatingSystemMXBean;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class WorkerConfigurationServiceTests {
+    private final WorkerConfigurationService workerConfiguration = new WorkerConfigurationService();
+
+    @Test
+    void shouldGetDefaultCpuCount() {
+        final int defaultAvailableCpuCount = Math.max(Runtime.getRuntime().availableProcessors() - 1, 1);
+        assertThat(workerConfiguration.getCpuCount()).isEqualTo(defaultAvailableCpuCount);
+    }
+
+    @Test
+    void shouldGetMemorySize() {
+        final com.sun.management.OperatingSystemMXBean os = (com.sun.management.OperatingSystemMXBean) getOperatingSystemMXBean();
+        assertThat(workerConfiguration.getMemorySize()).isEqualTo((int) os.getTotalMemorySize() / (1024 * 1024 * 1024));
+    }
+}
diff --git a/src/test/java/com/iexec/worker/sms/SmsServiceTests.java b/src/test/java/com/iexec/worker/sms/SmsServiceTests.java

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,6 @@ public boolean writeComputedFile(final ComputedFile computedFile) {`
`347`	`347`	`chainTaskId, computedFile);`
`348`	`348`	`return false;`
`349`	`349`	`}`
`350`		`- // TODO replace with fast getChainDeal access, only 1 on-chain read instead of 4`
`351`	`350`	`final ChainDeal chainDeal = iexecHubService.getChainDeal(chainTask.getDealid()).orElse(null);`
`352`	`351`	`if (chainDeal == null \|\| !TeeUtils.isTeeTag(chainDeal.getTag())) {`
`353`	`352`	`log.error("Cannot write computed file if task is not of TEE type [chainTaskId:{}, computedFile:{}]",`