You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/04 09:15:13 UTC
[incubator-dlab] branch DLAB-terraform updated (449754c -> 92c5c4a)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 449754c Merge remote-tracking branch 'origin/DLAB-terraform' into DLAB-terraform
add dfba3db DLAB-728 replaced security service with keycloak integration
add d57dab3 DLAB-000 added keycloak support
add 07f38d8 [DLAB-758]: added aditional parameter code to authentication
add 7a9b03d [DLAB-758]: added aditional parameter code to authentication
add 8ccf990 [DLAB-758]: cleanup login form; error handling messages
add 30a2f99 DLAB-000 added keycloak api
add f34e048 Merge branch 'dlab_refactored' of github.com:apache/incubator-dlab into dlab_refactored
add 6b19f86 [DLAB-758]: oauth endpoint changes
add a4a4bb0 DLAB-000 merge conflicts fixed
add 7f9a474 [DLAB-758]: oauth endpoint changes
add 1da5903 DLAB-000 added query param for oauth request
add 4862bb9 DLAB-000 fixed issue with login
add fa518e2 DLAB-000 removed hardcoded credentials
add 327f19c DLAB-000 fixed config for prod mode
add 8c446c8 DLAB-000 changed hardcoded value for keycloak server
add fd3f535 DLAB-000 logging added
add 0e25ee7 DLAB-000 replaced hardcoded realm
add 92bf71a DLAB-000 changed packaging for provisioning
add 6d53673 [DLAB-758]: authorize Request parameter fixes
add 4c8f563 DLAB-000 added correct authorization class for keycloak
add 99b7fab DLAB-757 added possibility to import mongo roles on ss startup
add a8f1ca1 DLAB-757 added API for getting keycloak login page
add be3bb7f DLAB-000 removed authorization for project callback resource
add cfc2fa2 DLAB-000 added possibility to populate cloud properties from ss config
add e2cdc84 DLAB-973 fixed bug connected with displaying installed libs when notebook is created from image
add 1552046 [DLAB-758]: only params check on authorize
add bfa78d4 [DLAB-758]: added location check wirh redirect
add 71cd5a6 [DLAB-758]: added location check wirh redirect; error handling on login
add cfab0fa Merge branch 'dlab_refactored' of github.com:apache/incubator-dlab into dlab_refactored
add 8f8fda7 Merge remote-tracking branch 'origin/dlab_refactored' into dlab_refactored
add e614ea4 Merge remote-tracking branch 'remotes/origin/develop' into dlab_refactored
add 087975c DLAB-000 fixed compile errors
add fa11995 DLAB-000 added new cloud properties
add 12c96aa Merge remote-tracking branch 'remotes/origin/develop' into dlab_refactored
add 59c8c3d DLAB-1022 add possibility to cache keycloak token on DLab side
add 145ad57 DLAB-000 added support of group claim
new 92c5c4a Merge pull request #283 from apache/dlab_refactored
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/ssn/templates/ssn.yml | 18 +-
pom.xml | 4 -
.../com/epam/dlab/dto/aws/AwsCloudSettings.java | 18 ++
.../java/com/epam/dlab/dto/base/CloudSettings.java | 1 +
.../com/epam/dlab/auth/SecurityAuthorizer.java | 54 -----
.../java/com/epam/dlab/auth/SecurityFactory.java | 54 -----
.../epam/dlab/auth/SecurityRestAuthenticator.java | 54 -----
.../com/epam/dlab/auth/SystemUserInfoService.java | 50 -----
.../epam/dlab/auth/SystemUserInfoServiceImpl.java | 74 -------
services/provisioning-service/pom.xml | 20 +-
services/provisioning-service/provisioning.yml | 11 +
.../DropwizardBearerTokenFilterImpl.java | 20 ++
.../backendapi/ProvisioningServiceApplication.java | 49 ++++-
...rovisioningServiceApplicationConfiguration.java | 7 +
.../response/handlers/BackupCallbackHandler.java | 7 +-
.../handlers/CheckInactivityCallbackHandler.java | 11 +-
.../handlers/ComputationalCallbackHandler.java | 6 +-
.../response/handlers/ComputationalConfigure.java | 5 +-
.../ComputationalConfigureCallbackHandler.java | 6 +-
.../response/handlers/EdgeCallbackHandler.java | 4 +-
.../handlers/ExploratoryCallbackHandler.java | 6 +-
.../ExploratoryGitCredsCallbackHandler.java | 8 +-
.../handlers/ImageCreateCallbackHandler.java | 7 +-
.../handlers/LibInstallCallbackHandler.java | 6 +-
.../response/handlers/LibListCallbackHandler.java | 10 +-
.../response/handlers/ProjectCallbackHandler.java | 5 +-
.../response/handlers/ResourceCallbackHandler.java | 12 +-
.../handlers/ResourcesStatusCallbackHandler.java | 6 +-
.../handlers/ReuploadKeyCallbackHandler.java | 7 +-
.../dlab/backendapi/modules/ProductionModule.java | 5 -
.../backendapi/modules/ProvisioningDevModule.java | 16 +-
.../dlab/backendapi/resources/BackupResource.java | 5 +-
.../resources/GitExploratoryResource.java | 8 +-
.../dlab/backendapi/resources/ImageResource.java | 8 +-
.../dlab/backendapi/resources/LibraryResource.java | 12 +-
.../resources/aws/ComputationalResourceAws.java | 6 +-
.../backendapi/resources/aws/EdgeResourceAws.java | 6 +-
.../resources/azure/EdgeResourceAzure.java | 6 +-
.../backendapi/resources/base/EdgeService.java | 3 -
.../resources/base/ExploratoryService.java | 70 +++----
.../resources/base/InfrastructureService.java | 6 +-
.../resources/gcp/ComputationalResourceGcp.java | 6 +-
.../backendapi/resources/gcp/EdgeResourceGcp.java | 2 +-
.../service/impl/CheckInactivityServiceImpl.java | 4 +-
.../backendapi/service/impl/DockerService.java | 23 +-
.../dlab/backendapi/service/impl/KeyService.java | 7 +-
.../service/impl/ProjectServiceImpl.java | 5 +-
.../service/impl/SparkClusterService.java | 9 +-
.../core/commands/CommandExecutorMockTest.java | 4 +-
.../dao/FileSystemCallbackHandlerDaoTest.java | 9 +-
services/security-aws/pom.xml | 58 ------
.../com/epam/dlab/auth/aws/dao/AwsUserDAO.java | 35 ----
.../com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java | 79 -------
.../aws/service/AwsCredentialRefreshService.java | 68 ------
.../aws/service/AwsUserVerificationService.java | 82 --------
services/security-azure/pom.xml | 78 -------
.../dlab/auth/azure/AuthorizationCodeSupplier.java | 44 ----
.../dlab/auth/azure/AuthorizationSupplier.java | 36 ----
.../auth/azure/AzureAuthenticationResource.java | 194 -----------------
.../dlab/auth/azure/AzureLocalAuthResponse.java | 42 ----
.../epam/dlab/auth/azure/AzureLoginUrlBuilder.java | 75 -------
.../dlab/auth/azure/AzureSecurityResource.java | 116 -----------
.../com/epam/dlab/auth/azure/RoleAssignment.java | 37 ----
.../dlab/auth/azure/RoleAssignmentProperties.java | 43 ----
.../dlab/auth/azure/RoleAssignmentResponse.java | 35 ----
.../dlab/auth/azure/UsernamePasswordSupplier.java | 43 ----
.../service/AzureAuthorizationCodeService.java | 46 ----
.../service/AzureAuthorizationCodeServiceImpl.java | 231 ---------------------
services/security-gcp/pom.xml | 66 ------
.../gcp/resources/GcpOauth2SecurityResource.java | 56 -----
.../auth/gcp/service/GcpAuthenticationService.java | 110 ----------
services/security-service/pom.xml | 183 ----------------
services/security-service/security.yml | 150 -------------
.../epam/dlab/auth/SecurityServiceApplication.java | 65 ------
.../dlab/auth/SecurityServiceConfiguration.java | 146 -------------
.../epam/dlab/auth/core/DlabLdapConnection.java | 42 ----
.../dlab/auth/core/DlabLdapConnectionFactory.java | 49 -----
.../epam/dlab/auth/core/ReturnableConnection.java | 67 ------
.../com/epam/dlab/auth/core/SimpleConnection.java | 47 -----
.../java/com/epam/dlab/auth/dao/LdapUserDAO.java | 30 ---
.../com/epam/dlab/auth/dao/LdapUserDAOImpl.java | 165 ---------------
.../main/java/com/epam/dlab/auth/dao/Request.java | 35 ----
.../epam/dlab/auth/dao/UserInfoDAODumbImpl.java | 54 -----
.../epam/dlab/auth/dao/UserInfoDAOMongoImpl.java | 132 ------------
.../auth/modules/AwsSecurityServiceModule.java | 92 --------
.../auth/modules/AzureSecurityServiceModule.java | 78 -------
.../auth/modules/GcpSecurityServiceModule.java | 94 ---------
.../com/epam/dlab/auth/modules/ModuleFactory.java | 43 ----
.../dlab/auth/modules/SecurityServiceModule.java | 66 ------
.../SynchronousLdapAuthenticationResource.java | 80 -------
.../dlab/auth/service/AuthenticationService.java | 34 ---
.../service/impl/LdapAuthenticationService.java | 89 --------
.../security-service/src/main/resources/banner.txt | 6 -
.../impl/LdapAuthenticationServiceTest.java | 139 -------------
services/self-service/pom.xml | 6 +
services/self-service/self-service.yml | 111 +++++++---
.../dlab/backendapi/SelfServiceApplication.java | 19 +-
.../backendapi/auth/KeycloakAuthenticator.java | 52 +++++
.../auth/SelfServiceSecurityAuthenticator.java | 55 -----
.../filters/DropwizardBearerTokenFilterImpl.java | 20 ++
.../dlab/backendapi/conf/CloudConfiguration.java | 35 ++++
.../SelfServiceApplicationConfiguration.java | 24 ++-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 2 +-
.../com/epam/dlab/backendapi/dao/MongoSetting.java | 7 +
.../com/epam/dlab/backendapi/dao/SecurityDAO.java | 40 +++-
.../com/epam/dlab/backendapi/dao/SettingsDAO.java | 88 ++++++++
.../com/epam/dlab/backendapi/dao/UserRoleDao.java | 5 +
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 10 +
.../dlab/backendapi/domain/EnvStatusListener.java | 2 +-
.../dropwizard/bundles/DlabKeycloakBundle.java | 40 ++++
.../dropwizard/listeners/MongoStartupListener.java | 87 ++++++++
.../listeners/RestoreHandlerStartupListener.java | 2 +-
.../ProvisioningServiceHealthCheck.java | 53 -----
.../backendapi/modules/AwsSelfServiceModule.java | 9 +-
.../backendapi/modules/AzureSelfServiceModule.java | 20 +-
.../epam/dlab/backendapi/modules/DevModule.java | 28 ++-
.../backendapi/modules/GcpSelfServiceModule.java | 15 +-
.../dlab/backendapi/modules/ModuleFactory.java | 2 +-
.../dlab/backendapi/modules/ProductionModule.java | 17 +-
.../backendapi/resources/ExploratoryResource.java | 2 +-
.../backendapi/resources/KeycloakResource.java | 50 +++++
.../backendapi/resources/SecurityResource.java | 8 +-
.../resources/aws/ComputationalResourceAws.java | 2 +-
.../azure/ComputationalResourceAzure.java | 2 +-
.../resources/callback/BackupCallback.java | 4 +-
.../callback/CheckInactivityCallback.java | 10 +-
.../resources/callback/ComputationalCallback.java | 9 +-
.../callback/EnvironmentStatusCallback.java | 2 +-
.../resources/callback/ExploratoryCallback.java | 9 +-
.../resources/callback/GitCredsCallback.java | 2 +-
.../resources/callback/ImageCallback.java | 2 +-
.../resources/callback/LibraryCallback.java | 92 ++++----
.../resources/callback/ProjectCallback.java | 4 +-
.../resources/callback/ReuploadKeyCallback.java | 2 +-
.../callback/aws/KeyUploaderCallbackAws.java | 38 ++--
.../callback/azure/EdgeCallbackAzure.java | 32 ++-
.../callback/azure/KeyUploaderCallbackAzure.java | 2 +-
.../resources/callback/base/EdgeCallback.java | 6 +-
.../resources/callback/gcp/EdgeCallbackGcp.java | 4 +-
.../callback/gcp/KeyUploaderCallbackGcp.java | 4 +-
.../resources/gcp/ComputationalResourceGcp.java | 2 +-
.../com/epam/dlab/backendapi/roles/UserRoles.java | 6 +-
.../schedulers/CheckInactivityScheduledJob.java | 4 -
.../schedulers/internal/ManagedScheduler.java | 2 +-
.../dlab/backendapi/service/AccessKeyService.java | 16 ++
.../dlab/backendapi/service/KeycloakService.java | 8 +
.../backendapi/service/KeycloakServiceImpl.java | 66 ++++++
.../backendapi/service/SchedulerJobService.java | 1 -
.../dlab/backendapi/service/SecurityService.java | 8 +
.../backendapi/service/SecurityServiceImpl.java | 51 +++++
.../aws/AwsInfrastructureTemplateService.java | 2 +-
.../gcp/GcpInfrastructureTemplateService.java | 2 +-
.../service/impl/AccessKeyServiceImpl.java | 2 +-
.../service/impl/EnvironmentServiceImpl.java | 17 +-
.../service/impl/GuacamoleServiceImpl.java | 2 +-
.../service/impl/InactivityServiceImpl.java | 8 +-
.../impl/InfrastructureInfoServiceBase.java | 2 +-
.../impl/InfrastructureTemplateServiceBase.java | 2 +-
.../service/impl/SchedulerJobServiceImpl.java | 17 +-
.../servlet/guacamole/GuacamoleSecurityFilter.java | 18 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 14 +-
...fServiceCloudConfigurationSequenceProvider.java | 2 +-
.../src/main/resources/mongo}/aws/mongo_roles.json | 0
.../main/resources/mongo}/azure/mongo_roles.json | 0
.../src/main/resources/mongo}/gcp/mongo_roles.json | 0
.../resources/webapp/src/app/app.routing.module.ts | 2 +-
.../resources/webapp/src/app/core/core.module.ts | 4 +-
.../services/{admin.quard.ts => admin.guard.ts} | 2 +-
.../src/app/core/services/appRouting.service.ts | 2 +-
.../core/services/applicationSecurity.service.ts | 21 +-
.../services/applicationServiceFacade.service.ts | 15 +-
.../src/app/core/services/authorization.guard.ts | 10 +-
.../src/app/core/services/checkParams.guard.ts | 17 +-
.../webapp/src/app/core/services/index.ts | 2 +-
.../webapp/src/app/login/login.component.css | 6 +-
.../webapp/src/app/login/login.component.html | 14 +-
.../webapp/src/app/login/login.component.ts | 13 +-
.../src/app/shared/navbar/navbar.component.ts | 1 -
.../resources/ExploratoryResourceTest.java | 17 --
.../backendapi/resources/SecurityResourceTest.java | 220 --------------------
.../aws/AwsInfrastructureTemplateServiceTest.java | 2 +-
.../gcp/GcpInfrastructureTemplateServiceTest.java | 2 +-
.../service/impl/AccessKeyServiceImplTest.java | 2 +-
.../service/impl/ComputationalServiceImplTest.java | 2 +-
.../service/impl/EnvironmentServiceImplTest.java | 61 +++---
.../service/impl/SchedulerJobServiceImplTest.java | 154 +++++++-------
.../dlab/backendapi/util/RequestBuilderTest.java | 2 +-
187 files changed, 1294 insertions(+), 4784 deletions(-)
delete mode 100644 services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/SecurityAuthorizer.java
delete mode 100644 services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/SecurityFactory.java
delete mode 100644 services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/SecurityRestAuthenticator.java
delete mode 100644 services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/SystemUserInfoService.java
delete mode 100644 services/dlab-webapp-common/src/main/java/com/epam/dlab/auth/SystemUserInfoServiceImpl.java
create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/DropwizardBearerTokenFilterImpl.java
delete mode 100644 services/security-aws/pom.xml
delete mode 100644 services/security-aws/src/main/java/com/epam/dlab/auth/aws/dao/AwsUserDAO.java
delete mode 100644 services/security-aws/src/main/java/com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java
delete mode 100644 services/security-aws/src/main/java/com/epam/dlab/auth/aws/service/AwsCredentialRefreshService.java
delete mode 100644 services/security-aws/src/main/java/com/epam/dlab/auth/aws/service/AwsUserVerificationService.java
delete mode 100644 services/security-azure/pom.xml
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/AuthorizationCodeSupplier.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/AuthorizationSupplier.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/AzureAuthenticationResource.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/AzureLocalAuthResponse.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/AzureLoginUrlBuilder.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/AzureSecurityResource.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/RoleAssignment.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/RoleAssignmentProperties.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/RoleAssignmentResponse.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/UsernamePasswordSupplier.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/service/AzureAuthorizationCodeService.java
delete mode 100644 services/security-azure/src/main/java/com/epam/dlab/auth/azure/service/AzureAuthorizationCodeServiceImpl.java
delete mode 100644 services/security-gcp/pom.xml
delete mode 100644 services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/resources/GcpOauth2SecurityResource.java
delete mode 100644 services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java
delete mode 100644 services/security-service/pom.xml
delete mode 100644 services/security-service/security.yml
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceApplication.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/core/DlabLdapConnection.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/core/DlabLdapConnectionFactory.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/core/ReturnableConnection.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/core/SimpleConnection.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAO.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/dao/LdapUserDAOImpl.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/dao/Request.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAODumbImpl.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/dao/UserInfoDAOMongoImpl.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/modules/AwsSecurityServiceModule.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/modules/AzureSecurityServiceModule.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/modules/ModuleFactory.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/modules/SecurityServiceModule.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/resources/SynchronousLdapAuthenticationResource.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/service/AuthenticationService.java
delete mode 100644 services/security-service/src/main/java/com/epam/dlab/auth/service/impl/LdapAuthenticationService.java
delete mode 100644 services/security-service/src/main/resources/banner.txt
delete mode 100644 services/security-service/src/test/java/com/epam/dlab/auth/service/impl/LdapAuthenticationServiceTest.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/auth/KeycloakAuthenticator.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/auth/SelfServiceSecurityAuthenticator.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/auth/filters/DropwizardBearerTokenFilterImpl.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/conf/CloudConfiguration.java
rename services/self-service/src/main/java/com/epam/dlab/backendapi/{ => conf}/SelfServiceApplicationConfiguration.java (91%)
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/bundles/DlabKeycloakBundle.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
rename services/self-service/src/main/java/com/epam/dlab/backendapi/{ => dropwizard}/listeners/RestoreHandlerStartupListener.java (96%)
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/healthcheck/ProvisioningServiceHealthCheck.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/KeycloakResource.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakService.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakServiceImpl.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/SecurityService.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/SecurityServiceImpl.java
rename {infrastructure-provisioning/src/ssn/files => services/self-service/src/main/resources/mongo}/aws/mongo_roles.json (100%)
rename {infrastructure-provisioning/src/ssn/files => services/self-service/src/main/resources/mongo}/azure/mongo_roles.json (100%)
rename {infrastructure-provisioning/src/ssn/files => services/self-service/src/main/resources/mongo}/gcp/mongo_roles.json (100%)
rename services/self-service/src/main/resources/webapp/src/app/core/services/{admin.quard.ts => admin.guard.ts} (95%)
delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/resources/SecurityResourceTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #283 from
apache/dlab_refactored
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 92c5c4a4b25548fb02db51f67fdc5f568c647e0a
Merge: 449754c 145ad57
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Wed Sep 4 12:15:09 2019 +0300
Merge pull request #283 from apache/dlab_refactored
Dlab refactored
.../src/ssn/templates/ssn.yml | 18 +-
pom.xml | 4 -
.../com/epam/dlab/dto/aws/AwsCloudSettings.java | 18 ++
.../java/com/epam/dlab/dto/base/CloudSettings.java | 1 +
.../com/epam/dlab/auth/SecurityAuthorizer.java | 54 -----
.../java/com/epam/dlab/auth/SecurityFactory.java | 54 -----
.../epam/dlab/auth/SecurityRestAuthenticator.java | 54 -----
.../com/epam/dlab/auth/SystemUserInfoService.java | 50 -----
.../epam/dlab/auth/SystemUserInfoServiceImpl.java | 74 -------
services/provisioning-service/pom.xml | 20 +-
services/provisioning-service/provisioning.yml | 11 +
.../DropwizardBearerTokenFilterImpl.java | 20 ++
.../backendapi/ProvisioningServiceApplication.java | 49 ++++-
...rovisioningServiceApplicationConfiguration.java | 7 +
.../response/handlers/BackupCallbackHandler.java | 7 +-
.../handlers/CheckInactivityCallbackHandler.java | 11 +-
.../handlers/ComputationalCallbackHandler.java | 6 +-
.../response/handlers/ComputationalConfigure.java | 5 +-
.../ComputationalConfigureCallbackHandler.java | 6 +-
.../response/handlers/EdgeCallbackHandler.java | 4 +-
.../handlers/ExploratoryCallbackHandler.java | 6 +-
.../ExploratoryGitCredsCallbackHandler.java | 8 +-
.../handlers/ImageCreateCallbackHandler.java | 7 +-
.../handlers/LibInstallCallbackHandler.java | 6 +-
.../response/handlers/LibListCallbackHandler.java | 10 +-
.../response/handlers/ProjectCallbackHandler.java | 5 +-
.../response/handlers/ResourceCallbackHandler.java | 12 +-
.../handlers/ResourcesStatusCallbackHandler.java | 6 +-
.../handlers/ReuploadKeyCallbackHandler.java | 7 +-
.../dlab/backendapi/modules/ProductionModule.java | 5 -
.../backendapi/modules/ProvisioningDevModule.java | 16 +-
.../dlab/backendapi/resources/BackupResource.java | 5 +-
.../resources/GitExploratoryResource.java | 8 +-
.../dlab/backendapi/resources/ImageResource.java | 8 +-
.../dlab/backendapi/resources/LibraryResource.java | 12 +-
.../resources/aws/ComputationalResourceAws.java | 6 +-
.../backendapi/resources/aws/EdgeResourceAws.java | 6 +-
.../resources/azure/EdgeResourceAzure.java | 6 +-
.../backendapi/resources/base/EdgeService.java | 3 -
.../resources/base/ExploratoryService.java | 70 +++----
.../resources/base/InfrastructureService.java | 6 +-
.../resources/gcp/ComputationalResourceGcp.java | 6 +-
.../backendapi/resources/gcp/EdgeResourceGcp.java | 2 +-
.../service/impl/CheckInactivityServiceImpl.java | 4 +-
.../backendapi/service/impl/DockerService.java | 23 +-
.../dlab/backendapi/service/impl/KeyService.java | 7 +-
.../service/impl/ProjectServiceImpl.java | 5 +-
.../service/impl/SparkClusterService.java | 9 +-
.../core/commands/CommandExecutorMockTest.java | 4 +-
.../dao/FileSystemCallbackHandlerDaoTest.java | 9 +-
services/security-aws/pom.xml | 58 ------
.../com/epam/dlab/auth/aws/dao/AwsUserDAO.java | 35 ----
.../com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java | 79 -------
.../aws/service/AwsCredentialRefreshService.java | 68 ------
.../aws/service/AwsUserVerificationService.java | 82 --------
services/security-azure/pom.xml | 78 -------
.../dlab/auth/azure/AuthorizationCodeSupplier.java | 44 ----
.../dlab/auth/azure/AuthorizationSupplier.java | 36 ----
.../auth/azure/AzureAuthenticationResource.java | 194 -----------------
.../dlab/auth/azure/AzureLocalAuthResponse.java | 42 ----
.../epam/dlab/auth/azure/AzureLoginUrlBuilder.java | 75 -------
.../dlab/auth/azure/AzureSecurityResource.java | 116 -----------
.../com/epam/dlab/auth/azure/RoleAssignment.java | 37 ----
.../dlab/auth/azure/RoleAssignmentProperties.java | 43 ----
.../dlab/auth/azure/RoleAssignmentResponse.java | 35 ----
.../dlab/auth/azure/UsernamePasswordSupplier.java | 43 ----
.../service/AzureAuthorizationCodeService.java | 46 ----
.../service/AzureAuthorizationCodeServiceImpl.java | 231 ---------------------
services/security-gcp/pom.xml | 66 ------
.../gcp/resources/GcpOauth2SecurityResource.java | 56 -----
.../auth/gcp/service/GcpAuthenticationService.java | 110 ----------
services/security-service/pom.xml | 183 ----------------
services/security-service/security.yml | 150 -------------
.../epam/dlab/auth/SecurityServiceApplication.java | 65 ------
.../dlab/auth/SecurityServiceConfiguration.java | 146 -------------
.../epam/dlab/auth/core/DlabLdapConnection.java | 42 ----
.../dlab/auth/core/DlabLdapConnectionFactory.java | 49 -----
.../epam/dlab/auth/core/ReturnableConnection.java | 67 ------
.../com/epam/dlab/auth/core/SimpleConnection.java | 47 -----
.../java/com/epam/dlab/auth/dao/LdapUserDAO.java | 30 ---
.../com/epam/dlab/auth/dao/LdapUserDAOImpl.java | 165 ---------------
.../main/java/com/epam/dlab/auth/dao/Request.java | 35 ----
.../epam/dlab/auth/dao/UserInfoDAODumbImpl.java | 54 -----
.../epam/dlab/auth/dao/UserInfoDAOMongoImpl.java | 132 ------------
.../auth/modules/AwsSecurityServiceModule.java | 92 --------
.../auth/modules/AzureSecurityServiceModule.java | 78 -------
.../auth/modules/GcpSecurityServiceModule.java | 94 ---------
.../com/epam/dlab/auth/modules/ModuleFactory.java | 43 ----
.../dlab/auth/modules/SecurityServiceModule.java | 66 ------
.../SynchronousLdapAuthenticationResource.java | 80 -------
.../dlab/auth/service/AuthenticationService.java | 34 ---
.../service/impl/LdapAuthenticationService.java | 89 --------
.../security-service/src/main/resources/banner.txt | 6 -
.../impl/LdapAuthenticationServiceTest.java | 139 -------------
services/self-service/pom.xml | 6 +
services/self-service/self-service.yml | 111 +++++++---
.../dlab/backendapi/SelfServiceApplication.java | 19 +-
.../backendapi/auth/KeycloakAuthenticator.java | 52 +++++
.../auth/SelfServiceSecurityAuthenticator.java | 55 -----
.../filters/DropwizardBearerTokenFilterImpl.java | 20 ++
.../dlab/backendapi/conf/CloudConfiguration.java | 35 ++++
.../SelfServiceApplicationConfiguration.java | 24 ++-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 2 +-
.../com/epam/dlab/backendapi/dao/MongoSetting.java | 7 +
.../com/epam/dlab/backendapi/dao/SecurityDAO.java | 40 +++-
.../com/epam/dlab/backendapi/dao/SettingsDAO.java | 88 ++++++++
.../com/epam/dlab/backendapi/dao/UserRoleDao.java | 5 +
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 10 +
.../dlab/backendapi/domain/EnvStatusListener.java | 2 +-
.../dropwizard/bundles/DlabKeycloakBundle.java | 40 ++++
.../dropwizard/listeners/MongoStartupListener.java | 87 ++++++++
.../listeners/RestoreHandlerStartupListener.java | 2 +-
.../ProvisioningServiceHealthCheck.java | 53 -----
.../backendapi/modules/AwsSelfServiceModule.java | 9 +-
.../backendapi/modules/AzureSelfServiceModule.java | 20 +-
.../epam/dlab/backendapi/modules/DevModule.java | 28 ++-
.../backendapi/modules/GcpSelfServiceModule.java | 15 +-
.../dlab/backendapi/modules/ModuleFactory.java | 2 +-
.../dlab/backendapi/modules/ProductionModule.java | 17 +-
.../backendapi/resources/ExploratoryResource.java | 2 +-
.../backendapi/resources/KeycloakResource.java | 50 +++++
.../backendapi/resources/SecurityResource.java | 8 +-
.../resources/aws/ComputationalResourceAws.java | 2 +-
.../azure/ComputationalResourceAzure.java | 2 +-
.../resources/callback/BackupCallback.java | 4 +-
.../callback/CheckInactivityCallback.java | 10 +-
.../resources/callback/ComputationalCallback.java | 9 +-
.../callback/EnvironmentStatusCallback.java | 2 +-
.../resources/callback/ExploratoryCallback.java | 9 +-
.../resources/callback/GitCredsCallback.java | 2 +-
.../resources/callback/ImageCallback.java | 2 +-
.../resources/callback/LibraryCallback.java | 92 ++++----
.../resources/callback/ProjectCallback.java | 4 +-
.../resources/callback/ReuploadKeyCallback.java | 2 +-
.../callback/aws/KeyUploaderCallbackAws.java | 38 ++--
.../callback/azure/EdgeCallbackAzure.java | 32 ++-
.../callback/azure/KeyUploaderCallbackAzure.java | 2 +-
.../resources/callback/base/EdgeCallback.java | 6 +-
.../resources/callback/gcp/EdgeCallbackGcp.java | 4 +-
.../callback/gcp/KeyUploaderCallbackGcp.java | 4 +-
.../resources/gcp/ComputationalResourceGcp.java | 2 +-
.../com/epam/dlab/backendapi/roles/UserRoles.java | 6 +-
.../schedulers/CheckInactivityScheduledJob.java | 4 -
.../schedulers/internal/ManagedScheduler.java | 2 +-
.../dlab/backendapi/service/AccessKeyService.java | 16 ++
.../dlab/backendapi/service/KeycloakService.java | 8 +
.../backendapi/service/KeycloakServiceImpl.java | 66 ++++++
.../backendapi/service/SchedulerJobService.java | 1 -
.../dlab/backendapi/service/SecurityService.java | 8 +
.../backendapi/service/SecurityServiceImpl.java | 51 +++++
.../aws/AwsInfrastructureTemplateService.java | 2 +-
.../gcp/GcpInfrastructureTemplateService.java | 2 +-
.../service/impl/AccessKeyServiceImpl.java | 2 +-
.../service/impl/EnvironmentServiceImpl.java | 17 +-
.../service/impl/GuacamoleServiceImpl.java | 2 +-
.../service/impl/InactivityServiceImpl.java | 8 +-
.../impl/InfrastructureInfoServiceBase.java | 2 +-
.../impl/InfrastructureTemplateServiceBase.java | 2 +-
.../service/impl/SchedulerJobServiceImpl.java | 17 +-
.../servlet/guacamole/GuacamoleSecurityFilter.java | 18 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 14 +-
...fServiceCloudConfigurationSequenceProvider.java | 2 +-
.../src/main/resources/mongo}/aws/mongo_roles.json | 0
.../main/resources/mongo}/azure/mongo_roles.json | 0
.../src/main/resources/mongo}/gcp/mongo_roles.json | 0
.../resources/webapp/src/app/app.routing.module.ts | 2 +-
.../resources/webapp/src/app/core/core.module.ts | 4 +-
.../services/{admin.quard.ts => admin.guard.ts} | 2 +-
.../src/app/core/services/appRouting.service.ts | 2 +-
.../core/services/applicationSecurity.service.ts | 21 +-
.../services/applicationServiceFacade.service.ts | 15 +-
.../src/app/core/services/authorization.guard.ts | 10 +-
.../src/app/core/services/checkParams.guard.ts | 17 +-
.../webapp/src/app/core/services/index.ts | 2 +-
.../webapp/src/app/login/login.component.css | 6 +-
.../webapp/src/app/login/login.component.html | 14 +-
.../webapp/src/app/login/login.component.ts | 13 +-
.../src/app/shared/navbar/navbar.component.ts | 1 -
.../resources/ExploratoryResourceTest.java | 17 --
.../backendapi/resources/SecurityResourceTest.java | 220 --------------------
.../aws/AwsInfrastructureTemplateServiceTest.java | 2 +-
.../gcp/GcpInfrastructureTemplateServiceTest.java | 2 +-
.../service/impl/AccessKeyServiceImplTest.java | 2 +-
.../service/impl/ComputationalServiceImplTest.java | 2 +-
.../service/impl/EnvironmentServiceImplTest.java | 61 +++---
.../service/impl/SchedulerJobServiceImplTest.java | 154 +++++++-------
.../dlab/backendapi/util/RequestBuilderTest.java | 2 +-
187 files changed, 1294 insertions(+), 4784 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org