Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #294 from ZuSe/https-support-for-es

Browse Source 
Https support for es
This commit is contained in:
Jens Kristian Villadsen
2021-12-11 16:14:22 +01:00
committed by GitHub
parent 18cf0fdec7 ff8302a04e
commit 7ece4c3b4e
4 changed files with 122 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java
View File

@@ -89,20 +89,20 @@ public class FhirServerConfigDstu3 extends BaseJavaConfigDstu3 {
@Bean() @Bean()
public ElasticsearchSvcImpl elasticsearchSvc() { public ElasticsearchSvcImpl elasticsearchSvc() {
if (EnvironmentHelper.isElasticsearchEnabled(configurableEnvironment)) { if (Boolean.TRUE.equals(EnvironmentHelper.isElasticsearchEnabled(configurableEnvironment))) {
String elasticsearchUrl = EnvironmentHelper.getElasticsearchServerUrl(configurableEnvironment); String elasticsearchUrl = EnvironmentHelper.getElasticsearchServerUrl(configurableEnvironment);
String elasticsearchHost; String elasticsearchHost = elasticsearchUrl;
if (elasticsearchUrl.startsWith("http")) { String elasticsearchProtocol = EnvironmentHelper.getElasticsearchServerProtocol(configurableEnvironment);
elasticsearchHost = elasticsearchUrl.substring(elasticsearchUrl.indexOf("://") + 3, elasticsearchUrl.lastIndexOf(":")); if (elasticsearchUrl.startsWith("http")) {
} else { elasticsearchProtocol = elasticsearchUrl.split("://")[0];
elasticsearchHost = elasticsearchUrl.substring(0, elasticsearchUrl.indexOf(":")); elasticsearchHost = elasticsearchUrl.split("://")[1];
} }
String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment); String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment);
String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment); String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment);
return new ElasticsearchSvcImpl(elasticsearchHost, elasticsearchUsername, elasticsearchPassword); return new ElasticsearchSvcImpl(elasticsearchProtocol, elasticsearchHost, elasticsearchUsername, elasticsearchPassword);
} else { } else {
return null; return null;
} }
} }
} }

29
src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
View File

@@ -85,21 +85,20 @@ public class FhirServerConfigR4 extends BaseJavaConfigR4 {
@Bean() @Bean()
public ElasticsearchSvcImpl elasticsearchSvc() { public ElasticsearchSvcImpl elasticsearchSvc() {
if (EnvironmentHelper.isElasticsearchEnabled(configurableEnvironment)) { if (Boolean.TRUE.equals(EnvironmentHelper.isElasticsearchEnabled(configurableEnvironment))) {
String elasticsearchUrl = EnvironmentHelper.getElasticsearchServerUrl(configurableEnvironment); String elasticsearchUrl = EnvironmentHelper.getElasticsearchServerUrl(configurableEnvironment);
String elasticsearchHost; String elasticsearchHost = elasticsearchUrl;
if (elasticsearchUrl.startsWith("http")) { String elasticsearchProtocol = EnvironmentHelper.getElasticsearchServerProtocol(configurableEnvironment);
elasticsearchHost = elasticsearchUrl.substring(elasticsearchUrl.indexOf("://") + 3, elasticsearchUrl.lastIndexOf(":")); if (elasticsearchUrl.startsWith("http")) {
} else { elasticsearchProtocol = elasticsearchUrl.split("://")[0];
elasticsearchHost = elasticsearchUrl.substring(0, elasticsearchUrl.indexOf(":")); elasticsearchHost = elasticsearchUrl.split("://")[1];
} }
String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment);
String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment); String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment);
String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment); return new ElasticsearchSvcImpl(elasticsearchProtocol, elasticsearchHost, elasticsearchUsername, elasticsearchPassword);
return new ElasticsearchSvcImpl(elasticsearchHost, elasticsearchUsername, elasticsearchPassword); } else {
} else { return null;
return null; }
}
} }
} }

12
src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java
View File

@@ -86,17 +86,17 @@ public class FhirServerConfigR5 extends BaseJavaConfigR5 {
@Bean() @Bean()
public ElasticsearchSvcImpl elasticsearchSvc() { public ElasticsearchSvcImpl elasticsearchSvc() {
if (EnvironmentHelper.isElasticsearchEnabled(configurableEnvironment)) { if (Boolean.TRUE.equals(EnvironmentHelper.isElasticsearchEnabled(configurableEnvironment))) {
String elasticsearchUrl = EnvironmentHelper.getElasticsearchServerUrl(configurableEnvironment); String elasticsearchUrl = EnvironmentHelper.getElasticsearchServerUrl(configurableEnvironment);
String elasticsearchHost; String elasticsearchHost;
String elasticsearchProtocol = EnvironmentHelper.getElasticsearchServerProtocol(configurableEnvironment);
if (elasticsearchUrl.startsWith("http")) { if (elasticsearchUrl.startsWith("http")) {
elasticsearchHost = elasticsearchUrl.substring(elasticsearchUrl.indexOf("://") + 3, elasticsearchUrl.lastIndexOf(":")); elasticsearchProtocol = elasticsearchUrl.split("://")[0];
} else { elasticsearchHost = elasticsearchUrl.split("://")[1];
elasticsearchHost = elasticsearchUrl.substring(0, elasticsearchUrl.indexOf(":")); }
}
String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment); String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment);
String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment); String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment);
return new ElasticsearchSvcImpl(elasticsearchHost, elasticsearchUsername, elasticsearchPassword); return new ElasticsearchSvcImpl(elasticsearchProtocol, elasticsearchHost, elasticsearchUsername, elasticsearchPassword);
} else { } else {
return null; return null;
} }

176
src/main/resources/application.yaml
View File

@@ -17,20 +17,20 @@ spring:
properties: properties:
hibernate.format_sql: false hibernate.format_sql: false
hibernate.show_sql: false hibernate.show_sql: false
# hibernate.dialect: org.hibernate.dialect.h2dialect # hibernate.dialect: org.hibernate.dialect.h2dialect
# hibernate.hbm2ddl.auto: update # hibernate.hbm2ddl.auto: update
# hibernate.jdbc.batch_size: 20 # hibernate.jdbc.batch_size: 20
# hibernate.cache.use_query_cache: false # hibernate.cache.use_query_cache: false
# hibernate.cache.use_second_level_cache: false # hibernate.cache.use_second_level_cache: false
# hibernate.cache.use_structured_entries: false # hibernate.cache.use_structured_entries: false
# hibernate.cache.use_minimal_puts: false # hibernate.cache.use_minimal_puts: false
### These settings will enable fulltext search with lucene ### These settings will enable fulltext search with lucene
# hibernate.search.enabled: true # hibernate.search.enabled: true
# hibernate.search.backend.type: lucene # hibernate.search.backend.type: lucene
# hibernate.search.backend.analysis.configurer: ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer # hibernate.search.backend.analysis.configurer: ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer
# hibernate.search.backend.directory.type: local-filesystem # hibernate.search.backend.directory.type: local-filesystem
# hibernate.search.backend.directory.root: target/lucenefiles # hibernate.search.backend.directory.root: target/lucenefiles
# hibernate.search.backend.lucene_version: lucene_current # hibernate.search.backend.lucene_version: lucene_current
batch: batch:
job: job:
enabled: false enabled: false
@@ -40,57 +40,57 @@ hapi:
openapi_enabled: true openapi_enabled: true
### This is the FHIR version. Choose between, DSTU2, DSTU3, R4 or R5 ### This is the FHIR version. Choose between, DSTU2, DSTU3, R4 or R5
fhir_version: R4 fhir_version: R4
### enable to use the ApacheProxyAddressStrategy which uses X-Forwarded-* headers ### enable to use the ApacheProxyAddressStrategy which uses X-Forwarded-* headers
### to determine the FHIR server address ### to determine the FHIR server address
# use_apache_address_strategy: false # use_apache_address_strategy: false
### forces the use of the https:// protocol for the returned server address. ### forces the use of the https:// protocol for the returned server address.
### alternatively, it may be set using the X-Forwarded-Proto header. ### alternatively, it may be set using the X-Forwarded-Proto header.
# use_apache_address_strategy_https: false # use_apache_address_strategy_https: false
### enable to set the Server URL ### enable to set the Server URL
# server_address: http://hapi.fhir.org/baseR4 # server_address: http://hapi.fhir.org/baseR4
# defer_indexing_for_codesystems_of_size: 101 # defer_indexing_for_codesystems_of_size: 101
# install_transitive_ig_dependencies: true # install_transitive_ig_dependencies: true
# implementationguides: # implementationguides:
### example from registry (packages.fhir.org) ### example from registry (packages.fhir.org)
# swiss: # swiss:
# name: swiss.mednet.fhir # name: swiss.mednet.fhir
# version: 0.8.0 # version: 0.8.0
# example not from registry # example not from registry
# ips_1_0_0: # ips_1_0_0:
# url: https://build.fhir.org/ig/HL7/fhir-ips/package.tgz # url: https://build.fhir.org/ig/HL7/fhir-ips/package.tgz
# name: hl7.fhir.uv.ips # name: hl7.fhir.uv.ips
# version: 1.0.0 # version: 1.0.0
# supported_resource_types: # supported_resource_types:
# - Patient # - Patient
# - Observation # - Observation
# allow_cascading_deletes: true # allow_cascading_deletes: true
# allow_contains_searches: true # allow_contains_searches: true
# allow_external_references: true # allow_external_references: true
# allow_multiple_delete: true # allow_multiple_delete: true
# allow_override_default_search_params: true # allow_override_default_search_params: true
# auto_create_placeholder_reference_targets: false # auto_create_placeholder_reference_targets: false
# cql_enabled: true # cql_enabled: true
# default_encoding: JSON # default_encoding: JSON
# default_pretty_print: true # default_pretty_print: true
# default_page_size: 20 # default_page_size: 20
# delete_expunge_enabled: true # delete_expunge_enabled: true
# enable_repository_validating_interceptor: false # enable_repository_validating_interceptor: false
# enable_index_missing_fields: false # enable_index_missing_fields: false
# enable_index_contained_resource: false # enable_index_contained_resource: false
# enforce_referential_integrity_on_delete: false # enforce_referential_integrity_on_delete: false
# enforce_referential_integrity_on_write: false # enforce_referential_integrity_on_write: false
# etag_support_enabled: true # etag_support_enabled: true
# expunge_enabled: true # expunge_enabled: true
# daoconfig_client_id_strategy: null # daoconfig_client_id_strategy: null
# client_id_strategy: ALPHANUMERIC # client_id_strategy: ALPHANUMERIC
# fhirpath_interceptor_enabled: false # fhirpath_interceptor_enabled: false
# filter_search_enabled: true # filter_search_enabled: true
# graphql_enabled: true # graphql_enabled: true
# narrative_enabled: true # narrative_enabled: true
# mdm_enabled: true # mdm_enabled: true
# partitioning: # partitioning:
# allow_references_across_partitions: false # allow_references_across_partitions: false
# partitioning_include_in_search_hashes: false # partitioning_include_in_search_hashes: false
cors: cors:
allow_Credentials: true allow_Credentials: true
# These are allowed_origin patterns, see: https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/cors/CorsConfiguration.html#setAllowedOriginPatterns-java.util.List- # These are allowed_origin patterns, see: https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/cors/CorsConfiguration.html#setAllowedOriginPatterns-java.util.List-
@@ -102,30 +102,30 @@ hapi:
search-coord-max-pool-size: 100 search-coord-max-pool-size: 100
search-coord-queue-capacity: 200 search-coord-queue-capacity: 200
# logger: # logger:
# error_format: 'ERROR - ${requestVerb} ${requestUrl}' # error_format: 'ERROR - ${requestVerb} ${requestUrl}'
# format: >- # format: >-
# Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] # Path[${servletPath}] Source[${requestHeader.x-forwarded-for}]
# Operation[${operationType} ${operationName} ${idOrResourceName}] # Operation[${operationType} ${operationName} ${idOrResourceName}]
# UA[${requestHeader.user-agent}] Params[${requestParameters}] # UA[${requestHeader.user-agent}] Params[${requestParameters}]
# ResponseEncoding[${responseEncodingNoDefault}] # ResponseEncoding[${responseEncodingNoDefault}]
# log_exceptions: true # log_exceptions: true
# name: fhirtest.access # name: fhirtest.access
# max_binary_size: 104857600 # max_binary_size: 104857600
# max_page_size: 200 # max_page_size: 200
# retain_cached_searches_mins: 60 # retain_cached_searches_mins: 60
# reuse_cached_search_results_millis: 60000 # reuse_cached_search_results_millis: 60000
tester: tester:
home: home:
name: Local Tester name: Local Tester
server_address: 'http://localhost:8080/fhir' server_address: 'http://localhost:8080/fhir'
refuse_to_fetch_third_party_urls: false refuse_to_fetch_third_party_urls: false
fhir_version: R4 fhir_version: R4
global: global:
name: Global Tester name: Global Tester
server_address: "http://hapi.fhir.org/baseR4" server_address: "http://hapi.fhir.org/baseR4"
refuse_to_fetch_third_party_urls: false refuse_to_fetch_third_party_urls: false
fhir_version: R4 fhir_version: R4
# validation: # validation:
# requests_enabled: true # requests_enabled: true
# responses_enabled: true # responses_enabled: true