[cxf] branch master updated: use latest releases of build-utils and xjc-utils, currently there is no need to have snapshot version
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new 55b054d use latest releases of build-utils and xjc-utils, currently there is no need to have snapshot version 55b054d is described below commit 55b054d7582a9448fdba7c01393ff20c31fb0564 Author: Dennis Kieselhorst AuthorDate: Wed Jul 11 09:39:47 2018 +0200 use latest releases of build-utils and xjc-utils, currently there is no need to have snapshot version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6a273f3..de103ca 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ false -3.4.2-SNAPSHOT -3.2.3-SNAPSHOT +3.4.1 +3.2.2 1.8 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site
[cxf] branch 3.2.x-fixes updated: CXF-7759 - Null pointer from the ThreadLocalServletContext class
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 10093a9 CXF-7759 - Null pointer from the ThreadLocalServletContext
class
10093a9 is described below
commit 10093a9546dd340f071d14d3d6730f9ebca9e4df
Author: Colm O hEigeartaigh
AuthorDate: Wed Jul 11 14:28:35 2018 +0100
CXF-7759 - Null pointer from the ThreadLocalServletContext class
(cherry picked from commit 75435cbc19cc5dc75befce1d648a17327bae876d)
---
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index ede0eb9..aa73e64 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -158,8 +158,9 @@ public class JAXRSInvoker extends AbstractInvoker {
final ClassResourceInfo cri = ori.getClassResourceInfo();
final Message inMessage = exchange.getInMessage();
final ServerProviderFactory providerFactory =
ServerProviderFactory.getInstance(inMessage);
+cri.injectContexts(resourceObject, ori, inMessage);
+
if (cri.isRoot()) {
-cri.injectContexts(resourceObject, ori, inMessage);
ProviderInfo appProvider =
providerFactory.getApplicationProvider();
if (appProvider != null) {
InjectionUtils.injectContexts(appProvider.getProvider(),
[cxf] branch 3.1.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.1.x-fixes by this push: new 9b7993c Recording .gitmergeinfo Changes 9b7993c is described below commit 9b7993ce8c6038b42150f773c384ccd6ba727ec0 Author: Colm O hEigeartaigh AuthorDate: Wed Jul 11 15:19:02 2018 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index afcaf1d..aee5b22 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -62,6 +62,7 @@ B 0f018bc0a8cbea00de07f2fe72caffd80cd87bf0 B 0f3e3468906d9a4b55a7aa30276ddf7367687ebb B 0f5b93e81262e7bbc8cc85466fc151a87f67032e B 0f74af5ed7561838e1950c758a7a05e588badd10 +B 10093a9546dd340f071d14d3d6730f9ebca9e4df B 10110bcb6f49bcad1cf239926168783f9bfca3b5 B 101e9a0a43f2d819057d995adbb6e6776d5c7f40 B 1050ec5cc0cd2996c58e3bc611bc6ced3afcc489
[cxf] branch master updated: CXF-7759 - Null pointer from the ThreadLocalServletContext class
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 75435cb CXF-7759 - Null pointer from the ThreadLocalServletContext
class
75435cb is described below
commit 75435cbc19cc5dc75befce1d648a17327bae876d
Author: Colm O hEigeartaigh
AuthorDate: Wed Jul 11 14:28:35 2018 +0100
CXF-7759 - Null pointer from the ThreadLocalServletContext class
---
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index ede0eb9..aa73e64 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -158,8 +158,9 @@ public class JAXRSInvoker extends AbstractInvoker {
final ClassResourceInfo cri = ori.getClassResourceInfo();
final Message inMessage = exchange.getInMessage();
final ServerProviderFactory providerFactory =
ServerProviderFactory.getInstance(inMessage);
+cri.injectContexts(resourceObject, ori, inMessage);
+
if (cri.isRoot()) {
-cri.injectContexts(resourceObject, ori, inMessage);
ProviderInfo appProvider =
providerFactory.getApplicationProvider();
if (appProvider != null) {
InjectionUtils.injectContexts(appProvider.getProvider(),
[cxf-fediz] branch master updated: FEDIZ-221 - Got basic logout functionality working for SAML SSO
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 2f71f20 FEDIZ-221 - Got basic logout functionality working for SAML
SSO
2f71f20 is described below
commit 2f71f20100d4ed7d4cb913023fc983288977
Author: Colm O hEigeartaigh
AuthorDate: Wed Jul 11 16:51:33 2018 +0100
FEDIZ-221 - Got basic logout functionality working for SAML SSO
---
.../idp/beans/SigninParametersCacheAction.java | 40 +++
.../idp/beans/samlsso/AuthnRequestParser.java | 6 +-
.../WEB-INF/flows/federation-validate-request.xml | 2 +-
.../webapp/WEB-INF/flows/saml-validate-request.xml | 3 +-
.../apache/cxf/fediz/systests/samlsso/IdpTest.java | 119 -
5 files changed, 144 insertions(+), 26 deletions(-)
diff --git
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
index bbecc5a..ac69ce6 100644
---
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
+++
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
@@ -62,10 +62,6 @@ public class SigninParametersCacheAction {
if (value != null) {
signinParams.put(IdpConstants.RETURN_ADDRESS, value);
}
-value = WebUtils.getAttributeFromFlowScope(context,
IdpConstants.RETURN_ADDRESS);
-if (value != null) {
-signinParams.put(IdpConstants.RETURN_ADDRESS, value);
-}
if ("samlsso".equals(protocol)) {
value = WebUtils.getAttributeFromFlowScope(context,
IdpConstants.SAML_AUTHN_REQUEST);
@@ -132,18 +128,21 @@ public class SigninParametersCacheAction {
}
}
-public void storeRPConfigInSession(RequestContext context) throws
ProcessingException {
+public void storeRPConfigInSession(RequestContext context, String
replyAddress) throws ProcessingException {
-String wtrealm = (String)WebUtils.getAttributeFromFlowScope(context,
FederationConstants.PARAM_TREALM);
+String realm = (String)WebUtils.getAttributeFromFlowScope(context,
IdpConstants.REALM);
+if (realm == null) {
+realm = (String)WebUtils.getAttributeFromFlowScope(context,
FederationConstants.PARAM_TREALM);
+}
Idp idpConfig = (Idp) WebUtils.getAttributeFromFlowScope(context,
IdpConstants.IDP_CONFIG);
-if (wtrealm == null || idpConfig == null) {
+if (realm == null || idpConfig == null) {
return;
}
-Application serviceConfig = idpConfig.findApplication(wtrealm);
+Application serviceConfig = idpConfig.findApplication(realm);
if (serviceConfig != null) {
if (serviceConfig.getPassiveRequestorEndpoint() == null) {
-String url = guessPassiveRequestorURL(context, wtrealm);
+String url = guessPassiveRequestorURL(context, replyAddress,
realm);
serviceConfig.setPassiveRequestorEndpoint(url);
}
@@ -157,22 +156,25 @@ public class SigninParametersCacheAction {
WebUtils.putAttributeInExternalContext(context,
ACTIVE_APPLICATIONS, realmConfigMap);
}
-if (realmConfigMap.get(wtrealm) == null) {
-realmConfigMap.put(wtrealm, serviceConfig);
+if (realmConfigMap.get(realm) == null) {
+realmConfigMap.put(realm, serviceConfig);
}
}
}
-protected String guessPassiveRequestorURL(RequestContext context, String
wtrealm) throws ProcessingException {
-String url = (String)WebUtils.getAttributeFromFlowScope(context,
FederationConstants.PARAM_REPLY);
-try {
-//basic check if the url is correctly formed
-new URL(url);
-} catch (Exception e) {
-url = null;
+protected String guessPassiveRequestorURL(RequestContext context, String
replyAddress,
+ String realm) throws
ProcessingException {
+String url = replyAddress;
+if (url != null) {
+try {
+//basic check if the url is correctly formed
+new URL(url);
+} catch (Exception e) {
+url = null;
+}
}
if (url == null) {
-url = wtrealm;
+url = realm;
try {
//basic check if the url is correctly formed
new URL(url);
diff --git
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
[cxf-fediz] branch 1.4.x-fixes updated: FEDIZ-221 - Got basic logout functionality working for SAML SSO
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 1.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/1.4.x-fixes by this push:
new f2308fa FEDIZ-221 - Got basic logout functionality working for SAML
SSO
f2308fa is described below
commit f2308fa1cb907fd5be91490c9478b19c0345ea00
Author: Colm O hEigeartaigh
AuthorDate: Wed Jul 11 16:51:33 2018 +0100
FEDIZ-221 - Got basic logout functionality working for SAML SSO
---
.../idp/beans/SigninParametersCacheAction.java | 40 +++
.../idp/beans/samlsso/AuthnRequestParser.java | 6 +-
.../WEB-INF/flows/federation-validate-request.xml | 2 +-
.../webapp/WEB-INF/flows/saml-validate-request.xml | 3 +-
.../org/apache/cxf/fediz/systests/idp/IdpTest.java | 119 -
5 files changed, 144 insertions(+), 26 deletions(-)
diff --git
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
index bbecc5a..ac69ce6 100644
---
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
+++
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
@@ -62,10 +62,6 @@ public class SigninParametersCacheAction {
if (value != null) {
signinParams.put(IdpConstants.RETURN_ADDRESS, value);
}
-value = WebUtils.getAttributeFromFlowScope(context,
IdpConstants.RETURN_ADDRESS);
-if (value != null) {
-signinParams.put(IdpConstants.RETURN_ADDRESS, value);
-}
if ("samlsso".equals(protocol)) {
value = WebUtils.getAttributeFromFlowScope(context,
IdpConstants.SAML_AUTHN_REQUEST);
@@ -132,18 +128,21 @@ public class SigninParametersCacheAction {
}
}
-public void storeRPConfigInSession(RequestContext context) throws
ProcessingException {
+public void storeRPConfigInSession(RequestContext context, String
replyAddress) throws ProcessingException {
-String wtrealm = (String)WebUtils.getAttributeFromFlowScope(context,
FederationConstants.PARAM_TREALM);
+String realm = (String)WebUtils.getAttributeFromFlowScope(context,
IdpConstants.REALM);
+if (realm == null) {
+realm = (String)WebUtils.getAttributeFromFlowScope(context,
FederationConstants.PARAM_TREALM);
+}
Idp idpConfig = (Idp) WebUtils.getAttributeFromFlowScope(context,
IdpConstants.IDP_CONFIG);
-if (wtrealm == null || idpConfig == null) {
+if (realm == null || idpConfig == null) {
return;
}
-Application serviceConfig = idpConfig.findApplication(wtrealm);
+Application serviceConfig = idpConfig.findApplication(realm);
if (serviceConfig != null) {
if (serviceConfig.getPassiveRequestorEndpoint() == null) {
-String url = guessPassiveRequestorURL(context, wtrealm);
+String url = guessPassiveRequestorURL(context, replyAddress,
realm);
serviceConfig.setPassiveRequestorEndpoint(url);
}
@@ -157,22 +156,25 @@ public class SigninParametersCacheAction {
WebUtils.putAttributeInExternalContext(context,
ACTIVE_APPLICATIONS, realmConfigMap);
}
-if (realmConfigMap.get(wtrealm) == null) {
-realmConfigMap.put(wtrealm, serviceConfig);
+if (realmConfigMap.get(realm) == null) {
+realmConfigMap.put(realm, serviceConfig);
}
}
}
-protected String guessPassiveRequestorURL(RequestContext context, String
wtrealm) throws ProcessingException {
-String url = (String)WebUtils.getAttributeFromFlowScope(context,
FederationConstants.PARAM_REPLY);
-try {
-//basic check if the url is correctly formed
-new URL(url);
-} catch (Exception e) {
-url = null;
+protected String guessPassiveRequestorURL(RequestContext context, String
replyAddress,
+ String realm) throws
ProcessingException {
+String url = replyAddress;
+if (url != null) {
+try {
+//basic check if the url is correctly formed
+new URL(url);
+} catch (Exception e) {
+url = null;
+}
}
if (url == null) {
-url = wtrealm;
+url = realm;
try {
//basic check if the url is correctly formed
new URL(url);
diff --git
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
