date:20160728

cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

2016-07-28 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes bc3ccc3ab -> fcf585eb1


add jax_rs/websocket_osgi in samples/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fcf585eb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fcf585eb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fcf585eb

Branch: refs/heads/3.1.x-fixes
Commit: fcf585eb1b260c320281f1a5128307e9ae082547
Parents: bc3ccc3
Author: Akitoshi Yoshida 
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Jul 29 00:16:20 2016 +0200

--
 .../main/release/samples/jax_rs/websocket_osgi/pom.xml  |  8 
 .../main/release/samples/jax_rs/websocket_web/pom.xml   | 12 ++--
 distribution/src/main/release/samples/pom.xml   |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index 16e1988..f63bfc1 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 ../..
 
 
@@ -68,17 +68,17 @@
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-websocket
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 javax.ws.rs

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 7b76bbc..0b57c11 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,13 +20,13 @@
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 4.0.0
 jax_rs_websocket_web
-JAX-RS WebSocket Demo
-JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket Demo
 war
 
 org.apache.cxf.samples
 cxf-samples
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 ../..
 
 
@@ -82,17 +82,17 @@
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-websocket
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 javax.ws.rs

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 668792b..88d1ac0 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -51,6 +51,8 @@
 jax_rs/basic_https
 jax_rs/basic
 jax_rs/websocket
+jax_rs/websocket_web
+jax_rs/websocket_osgi
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2

cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

2016-07-28 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master f5e753380 -> 45d54d558


add jax_rs/websocket_osgi in samples/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/45d54d55
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/45d54d55
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/45d54d55

Branch: refs/heads/master
Commit: 45d54d558625236b84752b0d7976f0cf85518c16
Parents: f5e7533
Author: Akitoshi Yoshida 
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Jul 29 00:06:07 2016 +0200

--
 .../src/main/release/samples/jax_rs/websocket_web/pom.xml| 4 ++--
 distribution/src/main/release/samples/pom.xml| 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 49c4540..1976690 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,8 +20,8 @@
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 4.0.0
 jax_rs_websocket_web
-JAX-RS WebSocket Demo
-JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket Demo
 war
 
 org.apache.cxf.samples

http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index d73a7d0..ca874f3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -52,6 +52,7 @@
 jax_rs/basic
 jax_rs/websocket
 jax_rs/websocket_web
+jax_rs/websocket_osgi
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2

cxf-fediz git commit: [FEDIZ-172] Adding a comment

2016-07-28 Thread sergeyb

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 86f7a5eb6 -> b45b3b7b2


[FEDIZ-172] Adding a comment


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b45b3b7b
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b45b3b7b
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b45b3b7b

Branch: refs/heads/master
Commit: b45b3b7b2cd57b5678eb0b982db93b61d97672e0
Parents: 86f7a5e
Author: Sergey Beryozkin 
Authored: Thu Jul 28 21:40:41 2016 +0300
Committer: Sergey Beryozkin 
Committed: Thu Jul 28 21:40:41 2016 +0300

--
 .../org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b45b3b7b/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 ff34955..16bd697 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
@@ -65,6 +65,9 @@ public class OAuthDataProviderImpl extends 
DefaultEHCacheCodeDataProvider {
 @Override
 public List convertScopeToPermissions(Client client, 
List requestedScopes) {
 //TODO: push this code into the abstract class
+//NOTE: if OIDC-registered clients will be allowed to support not only 
code/implicit
+// (as it is now) but also client credentials/etc then the check below 
will need to be more strict
+// with the help of getMessageContext().get(OAuthConstants.GRANT_TYPE)
 if 
(!client.getAllowedGrantTypes().contains(OAuthConstants.CLIENT_CREDENTIALS_GRANT)
 && !requestedScopes.contains(OidcUtils.OPENID_SCOPE)) {
 throw new OAuthServiceException("Required scopes are missing");

cxf-fediz git commit: [FEDIZ-172] Enforcing the oidc scope at the Fediz data provider level

2016-07-28 Thread sergeyb

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 167455bbe -> 86f7a5eb6


[FEDIZ-172] Enforcing the oidc scope at the Fediz data provider level


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/86f7a5eb
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/86f7a5eb
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/86f7a5eb

Branch: refs/heads/master
Commit: 86f7a5eb68d56363ee919235ba94c52ca1e5fdaf
Parents: 167455b
Author: Sergey Beryozkin 
Authored: Thu Jul 28 21:27:32 2016 +0300
Committer: Sergey Beryozkin 
Committed: Thu Jul 28 21:27:32 2016 +0300

--
 .../service/oidc/OAuthDataProviderImpl.java | 23 +---
 .../src/main/webapp/WEB-INF/data-manager.xml|  2 --
 2 files changed, 20 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/86f7a5eb/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 7c37cc2..ff34955 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
@@ -19,10 +19,15 @@
 package org.apache.cxf.fediz.service.oidc;
 
 import java.security.Principal;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.cxf.rs.security.oauth2.common.Client;
+import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
 import 
org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvider;
+import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
 import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
 
 public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
 
@@ -30,10 +35,12 @@ public class OAuthDataProviderImpl extends 
DefaultEHCacheCodeDataProvider {
 
 @Override
 public Client getClient(String clientId) {
+//TODO: push most of this code into the abstract class
 Client client = super.getClient(clientId);
 if (client != null || checkOnlyRegisteredClients) {
 return client;
 }
+
 String grantType = 
(String)getMessageContext().get(OAuthConstants.GRANT_TYPE);
 if (OAuthConstants.CLIENT_CREDENTIALS_GRANT.equals(grantType)) {
 // Pre-registering the OAuth2 Client representations for 
@@ -46,15 +53,25 @@ public class OAuthDataProviderImpl extends 
DefaultEHCacheCodeDataProvider {
 } else {
 Principal p = 
super.getMessageContext().getSecurityContext().getUserPrincipal();
 if (clientId.equals(p.getName())) {
-// Client was already authenticated with Servlet Security 
-// or CXF (JAAS/etc) filters
-return new Client(clientId, null, true);
+Client c = new Client(clientId, null, true);
+
c.setAllowedGrantTypes(Collections.singletonList(OAuthConstants.CLIENT_CREDENTIALS_GRANT));
+return c;
 }
 }
 }
 return null;
 }
 
+@Override
+public List convertScopeToPermissions(Client client, 
List requestedScopes) {
+//TODO: push this code into the abstract class
+if 
(!client.getAllowedGrantTypes().contains(OAuthConstants.CLIENT_CREDENTIALS_GRANT)
+&& !requestedScopes.contains(OidcUtils.OPENID_SCOPE)) {
+throw new OAuthServiceException("Required scopes are missing"); 
+}
+return super.convertScopeToPermissions(client, requestedScopes);
+}
+
 protected Client authenticateClient(String clientId, String clientSecret) {
 // If the authentication is successful: 
 // return new Client(clientId, clientSecret, true)

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/86f7a5eb/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml 
b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
index 5640443..0fd539a 100644
--- a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
@@ -60,8 +60,6 @@
   init-method="init" destroy-method="close">
   
 
-
-

cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

cxf-fediz git commit: [FEDIZ-172] Adding a comment

cxf-fediz git commit: [FEDIZ-172] Enforcing the oidc scope at the Fediz data provider level

4 matches

Site Navigation

Mail list logo

Footer information