You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/08/18 10:19:53 UTC
[1/2] cxf-fediz git commit: Fixing a typo in BackChannelLogoutHandler
as spotted by Ievgen Tarasov
Repository: cxf-fediz
Updated Branches:
refs/heads/1.4.x-fixes d64a36f8f -> a620f226e
Fixing a typo in BackChannelLogoutHandler as spotted by Ievgen Tarasov
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a78b1bb6
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a78b1bb6
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a78b1bb6
Branch: refs/heads/1.4.x-fixes
Commit: a78b1bb63ce5aa426b3e8cd7b31ebbcc8baf1f2a
Parents: d64a36f
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Aug 18 10:47:05 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Aug 18 10:47:05 2017 +0100
----------------------------------------------------------------------
.../cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a78b1bb6/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
index 0c417b6..f97e642 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
@@ -53,7 +53,7 @@ public class BackChannelLogoutHandler extends JoseJwtProducer {
// to check the access tokens - it can not offer a complete solution, for ex
// in cases when ATs have expired or been revoked or Implicit id_token flow is used.
// Most likely a 'visited sites' cookie as suggested by the spec will need to be used.
- List<ServerAccessToken> accessTokens = dataProvider.getAccessTokens(client, subject);
+ List<ServerAccessToken> accessTokens = dataProvider.getAccessTokens(null, subject);
Set<String> processedClients = new HashSet<String>();
for (ServerAccessToken at : accessTokens) {
Client atClient = at.getClient();
[2/2] cxf-fediz git commit: And adding some logging to
BackChannelLogoutHandler as suggested by Ievgen
Posted by se...@apache.org.
And adding some logging to BackChannelLogoutHandler as suggested by Ievgen
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a620f226
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a620f226
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a620f226
Branch: refs/heads/1.4.x-fixes
Commit: a620f226e75f51eec4e0cb00658ba9361430290d
Parents: a78b1bb
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Aug 18 11:19:29 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Aug 18 11:19:29 2017 +0100
----------------------------------------------------------------------
.../service/oidc/logout/BackChannelLogoutHandler.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a620f226/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
index f97e642..5d1b50f 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
@@ -24,11 +24,14 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.logging.Logger;
import javax.ws.rs.core.Form;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64UrlUtility;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.rs.security.jose.jwt.JoseJwtProducer;
import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
import org.apache.cxf.rs.security.jose.jwt.JwtToken;
@@ -40,6 +43,8 @@ import org.apache.cxf.rs.security.oidc.idp.OidcUserSubject;
import org.apache.cxf.rt.security.crypto.CryptoUtils;
public class BackChannelLogoutHandler extends JoseJwtProducer {
+ private static final Logger LOG = LogUtils.getL7dLogger(BackChannelLogoutHandler.class);
+
private static final String BACK_CHANNEL_LOGOUT_URI = "backchannel_logout_uri";
private static final String LOGOUT_TOKEN = "logout_token";
private static final String EVENTS_PROPERTY = "events";
@@ -72,8 +77,8 @@ public class BackChannelLogoutHandler extends JoseJwtProducer {
}
- private void submitBackChannelLogoutRequest(Client client, OidcUserSubject subject,
- IdToken idTokenHint, String uri) {
+ private void submitBackChannelLogoutRequest(final Client client, final OidcUserSubject subject,
+ final IdToken idTokenHint, final String uri) {
// Application context is expected to contain HttpConduit HTTPS configuration
final WebClient wc = WebClient.create(uri);
IdToken idToken = idTokenHint != null ? idTokenHint : subject.getIdToken();
@@ -93,7 +98,9 @@ public class BackChannelLogoutHandler extends JoseJwtProducer {
try {
wc.form(new Form().param(LOGOUT_TOKEN, logoutToken));
} catch (Exception ex) {
- // nothing else can be done
+ LOG.info(String.format("Back channel request to %s to log out %s from client %s has failed",
+ uri, subject.getLogin(), client.getClientId()));
+ LOG.fine(String.format("%s connection failure", ExceptionUtils.getStackTrace(ex)));
}
}