This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch refactor/phase1-leaf-modules in repository https://gitbox.apache.org/repos/asf/airavata.git
commit f1e8ac38ace7fcc41b6ce66b2a7b5190b43a7e76 Author: yasithdev <[email protected]> AuthorDate: Thu Mar 26 19:57:52 2026 -0500 refactor: reorganize o.a.a.security into repository/service/util/profile layers Move security-related classes into consolidated package structure: - security/repository/: JDBC, LDAP, Session user store implementations - security/util/: auth primitives, configuration readers, SecurityUtil - security/service/: security managers, identity context, authz cache, interceptors - security/profile/: profile service (client, commons, IAM, tenant, user) --- .../credential/store/store/impl/db/CredentialsDAO.java | 2 +- .../apache/airavata/helix/impl/task/AiravataTask.java | 2 +- .../org/apache/airavata/helix/impl/task/TaskContext.java | 4 ++-- .../profile/client/ProfileServiceClientFactory.java | 2 +- .../profile/commons/repositories/AbstractRepository.java | 6 +++--- .../profile/commons/tenant/entities/GatewayEntity.java | 2 +- .../commons/user/entities/CustomizedDashboardEntity.java | 2 +- .../commons/user/entities/NSFDemographicsEntity.java | 2 +- .../profile/commons/user/entities/UserProfileEntity.java | 2 +- .../profile/commons/utils/Committer.java | 2 +- .../profile/commons/utils/JPAConstants.java | 2 +- .../profile/commons/utils/JPAUtils.java | 2 +- .../profile/commons/utils/ObjectMapperSingleton.java | 2 +- .../profile/commons/utils/ProfileServiceJDBCConfig.java | 2 +- .../profile/commons/utils/QueryConstants.java | 2 +- .../profile/commons/utils/Utils.java | 2 +- .../services/core/impl/TenantManagementKeycloakImpl.java | 6 +++--- .../core/interfaces/TenantManagementInterface.java | 2 +- .../core/repositories/TenantProfileRepository.java | 8 ++++---- .../core/exceptions/UserProfileRegistryException.java | 2 +- .../user/core/repositories/UserProfileRepository.java | 12 ++++++------ .../user/core/utils/UserProfileCatalogDBInitConfig.java | 2 +- .../user/core/utils/UserProfileCatalogJDBCConfig.java | 4 ++-- .../{userstore => repository}/AbstractJDBCUserStore.java | 6 +++--- .../{userstore => repository}/JDBCUserStore.java | 4 ++-- .../{userstore => repository}/LDAPUserStore.java | 6 +++--- .../{userstore => repository}/SessionDBUserStore.java | 4 ++-- .../service}/AiravataSecurityManager.java | 4 ++-- .../service}/GatewayGroupsInitializer.java | 2 +- .../security => security/service}/IdentityContext.java | 2 +- .../service}/KeyCloakSecurityManager.java | 6 +++--- .../service}/SecurityManagerFactory.java | 4 ++-- .../{service/security => security/service}/UserInfo.java | 2 +- .../service}/authzcache/AuthzCache.java | 2 +- .../service}/authzcache/AuthzCacheEntry.java | 2 +- .../service}/authzcache/AuthzCacheIndex.java | 2 +- .../service}/authzcache/AuthzCacheManager.java | 4 ++-- .../service}/authzcache/AuthzCacheManagerFactory.java | 4 ++-- .../service}/authzcache/AuthzCachedStatus.java | 2 +- .../service}/authzcache/DefaultAuthzCacheManager.java | 4 ++-- .../service}/interceptor/SecurityCheck.java | 2 +- .../service}/interceptor/SecurityInterceptor.java | 10 +++++----- .../service}/interceptor/SecurityModule.java | 2 +- .../security/{ => util}/AbstractAuthenticator.java | 2 +- .../AbstractConfigurationReader.java | 2 +- .../{ => util}/AbstractDatabaseAuthenticator.java | 2 +- .../security/{ => util}/AiravataSecurityException.java | 2 +- .../security/{ => util}/AuthenticationException.java | 2 +- .../airavata/security/{ => util}/Authenticator.java | 2 +- .../AuthenticatorConfigurationReader.java | 8 ++++---- .../apache/airavata/security/{ => util}/Authoriser.java | 2 +- .../apache/airavata/security/util/PasswordDigester.java | 4 ++-- .../{common/utils => security/util}/SecurityUtil.java | 2 +- .../apache/airavata/security/{ => util}/UserStore.java | 2 +- .../airavata/security/{ => util}/UserStoreException.java | 2 +- .../apache/airavata/service/sharing/SharingHelper.java | 2 +- .../registry/migrator/airavata/AiravataDataMigrator.java | 10 +++++----- airavata-api/src/main/resources/META-INF/persistence.xml | 8 ++++---- .../src/main/resources/airavata-server.properties | 4 ++-- .../{userstore => repository}/JDBCUserStoreTest.java | 4 ++-- .../{userstore => repository}/LDAPUserStoreTest.java | 4 ++-- .../SessionDBUserStoreTest.java | 2 +- .../service}/GatewayGroupsInitializerTest.java | 2 +- .../service}/KeyCloakSecurityManagerTest.java | 12 ++++++------ .../AuthenticatorConfigurationReaderTest.java | 8 ++++---- .../utils => security/util}/SecurityUtilTest.java | 2 +- .../{configurations => util}/TestDBAuthenticator1.java | 6 +++--- .../{configurations => util}/TestDBAuthenticator2.java | 6 +++--- .../{configurations => util}/TestDBAuthenticator3.java | 6 +++--- .../security/{configurations => util}/TestUserStore.java | 4 ++-- .../iam/admin/services/core/tests/SetupNewGateway.java | 4 ++-- airavata-api/src/test/resources/authenticators.xml | 16 ++++++++-------- .../src/test/resources/disabled-authenticator.xml | 16 ++++++++-------- airavata-api/src/test/resources/jdbc-authenticator.xml | 4 ++-- airavata-api/src/test/resources/ldap-authenticator.xml | 4 ++-- .../src/test/resources/session-authenticator.xml | 2 +- .../org/apache/airavata/api/server/AiravataServer.java | 10 +++++----- .../api/server/handler/AiravataServerHandler.java | 2 +- .../profile/handlers/GroupManagerServiceHandler.java | 6 +++--- .../profile/handlers/IamAdminServicesHandler.java | 8 ++++---- .../profile/handlers/TenantProfileServiceHandler.java | 8 ++++---- .../profile/handlers/UserProfileServiceHandler.java | 16 ++++++++-------- .../ansible/roles/airavata_services/defaults/main.yml | 4 ++-- .../api-orch/templates/airavata-server.properties.j2 | 4 ++-- .../templates/participant/airavata-server.properties.j2 | 2 +- .../profile/client/samples/GroupManagerSample.java | 6 +++--- .../profile/client/samples/TenantProfileSample.java | 6 +++--- .../profile/client/samples/UserProfileSample.java | 6 +++--- .../profile/client/util/ProfileServiceClientUtil.java | 2 +- .../airavata/research/service/AiravataService.java | 2 +- 90 files changed, 194 insertions(+), 194 deletions(-) diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java b/airavata-api/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java index cd96ab63c9..2209a83b71 100644 --- a/airavata-api/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java +++ b/airavata-api/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.stream.Collectors; import org.apache.airavata.common.db.DBUtil; import org.apache.airavata.common.server.KeyStorePasswordCallback; -import org.apache.airavata.common.utils.SecurityUtil; +import org.apache.airavata.security.util.SecurityUtil; import org.apache.airavata.credential.store.credential.Credential; import org.apache.airavata.credential.store.credential.CredentialOwnerType; import org.apache.airavata.credential.store.store.CredentialStoreException; diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java index e56b130951..4f0a7f486a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java @@ -50,7 +50,7 @@ import org.apache.airavata.model.status.*; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; import org.apache.airavata.registry.api.exception.RegistryServiceException; -import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.security.profile.client.ProfileServiceClientFactory; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException; import org.apache.commons.io.FileUtils; diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java index 9ad7f888ef..98a1c41894 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java @@ -70,8 +70,8 @@ import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.model.util.GroupComputeResourcePreferenceUtil; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.service.profile.user.cpi.UserProfileService; -import org.apache.airavata.service.security.AiravataSecurityManager; -import org.apache.airavata.service.security.SecurityManagerFactory; +import org.apache.airavata.security.service.AiravataSecurityManager; +import org.apache.airavata.security.service.SecurityManagerFactory; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/client/ProfileServiceClientFactory.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/client/ProfileServiceClientFactory.java index d3074ddb14..74117c58af 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/client/ProfileServiceClientFactory.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.client; +package org.apache.airavata.security.profile.client; import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService; import org.apache.airavata.service.profile.groupmanager.cpi.exception.GroupManagerServiceException; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/repositories/AbstractRepository.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/repositories/AbstractRepository.java index f7af96c783..599b692431 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/repositories/AbstractRepository.java @@ -17,15 +17,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.repositories; +package org.apache.airavata.security.profile.commons.repositories; import com.github.dozermapper.core.Mapper; import jakarta.persistence.Query; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.airavata.service.profile.commons.utils.JPAUtils; -import org.apache.airavata.service.profile.commons.utils.ObjectMapperSingleton; +import org.apache.airavata.security.profile.commons.utils.JPAUtils; +import org.apache.airavata.security.profile.commons.utils.ObjectMapperSingleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/tenant/entities/GatewayEntity.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/tenant/entities/GatewayEntity.java index dfbdff2512..181df1ed2b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/tenant/entities/GatewayEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.tenant.entities; +package org.apache.airavata.security.profile.commons.tenant.entities; import jakarta.persistence.*; import java.util.UUID; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/CustomizedDashboardEntity.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/CustomizedDashboardEntity.java index 1534279537..96bab1fa5e 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/CustomizedDashboardEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/CustomizedDashboardEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.user.entities; +package org.apache.airavata.security.profile.commons.user.entities; import jakarta.persistence.*; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/NSFDemographicsEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/NSFDemographicsEntity.java index e79559ec5a..98c9b41f12 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/NSFDemographicsEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/NSFDemographicsEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.user.entities; +package org.apache.airavata.security.profile.commons.user.entities; import jakarta.persistence.*; import java.util.List; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/UserProfileEntity.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/UserProfileEntity.java index ae4f8a364b..2db2adab9d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/user/entities/UserProfileEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/user/entities/UserProfileEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.user.entities; +package org.apache.airavata.security.profile.commons.user.entities; import jakarta.persistence.*; import java.util.Date; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Committer.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Committer.java similarity index 93% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Committer.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Committer.java index 55087e2d7f..ecb6af2021 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Committer.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Committer.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.utils; +package org.apache.airavata.security.profile.commons.utils; @FunctionalInterface public interface Committer<T, R> { diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAConstants.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAConstants.java index 608a86b54b..44326ec12b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAConstants.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAConstants.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.utils; +package org.apache.airavata.security.profile.commons.utils; public class JPAConstants { public static final String KEY_JDBC_URL = "airavata.jdbc.url"; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAUtils.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAUtils.java index 9c15a7d1d3..366cd88f15 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/JPAUtils.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.utils; +package org.apache.airavata.security.profile.commons.utils; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/ObjectMapperSingleton.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/ObjectMapperSingleton.java index 7559aa55b7..f00a7c8f0d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/ObjectMapperSingleton.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.utils; +package org.apache.airavata.security.profile.commons.utils; import com.github.dozermapper.core.DozerBeanMapperBuilder; import com.github.dozermapper.core.Mapper; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/ProfileServiceJDBCConfig.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/ProfileServiceJDBCConfig.java index 862d6cfeca..92425cddef 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/ProfileServiceJDBCConfig.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/ProfileServiceJDBCConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.utils; +package org.apache.airavata.security.profile.commons.utils; import org.apache.airavata.common.db.JDBCConfig; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/QueryConstants.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/QueryConstants.java index 1bd7657b2b..5a6a5e2d6b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/QueryConstants.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.utils; +package org.apache.airavata.security.profile.commons.utils; import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.model.workspace.Gateway; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Utils.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Utils.java index 5eda0dbdc2..66e2f20975 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/Utils.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/commons/utils/Utils.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.commons.utils; +package org.apache.airavata.security.profile.commons.utils; import java.net.URI; import org.apache.airavata.common.exception.ApplicationSettingsException; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java index 9c0d5da8f9..de94c63284 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.iam.admin.services.core.impl; +package org.apache.airavata.security.profile.iam.admin.services.core.impl; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; @@ -34,8 +34,8 @@ import org.apache.airavata.model.credential.store.PasswordCredential; import org.apache.airavata.model.user.Status; import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.model.workspace.Gateway; -import org.apache.airavata.security.AiravataSecurityException; -import org.apache.airavata.service.profile.iam.admin.services.core.interfaces.TenantManagementInterface; +import org.apache.airavata.security.util.AiravataSecurityException; +import org.apache.airavata.security.profile.iam.admin.services.core.interfaces.TenantManagementInterface; import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java index b8f8361c42..b6f3b49488 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/iam/admin/services/core/interfaces/TenantManagementInterface.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.iam.admin.services.core.interfaces; +package org.apache.airavata.security.profile.iam.admin.services.core.interfaces; import java.util.List; import org.apache.airavata.model.credential.store.PasswordCredential; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/tenant/core/repositories/TenantProfileRepository.java similarity index 93% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/tenant/core/repositories/TenantProfileRepository.java index 3ed7fb82b9..9c3efcc22d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/tenant/core/repositories/TenantProfileRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/tenant/core/repositories/TenantProfileRepository.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.tenant.core.repositories; +package org.apache.airavata.security.profile.tenant.core.repositories; import java.util.Arrays; import java.util.HashMap; @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; import org.apache.airavata.model.workspace.Gateway; import org.apache.airavata.model.workspace.GatewayApprovalStatus; -import org.apache.airavata.service.profile.commons.repositories.AbstractRepository; -import org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity; -import org.apache.airavata.service.profile.commons.utils.QueryConstants; +import org.apache.airavata.security.profile.commons.repositories.AbstractRepository; +import org.apache.airavata.security.profile.commons.tenant.entities.GatewayEntity; +import org.apache.airavata.security.profile.commons.utils.QueryConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/exceptions/UserProfileRegistryException.java similarity index 93% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/exceptions/UserProfileRegistryException.java index dc567c9fd2..19816f32b3 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/exceptions/UserProfileRegistryException.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.user.core.exceptions; +package org.apache.airavata.security.profile.user.core.exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/repositories/UserProfileRepository.java similarity index 91% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/repositories/UserProfileRepository.java index 5f2912d310..214c8423ec 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/repositories/UserProfileRepository.java @@ -17,18 +17,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.user.core.repositories; +package org.apache.airavata.security.profile.user.core.repositories; import com.github.dozermapper.core.Mapper; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.airavata.model.user.UserProfile; -import org.apache.airavata.service.profile.commons.repositories.AbstractRepository; -import org.apache.airavata.service.profile.commons.user.entities.UserProfileEntity; -import org.apache.airavata.service.profile.commons.utils.JPAUtils; -import org.apache.airavata.service.profile.commons.utils.ObjectMapperSingleton; -import org.apache.airavata.service.profile.commons.utils.QueryConstants; +import org.apache.airavata.security.profile.commons.repositories.AbstractRepository; +import org.apache.airavata.security.profile.commons.user.entities.UserProfileEntity; +import org.apache.airavata.security.profile.commons.utils.JPAUtils; +import org.apache.airavata.security.profile.commons.utils.ObjectMapperSingleton; +import org.apache.airavata.security.profile.commons.utils.QueryConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/utils/UserProfileCatalogDBInitConfig.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/utils/UserProfileCatalogDBInitConfig.java index 36aeffb2f6..f7aba1406f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/utils/UserProfileCatalogDBInitConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.user.core.utils; +package org.apache.airavata.security.profile.user.core.utils; import org.apache.airavata.common.db.DBInitConfig; import org.apache.airavata.common.db.JDBCConfig; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/utils/UserProfileCatalogJDBCConfig.java similarity index 91% rename from airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java rename to airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/utils/UserProfileCatalogJDBCConfig.java index 792ec5724f..0cf3529ecf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/profile/user/core/utils/UserProfileCatalogJDBCConfig.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.user.core.utils; +package org.apache.airavata.security.profile.user.core.utils; import org.apache.airavata.common.db.JDBCConfig; -import org.apache.airavata.service.profile.commons.utils.Utils; +import org.apache.airavata.security.profile.commons.utils.Utils; public class UserProfileCatalogJDBCConfig implements JDBCConfig { diff --git a/airavata-api/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/repository/AbstractJDBCUserStore.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java rename to airavata-api/src/main/java/org/apache/airavata/security/repository/AbstractJDBCUserStore.java index cab0794d1d..f64f41759a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/repository/AbstractJDBCUserStore.java @@ -17,12 +17,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.userstore; +package org.apache.airavata.security.repository; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.config.ServerSettings; -import org.apache.airavata.security.UserStore; -import org.apache.airavata.security.UserStoreException; +import org.apache.airavata.security.util.UserStore; +import org.apache.airavata.security.util.UserStoreException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Element; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/repository/JDBCUserStore.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java rename to airavata-api/src/main/java/org/apache/airavata/security/repository/JDBCUserStore.java index 8a9405b531..977772af94 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/repository/JDBCUserStore.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.userstore; +package org.apache.airavata.security.repository; import javax.sql.DataSource; import org.apache.airavata.common.db.DBUtil; -import org.apache.airavata.security.UserStoreException; +import org.apache.airavata.security.util.UserStoreException; import org.apache.airavata.security.util.PasswordDigester; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/userstore/LDAPUserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/repository/LDAPUserStore.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/security/userstore/LDAPUserStore.java rename to airavata-api/src/main/java/org/apache/airavata/security/repository/LDAPUserStore.java index f285ddbaa0..39616b7990 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/userstore/LDAPUserStore.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/repository/LDAPUserStore.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.userstore; +package org.apache.airavata.security.repository; -import org.apache.airavata.security.UserStore; -import org.apache.airavata.security.UserStoreException; +import org.apache.airavata.security.util.UserStore; +import org.apache.airavata.security.util.UserStoreException; import org.apache.airavata.security.util.PasswordDigester; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/repository/SessionDBUserStore.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java rename to airavata-api/src/main/java/org/apache/airavata/security/repository/SessionDBUserStore.java index fcdd552631..d50d18f048 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/repository/SessionDBUserStore.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.userstore; +package org.apache.airavata.security.repository; import java.sql.SQLException; import org.apache.airavata.common.db.DBUtil; -import org.apache.airavata.security.UserStoreException; +import org.apache.airavata.security.util.UserStoreException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Element; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/AiravataSecurityManager.java b/airavata-api/src/main/java/org/apache/airavata/security/service/AiravataSecurityManager.java similarity index 94% rename from airavata-api/src/main/java/org/apache/airavata/service/security/AiravataSecurityManager.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/AiravataSecurityManager.java index 065b23ec52..8c0bf7e45d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/AiravataSecurityManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/AiravataSecurityManager.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; import java.util.Map; import org.apache.airavata.model.security.AuthzToken; -import org.apache.airavata.security.AiravataSecurityException; +import org.apache.airavata.security.util.AiravataSecurityException; public interface AiravataSecurityManager { diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java b/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java index 5029181445..eb84261cac 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.util.AiravataUtils; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/IdentityContext.java b/airavata-api/src/main/java/org/apache/airavata/security/service/IdentityContext.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/service/security/IdentityContext.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/IdentityContext.java index 07999c67bc..e0829b3131 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/IdentityContext.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/IdentityContext.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; import org.apache.airavata.model.security.AuthzToken; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java b/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java index 04376cabde..40f6b3625a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; import java.io.BufferedReader; import java.io.IOException; @@ -42,8 +42,8 @@ import org.apache.airavata.model.workspace.Gateway; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; import org.apache.airavata.registry.api.exception.RegistryServiceException; -import org.apache.airavata.security.AiravataSecurityException; -import org.apache.airavata.service.security.authzcache.*; +import org.apache.airavata.security.util.AiravataSecurityException; +import org.apache.airavata.security.service.authzcache.*; import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.UserGroup; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/SecurityManagerFactory.java b/airavata-api/src/main/java/org/apache/airavata/security/service/SecurityManagerFactory.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/security/SecurityManagerFactory.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/SecurityManagerFactory.java index 665b13f056..f47c585f9f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/SecurityManagerFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/SecurityManagerFactory.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.config.ServerSettings; -import org.apache.airavata.security.AiravataSecurityException; +import org.apache.airavata.security.util.AiravataSecurityException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/UserInfo.java b/airavata-api/src/main/java/org/apache/airavata/security/service/UserInfo.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/service/security/UserInfo.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/UserInfo.java index b88c6e4acc..2dd1bb7d1c 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/UserInfo.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/UserInfo.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; public class UserInfo { private String sub; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCache.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCache.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCache.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCache.java index 8f79703f1b..49529a9d78 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCache.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCache.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.authzcache; +package org.apache.airavata.security.service.authzcache; import java.util.LinkedHashMap; import java.util.Map; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheEntry.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheEntry.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheEntry.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheEntry.java index 50bd71eb92..48caf10aaf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheEntry.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheEntry.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.authzcache; +package org.apache.airavata.security.service.authzcache; /** * Cache entry in the default authorization cache. diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheIndex.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheIndex.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheIndex.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheIndex.java index ab4445db0d..272294b8b6 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheIndex.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheIndex.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.authzcache; +package org.apache.airavata.security.service.authzcache; /** * Cache index of the default authorization cache. diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManager.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManager.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManager.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManager.java index 8ee7caf971..593e3f275d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManager.java @@ -17,9 +17,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.authzcache; +package org.apache.airavata.security.service.authzcache; -import org.apache.airavata.security.AiravataSecurityException; +import org.apache.airavata.security.util.AiravataSecurityException; /** * This is the interface through which security manager accesses the underlying caching implementation diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManagerFactory.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManagerFactory.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManagerFactory.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManagerFactory.java index f7d20a9f4b..0065ab06d5 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManagerFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCacheManagerFactory.java @@ -17,11 +17,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.authzcache; +package org.apache.airavata.security.service.authzcache; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.config.ServerSettings; -import org.apache.airavata.security.AiravataSecurityException; +import org.apache.airavata.security.util.AiravataSecurityException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCachedStatus.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCachedStatus.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCachedStatus.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCachedStatus.java index ed766f3dde..67d1e2210f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCachedStatus.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/AuthzCachedStatus.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.authzcache; +package org.apache.airavata.security.service.authzcache; /** * This enum defines the status of the authorization cache returned by the authorization cache manager diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/DefaultAuthzCacheManager.java b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/DefaultAuthzCacheManager.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/DefaultAuthzCacheManager.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/DefaultAuthzCacheManager.java index 1a2ea0ff53..f83999b9e6 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/DefaultAuthzCacheManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/authzcache/DefaultAuthzCacheManager.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.authzcache; +package org.apache.airavata.security.service.authzcache; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.security.AiravataSecurityException; +import org.apache.airavata.security.util.AiravataSecurityException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityCheck.java b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityCheck.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityCheck.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityCheck.java index 765a6df3bd..cae9d70168 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityCheck.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityCheck.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.interceptor; +package org.apache.airavata.security.service.interceptor; import com.google.inject.BindingAnnotation; import java.lang.annotation.ElementType; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityInterceptor.java b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityInterceptor.java similarity index 91% rename from airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityInterceptor.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityInterceptor.java index 1104846e29..1446f27181 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityInterceptor.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityInterceptor.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.interceptor; +package org.apache.airavata.security.service.interceptor; import java.util.HashMap; import java.util.Map; @@ -29,10 +29,10 @@ import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.model.error.AuthorizationException; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.common.server.CountMonitor; -import org.apache.airavata.security.AiravataSecurityException; -import org.apache.airavata.service.security.AiravataSecurityManager; -import org.apache.airavata.service.security.IdentityContext; -import org.apache.airavata.service.security.SecurityManagerFactory; +import org.apache.airavata.security.util.AiravataSecurityException; +import org.apache.airavata.security.service.AiravataSecurityManager; +import org.apache.airavata.security.service.IdentityContext; +import org.apache.airavata.security.service.SecurityManagerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityModule.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java rename to airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityModule.java index f63efa56cc..de56e0cad3 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/interceptor/SecurityModule.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security.interceptor; +package org.apache.airavata.security.service.interceptor; import com.google.inject.AbstractModule; import com.google.inject.matcher.Matchers; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java b/airavata-api/src/main/java/org/apache/airavata/security/util/AbstractAuthenticator.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/AbstractAuthenticator.java index 91308d4de3..8fb1aa4adf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/AbstractAuthenticator.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/configurations/AbstractConfigurationReader.java b/airavata-api/src/main/java/org/apache/airavata/security/util/AbstractConfigurationReader.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/security/configurations/AbstractConfigurationReader.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/AbstractConfigurationReader.java index d419163c52..1a15c01503 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/configurations/AbstractConfigurationReader.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/AbstractConfigurationReader.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.configurations; +package org.apache.airavata.security.util; import java.io.File; import java.io.FileInputStream; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/AbstractDatabaseAuthenticator.java b/airavata-api/src/main/java/org/apache/airavata/security/util/AbstractDatabaseAuthenticator.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/security/AbstractDatabaseAuthenticator.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/AbstractDatabaseAuthenticator.java index 6863ac33c8..d30212ae88 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/AbstractDatabaseAuthenticator.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/AbstractDatabaseAuthenticator.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/AiravataSecurityException.java b/airavata-api/src/main/java/org/apache/airavata/security/util/AiravataSecurityException.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/security/AiravataSecurityException.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/AiravataSecurityException.java index 2fbf380638..a53d8fc0d4 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/AiravataSecurityException.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/AiravataSecurityException.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; /** * This class is named as AiravataSecurityException in order to avoid the conflicts with the diff --git a/airavata-api/src/main/java/org/apache/airavata/security/AuthenticationException.java b/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticationException.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/security/AuthenticationException.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticationException.java index 54327effb2..a6bb934648 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/AuthenticationException.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticationException.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; /** * Wraps errors during authentication. This exception will be thrown if there is a system error during authentication. diff --git a/airavata-api/src/main/java/org/apache/airavata/security/Authenticator.java b/airavata-api/src/main/java/org/apache/airavata/security/util/Authenticator.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/security/Authenticator.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/Authenticator.java index 80dbb3f97e..331c4815bc 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/Authenticator.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/Authenticator.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; import org.w3c.dom.Node; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReader.java b/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticatorConfigurationReader.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReader.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticatorConfigurationReader.java index 1b3d5bd8e4..151648e5bd 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReader.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/AuthenticatorConfigurationReader.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.configurations; +package org.apache.airavata.security.util; import java.io.IOException; import java.io.InputStream; @@ -28,9 +28,9 @@ import java.util.List; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.airavata.security.AbstractAuthenticator; -import org.apache.airavata.security.Authenticator; -import org.apache.airavata.security.UserStore; +import org.apache.airavata.security.util.AbstractAuthenticator; +import org.apache.airavata.security.util.Authenticator; +import org.apache.airavata.security.util.UserStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/Authoriser.java b/airavata-api/src/main/java/org/apache/airavata/security/util/Authoriser.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/security/Authoriser.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/Authoriser.java index 9065e2c055..32668a0b61 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/Authoriser.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/Authoriser.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; /** * An interface which can be used to authorise accessing resources. diff --git a/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java b/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java index f704520544..29d70b2f34 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java @@ -22,8 +22,8 @@ package org.apache.airavata.security.util; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.apache.airavata.common.utils.SecurityUtil; -import org.apache.airavata.security.UserStoreException; +import org.apache.airavata.security.util.SecurityUtil; +import org.apache.airavata.security.util.UserStoreException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java b/airavata-api/src/main/java/org/apache/airavata/security/util/SecurityUtil.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/SecurityUtil.java index cf7fb308a1..5aa1049d0f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/common/utils/SecurityUtil.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/SecurityUtil.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.common.utils; +package org.apache.airavata.security.util; import java.io.*; import java.security.*; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/UserStore.java b/airavata-api/src/main/java/org/apache/airavata/security/util/UserStore.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/security/UserStore.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/UserStore.java index 1b8e2b24bd..a8b78af437 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/UserStore.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/UserStore.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; import org.w3c.dom.Node; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/UserStoreException.java b/airavata-api/src/main/java/org/apache/airavata/security/util/UserStoreException.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/security/UserStoreException.java rename to airavata-api/src/main/java/org/apache/airavata/security/util/UserStoreException.java index 5ebeca48b2..4545460bb5 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/UserStoreException.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/util/UserStoreException.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security; +package org.apache.airavata.security.util; /** * Exception class to wrap user store errors. diff --git a/airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingHelper.java b/airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingHelper.java index 8b1c78eeb3..5b1eaa2d07 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingHelper.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingHelper.java @@ -24,7 +24,7 @@ import org.apache.airavata.common.config.ServerSettings; import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups; import org.apache.airavata.model.group.ResourcePermissionType; import org.apache.airavata.registry.api.service.handler.RegistryServerHandler; -import org.apache.airavata.service.security.GatewayGroupsInitializer; +import org.apache.airavata.security.service.GatewayGroupsInitializer; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.PermissionType; import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java index cc1b94ca77..f8b93d6077 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java @@ -57,13 +57,13 @@ import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; import org.apache.airavata.registry.api.exception.RegistryServiceException; -import org.apache.airavata.security.AiravataSecurityException; -import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; -import org.apache.airavata.service.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl; +import org.apache.airavata.security.util.AiravataSecurityException; +import org.apache.airavata.security.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.security.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl; import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices; import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException; -import org.apache.airavata.service.security.AiravataSecurityManager; -import org.apache.airavata.service.security.SecurityManagerFactory; +import org.apache.airavata.security.service.AiravataSecurityManager; +import org.apache.airavata.security.service.SecurityManagerFactory; import org.apache.airavata.sharing.registry.models.Domain; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.EntitySearchField; diff --git a/airavata-api/src/main/resources/META-INF/persistence.xml b/airavata-api/src/main/resources/META-INF/persistence.xml index 4ba4f1216c..3841f3142c 100644 --- a/airavata-api/src/main/resources/META-INF/persistence.xml +++ b/airavata-api/src/main/resources/META-INF/persistence.xml @@ -22,10 +22,10 @@ <persistence xmlns="http://java.sun.com/xml/ns/persistence"; version="2.0"> <persistence-unit name="profile_service"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.service.profile.commons.user.entities.UserProfileEntity</class> - <class>org.apache.airavata.service.profile.commons.user.entities.NSFDemographicsEntity</class> - <class>org.apache.airavata.service.profile.commons.user.entities.CustomizedDashboardEntity</class> - <class>org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity</class> + <class>org.apache.airavata.security.profile.commons.user.entities.UserProfileEntity</class> + <class>org.apache.airavata.security.profile.commons.user.entities.NSFDemographicsEntity</class> + <class>org.apache.airavata.security.profile.commons.user.entities.CustomizedDashboardEntity</class> + <class>org.apache.airavata.security.profile.commons.tenant.entities.GatewayEntity</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> <properties> <property name="openjpa.jdbc.MappingDefaults" diff --git a/airavata-api/src/main/resources/airavata-server.properties b/airavata-api/src/main/resources/airavata-server.properties index 51b0221c8d..e891f10e80 100644 --- a/airavata-api/src/main/resources/airavata-server.properties +++ b/airavata-api/src/main/resources/airavata-server.properties @@ -154,8 +154,8 @@ credential.store.keystore.url=keystores/airavata.sym.p12 credential.store.keystore.password=airavata credential.store.keystore.alias=airavata authz.cache.enabled=true -authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager -security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager +authz.cache.manager.class=org.apache.airavata.security.service.authzcache.DefaultAuthzCacheManager +security.manager.class=org.apache.airavata.security.service.KeyCloakSecurityManager validationQuery=SELECT 1 diff --git a/airavata-api/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java b/airavata-api/src/test/java/org/apache/airavata/security/repository/JDBCUserStoreTest.java similarity index 97% rename from airavata-api/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java rename to airavata-api/src/test/java/org/apache/airavata/security/repository/JDBCUserStoreTest.java index d384542e03..6ac5892884 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/repository/JDBCUserStoreTest.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.userstore; +package org.apache.airavata.security.repository; import static org.junit.jupiter.api.Assertions.*; @@ -25,7 +25,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.airavata.common.utils.DatabaseTestCases; import org.apache.airavata.common.db.DerbyUtil; -import org.apache.airavata.security.UserStore; +import org.apache.airavata.security.util.UserStore; import org.junit.jupiter.api.*; import org.w3c.dom.Document; import org.w3c.dom.NodeList; diff --git a/airavata-api/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java b/airavata-api/src/test/java/org/apache/airavata/security/repository/LDAPUserStoreTest.java similarity index 95% rename from airavata-api/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java rename to airavata-api/src/test/java/org/apache/airavata/security/repository/LDAPUserStoreTest.java index 592330d6c5..04388a1d08 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/repository/LDAPUserStoreTest.java @@ -17,13 +17,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.userstore; +package org.apache.airavata.security.repository; import static org.junit.jupiter.api.Assertions.*; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.airavata.security.UserStore; +import org.apache.airavata.security.util.UserStore; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; diff --git a/airavata-api/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java b/airavata-api/src/test/java/org/apache/airavata/security/repository/SessionDBUserStoreTest.java similarity index 98% rename from airavata-api/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java rename to airavata-api/src/test/java/org/apache/airavata/security/repository/SessionDBUserStoreTest.java index f582c8ccf4..7e9090f892 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/repository/SessionDBUserStoreTest.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.userstore; +package org.apache.airavata.security.repository; import static org.junit.jupiter.api.Assertions.*; diff --git a/airavata-api/src/test/java/org/apache/airavata/service/security/GatewayGroupsInitializerTest.java b/airavata-api/src/test/java/org/apache/airavata/security/service/GatewayGroupsInitializerTest.java similarity index 99% rename from airavata-api/src/test/java/org/apache/airavata/service/security/GatewayGroupsInitializerTest.java rename to airavata-api/src/test/java/org/apache/airavata/security/service/GatewayGroupsInitializerTest.java index 4d228447a0..94ae88f634 100644 --- a/airavata-api/src/test/java/org/apache/airavata/service/security/GatewayGroupsInitializerTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/service/GatewayGroupsInitializerTest.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; import static org.junit.jupiter.api.Assertions.*; diff --git a/airavata-api/src/test/java/org/apache/airavata/service/security/KeyCloakSecurityManagerTest.java b/airavata-api/src/test/java/org/apache/airavata/security/service/KeyCloakSecurityManagerTest.java similarity index 97% rename from airavata-api/src/test/java/org/apache/airavata/service/security/KeyCloakSecurityManagerTest.java rename to airavata-api/src/test/java/org/apache/airavata/security/service/KeyCloakSecurityManagerTest.java index b10dcb4ba8..6a2df0ae8a 100644 --- a/airavata-api/src/test/java/org/apache/airavata/service/security/KeyCloakSecurityManagerTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/service/KeyCloakSecurityManagerTest.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.security; +package org.apache.airavata.security.service; import static org.junit.jupiter.api.Assertions.*; @@ -39,11 +39,11 @@ import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; -import org.apache.airavata.security.AiravataSecurityException; -import org.apache.airavata.service.security.authzcache.AuthzCacheIndex; -import org.apache.airavata.service.security.authzcache.AuthzCacheManager; -import org.apache.airavata.service.security.authzcache.AuthzCacheManagerFactory; -import org.apache.airavata.service.security.authzcache.AuthzCachedStatus; +import org.apache.airavata.security.util.AiravataSecurityException; +import org.apache.airavata.security.service.authzcache.AuthzCacheIndex; +import org.apache.airavata.security.service.authzcache.AuthzCacheManager; +import org.apache.airavata.security.service.authzcache.AuthzCacheManagerFactory; +import org.apache.airavata.security.service.authzcache.AuthzCachedStatus; import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.UserGroup; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; diff --git a/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java b/airavata-api/src/test/java/org/apache/airavata/security/util/AuthenticatorConfigurationReaderTest.java similarity index 95% rename from airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java rename to airavata-api/src/test/java/org/apache/airavata/security/util/AuthenticatorConfigurationReaderTest.java index 33cbc2d1f1..60c99791ee 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/util/AuthenticatorConfigurationReaderTest.java @@ -17,16 +17,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.configurations; +package org.apache.airavata.security.util; import static org.junit.jupiter.api.Assertions.*; import java.io.File; import java.net.URLDecoder; import java.util.List; -import org.apache.airavata.security.Authenticator; -import org.apache.airavata.security.userstore.JDBCUserStore; -import org.apache.airavata.security.userstore.LDAPUserStore; +import org.apache.airavata.security.util.Authenticator; +import org.apache.airavata.security.repository.JDBCUserStore; +import org.apache.airavata.security.repository.LDAPUserStore; import org.junit.jupiter.api.Test; /** diff --git a/airavata-api/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java b/airavata-api/src/test/java/org/apache/airavata/security/util/SecurityUtilTest.java similarity index 98% rename from airavata-api/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java rename to airavata-api/src/test/java/org/apache/airavata/security/util/SecurityUtilTest.java index ffc751e26c..dab16b5a05 100644 --- a/airavata-api/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/util/SecurityUtilTest.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.common.utils; +package org.apache.airavata.security.util; import static org.junit.jupiter.api.Assertions.*; diff --git a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java b/airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator1.java similarity index 91% rename from airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java rename to airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator1.java index 36942a065a..70a2393d32 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator1.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.configurations; +package org.apache.airavata.security.util; -import org.apache.airavata.security.AbstractDatabaseAuthenticator; -import org.apache.airavata.security.AuthenticationException; +import org.apache.airavata.security.util.AbstractDatabaseAuthenticator; +import org.apache.airavata.security.util.AuthenticationException; public class TestDBAuthenticator1 extends AbstractDatabaseAuthenticator { diff --git a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java b/airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator2.java similarity index 91% rename from airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java rename to airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator2.java index d5116bedac..4f014d6718 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator2.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.configurations; +package org.apache.airavata.security.util; -import org.apache.airavata.security.AbstractAuthenticator; -import org.apache.airavata.security.AuthenticationException; +import org.apache.airavata.security.util.AbstractAuthenticator; +import org.apache.airavata.security.util.AuthenticationException; import org.w3c.dom.Node; public class TestDBAuthenticator2 extends AbstractAuthenticator { diff --git a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java b/airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator3.java similarity index 91% rename from airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java rename to airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator3.java index 5e606ffba9..1fa76071fe 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/util/TestDBAuthenticator3.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.configurations; +package org.apache.airavata.security.util; -import org.apache.airavata.security.AbstractDatabaseAuthenticator; -import org.apache.airavata.security.AuthenticationException; +import org.apache.airavata.security.util.AbstractDatabaseAuthenticator; +import org.apache.airavata.security.util.AuthenticationException; public class TestDBAuthenticator3 extends AbstractDatabaseAuthenticator { diff --git a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java b/airavata-api/src/test/java/org/apache/airavata/security/util/TestUserStore.java similarity index 93% rename from airavata-api/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java rename to airavata-api/src/test/java/org/apache/airavata/security/util/TestUserStore.java index 7b44fd5ab6..be0a139b13 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/util/TestUserStore.java @@ -17,9 +17,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.security.configurations; +package org.apache.airavata.security.util; -import org.apache.airavata.security.UserStore; +import org.apache.airavata.security.util.UserStore; import org.w3c.dom.Node; /** diff --git a/airavata-api/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java b/airavata-api/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java index 5fa3a0049c..59d6976aad 100644 --- a/airavata-api/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java +++ b/airavata-api/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.iam.admin.services.core.tests; +package org.apache.airavata.security.profile.iam.admin.services.core.tests; import java.util.ArrayList; import java.util.List; import org.apache.airavata.model.credential.store.PasswordCredential; import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.model.workspace.Gateway; -import org.apache.airavata.service.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl; +import org.apache.airavata.security.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl; import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/test/resources/authenticators.xml b/airavata-api/src/test/resources/authenticators.xml index e236a0db78..a135d801b9 100644 --- a/airavata-api/src/test/resources/authenticators.xml +++ b/airavata-api/src/test/resources/authenticators.xml @@ -20,8 +20,8 @@ Those configurations are reside inside <specificConfigurations> tags. --> <authenticators> - <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1" - enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.util.TestDBAuthenticator1" + enabled="true" priority="6" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql1</jdbcUrl> @@ -37,8 +37,8 @@ Those configurations are reside inside <specificConfigurations> tags. </specificConfigurations> </authenticator> - <authenticator name="dbAuthenticator2" class="org.apache.airavata.security.configurations.TestDBAuthenticator2" - enabled="true" priority="7" userstore="org.apache.airavata.security.userstore.LDAPUserStore"> + <authenticator name="dbAuthenticator2" class="org.apache.airavata.security.util.TestDBAuthenticator2" + enabled="true" priority="7" userstore="org.apache.airavata.security.repository.LDAPUserStore"> <specificConfigurations> <ldap> <!-- @@ -55,8 +55,8 @@ Those configurations are reside inside <specificConfigurations> tags. </specificConfigurations> </authenticator> - <authenticator name="dbAuthenticator4" class="org.apache.airavata.security.configurations.TestDBAuthenticator2" - enabled="false" priority="7" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator4" class="org.apache.airavata.security.util.TestDBAuthenticator2" + enabled="false" priority="7" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql2</jdbcUrl> @@ -70,8 +70,8 @@ Those configurations are reside inside <specificConfigurations> tags. </specificConfigurations> </authenticator> - <authenticator name="dbAuthenticator3" class="org.apache.airavata.security.configurations.TestDBAuthenticator3" - enabled="true" priority="8" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator3" class="org.apache.airavata.security.util.TestDBAuthenticator3" + enabled="true" priority="8" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql3</jdbcUrl> diff --git a/airavata-api/src/test/resources/disabled-authenticator.xml b/airavata-api/src/test/resources/disabled-authenticator.xml index 627ba573db..51ca63a1c1 100644 --- a/airavata-api/src/test/resources/disabled-authenticator.xml +++ b/airavata-api/src/test/resources/disabled-authenticator.xml @@ -20,8 +20,8 @@ Those configurations are reside inside <specificConfigurations> tags. --> <authenticators enabled="false"> - <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1" - enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.util.TestDBAuthenticator1" + enabled="true" priority="6" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql1</jdbcUrl> @@ -36,8 +36,8 @@ Those configurations are reside inside <specificConfigurations> tags. </specificConfigurations> </authenticator> - <authenticator name="dbAuthenticator2" class="org.apache.airavata.security.configurations.TestDBAuthenticator2" - enabled="true" priority="7" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator2" class="org.apache.airavata.security.util.TestDBAuthenticator2" + enabled="true" priority="7" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql2</jdbcUrl> @@ -51,8 +51,8 @@ Those configurations are reside inside <specificConfigurations> tags. </specificConfigurations> </authenticator> - <authenticator name="dbAuthenticator4" class="org.apache.airavata.security.configurations.TestDBAuthenticator2" - enabled="false" priority="7" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator4" class="org.apache.airavata.security.util.TestDBAuthenticator2" + enabled="false" priority="7" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql2</jdbcUrl> @@ -66,8 +66,8 @@ Those configurations are reside inside <specificConfigurations> tags. </specificConfigurations> </authenticator> - <authenticator name="dbAuthenticator3" class="org.apache.airavata.security.configurations.TestDBAuthenticator3" - enabled="true" priority="8" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator3" class="org.apache.airavata.security.util.TestDBAuthenticator3" + enabled="true" priority="8" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <jdbcUrl>jdbc:sql:thin:@//myhost:1521/mysql3</jdbcUrl> diff --git a/airavata-api/src/test/resources/jdbc-authenticator.xml b/airavata-api/src/test/resources/jdbc-authenticator.xml index 3df88ab39e..6796deb856 100644 --- a/airavata-api/src/test/resources/jdbc-authenticator.xml +++ b/airavata-api/src/test/resources/jdbc-authenticator.xml @@ -21,8 +21,8 @@ ~ */ --> <authenticators> - <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1" - enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.JDBCUserStore"> + <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.util.TestDBAuthenticator1" + enabled="true" priority="6" userstore="org.apache.airavata.security.repository.JDBCUserStore"> <specificConfigurations> <database> <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl--> diff --git a/airavata-api/src/test/resources/ldap-authenticator.xml b/airavata-api/src/test/resources/ldap-authenticator.xml index 6261b7b40d..6129f8807e 100644 --- a/airavata-api/src/test/resources/ldap-authenticator.xml +++ b/airavata-api/src/test/resources/ldap-authenticator.xml @@ -21,8 +21,8 @@ ~ */ --> <authenticators> - <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.configurations.TestDBAuthenticator1" - enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.LDAPUserStore"> + <authenticator name="dbAuthenticator1" class="org.apache.airavata.security.util.TestDBAuthenticator1" + enabled="true" priority="6" userstore="org.apache.airavata.security.repository.LDAPUserStore"> <specificConfigurations> <ldap> <!-- diff --git a/airavata-api/src/test/resources/session-authenticator.xml b/airavata-api/src/test/resources/session-authenticator.xml index 6760176867..f27ea1c708 100644 --- a/airavata-api/src/test/resources/session-authenticator.xml +++ b/airavata-api/src/test/resources/session-authenticator.xml @@ -23,7 +23,7 @@ <authenticators> <authenticator name="sessionAuthenticator" class="org.apache.airavata.services.registry.rest.security.session.SessionAuthenticator" - enabled="true" priority="6" userstore="org.apache.airavata.security.userstore.SessionDBUserStore"> + enabled="true" priority="6" userstore="org.apache.airavata.security.repository.SessionDBUserStore"> <specificConfigurations> <database> <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl--> diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java index 6c110f38e4..0fc16788cd 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java @@ -61,15 +61,15 @@ import org.apache.airavata.registry.core.utils.ReplicaCatalogDBInitConfig; import org.apache.airavata.registry.core.utils.WorkflowCatalogDBInitConfig; import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService; import org.apache.airavata.service.profile.groupmanager.cpi.group_manager_cpiConstants; -import org.apache.airavata.service.profile.handlers.GroupManagerServiceHandler; -import org.apache.airavata.service.profile.handlers.IamAdminServicesHandler; -import org.apache.airavata.service.profile.handlers.TenantProfileServiceHandler; -import org.apache.airavata.service.profile.handlers.UserProfileServiceHandler; +import org.apache.airavata.security.profile.handlers.GroupManagerServiceHandler; +import org.apache.airavata.security.profile.handlers.IamAdminServicesHandler; +import org.apache.airavata.security.profile.handlers.TenantProfileServiceHandler; +import org.apache.airavata.security.profile.handlers.UserProfileServiceHandler; import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices; import org.apache.airavata.service.profile.iam.admin.services.cpi.iam_admin_services_cpiConstants; import org.apache.airavata.service.profile.tenant.cpi.TenantProfileService; import org.apache.airavata.service.profile.tenant.cpi.profile_tenant_cpiConstants; -import org.apache.airavata.service.profile.user.core.utils.UserProfileCatalogDBInitConfig; +import org.apache.airavata.security.profile.user.core.utils.UserProfileCatalogDBInitConfig; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.apache.airavata.service.profile.user.cpi.profile_user_cpiConstants; import org.apache.airavata.sharing.registry.db.utils.SharingRegistryDBInitConfig; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 57cdb26ede..96f2a141dc 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -86,7 +86,7 @@ import org.apache.airavata.service.project.ProjectService; import org.apache.airavata.service.resource.ResourceService; import org.apache.airavata.service.resourceprofile.GatewayResourceProfileService; import org.apache.airavata.service.resourceprofile.UserResourceProfileService; -import org.apache.airavata.service.security.interceptor.SecurityCheck; +import org.apache.airavata.security.service.interceptor.SecurityCheck; import org.apache.airavata.service.sharing.ResourceSharingService; import org.apache.airavata.sharing.registry.models.*; import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java index 8addaf1a4e..280e73aa1d 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.security.profile.handlers; import java.util.ArrayList; import java.util.List; @@ -33,8 +33,8 @@ import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService; import org.apache.airavata.service.profile.groupmanager.cpi.exception.GroupManagerServiceException; import org.apache.airavata.service.profile.groupmanager.cpi.group_manager_cpiConstants; -import org.apache.airavata.service.profile.user.core.repositories.UserProfileRepository; -import org.apache.airavata.service.security.interceptor.SecurityCheck; +import org.apache.airavata.security.profile.user.core.repositories.UserProfileRepository; +import org.apache.airavata.security.service.interceptor.SecurityCheck; import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.GroupCardinality; import org.apache.airavata.sharing.registry.models.GroupType; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java index 04c37a550f..5f837e771a 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.security.profile.handlers; import java.util.List; import org.apache.airavata.common.exception.AiravataException; @@ -41,12 +41,12 @@ import org.apache.airavata.model.workspace.Gateway; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; import org.apache.airavata.registry.api.exception.RegistryServiceException; -import org.apache.airavata.service.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl; +import org.apache.airavata.security.profile.iam.admin.services.core.impl.TenantManagementKeycloakImpl; import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices; import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException; import org.apache.airavata.service.profile.iam.admin.services.cpi.iam_admin_services_cpiConstants; -import org.apache.airavata.service.profile.user.core.repositories.UserProfileRepository; -import org.apache.airavata.service.security.interceptor.SecurityCheck; +import org.apache.airavata.security.profile.user.core.repositories.UserProfileRepository; +import org.apache.airavata.security.service.interceptor.SecurityCheck; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java index 7fcf67e762..61719b58a7 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.security.profile.handlers; import java.util.List; import java.util.UUID; @@ -36,12 +36,12 @@ import org.apache.airavata.model.error.AuthorizationException; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.model.workspace.Gateway; import org.apache.airavata.model.workspace.GatewayApprovalStatus; -import org.apache.airavata.service.profile.commons.tenant.entities.GatewayEntity; -import org.apache.airavata.service.profile.tenant.core.repositories.TenantProfileRepository; +import org.apache.airavata.security.profile.commons.tenant.entities.GatewayEntity; +import org.apache.airavata.security.profile.tenant.core.repositories.TenantProfileRepository; import org.apache.airavata.service.profile.tenant.cpi.TenantProfileService; import org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException; import org.apache.airavata.service.profile.tenant.cpi.profile_tenant_cpiConstants; -import org.apache.airavata.service.security.interceptor.SecurityCheck; +import org.apache.airavata.security.service.interceptor.SecurityCheck; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java index c7239a332e..51cf4b553f 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.handlers; +package org.apache.airavata.security.profile.handlers; import java.util.List; import org.apache.airavata.common.exception.ApplicationSettingsException; @@ -32,18 +32,18 @@ import org.apache.airavata.model.error.AuthorizationException; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.model.user.Status; import org.apache.airavata.model.user.UserProfile; -import org.apache.airavata.security.AiravataSecurityException; -import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.security.util.AiravataSecurityException; +import org.apache.airavata.security.profile.client.ProfileServiceClientFactory; import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices; import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException; -import org.apache.airavata.service.profile.user.core.repositories.UserProfileRepository; +import org.apache.airavata.security.profile.user.core.repositories.UserProfileRepository; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException; import org.apache.airavata.service.profile.user.cpi.profile_user_cpiConstants; -import org.apache.airavata.service.security.AiravataSecurityManager; -import org.apache.airavata.service.security.SecurityManagerFactory; -import org.apache.airavata.service.security.UserInfo; -import org.apache.airavata.service.security.interceptor.SecurityCheck; +import org.apache.airavata.security.service.AiravataSecurityManager; +import org.apache.airavata.security.service.SecurityManagerFactory; +import org.apache.airavata.security.service.UserInfo; +import org.apache.airavata.security.service.interceptor.SecurityCheck; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dev-tools/ansible/roles/airavata_services/defaults/main.yml b/dev-tools/ansible/roles/airavata_services/defaults/main.yml index d0fda3cbe0..4b00bce27a 100644 --- a/dev-tools/ansible/roles/airavata_services/defaults/main.yml +++ b/dev-tools/ansible/roles/airavata_services/defaults/main.yml @@ -78,12 +78,12 @@ super_tenant_gatewayId: "default" airavata_jdbc_driver: "org.mariadb.jdbc.Driver" # Security configuration -security_manager_class: "org.apache.airavata.service.security.KeyCloakSecurityManager" +security_manager_class: "org.apache.airavata.security.service.KeyCloakSecurityManager" TLS_enabled: false TLS_client_timeout: 10000 keystore_path: "keystores/airavata.p12" authz_cache_enabled: true -authz_cache_manager_class: "org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager" +authz_cache_manager_class: "org.apache.airavata.security.service.authzcache.DefaultAuthzCacheManager" in_memory_cache_size: 1000 # Keystore configuration diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 index e6dde10b3e..989558674e 100644 --- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 @@ -127,7 +127,7 @@ zookeeper.server.connection={{ zookeeper_connection_url }} ######################################################################## ## API Security Configuration ######################################################################## -security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager +security.manager.class=org.apache.airavata.security.service.KeyCloakSecurityManager ### TLS related configuration #### TLS.enabled={{ tls_enable }} TLS.client.timeout=10000 @@ -138,7 +138,7 @@ keystore.password={{ keystore_passwd }} {% endif %} #### authorization cache related configuration #### authz.cache.enabled=true -authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager +authz.cache.manager.class=org.apache.airavata.security.service.authzcache.DefaultAuthzCacheManager in.memory.cache.size=1000 ########################################################################### diff --git a/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 b/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 index c9710f3f03..b8f22e2646 100644 --- a/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2 @@ -27,7 +27,7 @@ regserver.server.port={{ registry_port }} ########################################################################### credential.store.server.host={{ cred_store_server_host }} credential.store.server.port={{ cred_store_port }} -security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager +security.manager.class=org.apache.airavata.security.service.KeyCloakSecurityManager ########################################################################### # Profile Server Configuration diff --git a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java index 93967b6701..b37cea4c5d 100644 --- a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java +++ b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/GroupManagerSample.java @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.client.samples; +package org.apache.airavata.security.profile.client.samples; import java.util.HashMap; import java.util.Map; import org.apache.airavata.common.config.Constants; import org.apache.airavata.model.security.AuthzToken; -import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; -import org.apache.airavata.service.profile.client.util.ProfileServiceClientUtil; +import org.apache.airavata.security.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.security.profile.client.util.ProfileServiceClientUtil; import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java index 6868dad085..23e6df3e72 100644 --- a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java +++ b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/TenantProfileSample.java @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.client.samples; +package org.apache.airavata.security.profile.client.samples; import java.util.concurrent.ThreadLocalRandom; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.model.workspace.Gateway; import org.apache.airavata.model.workspace.GatewayApprovalStatus; -import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; -import org.apache.airavata.service.profile.client.util.ProfileServiceClientUtil; +import org.apache.airavata.security.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.security.profile.client.util.ProfileServiceClientUtil; import org.apache.airavata.service.profile.tenant.cpi.TenantProfileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java index 569cb93860..79b7fc4f65 100644 --- a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java +++ b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/samples/UserProfileSample.java @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.client.samples; +package org.apache.airavata.security.profile.client.samples; import java.util.List; import java.util.concurrent.ThreadLocalRandom; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.model.user.*; -import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; -import org.apache.airavata.service.profile.client.util.ProfileServiceClientUtil; +import org.apache.airavata.security.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.security.profile.client.util.ProfileServiceClientUtil; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java index d948495d0f..96a285a569 100644 --- a/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java +++ b/examples/profile-service-java-client-samples/src/main/java/org/apache/airavata/service/profile/client/util/ProfileServiceClientUtil.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.profile.client.util; +package org.apache.airavata.security.profile.client.util; import java.net.URL; import java.util.Properties; diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java index 8e81ad6b2f..67f8493ac6 100644 --- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java +++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java @@ -22,7 +22,7 @@ package org.apache.airavata.research.service; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.research.service.model.UserContext; -import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.security.profile.client.ProfileServiceClientFactory; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException; import org.apache.thrift.TException;
