-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add logs for better traceability (#675)
- Loading branch information
1 parent
038f984
commit 475a2e2
Showing
5 changed files
with
107 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2024-2024 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.core.worker; | ||
|
|
||
| import lombok.AccessLevel; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.commons.lang3.StringUtils; | ||
|
|
||
| @NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
| @Slf4j | ||
| public class WorkerUtils { | ||
|
|
||
| /** | ||
| * Utility function to log a message in the event of unauthorized access | ||
| * Either because the worker is not whitelisted or because the worker address was not found in the JWT token | ||
| * | ||
| * @param workerWalletAddress Address of the worker who attempted access | ||
| */ | ||
| public static void emitWarnOnUnAuthorizedAccess(String workerWalletAddress) { | ||
| final String workerAddress = StringUtils.isEmpty(workerWalletAddress) ? "NotAvailable" : workerWalletAddress; | ||
| log.warn("Worker is not allowed to join this workerpool [workerAddress:{}]", workerAddress); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright 2024-2024 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.core.worker; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.NullSource; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
| import org.springframework.boot.test.system.CapturedOutput; | ||
| import org.springframework.boot.test.system.OutputCaptureExtension; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| @ExtendWith(OutputCaptureExtension.class) | ||
| class WorkerUtilsTests { | ||
|
|
||
| @Test | ||
| void testEmitOnErrorWithWorkerAddress(CapturedOutput output) { | ||
| final String workerAddress = "0x9d693a8fd049c607a6"; | ||
| WorkerUtils.emitWarnOnUnAuthorizedAccess(workerAddress); | ||
| assertThat(output.getOut()).contains("Worker is not allowed to join this workerpool [workerAddress:0x9d693a8fd049c607a6]"); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @NullSource | ||
| @ValueSource(strings = {""}) | ||
| void testEmitOnErrorWithEmptyWorkerAddress(String value, CapturedOutput output) { | ||
| WorkerUtils.emitWarnOnUnAuthorizedAccess(value); | ||
| assertThat(output.getOut()).contains("Worker is not allowed to join this workerpool [workerAddress:NotAvailable]"); | ||
| } | ||
| } |