Repository: cxf-fediz Updated Branches: refs/heads/1.4.x-fixes d881d88f1 -> b301cc8a2
[FEDIZ-207] Properly reverting in 1.4.x Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b301cc8a Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b301cc8a Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b301cc8a Branch: refs/heads/1.4.x-fixes Commit: b301cc8a2c92391a7c29f5e3a887665deb2bbbd6 Parents: d881d88 Author: Sergey Beryozkin <[email protected]> Authored: Tue Sep 5 11:04:35 2017 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Sep 5 11:04:35 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/fediz/core/FedizPrincipal.java | 1 - .../apache/cxf/fediz/core/federation/TestSigninHandler.java | 7 +------ .../org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java | 7 ------- .../org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java | 7 ------- .../org/apache/cxf/fediz/jetty9/FederationUserPrincipal.java | 7 ------- .../spring/authentication/FederationAuthenticationToken.java | 7 ------- .../spring/authentication/FederationAuthenticationToken.java | 7 ------- .../spring/authentication/FederationAuthenticationToken.java | 7 ------- .../org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java | 7 ------- .../org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java | 7 ------- .../apache/cxf/fediz/service/oidc/FedizSubjectCreator.java | 3 +-- 11 files changed, 2 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java ---------------------------------------------------------------------- diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java index 10cf6f0..f74991a 100644 --- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java +++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java @@ -32,5 +32,4 @@ public interface FedizPrincipal extends Principal { List<String> getRoleClaims(); - String getId(); } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java ---------------------------------------------------------------------- diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java index 1317fd1..b6a1e1e 100644 --- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java +++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/TestSigninHandler.java @@ -92,12 +92,7 @@ public class TestSigninHandler extends SigninHandler<FedizPrincipal> { return roles; } - @Override - public String getId() { - // TODO Auto-generated method stub - return null; - } - + } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java ---------------------------------------------------------------------- diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java index 326fff5..6107491 100644 --- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java +++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java @@ -20,7 +20,6 @@ package org.apache.cxf.fediz.cxf.plugin; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; import org.apache.cxf.fediz.core.Claim; @@ -29,7 +28,6 @@ import org.apache.cxf.fediz.core.FedizPrincipal; public class CXFFedizPrincipal implements FedizPrincipal { - private String principalId; private final String subject; private final List<Claim> claims; private Element token; @@ -43,7 +41,6 @@ public class CXFFedizPrincipal implements FedizPrincipal { if (roles != null) { this.roles = roles; } - principalId = UUID.randomUUID().toString(); } @Override @@ -65,8 +62,4 @@ public class CXFFedizPrincipal implements FedizPrincipal { return Collections.unmodifiableList(roles); } - @Override - public String getId() { - return principalId; - } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java ---------------------------------------------------------------------- diff --git a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java index c6799b4..b3aa748 100644 --- a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java +++ b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java @@ -21,7 +21,6 @@ package org.apache.cxf.fediz.jetty8; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; @@ -30,7 +29,6 @@ import org.apache.cxf.fediz.core.FedizPrincipal; import org.apache.cxf.fediz.core.processor.FedizResponse; public class FederationUserPrincipal implements FedizPrincipal { - private String principalId; private String name; private ClaimCollection claims; private FedizResponse response; @@ -43,7 +41,6 @@ public class FederationUserPrincipal implements FedizPrincipal { if (response.getRoles() != null) { this.roles = response.getRoles(); } - principalId = UUID.randomUUID().toString(); } @Override @@ -72,8 +69,4 @@ public class FederationUserPrincipal implements FedizPrincipal { return Collections.unmodifiableList(roles); } - @Override - public String getId() { - return principalId; - } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserPrincipal.java ---------------------------------------------------------------------- diff --git a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserPrincipal.java b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserPrincipal.java index edce599..48a7d01 100644 --- a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserPrincipal.java +++ b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserPrincipal.java @@ -21,7 +21,6 @@ package org.apache.cxf.fediz.jetty9; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; @@ -30,7 +29,6 @@ import org.apache.cxf.fediz.core.FedizPrincipal; import org.apache.cxf.fediz.core.processor.FedizResponse; public class FederationUserPrincipal implements FedizPrincipal { - private String principalId; private String name; private ClaimCollection claims; private FedizResponse response; @@ -43,7 +41,6 @@ public class FederationUserPrincipal implements FedizPrincipal { if (response.getRoles() != null) { this.roles = response.getRoles(); } - principalId = UUID.randomUUID().toString(); } @Override @@ -72,8 +69,4 @@ public class FederationUserPrincipal implements FedizPrincipal { return Collections.unmodifiableList(roles); } - @Override - public String getId() { - return principalId; - } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java ---------------------------------------------------------------------- diff --git a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java index ca63efc..e6caeb7 100644 --- a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java +++ b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java @@ -23,7 +23,6 @@ import java.io.Serializable; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; import org.apache.cxf.fediz.core.ClaimCollection; @@ -42,7 +41,6 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - private String principalId; private final Object credentials; private final Object principal; private final UserDetails userDetails; @@ -68,7 +66,6 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken if (response.getRoles() != null) { this.roles = response.getRoles(); } - principalId = UUID.randomUUID().toString(); } public Object getCredentials() { @@ -110,8 +107,4 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken return Collections.unmodifiableList(roles); } - @Override - public String getId() { - return principalId; - } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java ---------------------------------------------------------------------- diff --git a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java index 65ccfb6..d39cc2c 100644 --- a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java +++ b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java @@ -22,7 +22,6 @@ package org.apache.cxf.fediz.spring.authentication; import java.io.Serializable; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; import org.apache.cxf.fediz.core.ClaimCollection; @@ -40,7 +39,6 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken private static final long serialVersionUID = 1L; - private String principalId; private final Object credentials; private final Object principal; private final UserDetails userDetails; @@ -66,7 +64,6 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken if (response.getRoles() != null) { this.roles = response.getRoles(); } - principalId = UUID.randomUUID().toString(); } public Object getCredentials() { @@ -108,8 +105,4 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken return Collections.unmodifiableList(roles); } - @Override - public String getId() { - return principalId; - } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java ---------------------------------------------------------------------- diff --git a/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java b/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java index ca63efc..e6caeb7 100644 --- a/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java +++ b/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java @@ -23,7 +23,6 @@ import java.io.Serializable; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; import org.apache.cxf.fediz.core.ClaimCollection; @@ -42,7 +41,6 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - private String principalId; private final Object credentials; private final Object principal; private final UserDetails userDetails; @@ -68,7 +66,6 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken if (response.getRoles() != null) { this.roles = response.getRoles(); } - principalId = UUID.randomUUID().toString(); } public Object getCredentials() { @@ -110,8 +107,4 @@ public class FederationAuthenticationToken extends AbstractAuthenticationToken return Collections.unmodifiableList(roles); } - @Override - public String getId() { - return principalId; - } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java ---------------------------------------------------------------------- diff --git a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java index ac630cb..4beee9f 100644 --- a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java +++ b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java @@ -21,7 +21,6 @@ package org.apache.cxf.fediz.tomcat7; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; import org.apache.catalina.realm.GenericPrincipal; @@ -31,7 +30,6 @@ import org.apache.cxf.fediz.core.FedizPrincipal; public class FederationPrincipalImpl extends GenericPrincipal implements FedizPrincipal { - protected String principalId; protected ClaimCollection claims; protected Element loginToken; private List<String> roles = Collections.emptyList(); @@ -44,7 +42,6 @@ public class FederationPrincipalImpl extends GenericPrincipal implements FedizPr if (roles != null) { this.roles = roles; } - principalId = UUID.randomUUID().toString(); } public ClaimCollection getClaims() { @@ -60,8 +57,4 @@ public class FederationPrincipalImpl extends GenericPrincipal implements FedizPr return Collections.unmodifiableList(roles); } - public String getId() { - return principalId; - } - } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java ---------------------------------------------------------------------- diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java index a71ff06..1e5b660 100644 --- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java +++ b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java @@ -21,7 +21,6 @@ package org.apache.cxf.fediz.tomcat8; import java.util.Collections; import java.util.List; -import java.util.UUID; import org.w3c.dom.Element; import org.apache.catalina.realm.GenericPrincipal; @@ -30,7 +29,6 @@ import org.apache.cxf.fediz.core.ClaimCollection; import org.apache.cxf.fediz.core.FedizPrincipal; public class FederationPrincipalImpl extends GenericPrincipal implements FedizPrincipal { - protected String principalId; protected ClaimCollection claims; protected Element loginToken; private List<String> roles = Collections.emptyList(); @@ -43,7 +41,6 @@ public class FederationPrincipalImpl extends GenericPrincipal implements FedizPr if (roles != null) { this.roles = roles; } - principalId = UUID.randomUUID().toString(); } public ClaimCollection getClaims() { @@ -59,8 +56,4 @@ public class FederationPrincipalImpl extends GenericPrincipal implements FedizPr return Collections.unmodifiableList(roles); } - @Override - public String getId() { - return principalId; - } } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b301cc8a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java index de44fce..a4b2161 100644 --- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java +++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java @@ -104,8 +104,7 @@ public class FedizSubjectCreator implements SubjectCreator { OidcUserSubject oidcSub = new OidcUserSubject(); oidcSub.setLogin(fedizPrincipal.getName()); - String principalId = fedizPrincipal.getId(); - oidcSub.setId(principalId != null ? principalId : fedizPrincipal.getName()); + oidcSub.setId(fedizPrincipal.getName()); IdToken idToken = convertToIdToken(mc, fedizPrincipal.getLoginToken(),
