This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 2d3ec5e114 TOMEE-4118 - CXF 3.4.9
2d3ec5e114 is described below
commit 2d3ec5e114a7b09a021c8970e0c5ee40ff065684
Author: Richard Zowalla <[email protected]>
AuthorDate: Fri Nov 25 13:36:16 2022 +0100
TOMEE-4118 - CXF 3.4.9
---
boms/tomee-microprofile/pom.xml | 42 +++---
boms/tomee-plume/pom.xml | 42 +++---
boms/tomee-plus/pom.xml | 42 +++---
boms/tomee-webprofile/pom.xml | 22 +--
.../cxf/transport/http/auth/HttpAuthHeader.java | 154 -------------------
.../transport/https/HttpsURLConnectionInfo.java | 168 ---------------------
pom.xml | 2 +-
7 files changed, 75 insertions(+), 397 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 1bbf8a4e26..86bf07e790 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -334,7 +334,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,7 +400,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 22809b2333..8d66281ca6 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -576,7 +576,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -587,7 +587,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -598,7 +598,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -609,7 +609,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -620,7 +620,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -631,7 +631,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 8a603b5dd2..03fa15d2fe 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -576,7 +576,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -587,7 +587,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -598,7 +598,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -609,7 +609,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -620,7 +620,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -631,7 +631,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -642,7 +642,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 1979e88fed..3059102914 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -224,7 +224,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -235,7 +235,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -246,7 +246,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -290,7 +290,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.8</version>
+ <version>3.4.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git
a/deps/cxf-shade/src/patch/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
b/deps/cxf-shade/src/patch/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
deleted file mode 100644
index ee7251899e..0000000000
---
a/deps/cxf-shade/src/patch/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.transport.http.auth;
-
-import java.io.IOException;
-import java.io.StreamTokenizer;
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public final class HttpAuthHeader {
- public static final String AUTH_TYPE_BASIC = "Basic";
- public static final String AUTH_TYPE_DIGEST = "Digest";
- public static final String AUTH_TYPE_NEGOTIATE = "Negotiate";
-
- private final String fullHeader;
- private final String authType;
- private final String fullContent;
- private final Map<String, String> params;
-
- public HttpAuthHeader(String fullHeader) {
- this.fullHeader = (fullHeader == null) ? "" : fullHeader;
- int spacePos = this.fullHeader.indexOf(' ');
- if (spacePos == -1) {
- this.authType = this.fullHeader;
- this.fullContent = "";
- } else {
- this.authType = this.fullHeader.substring(0, spacePos);
- this.fullContent = this.fullHeader.substring(spacePos + 1);
- }
- this.params = parseHeader();
- }
- public HttpAuthHeader(List<String> params) {
- fullHeader = String.join(", ", params);
- int spacePos = this.fullHeader.indexOf(' ');
- if (spacePos == -1) {
- this.authType = this.fullHeader;
- this.fullContent = "";
- } else {
- this.authType = this.fullHeader.substring(0, spacePos);
- this.fullContent = this.fullHeader.substring(spacePos + 1);
- }
- this.params = parseHeader();
- }
-
- public HttpAuthHeader(String authType, Map<String, String> params) {
- this.authType = authType;
- this.params = params;
- this.fullContent = paramsToString();
- this.fullHeader = authType + " " + fullContent;
- }
-
- private String paramsToString() {
- StringBuilder builder = new StringBuilder();
- boolean first = true;
- for (Map.Entry<String, String> entry : params.entrySet()) {
- String param = entry.getValue();
- if (param != null) {
- if (!first) {
- builder.append(", ");
- }
- if ("nc".equals(entry.getKey())
- || "qop".equals(entry.getKey())
- || "algorithm".equals(entry.getKey())) {
- builder.append(entry.getKey()).append('=').append(param);
- } else {
-
builder.append(entry.getKey()).append("=\"").append(param).append('"');
- }
- first = false;
- }
- }
- return builder.toString();
- }
-
- private Map<String, String> parseHeader() {
- Map<String, String> map = new HashMap<>();
- try {
- StreamTokenizer tok = new StreamTokenizer(new
StringReader(this.fullContent)) {
- @Override
- public void parseNumbers() {
- // skip parse numbers
- wordChars('0', '9');
- wordChars('.', '.');
- wordChars('-', '-');
- }
- };
- tok.whitespaceChars('=', '=');
- tok.whitespaceChars(',', ',');
-
- while (tok.nextToken() != StreamTokenizer.TT_EOF) {
- map.put(tok.sval, tok.nextToken() != StreamTokenizer.TT_EOF ?
tok.sval : null);
- }
- } catch (IOException ex) {
- //ignore can't happen for StringReader
- }
- return map;
- }
-
- /**
- * Extracts the authorization realm from the
- * "WWW-Authenticate" Http response header.
- *
- * @return The realm, or null if it is non-existent.
- */
- public String getRealm() {
- return params.get("realm");
- }
-
- public boolean authTypeIsDigest() {
- return AUTH_TYPE_DIGEST.equals(this.authType);
- }
-
- public boolean authTypeIsBasic() {
- return AUTH_TYPE_BASIC.equals(this.authType);
- }
-
- public boolean authTypeIsNegotiate() {
- return AUTH_TYPE_NEGOTIATE.equals(this.authType);
- }
-
- public String getAuthType() {
- return authType;
- }
-
- public String getFullContent() {
- return fullContent;
- }
-
- public String getFullHeader() {
- return this.fullHeader;
- }
-
- public Map<String, String> getParams() {
- return params;
- }
-
-}
diff --git
a/deps/cxf-shade/src/patch/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
b/deps/cxf-shade/src/patch/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
deleted file mode 100644
index 31bff301a4..0000000000
---
a/deps/cxf-shade/src/patch/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.transport.https;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.security.Principal;
-import java.security.cert.Certificate;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import org.apache.cxf.transport.http.HttpURLConnectionInfo;
-
-/**
- * This class holds information about the HttpsURLConnection. This
- * class should be used when the getURL().getProtocol() is "https".
- */
-public class HttpsURLConnectionInfo extends HttpURLConnectionInfo {
-
- /**
- * This field contains the cipherSuite enabled in the
- * HTTPS URLconnection.
- */
- protected String enabledCipherSuite;
-
- /**
- * This field contains the certificates that were used to
- * authenticate the connection to the peer.
- */
- protected Certificate[] localCertificates;
-
- /**
- * This field contains the Principal that authenticated to the
- * peer.
- */
- protected Principal localPrincipal;
-
- /**
- * This field contains the certificates the server presented
- * to authenticate.
- */
- protected Certificate[] serverCertificates;
-
- /**
- * This field contains the Principal that represents the
- * authenticated peer.
- */
- protected Principal peerPrincipal;
-
-
- public HttpsURLConnectionInfo(URI uri,
- String method,
- String cipherSuite,
- Certificate[] localCerts,
- Principal principal,
- Certificate[] serverCerts,
- Principal peer) {
- super(uri, method);
- enabledCipherSuite = cipherSuite;
- localCertificates = localCerts;
- localPrincipal = principal;
- serverCertificates = serverCerts;
- peerPrincipal = peer;
- }
-
-
-
- /**
- * This constructor is used to create the info object
- * representing the this HttpsURLConnection. Connection parameter is
- * of supertype HttpURLConnection, which allows internal cast to
- * potentially divergent subtype (Https) implementations.
- */
- public HttpsURLConnectionInfo(HttpURLConnection connection)
- throws IOException {
- super(connection.getURL(), connection.getRequestMethod());
- if (connection instanceof HttpsURLConnection) {
- HttpsURLConnection conn = (HttpsURLConnection) connection;
- enabledCipherSuite = conn.getCipherSuite();
- localCertificates = conn.getLocalCertificates();
- localPrincipal = conn.getLocalPrincipal();
- serverCertificates = conn.getServerCertificates();
- peerPrincipal = conn.getPeerPrincipal();
- } else {
- try {
- Method method =
connection.getClass().getMethod("getCipherSuite", (Class[]) null);
- enabledCipherSuite = (String) method.invoke(connection,
(Object[]) null);
- method =
connection.getClass().getMethod("getLocalCertificates", (Class[]) null);
- localCertificates = (Certificate[]) method.invoke(connection,
(Object[]) null);
- method =
connection.getClass().getMethod("getServerCertificates", (Class[]) null);
- serverCertificates = (Certificate[]) method.invoke(connection,
(Object[]) null);
-
- //TODO Obtain localPrincipal and peerPrincipal using the
com.sun.net.ssl api
- } catch (Exception e) {
- Throwable ex = e;
- if (e instanceof InvocationTargetException) {
- ex = ((InvocationTargetException) e).getTargetException();
- }
- if (ex instanceof IOException) {
- throw (IOException) ex;
- }
- throw new IOException("Error constructing
HttpsURLConnectionInfo "
- + "for connection class "
- +
connection.getClass().getName(), ex);
- }
- }
- }
-
- /**
- * This method returns the cipher suite employed in this
- * HttpsURLConnection.
- */
- public String getEnabledCipherSuite() {
- return enabledCipherSuite;
- }
-
- /**
- * This method returns the certificates that were used to
- * authenticate to the peer.
- */
- public Certificate[] getLocalCertificates() {
- return localCertificates;
- }
-
- /**
- * This method returns the Princpal that authenticated to
- * the peer.
- */
- public Principal getLocalPrincipal() {
- return localPrincipal;
- }
-
- /**
- * This method returns the certificates presented by the
- * peer for authentication.
- */
- public Certificate[] getServerCertificates() {
- return serverCertificates;
- }
-
- /**
- * This method returns the Principal that represents the
- * authenticated peer.
- */
- public Principal getPeerPrincipal() {
- return peerPrincipal;
- }
-}
diff --git a/pom.xml b/pom.xml
index 57e7686494..fb3ac1e5f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,7 @@
<version.activemq>5.16.5</version.activemq>
<version.batchee>1.0.2</version.batchee>
<version.bval>2.0.5</version.bval>
- <version.cxf>3.4.8</version.cxf>
+ <version.cxf>3.4.9</version.cxf>
<version.woodstox>6.4.0</version.woodstox>
<version.geronimo.components>3.1.5</version.geronimo.components>
<version.geronimo-javamail_1.6_mail>1.0.1</version.geronimo-javamail_1.6_mail>
