From cc576b7edc9aa37dfab1285aa6c0a83565006288 Mon Sep 17 00:00:00 2001 From: Evelina02 Date: Wed, 17 Jun 2026 15:49:37 +0300 Subject: [PATCH 1/3] EPMRPP-115237 encrypt in service-api --- build.gradle | 4 ++-- gradle.properties | 2 +- .../reportportal/extension/github/GitHubExtension.java | 8 ++++---- .../github/service/GitHubIntegrationStrategy.java | 7 ++++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 5fd9f7c..dec45b3 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,8 @@ dependencies { exclude group: 'org.springframework.modulith', module: 'spring-modulith-apt' } } else { - implementation 'com.github.reportportal:service-api:b6fe35f3df' - annotationProcessor('com.github.reportportal:service-api:b6fe35f3df') { + implementation 'com.github.reportportal:service-api:771a360' + annotationProcessor('com.github.reportportal:service-api:771a360') { exclude group: 'org.springframework.modulith', module: 'spring-modulith-apt' } } diff --git a/gradle.properties b/gradle.properties index 00fe68f..6d678b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=1.0.0 description=EPAM Report Portal. GitHub auth plugin. pluginId=github pluginClass=com.epam.reportportal.extension.github.GitHubPlugin -pluginName=GitHub Auth Plugin +pluginName=GitHub Auth provider=ReportPortal license=Apache 2.0 documentation=https://reportportal.io/docs/plugins/authorization/GitHubAuthorization diff --git a/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java b/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java index 776d1e0..a8dcc96 100644 --- a/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java +++ b/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java @@ -54,7 +54,7 @@ import java.util.function.Supplier; import javax.sql.DataSource; import lombok.extern.slf4j.Slf4j; -import org.jasypt.util.text.BasicTextEncryptor; +import com.epam.reportportal.base.core.integration.util.IntegrationParamsEncryptor; import org.pf4j.Extension; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; @@ -75,7 +75,7 @@ public class GitHubExtension implements AuthExtension, DisposableBean { public static final String SCHEMA_SCRIPTS_DIR = "resources/schema"; private static final String PLUGIN_ID = "github"; - private static final String PLUGIN_NAME = "GitHub OAuth Plugin"; + private static final String PLUGIN_NAME = "GitHub OAuth"; private static final String DOCUMENTATION_LINK = "https://reportportal.io/docs/plugins/authorization/GitHubAuthorization"; private static final String DOCUMENTATION_LINK_FIELD = "documentationLink"; private static final String NAME_FIELD = "name"; @@ -128,7 +128,7 @@ public boolean supports(Class authentication) { private OrganizationRepository organizationRepository; @Autowired - private BasicTextEncryptor encryptor; + private IntegrationParamsEncryptor paramsEncryptor; @Autowired private DataSource dataSource; @@ -147,7 +147,7 @@ public void init() throws IOException { this.gitHubIntegrationStrategySupplier = new MemoizingSupplier<>( () -> new GitHubIntegrationStrategy(integrationRepository, new UpdateAuthRequestValidator(new GitHubRequiredParamNamesProvider()), integrationDuplicateValidator, - encryptor)); + paramsEncryptor)); this.pluginLoadedListenerSupplier = new MemoizingSupplier<>( () -> new PluginLoadedEventListener(PLUGIN_ID, integrationTypeRepository, integrationRepository, diff --git a/src/main/java/com/epam/reportportal/extension/github/service/GitHubIntegrationStrategy.java b/src/main/java/com/epam/reportportal/extension/github/service/GitHubIntegrationStrategy.java index 8eed1d3..2c1688d 100644 --- a/src/main/java/com/epam/reportportal/extension/github/service/GitHubIntegrationStrategy.java +++ b/src/main/java/com/epam/reportportal/extension/github/service/GitHubIntegrationStrategy.java @@ -44,7 +44,7 @@ import java.util.Map; import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import org.jasypt.util.text.BasicTextEncryptor; +import com.epam.reportportal.base.core.integration.util.IntegrationParamsEncryptor; import org.springframework.security.config.oauth2.client.CommonOAuth2Provider; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.stereotype.Service; @@ -62,8 +62,9 @@ public class GitHubIntegrationStrategy extends AuthIntegrationStrategy { public GitHubIntegrationStrategy(IntegrationRepository integrationRepository, AuthRequestValidator updateAuthRequestValidator, IntegrationDuplicateValidator integrationDuplicateValidator, - BasicTextEncryptor encryptor) { - super(integrationRepository, updateAuthRequestValidator, integrationDuplicateValidator); + IntegrationParamsEncryptor paramsEncryptor) { + super(integrationRepository, updateAuthRequestValidator, integrationDuplicateValidator, + paramsEncryptor); } @Override From 538861a03d6d2726a65108f303095f381511e5a9 Mon Sep 17 00:00:00 2001 From: Evelina Sarkisian <59954853+Evelina02@users.noreply.github.com> Date: Wed, 17 Jun 2026 16:26:11 +0300 Subject: [PATCH 2/3] Update GitHubExtension.java --- .../com/epam/reportportal/extension/github/GitHubExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java b/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java index a8dcc96..5a5bd6d 100644 --- a/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java +++ b/src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java @@ -75,7 +75,7 @@ public class GitHubExtension implements AuthExtension, DisposableBean { public static final String SCHEMA_SCRIPTS_DIR = "resources/schema"; private static final String PLUGIN_ID = "github"; - private static final String PLUGIN_NAME = "GitHub OAuth"; + private static final String PLUGIN_NAME = "GitHub Auth"; private static final String DOCUMENTATION_LINK = "https://reportportal.io/docs/plugins/authorization/GitHubAuthorization"; private static final String DOCUMENTATION_LINK_FIELD = "documentationLink"; private static final String NAME_FIELD = "name"; From af9a81a13b69a3a0a68b410bb2b8f1215659752f Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Thu, 18 Jun 2026 09:47:38 +0300 Subject: [PATCH 3/3] EPMRPP-114242 || refactor GitHubIntegrationStrategy: simplify buildRestrictions method and remove unused constants --- build.gradle | 4 ++-- .../extension/github/oauth/GitHubOAuth2UserService.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index dec45b3..ea83399 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,8 @@ dependencies { exclude group: 'org.springframework.modulith', module: 'spring-modulith-apt' } } else { - implementation 'com.github.reportportal:service-api:771a360' - annotationProcessor('com.github.reportportal:service-api:771a360') { + implementation 'com.github.reportportal:service-api:0141b9e' + annotationProcessor('com.github.reportportal:service-api:0141b9e') { exclude group: 'org.springframework.modulith', module: 'spring-modulith-apt' } } diff --git a/src/main/java/com/epam/reportportal/extension/github/oauth/GitHubOAuth2UserService.java b/src/main/java/com/epam/reportportal/extension/github/oauth/GitHubOAuth2UserService.java index a0151b0..e53cb11 100644 --- a/src/main/java/com/epam/reportportal/extension/github/oauth/GitHubOAuth2UserService.java +++ b/src/main/java/com/epam/reportportal/extension/github/oauth/GitHubOAuth2UserService.java @@ -79,6 +79,9 @@ private List parseAllowedOrganizations(OAuthRegistrationResource registr private void validateUserOrganizations(UserResource user, GitHubClient client, List allowedOrgs) { + if (allowedOrgs.isEmpty()) { + return; + } boolean hasAccess = client.getUserOrganizations(user) .stream() .map(OrganizationResource::getLogin)