This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch dev-env-fix
in repository https://gitbox.apache.org/repos/asf/airavata.git
from c48e9a8e90 remove unused properties and getters/setters. fix few code
warnings
add f3e06c1a87 use java truststore. run keytool to add self-signed *.key
files here. change keystore format to p12. airavata.p12 must bundle AES key
(airavata) and *.crt/pem. simplify security vars, remove dead props.
No new revisions were added by this update.
Summary of changes:
.devcontainer/Dockerfile | 4 +-
.devcontainer/docker-compose-alt.yml | 6 +-
.devcontainer/docker-compose.yml | 17 +-
.devcontainer/proxy/{proxy.conf => http.conf} | 2 +-
.devcontainer/proxy/nginx.conf | 15 ++
.devcontainer/proxy/stream.conf | 18 ++
.run/APIServerStarter.run.xml | 6 -
.run/JobEngineStarter.run.xml | 6 -
.run/JobMonitorStarter.run.xml | 6 -
README.md | 7 +-
airavata-api/src/main/docker/Dockerfile | 2 -
.../airavata/api/client/AiravataClientFactory.java | 64 ++----
.../airavata/api/server/AiravataAPIServer.java | 130 ++++-------
.../airavata/common/utils/ApplicationSettings.java | 17 --
.../apache/airavata/common/utils/Constants.java | 4 -
.../apache/airavata/common/utils/SecurityUtil.java | 98 +--------
.../airavata/common/utils/ServerSettings.java | 36 +--
.../credential/store/client/TestSSLClient.java | 2 +-
.../airavata/helix/impl/task/TaskContext.java | 2 +-
.../appcatalog/GwyResourceProfileRepository.java | 1 +
.../airavata/security/util/TrustStoreManager.java | 100 ---------
.../core/impl/TenantManagementKeycloakImpl.java | 63 ++----
.../service/security/AiravataSecurityManager.java | 7 +-
.../service/security/KeyCloakSecurityManager.java | 242 +++++++--------------
.../service/security/SecurityManagerFactory.java | 11 +-
.../security/interceptor/SecurityInterceptor.java | 2 +-
.../registry/server/SharingRegistryServer.java | 16 +-
.../src/main/resources/airavata-server.properties | 13 +-
airavata-api/src/main/resources/dozer_mapping.xml | 6 +-
.../airavata/common/utils/SecurityUtilTest.java | 47 ++--
.../store/cpi/SSHSummaryTest/SSHSummaryTest.java | 2 +-
.../store/store/impl/db/CredentialsDAOTest.java | 4 +-
.../security/KeyCloakSecurityManagerTest.java | 11 +-
.../airavata/sharing/registry/CipresTest.java | 3 +-
.../registry/SharingRegistryServiceTest.java | 3 +-
.../scigap/develop/group_vars/all/vars.yml | 8 +-
.../scigap/production/group_vars/all/vars.yml | 8 +-
.../scigap/staging/group_vars/all/vars.yml | 8 +-
.../scigap/testing/group_vars/all/vars.yml | 8 +-
.../inventories/standalone/group_vars/all/vars.yml | 6 +-
.../inventories/template/group_vars/all/vars.yml | 6 +-
.../templates/airavata-server.properties.j2 | 8 -
dev-tools/ansible/roles/common/defaults/main.yml | 4 +-
dev-tools/ansible/roles/common/tasks/main.yml | 4 +-
dev-tools/ansible/roles/keycloak/defaults/main.yml | 4 +-
.../deployment-scripts/distribution_update.sh | 8 +-
dev-tools/load-client/pom.xml | 24 +-
.../src/main/assembly/load-client-bin-assembly.xml | 2 +-
.../org/apache/airavata/tools/load/LoadClient.java | 23 +-
.../airavata/tools/load/SecurityManager.java | 92 --------
.../apache/airavata/tools/load/StatusMonitor.java | 18 +-
.../org/apache/airavata/tools/load/UnitLoad.java | 19 +-
.../airavata/client/secure/client/Properties.java | 2 +-
keystores/aes.p12 | Bin 0 -> 409 bytes
keystores/airavata.jks | Bin 2848 -> 0 bytes
keystores/generate_keystore.sh | 25 ++-
keystores/server.crt | 18 ++
keystores/server.key | 28 +++
modules/agent-framework/agent-service/pom.xml | 2 +-
.../main/assembly/agent-service-bin-assembly.xml | 2 +-
.../service/services/AiravataService.java | 15 +-
.../src/main/resources/application.yml | 11 +-
.../resources/distribution/bin/agent-service.sh | 2 +-
modules/ide-integration/README.md | 13 +-
.../assembly/research-service-bin-assembly.xml | 2 +-
.../resources/distribution/bin/research-service.sh | 2 +-
66 files changed, 411 insertions(+), 934 deletions(-)
rename .devcontainer/proxy/{proxy.conf => http.conf} (99%)
create mode 100644 .devcontainer/proxy/nginx.conf
create mode 100644 .devcontainer/proxy/stream.conf
delete mode 100644
airavata-api/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java
delete mode 100644
dev-tools/load-client/src/main/java/org/apache/airavata/tools/load/SecurityManager.java
create mode 100644 keystores/aes.p12
delete mode 100644 keystores/airavata.jks
create mode 100644 keystores/server.crt
create mode 100644 keystores/server.key
