From a2b242d6314d174a73cecb6dd03df7ce0787f705 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 7 Feb 2020 10:59:24 -0500 Subject: [PATCH] Allow clients to set the secure protocol, if needed. Use the default handshake negotiation if not set. --- .idea/compiler.xml | 19 ++++++++++++ .idea/encodings.xml | 8 +++++ ..._ch_qos_logback_logback_classic_1_0_13.xml | 13 +++++++++ ...en__ch_qos_logback_logback_core_1_0_13.xml | 13 +++++++++ ...jackson_core_jackson_annotations_2_6_0.xml | 13 +++++++++ ...terxml_jackson_core_jackson_core_2_6_0.xml | 13 +++++++++ ...ml_jackson_core_jackson_databind_2_6_0.xml | 13 +++++++++ ...ax_annotation_javax_annotation_api_1_2.xml | 13 +++++++++ ...ven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml | 13 +++++++++ .idea/libraries/Maven__junit_junit_4_12.xml | 13 +++++++++ ...cube_common_authorization_client_2_0_6.xml | 13 +++++++++ ...cube_common_common_authorization_2_2_0.xml | 13 +++++++++ ...n_configuration_scanner_1_0_0_SNAPSHOT.xml | 13 +++++++++ ...gcube_core_common_scope_1_2_2_SNAPSHOT.xml | 13 +++++++++ ..._core_common_scope_maps_1_2_0_SNAPSHOT.xml | 13 +++++++++ ...ernal_aopalliance_repackaged_2_5_0_b32.xml | 13 +++++++++ ...sh_hk2_external_javax_inject_2_5_0_b32.xml | 13 +++++++++ ...n__org_glassfish_hk2_hk2_api_2_5_0_b32.xml | 13 +++++++++ ...rg_glassfish_hk2_hk2_locator_2_5_0_b32.xml | 13 +++++++++ ..._org_glassfish_hk2_hk2_utils_2_5_0_b32.xml | 13 +++++++++ ...ssfish_hk2_osgi_resource_locator_1_0_1.xml | 13 +++++++++ ...bundles_repackaged_jersey_guava_2_25_1.xml | 13 +++++++++ ...sfish_jersey_core_jersey_client_2_25_1.xml | 13 +++++++++ ...sfish_jersey_core_jersey_common_2_25_1.xml | 13 +++++++++ ...lassfish_jersey_inject_jersey_hk2_2_27.xml | 13 +++++++++ .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 +++++++++ ...ven__org_javassist_javassist_3_20_0_GA.xml | 13 +++++++++ .../Maven__org_slf4j_slf4j_api_1_7_25.xml | 13 +++++++++ gxHTTP/gxHTTP.iml | 8 ++--- gxJRS/gxJRS.iml | 8 ++--- .../request/GXWebTargetAdapterRequest.java | 29 ++++++++++++++++--- 31 files changed, 398 insertions(+), 12 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_0.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_0.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_0.xml create mode 100644 .idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml create mode 100644 .idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml create mode 100644 .idea/libraries/Maven__org_gcube_common_authorization_client_2_0_6.xml create mode 100644 .idea/libraries/Maven__org_gcube_common_common_authorization_2_2_0.xml create mode 100644 .idea/libraries/Maven__org_gcube_core_common_configuration_scanner_1_0_0_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_gcube_core_common_scope_1_2_2_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_gcube_core_common_scope_maps_1_2_0_SNAPSHOT.xml create mode 100644 .idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_5_0_b32.xml create mode 100644 .idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_5_0_b32.xml create mode 100644 .idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_5_0_b32.xml create mode 100644 .idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_5_0_b32.xml create mode 100644 .idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_5_0_b32.xml create mode 100644 .idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml create mode 100644 .idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_25_1.xml create mode 100644 .idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_25_1.xml create mode 100644 .idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_25_1.xml create mode 100644 .idea/libraries/Maven__org_glassfish_jersey_inject_jersey_hk2_2_27.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 .idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..40ecd6b --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e683276 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml new file mode 100644 index 0000000..3d4778e --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml new file mode 100644 index 0000000..45d3320 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_0.xml new file mode 100644 index 0000000..cc9065d --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_0.xml new file mode 100644 index 0000000..947b449 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_0.xml new file mode 100644 index 0000000..e5f331f --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml new file mode 100644 index 0000000..e35b936 --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_gcube_common_authorization_client_2_0_6.xml b/.idea/libraries/Maven__org_gcube_common_authorization_client_2_0_6.xml new file mode 100644 index 0000000..d1c99f8 --- /dev/null +++ b/.idea/libraries/Maven__org_gcube_common_authorization_client_2_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_gcube_common_common_authorization_2_2_0.xml b/.idea/libraries/Maven__org_gcube_common_common_authorization_2_2_0.xml new file mode 100644 index 0000000..6f76790 --- /dev/null +++ b/.idea/libraries/Maven__org_gcube_common_common_authorization_2_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_gcube_core_common_configuration_scanner_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__org_gcube_core_common_configuration_scanner_1_0_0_SNAPSHOT.xml new file mode 100644 index 0000000..7610791 --- /dev/null +++ b/.idea/libraries/Maven__org_gcube_core_common_configuration_scanner_1_0_0_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_gcube_core_common_scope_1_2_2_SNAPSHOT.xml b/.idea/libraries/Maven__org_gcube_core_common_scope_1_2_2_SNAPSHOT.xml new file mode 100644 index 0000000..91d264f --- /dev/null +++ b/.idea/libraries/Maven__org_gcube_core_common_scope_1_2_2_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_gcube_core_common_scope_maps_1_2_0_SNAPSHOT.xml b/.idea/libraries/Maven__org_gcube_core_common_scope_maps_1_2_0_SNAPSHOT.xml new file mode 100644 index 0000000..fd4b5ec --- /dev/null +++ b/.idea/libraries/Maven__org_gcube_core_common_scope_maps_1_2_0_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_5_0_b32.xml b/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_5_0_b32.xml new file mode 100644 index 0000000..bd18652 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_5_0_b32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_5_0_b32.xml b/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_5_0_b32.xml new file mode 100644 index 0000000..d948e06 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_5_0_b32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_5_0_b32.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_5_0_b32.xml new file mode 100644 index 0000000..1038f7c --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_5_0_b32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_5_0_b32.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_5_0_b32.xml new file mode 100644 index 0000000..73aa3db --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_5_0_b32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_5_0_b32.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_5_0_b32.xml new file mode 100644 index 0000000..5733415 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_5_0_b32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml b/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml new file mode 100644 index 0000000..3d299fa --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_25_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_25_1.xml new file mode 100644 index 0000000..86076d5 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_25_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_25_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_25_1.xml new file mode 100644 index 0000000..a2b3a50 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_25_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_25_1.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_25_1.xml new file mode 100644 index 0000000..253d2c2 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_25_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_inject_jersey_hk2_2_27.xml b/.idea/libraries/Maven__org_glassfish_jersey_inject_jersey_hk2_2_27.xml new file mode 100644 index 0000000..cc05484 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jersey_inject_jersey_hk2_2_27.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml new file mode 100644 index 0000000..c21c9b0 --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml new file mode 100644 index 0000000..20e8163 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/gxHTTP/gxHTTP.iml b/gxHTTP/gxHTTP.iml index 578a400..fd62e50 100644 --- a/gxHTTP/gxHTTP.iml +++ b/gxHTTP/gxHTTP.iml @@ -11,11 +11,11 @@ - - + + - - + + diff --git a/gxJRS/gxJRS.iml b/gxJRS/gxJRS.iml index d30db3d..43425d0 100644 --- a/gxJRS/gxJRS.iml +++ b/gxJRS/gxJRS.iml @@ -13,11 +13,11 @@ - - + + - - + + diff --git a/gxJRS/src/main/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequest.java b/gxJRS/src/main/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequest.java index 3b8cd05..c76b582 100644 --- a/gxJRS/src/main/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequest.java +++ b/gxJRS/src/main/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequest.java @@ -55,21 +55,42 @@ public class GXWebTargetAdapterRequest implements GXHTTP,GXInboundResp * @return the request */ public static GXWebTargetAdapterRequest newRequest(String address) { - return new GXWebTargetAdapterRequest(address, false); + return new GXWebTargetAdapterRequest(address, false, "Default"); } + /** + * Creates a new secure request. + * + * @param address + * the address of the web app to call + * @param tslprotocol + * the secure socket protocol to use in the call + * @return the request + */ + public static GXWebTargetAdapterRequest newRequest(String address, String tslprotocol) { + return new GXWebTargetAdapterRequest(address, false, tslprotocol); + } + + /** + * Creates a new request. + * + * @param address + * the address of the web app to call + + * @return the request + */ public static GXWebTargetAdapterRequest newHTTPSRequest(String address) { - return new GXWebTargetAdapterRequest(address, true); + return new GXWebTargetAdapterRequest(address, true,"Default"); } /** * @param address */ - private GXWebTargetAdapterRequest(String address, boolean withHTTPS) { + private GXWebTargetAdapterRequest(String address, boolean withHTTPS, String tslprotocol ) { Client client = ClientBuilder.newClient(); if (withHTTPS) { try { - SSLContext sc = SSLContext.getInstance("TLSv1.2"); + SSLContext sc = SSLContext.getInstance(tslprotocol); TrustManager[] certs = new TrustManager[] { new X509TrustManager() { @Override public X509Certificate[] getAcceptedIssuers() {