You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/11/08 14:56:28 UTC
[01/14] cxf-fediz git commit: [FEDIZ-174] Updating to CXF
3.1.8-SNAPSHOT
Repository: cxf-fediz
Updated Branches:
refs/heads/1.3.x-fixes [created] 1d904eda8
[FEDIZ-174] Updating to CXF 3.1.8-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6b29a87d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6b29a87d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6b29a87d
Branch: refs/heads/1.3.x-fixes
Commit: 6b29a87dd101f15d195fb59b220e67c7f25ec0e9
Parents: b4ac287
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Sep 14 11:41:23 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:42:51 2016 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
services/idp/pom.xml | 5 -----
services/idp/src/main/resources/restContext.xml | 8 +++++---
3 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index beea523..2a07571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<commons.logging.version>1.2</commons.logging.version>
<commons.io.version>2.5</commons.io.version>
<commons.validator.version>1.5.1</commons.validator.version>
- <cxf.version>3.1.7</cxf.version>
+ <cxf.version>3.1.8-SNAPSHOT</cxf.version>
<cxf.build-utils.version>3.2.0</cxf.build-utils.version>
<easymock.version>3.4</easymock.version>
<ecj.version>4.5.1</ecj.version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index f7f8824..b7e918f 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -259,11 +259,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jaxrs</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>${commons.validator.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/services/idp/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/restContext.xml b/services/idp/src/main/resources/restContext.xml
index 6e3aaaf..1d6f446 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -55,7 +55,10 @@
<bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider" />
- <!-- CXF Swagger2Feature -->
+ <!-- CXF Swagger2Feature -->
+ <bean id="swagger2Serializers" class="org.apache.cxf.jaxrs.swagger.DefaultSwagger2Serializers">
+ <property name="replaceTags" value="true" />
+ </bean>
<bean id="swagger2Feature" class="org.apache.cxf.jaxrs.swagger.Swagger2Feature">
<property name="title" value="Apache Fediz IDP" />
<property name="version" value="${project.version}" />
@@ -65,8 +68,7 @@
<property name="resourcePackage" value="org.apache.cxf.fediz.service.idp.rest" />
<property name="scanAllResources" value="true" />
- <property name="dynamicBasePath" value="true" />
- <property name="replaceTags" value="true" />
+ <property name="swagger2Serializers" ref="swagger2Serializers" />
<property name="prettyPrint" value="true" />
</bean>
[09/14] cxf-fediz git commit: Switching jackson + updating ehcache
Posted by co...@apache.org.
Switching jackson + updating ehcache
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ff78d7b3
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ff78d7b3
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ff78d7b3
Branch: refs/heads/1.3.x-fixes
Commit: ff78d7b39b6c5b1dafd1827f30f0524df18f3fe8
Parents: e79c279
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Oct 18 14:50:40 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:46:51 2016 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
services/idp/pom.xml | 11 +++--------
services/idp/src/main/resources/restContext.xml | 2 +-
3 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0320c2..176e432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<cxf.build-utils.version>3.2.0</cxf.build-utils.version>
<easymock.version>3.4</easymock.version>
<ecj.version>4.6.1</ecj.version>
- <ehcache.version>2.9.0</ehcache.version>
+ <ehcache.version>2.10.3</ehcache.version>
<httpclient.version>4.3.5</httpclient.version>
<hsqldb.version>2.3.4</hsqldb.version>
<htmlunit.version>2.23</htmlunit.version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index e3ce225..6edde85 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -196,14 +196,9 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/services/idp/src/main/resources/restContext.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/restContext.xml b/services/idp/src/main/resources/restContext.xml
index 1d6f446..ba22cd3 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -53,7 +53,7 @@
<bean id="exceptionMapper"
class="org.apache.cxf.fediz.service.idp.rest.RestServiceExceptionMapper" />
- <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider" />
+ <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider" />
<!-- CXF Swagger2Feature -->
<bean id="swagger2Serializers" class="org.apache.cxf.jaxrs.swagger.DefaultSwagger2Serializers">
[11/14] cxf-fediz git commit: Updating LDAP
Posted by co...@apache.org.
Updating LDAP
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/afde06a1
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/afde06a1
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/afde06a1
Branch: refs/heads/1.3.x-fixes
Commit: afde06a17d90346d827af1cfed8706aecf88ad12
Parents: e1ca166
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Oct 19 15:49:26 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:47:12 2016 +0000
----------------------------------------------------------------------
services/sts/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/afde06a1/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 42df406..979a7d5 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
- <version>2.0.4.RELEASE</version>
+ <version>2.1.0.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
[08/14] cxf-fediz git commit: Updating some dependencies
Posted by co...@apache.org.
Updating some dependencies
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e79c2795
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e79c2795
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e79c2795
Branch: refs/heads/1.3.x-fixes
Commit: e79c2795e6fc0734fe357278d45bd60a4fabff7e
Parents: fe5c61a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Oct 17 11:05:40 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:46:41 2016 +0000
----------------------------------------------------------------------
pom.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e79c2795/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2a07571..b0320c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,34 +40,34 @@
<apacheds.version>2.0.0-M23</apacheds.version>
<bcprov.version>1.54</bcprov.version>
<bval.version>1.1.1</bval.version>
- <commons.lang.version>3.4</commons.lang.version>
+ <commons.lang.version>3.5</commons.lang.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.io.version>2.5</commons.io.version>
<commons.validator.version>1.5.1</commons.validator.version>
<cxf.version>3.1.8-SNAPSHOT</cxf.version>
<cxf.build-utils.version>3.2.0</cxf.build-utils.version>
<easymock.version>3.4</easymock.version>
- <ecj.version>4.5.1</ecj.version>
+ <ecj.version>4.6.1</ecj.version>
<ehcache.version>2.9.0</ehcache.version>
<httpclient.version>4.3.5</httpclient.version>
<hsqldb.version>2.3.4</hsqldb.version>
- <htmlunit.version>2.22</htmlunit.version>
+ <htmlunit.version>2.23</htmlunit.version>
<javassist.version>3.16.1-GA</javassist.version>
<javax.el.version>2.2</javax.el.version>
<javax.validation.version>1.1.0.Final</javax.validation.version>
<jericho.version>3.3</jericho.version>
- <jetty8.version>8.1.19.v20160209</jetty8.version>
- <jetty9.version>9.3.8.v20160314</jetty9.version>
+ <jetty8.version>8.1.22.v20160922</jetty8.version>
+ <jetty9.version>9.3.9.v20160517</jetty9.version>
<junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
- <ognl.version>3.1.5</ognl.version>
+ <ognl.version>3.1.11</ognl.version>
<openjpa.version>2.4.1</openjpa.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.21</slf4j.version>
- <spring.version>4.1.9.RELEASE</spring.version>
+ <spring.version>4.3.3.RELEASE</spring.version>
<spring.security.version>3.2.9.RELEASE</spring.security.version>
- <tomcat7.version>7.0.70</tomcat7.version>
- <tomcat8.version>8.0.36</tomcat8.version>
+ <tomcat7.version>7.0.72</tomcat7.version>
+ <tomcat8.version>8.0.38</tomcat8.version>
<wss4j.version>2.1.7</wss4j.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
[14/14] cxf-fediz git commit: Fixing merge
Posted by co...@apache.org.
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1d904eda
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1d904eda
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1d904eda
Branch: refs/heads/1.3.x-fixes
Commit: 1d904eda8a7ca4236cff7bb1bc6cc022581fa939
Parents: 1879daf
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Nov 8 14:48:44 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:48:44 2016 +0000
----------------------------------------------------------------------
services/sts/src/main/webapp/WEB-INF/ldap.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1d904eda/services/sts/src/main/webapp/WEB-INF/ldap.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/ldap.xml b/services/sts/src/main/webapp/WEB-INF/ldap.xml
index 8b36f86..9ee9807 100644
--- a/services/sts/src/main/webapp/WEB-INF/ldap.xml
+++ b/services/sts/src/main/webapp/WEB-INF/ldap.xml
@@ -102,7 +102,7 @@
</bean>
<jaxws:endpoint id="transportSTS1" implementor="#transportSTSProviderBean"
- address="/REALMA/STSServiceTransportUT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+ address="/STSService" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port">
<jaxws:properties>
[13/14] cxf-fediz git commit: Fixing LDAP configuration
Posted by co...@apache.org.
Fixing LDAP configuration
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1879dafc
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1879dafc
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1879dafc
Branch: refs/heads/1.3.x-fixes
Commit: 1879dafcc6a2c51b42be5413a5925a9b53d51e5d
Parents: 940d2fb
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Oct 25 16:55:23 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:47:44 2016 +0000
----------------------------------------------------------------------
services/sts/src/main/webapp/WEB-INF/ldap.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1879dafc/services/sts/src/main/webapp/WEB-INF/ldap.xml
----------------------------------------------------------------------
diff --git a/services/sts/src/main/webapp/WEB-INF/ldap.xml b/services/sts/src/main/webapp/WEB-INF/ldap.xml
index dbd3265..8b36f86 100644
--- a/services/sts/src/main/webapp/WEB-INF/ldap.xml
+++ b/services/sts/src/main/webapp/WEB-INF/ldap.xml
@@ -102,16 +102,16 @@
</bean>
<jaxws:endpoint id="transportSTS1" implementor="#transportSTSProviderBean"
- address="/STSService" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+ address="/REALMA/STSServiceTransportUT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port">
<jaxws:properties>
<entry key="ws-security.ut.validator">
- <bean class="org.apache.ws.security.validate.JAASUsernameTokenValidator">
+ <bean class="org.apache.wss4j.dom.validate.JAASUsernameTokenValidator">
<property name="contextName" value="LDAP" />
</bean>
</entry>
</jaxws:properties>
</jaxws:endpoint>
-</beans>
\ No newline at end of file
+</beans>
[07/14] cxf-fediz git commit: Allow to define properties on
STSClientAction to support other authentication styles against the STS (x509
for example)
Posted by co...@apache.org.
Allow to define properties on STSClientAction to support other authentication styles against the STS (x509 for example)
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/fe5c61ab
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/fe5c61ab
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/fe5c61ab
Branch: refs/heads/1.3.x-fixes
Commit: fe5c61ab08de600faba385b05c3b4ffd3109947f
Parents: b0774d6
Author: Jan Bernhardt <jb...@talend.com>
Authored: Thu Aug 4 16:16:07 2016 +0200
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:43:48 2016 +0000
----------------------------------------------------------------------
.../fediz/service/idp/beans/STSClientAction.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fe5c61ab/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
index dbfbed2..dbe4a25 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
@@ -24,6 +24,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.security.cert.X509Certificate;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.xml.namespace.QName;
@@ -92,6 +93,8 @@ public class STSClientAction {
protected String tokenType = WSConstants.WSS_SAML2_TOKEN_TYPE;
+ protected Map<String, Object> properties;
+
protected boolean use200502Namespace;
protected int ttl = 1800;
@@ -102,6 +105,7 @@ public class STSClientAction {
private String keyType = HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512_BEARER;
+
public String getWsdlLocation() {
return wsdlLocation;
}
@@ -273,6 +277,10 @@ public class STSClientAction {
LOG.error("Protocol {} not supported for realm {} ", serviceConfig.getProtocol(), realm);
throw new ProcessingException(TYPE.BAD_REQUEST);
}
+
+ if (properties != null) {
+ sts.setProperties(properties);
+ }
Element rpToken = null;
try {
@@ -425,4 +433,12 @@ public class STSClientAction {
}
}
}
+
+ public Map<String, Object> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Map<String, Object> properties) {
+ this.properties = properties;
+ }
}
[06/14] cxf-fediz git commit: Optinally persisting client cred client
records
Posted by co...@apache.org.
Optinally persisting client cred client records
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b0774d6f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b0774d6f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b0774d6f
Branch: refs/heads/1.3.x-fixes
Commit: b0774d6fd19d087098a2961b365ea3da2aaec318
Parents: af92516
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Sep 26 13:46:59 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:43:38 2016 +0000
----------------------------------------------------------------------
.../service/oidc/OAuthDataProviderImpl.java | 32 +++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b0774d6f/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
index 6b402b7..a14af3b 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
@@ -43,6 +43,7 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
private static final Logger LOG = LogUtils.getL7dLogger(OAuthDataProviderImpl.class);
private boolean checkOnlyRegisteredClients;
+ private boolean persistUnregisteredClients = true;
private String contextName;
private Configuration loginConfig;
@@ -59,7 +60,6 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
if (OAuthConstants.CLIENT_CREDENTIALS_GRANT.equals(grantType)) {
// Pre-registering the OAuth2 Client representations for
// "client_credentials" can be difficult.
-
String clientSecret = (String)getMessageContext().get(OAuthConstants.CLIENT_SECRET);
if (clientSecret != null) {
// Direct authentication with the back-end storage
@@ -67,9 +67,7 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
} else {
Principal p = super.getMessageContext().getSecurityContext().getUserPrincipal();
if (clientId.equals(p.getName())) {
- Client c = new Client(clientId, null, true);
- c.setAllowedGrantTypes(Collections.singletonList(OAuthConstants.CLIENT_CREDENTIALS_GRANT));
- return c;
+ return createClientCredClient(clientId, null);
}
}
}
@@ -95,10 +93,9 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
// Login using JAAS
CallbackHandler callbackHandler =
new NamePasswordCallbackHandler(clientId, clientSecret);
- LoginContext ctx = new LoginContext(getContextName(), null, callbackHandler, loginConfig);
+ LoginContext ctx = new LoginContext(contextName, null, callbackHandler, loginConfig);
ctx.login();
- Client client = new Client(clientId, clientSecret, true);
- client.setAllowedGrantTypes(Collections.singletonList(OAuthConstants.CLIENT_CREDENTIALS_GRANT));
+ Client client = createClientCredClient(clientId, clientSecret);
ctx.logout();
return client;
} catch (LoginException ex) {
@@ -113,20 +110,25 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
this.checkOnlyRegisteredClients = checkOnlyRegisteredClients;
}
- public String getContextName() {
- return contextName;
- }
-
public void setContextName(String contextName) {
this.contextName = contextName;
}
- public Configuration getLoginConfig() {
- return loginConfig;
- }
-
public void setLoginConfig(Configuration loginConfig) {
this.loginConfig = loginConfig;
}
+ public void setPersistUnregisteredClients(boolean persistUnregisteredClients) {
+ this.persistUnregisteredClients = persistUnregisteredClients;
+ }
+
+ protected Client createClientCredClient(String clientId, String password) {
+ Client c = new Client(clientId, password, true);
+ c.setAllowedGrantTypes(Collections.singletonList(OAuthConstants.CLIENT_CREDENTIALS_GRANT));
+ if (persistUnregisteredClients) {
+ // It will enable seeing these clients and their tokens in the OIDC management console
+ super.setClient(c);
+ }
+ return c;
+ }
}
[04/14] cxf-fediz git commit: Adding OIDC .well-known configuration
endpoint for clients to get jwks_uri and other endpoint addresses dynamically
Posted by co...@apache.org.
Adding OIDC .well-known configuration endpoint for clients to get jwks_uri and other endpoint addresses dynamically
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/236744fd
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/236744fd
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/236744fd
Branch: refs/heads/1.3.x-fixes
Commit: 236744fd05833333e2b77a2b5b043c54058e75b0
Parents: df70c79
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Sep 14 14:37:44 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:43:18 2016 +0000
----------------------------------------------------------------------
.../oidc/src/main/webapp/WEB-INF/applicationContext.xml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/236744fd/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 6091725..eea9aa8 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -225,6 +225,16 @@
<entry key="rs.security.signature.key.password.provider" value-ref="keyPasswordProvider"/>
</jaxrs:properties>
</jaxrs:server>
-
+
+ <!-- .well-known OIDC Configuration Service -->
+ <bean id="oidcConfigService" class="org.apache.cxf.rs.security.oidc.idp.OidcConfigurationService"/>
+ <jaxrs:server address="/.well-known">
+ <jaxrs:serviceBeans>
+ <ref bean="oidcConfigService"/>
+ </jaxrs:serviceBeans>
+ <jaxrs:properties>
+ <entry key="rs.security.signature.properties" value="rs.security.properties"/>
+ </jaxrs:properties>
+ </jaxrs:server>
</beans>
[10/14] cxf-fediz git commit: Picking up latest CXF release
Posted by co...@apache.org.
Picking up latest CXF release
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e1ca166a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e1ca166a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e1ca166a
Branch: refs/heads/1.3.x-fixes
Commit: e1ca166ad6368f5a74b4d2f0ad58f7498c28d28d
Parents: ff78d7b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Oct 19 09:59:39 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:46:59 2016 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e1ca166a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 176e432..0110631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<commons.logging.version>1.2</commons.logging.version>
<commons.io.version>2.5</commons.io.version>
<commons.validator.version>1.5.1</commons.validator.version>
- <cxf.version>3.1.8-SNAPSHOT</cxf.version>
+ <cxf.version>3.1.8</cxf.version>
<cxf.build-utils.version>3.2.0</cxf.build-utils.version>
<easymock.version>3.4</easymock.version>
<ecj.version>4.6.1</ecj.version>
[03/14] cxf-fediz git commit: Adding OIDC access token revocation
service
Posted by co...@apache.org.
Adding OIDC access token revocation service
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/df70c790
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/df70c790
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/df70c790
Branch: refs/heads/1.3.x-fixes
Commit: df70c79026348f69bb3e2f37eb0df818d583f1de
Parents: e88cf09
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Sep 14 12:58:01 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:43:12 2016 +0000
----------------------------------------------------------------------
services/oidc/src/main/webapp/WEB-INF/applicationContext.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/df70c790/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 53bd83f..6091725 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -201,6 +201,10 @@
<property name="grantHandlers" ref="grantHandlers"/>
<property name="canSupportPublicClients" value="true"/>
</bean>
+ <!-- Access Token Revocation service -->
+ <bean id="accessTokenRevocationService" class="org.apache.cxf.rs.security.oauth2.services.TokenRevocationService">
+ <property name="dataProvider" ref="oauthProvider"/>
+ </bean>
<!-- Access Token Introspection service -->
<bean id="accessTokenIntrospectionService" class="org.apache.cxf.rs.security.oauth2.services.TokenIntrospectionService">
<property name="dataProvider" ref="oauthProvider"/>
@@ -211,6 +215,7 @@
<jaxrs:serviceBeans>
<ref bean="accessTokenService"/>
<ref bean="accessTokenIntrospectionService"/>
+ <ref bean="accessTokenRevocationService"/>
</jaxrs:serviceBeans>
<jaxrs:providers>
<ref bean="oauthJsonProvider"/>
[02/14] cxf-fediz git commit: [FEDIZ-173] Cors support for js OIDC
Implicit Flow, patch from Adrian Gonzalez applied, This closes #9
Posted by co...@apache.org.
[FEDIZ-173] Cors support for js OIDC Implicit Flow, patch from Adrian Gonzalez applied, This closes #9
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e88cf097
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e88cf097
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e88cf097
Branch: refs/heads/1.3.x-fixes
Commit: e88cf0979eb11a67193b4fc9d8e61197c6480c96
Parents: 6b29a87
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Sep 14 12:06:29 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:43:03 2016 +0000
----------------------------------------------------------------------
services/oidc/pom.xml | 5 +++++
.../oidc/src/main/webapp/WEB-INF/applicationContext.xml | 9 +++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e88cf097/services/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index ad3b515..aede1dd 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -58,6 +58,11 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e88cf097/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index c893dd4..53bd83f 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -95,6 +95,7 @@
<ref bean="oidcKeysService"/>
</jaxrs:serviceBeans>
<jaxrs:providers>
+ <ref bean="corsFilter"/>
<bean class="org.apache.cxf.rs.security.jose.jaxrs.JsonWebKeysProvider"/>
</jaxrs:providers>
<jaxrs:properties>
@@ -119,6 +120,7 @@
<ref bean="userInfoService"/>
</jaxrs:serviceBeans>
<jaxrs:providers>
+ <ref bean="corsFilter"/>
<bean class="org.apache.cxf.jaxrs.provider.json.JsonMapObjectProvider"/>
<ref bean="oauth2TokenValidationFilter"/>
</jaxrs:providers>
@@ -178,6 +180,13 @@
<property name="signWithClientSecret" value="true"/>
-->
</bean>
+ <!-- Cors filter for endpoints used by implicit flow (by js clients) -->
+ <util:list id="implicitFlowAllowHeaders">
+ <value>Authorization</value>
+ </util:list>
+ <bean id="corsFilter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter">
+ <property name="allowHeaders" ref="implicitFlowAllowHeaders"/>
+ </bean>
<bean id="refreshTokenHandler" class="org.apache.cxf.rs.security.oauth2.grants.refresh.RefreshTokenGrantHandler">
<property name="dataProvider" ref="oauthProvider"/>
</bean>
[05/14] cxf-fediz git commit: Fix dependencies to beanutils and ognl.
This closes #10.
Posted by co...@apache.org.
Fix dependencies to beanutils and ognl. This closes #10.
Idp has a dependency to :
* both commons-beanutils-core:1.8.3 and commons-beanutils:1.9.2.
* opensymphony:ognl and ognl:ognl
Excluded dependency to the oldest version of libraries.
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/af925166
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/af925166
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/af925166
Branch: refs/heads/1.3.x-fixes
Commit: af925166aab61faf29d3753d96ac1ad45116466a
Parents: 236744f
Author: Adrian Gonzalez <ad...@yahoo.fr>
Authored: Sun Sep 18 22:24:21 2016 +0200
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:43:29 2016 +0000
----------------------------------------------------------------------
services/idp/pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/af925166/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index b7e918f..e3ce225 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -100,6 +100,12 @@
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-webflow</artifactId>
<version>2.3.4.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>opensymphony</groupId>
+ <artifactId>ognl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
@@ -256,6 +262,14 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
+ <!--
+ dependency to newer version (commons-beanutils)
+ imported from commons-validator
+ -->
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[12/14] cxf-fediz git commit: Switch to using https for repos
Posted by co...@apache.org.
Switch to using https for repos
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/940d2fb7
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/940d2fb7
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/940d2fb7
Branch: refs/heads/1.3.x-fixes
Commit: 940d2fb79268d05b6182f7a79fb8224676a0a420
Parents: afde06a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Oct 25 14:29:02 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 8 14:47:18 2016 +0000
----------------------------------------------------------------------
pom.xml | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/940d2fb7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0110631..a82ae12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<repositories>
<repository>
<id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
+ <url>https://repository.apache.org/snapshots/</url>
<name>Apache Snapshot Repo</name>
<snapshots>
<enabled>true</enabled>
@@ -135,13 +135,6 @@
</releases>
</repository>
<repository>
- <id>central</id>
- <url>https://repo1.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
<id>wasdev-maven-repo</id>
<name>wasdev-maven-repo</name>
<url>http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/</url>
@@ -150,7 +143,7 @@
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
+ <url>https://repository.apache.org/snapshots/</url>
<name>Apache Snapshot Repo</name>
<snapshots>
<enabled>true</enabled>
@@ -160,13 +153,6 @@
</releases>
</pluginRepository>
<pluginRepository>
- <id>central</id>
- <url>https://repo1.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
<id>Liberty</id>
<name>Liberty Repository</name>
<url>http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/</url>