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 2017/02/13 11:36:22 UTC
[06/18] cxf-fediz git commit: Whitespace cleanup
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
index 475ccd7..4af7ad1 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
@@ -47,31 +47,31 @@ import org.springframework.web.filter.GenericFilterBean;
public class GrantedAuthorityEntitlements extends GenericFilterBean {
private static final Logger LOG = LoggerFactory.getLogger(GrantedAuthorityEntitlements.class);
-
+
@Autowired
private RoleDAO roleDAO;
-
+
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
-
+
try {
Authentication currentAuth = SecurityContextHolder.getContext().getAuthentication();
if (currentAuth == null) {
chain.doFilter(request, response);
return;
}
-
+
final Set<GrantedAuthority> authorities = new HashSet<>();
if (currentAuth.getAuthorities() != null) {
authorities.addAll(currentAuth.getAuthorities());
}
-
+
Iterator<? extends GrantedAuthority> authIt = currentAuth.getAuthorities().iterator();
while (authIt.hasNext()) {
GrantedAuthority ga = authIt.next();
String roleName = ga.getAuthority();
-
+
try {
Role role = roleDAO.getRole(roleName.substring(5), Arrays.asList("all"));
for (Entitlement e : role.getEntitlements()) {
@@ -82,18 +82,18 @@ public class GrantedAuthorityEntitlements extends GenericFilterBean {
}
}
LOG.debug("Granted Authorities: {}", authorities);
-
+
UsernamePasswordAuthenticationToken enrichedAuthentication = new UsernamePasswordAuthenticationToken(
currentAuth.getName(), currentAuth.getCredentials(), authorities);
enrichedAuthentication.setDetails(currentAuth.getDetails());
-
+
SecurityContextHolder.getContext().setAuthentication(enrichedAuthentication);
LOG.info("Enriched AuthenticationToken added");
-
+
} catch (Exception ex) {
LOG.error("Failed to enrich security context with entitlements", ex);
}
-
+
chain.doFilter(request, response);
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/ApplicationProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/ApplicationProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/ApplicationProtocolHandler.java
index 1cd9dc1..dc16324 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/ApplicationProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/ApplicationProtocolHandler.java
@@ -23,11 +23,11 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.webflow.execution.RequestContext;
public interface ApplicationProtocolHandler extends ProtocolHandler {
-
+
boolean canHandleRequest(HttpServletRequest request);
void mapSignInRequest(RequestContext context);
-
+
void mapSignInResponse(RequestContext context);
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/TrustedIdpProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/TrustedIdpProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/TrustedIdpProtocolHandler.java
index a33591b..35e70d2 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/TrustedIdpProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/spi/TrustedIdpProtocolHandler.java
@@ -28,12 +28,12 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.springframework.webflow.execution.RequestContext;
public interface TrustedIdpProtocolHandler extends ProtocolHandler {
-
+
boolean canHandleRequest(HttpServletRequest request);
// Only supports HTTP GET SignIn Requests
URL mapSignInRequest(RequestContext context, Idp idp, TrustedIdp trustedIdp);
-
+
//Hook in <action-state id="validateToken"> of federation-signin-response.xml
SecurityToken mapSignInResponse(RequestContext context, Idp idp, TrustedIdp trustedIdp);
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
index 4484312..6f84af1 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/util/WebUtils.java
@@ -31,7 +31,7 @@ import org.springframework.webflow.execution.RequestContext;
* Utility class to bind with webflow artifacts
*/
public final class WebUtils {
-
+
private WebUtils() {
super();
}
@@ -79,7 +79,7 @@ public final class WebUtils {
/**
* put attribute in request or in session depending on storeInSession.
- *
+ *
* @param context
* @param attributeKey
*/
@@ -106,7 +106,7 @@ public final class WebUtils {
/**
* get attribute from request; if not found get it from session.
- *
+ *
* @param context
* @param attributeKey
* @return the attribute from the request or session
@@ -133,7 +133,7 @@ public final class WebUtils {
/**
* remove attribute from request and session.
- *
+ *
* @param context
* @param attributeKey
* @return the removed attribute
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
index 4a2970c..ba41a15 100644
--- a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
+++ b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java
@@ -46,27 +46,27 @@ public class ApplicationDAOJPATest {
@Autowired
private ApplicationDAO applicationDAO;
-
-
+
+
@BeforeClass
public static void init() {
System.setProperty("spring.profiles.active", "jpa");
}
-
-
+
+
@Test
public void testReadAllApplications() {
List<Application> applications = applicationDAO.getApplications(0, 999, null);
// Application could have been removed, Order not given as per JUnit design
Assert.isTrue(1 < applications.size(), "Size doesn't match [" + applications.size() + "]");
}
-
-
+
+
@Test
public void testReadExistingApplicationEmbeddedAll() {
Application application = applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld",
Arrays.asList("all"));
-
+
Assert.isTrue(application.getLifeTime() == 3600,
"LifeTime doesn't match");
Assert.isTrue("http://docs.oasis-open.org/wsfed/federation/200706".equals(application.getProtocol()),
@@ -85,41 +85,41 @@ public class ApplicationDAOJPATest {
Assert.isTrue(4 == application.getRequestedClaims().size(),
"Number of claims doesn't match [" + application.getRequestedClaims().size() + "]");
}
-
+
@Test
public void testReadExistingApplicationEmbeddedClaims() {
Application application = applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld",
Arrays.asList("claims"));
-
+
Assert.isTrue(4 == application.getRequestedClaims().size(),
"Number of claims doesn't match");
}
-
+
@Test
public void testReadExistingApplicationEmbeddedNull() {
Application application = applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld",
null);
-
+
Assert.isTrue(0 == application.getRequestedClaims().size(),
"Number of claims doesn't match");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryReadNonexistingApplication() {
applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld:NOTEXIST", null);
}
-
-
+
+
@Test
public void testAddNewApplication() {
-
+
String realm = "urn:org:apache:cxf:fediz:application:testaddnew";
Application application = createApplication(realm);
applicationDAO.addApplication(application);
-
+
application = applicationDAO.getApplication(realm, null);
-
+
Assert.isTrue("".equals(application.getEncryptionCertificate()),
"EncryptionCertificate doesn't match");
Assert.isTrue(application.getLifeTime() == 3600,
@@ -143,15 +143,15 @@ public class ApplicationDAOJPATest {
Assert.isTrue(0 == application.getRequestedClaims().size(),
"Number of claims doesn't match");
}
-
+
@Test
public void testUpdateApplication() {
String realm = "urn:org:apache:cxf:fediz:application:testupdate";
-
+
//Prepare
Application application = createApplication(realm);
applicationDAO.addApplication(application);
-
+
//Testcase
application = new Application();
application.setRealm(realm);
@@ -163,7 +163,7 @@ public class ApplicationDAOJPATest {
application.setServiceDisplayName("UFedizhelloworld2");
application.setTokenType("Uhttp://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1");
application.setPolicyNamespace("Uhttp://www.w3.org/ns/ws-policy");
-
+
Assert.isTrue("U".equals(application.getEncryptionCertificate()),
"EncryptionCertificate doesn't match");
Assert.isTrue(application.getLifeTime() == 1800,
@@ -187,7 +187,7 @@ public class ApplicationDAOJPATest {
Assert.isTrue(0 == application.getRequestedClaims().size(),
"Number of claims doesn't match");
}
-
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingApplication() {
Application application = new Application();
@@ -199,29 +199,29 @@ public class ApplicationDAOJPATest {
application.setServiceDescription("Fedizhelloworld description");
application.setServiceDisplayName("Fedizhelloworld");
application.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
-
+
applicationDAO.addApplication(application);
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryRemoveUnknownApplication() {
applicationDAO.deleteApplication("urn:org:apache:cxf:fediz:fedizhelloworld:NOTEXIST");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testRemoveExistingApplication() {
String realm = "urn:org:apache:cxf:fediz:app:testdelete";
Application application = createApplication(realm);
-
+
applicationDAO.addApplication(application);
-
+
applicationDAO.deleteApplication(realm);
-
+
applicationDAO.getApplication(realm, null);
}
-
+
@Test
public void testAddClaimToApplication() {
//Prepare step
@@ -234,47 +234,47 @@ public class ApplicationDAOJPATest {
application.setServiceDescription("Fedizhelloworld description");
application.setServiceDisplayName("Fedizhelloworld");
application.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
-
+
applicationDAO.addApplication(application);
-
+
//Testcase
RequestClaim requestClaim = new RequestClaim();
requestClaim.setOptional(false);
requestClaim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"));
-
+
applicationDAO.addClaimToApplication(application, requestClaim);
-
+
application = applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld:testaddclaim",
Arrays.asList("all"));
-
+
Assert.isTrue(1 == application.getRequestedClaims().size(), "requestedClaims size doesn't match");
}
-
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingClaimToApplication() {
Application application = new Application();
application.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
-
+
RequestClaim requestClaim = new RequestClaim();
requestClaim.setOptional(false);
requestClaim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"));
-
+
applicationDAO.addClaimToApplication(application, requestClaim);
}
-
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryAddUnknownClaimToApplication() {
Application application = new Application();
application.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
-
+
RequestClaim requestClaim = new RequestClaim();
requestClaim.setOptional(false);
requestClaim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/UNKOWN"));
-
+
applicationDAO.addClaimToApplication(application, requestClaim);
}
-
-
+
+
@Test
public void testRemoveClaimFromApplication() {
//Prepare step
@@ -287,50 +287,50 @@ public class ApplicationDAOJPATest {
application.setServiceDescription("Fedizhelloworld description");
application.setServiceDisplayName("Fedizhelloworld");
application.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
-
+
applicationDAO.addApplication(application);
-
+
RequestClaim requestClaim = new RequestClaim();
requestClaim.setOptional(false);
requestClaim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"));
-
+
applicationDAO.addClaimToApplication(application, requestClaim);
-
+
application = applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld:testremoveclaim",
Arrays.asList("all"));
Assert.isTrue(1 == application.getRequestedClaims().size(), "requestedClaims size doesn't match");
-
+
//Testcase
applicationDAO.removeClaimFromApplication(application, requestClaim);
application = applicationDAO.getApplication("urn:org:apache:cxf:fediz:fedizhelloworld:testremoveclaim",
Arrays.asList("all"));
Assert.isTrue(0 == application.getRequestedClaims().size(), "requestedClaims size doesn't match");
}
-
+
@Test(expected = JpaObjectRetrievalFailureException.class)
public void testTryRemoveNotAssignedClaimFromApplication() {
Application application = new Application();
application.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
-
+
RequestClaim requestClaim = new RequestClaim();
requestClaim.setOptional(false);
requestClaim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/city"));
-
+
applicationDAO.removeClaimFromApplication(application, requestClaim);
}
-
+
@Test(expected = JpaObjectRetrievalFailureException.class)
public void testTryRemoveUnknownClaimFromApplication() {
Application application = new Application();
application.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
-
+
RequestClaim requestClaim = new RequestClaim();
requestClaim.setOptional(false);
requestClaim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/UNKNOWN"));
-
+
applicationDAO.removeClaimFromApplication(application, requestClaim);
}
-
+
private static Application createApplication(String realm) {
Application application = new Application();
application.setRealm(realm);
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPATest.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPATest.java b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPATest.java
index 767a989..cabbf4b 100644
--- a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPATest.java
+++ b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPATest.java
@@ -42,20 +42,20 @@ public class ClaimDAOJPATest {
@Autowired
private ClaimDAO claimDAO;
-
-
+
+
@BeforeClass
public static void init() {
System.setProperty("spring.profiles.active", "jpa");
}
-
-
+
+
@Test
public void testReadAllClaims() {
List<Claim> claims = claimDAO.getClaims(0, 999);
Assert.isTrue(5 == claims.size(), "Size doesn't match");
}
-
+
@Test
public void testReadExistingClaim() {
Claim claim = claimDAO.getClaim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname");
@@ -67,14 +67,14 @@ public class ClaimDAOJPATest {
Assert.isTrue("Description for firstname".equals(claim.getDescription()),
"Claim Description name doesn't match");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryReadNonexistingClaim() {
claimDAO.getClaim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givennamenotexist");
}
-
-
+
+
@Test
public void testAddNewClaim() {
Claim claim5 = new Claim();
@@ -82,12 +82,12 @@ public class ClaimDAOJPATest {
claim5.setDisplayName("Town");
claim5.setDescription("Town Description");
claimDAO.addClaim(claim5);
-
+
List<Claim> claims = claimDAO.getClaims(0, 999);
Assert.isTrue(6 == claims.size(), "Size doesn't match. Claim not added");
}
-
-
+
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingClaim() {
Claim claim5 = new Claim();
@@ -96,20 +96,20 @@ public class ClaimDAOJPATest {
claim5.setDescription("Description for firstname");
claimDAO.addClaim(claim5);
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryRemoveUnknownClaim() {
claimDAO.deleteClaim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/town/WRONG");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testRemoveExistingClaim() {
claimDAO.deleteClaim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/email");
-
+
claimDAO.getClaim("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/email");
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPATest.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPATest.java b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPATest.java
index 1d63fde..9172ea6 100644
--- a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPATest.java
+++ b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPATest.java
@@ -41,20 +41,20 @@ public class EntitlementDAOJPATest {
@Autowired
private EntitlementDAO entitlementDAO;
-
-
+
+
@BeforeClass
public static void init() {
System.setProperty("spring.profiles.active", "jpa");
}
-
-
+
+
@Test
public void testReadAllEntitlements() {
List<Entitlement> entitlements = entitlementDAO.getEntitlements(0, 999);
Assert.isTrue(30 == entitlements.size(), "Size doesn't match");
}
-
+
@Test
public void testReadExistingEntitlement() {
Entitlement entitlement = entitlementDAO.getEntitlement("CLAIM_LIST");
@@ -63,26 +63,26 @@ public class EntitlementDAOJPATest {
Assert.isTrue("Description for CLAIM_LIST".equals(entitlement.getDescription()),
"Entitlement Description doesn't match");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryReadNonexistingEntitlement() {
entitlementDAO.getEntitlement("CLAIM_NOT_EXIST");
}
-
-
+
+
@Test
public void testAddNewEntitlement() {
Entitlement entitlement5 = new Entitlement();
entitlement5.setName("GUGUS_CREATE");
entitlement5.setDescription("Any entitlement");
entitlementDAO.addEntitlement(entitlement5);
-
+
List<Entitlement> entitlements = entitlementDAO.getEntitlements(0, 999);
Assert.isTrue(31 == entitlements.size(), "Size doesn't match. Entitlement not added");
}
-
-
+
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingEntitlement() {
Entitlement entitlement5 = new Entitlement();
@@ -90,26 +90,26 @@ public class EntitlementDAOJPATest {
entitlement5.setDescription("Description for CLAIM_DELETE");
entitlementDAO.addEntitlement(entitlement5);
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryRemoveUnknownEntitlement() {
entitlementDAO.deleteEntitlement("GUGUS_NOT_EXIST");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testRemoveExistingEntitlement() {
-
+
Entitlement entitlement5 = new Entitlement();
entitlement5.setName("CLAIM_TO_DELETE");
entitlement5.setDescription("Description for CLAIM_TO_DELETE");
entitlementDAO.addEntitlement(entitlement5);
-
+
entitlementDAO.deleteEntitlement("CLAIM_TO_DELETE");
-
+
entitlementDAO.getEntitlement("CLAIM_TO_DELETE");
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
index 6256371..7ebb375 100644
--- a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
+++ b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPATest.java
@@ -51,26 +51,26 @@ public class IdpDAOJPATest {
@Autowired
private IdpDAO idpDAO;
-
-
+
+
@BeforeClass
public static void init() {
System.setProperty("spring.profiles.active", "jpa");
}
-
-
+
+
@Test
public void testReadAllIdps() {
List<Idp> idps = idpDAO.getIdps(0, 999, null);
// Idp could have been removed, Order not given as per JUnit design
Assert.isTrue(0 < idps.size(), "Size doesn't match [" + idps.size() + "]");
}
-
-
+
+
@Test
public void testReadExistingIdpEmbeddedAll() throws MalformedURLException {
Idp idp = idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:realm-A", Arrays.asList("all"));
-
+
Assert.isTrue("stsKeystoreA.properties".equals(idp.getCertificate()),
"Certificate doesn't match");
Assert.isTrue("realma".equals(idp.getCertificatePassword()),
@@ -80,7 +80,7 @@ public class IdpDAOJPATest {
Assert.isTrue("IDP of Realm A".equals(idp.getServiceDescription()),
"ServiceDescription doesn't match");
Assert.isTrue("REALM A".equals(idp.getServiceDisplayName()),
- "ServiceDisplayName doesn't match");
+ "ServiceDisplayName doesn't match");
Assert.isTrue(new URL("https://localhost:9443/fediz-idp/federation").equals(idp.getIdpUrl()),
"IdpUrl doesn't match");
Assert.isTrue(new URL("https://localhost:9443/fediz-idp-sts/REALMA").equals(idp.getStsUrl()),
@@ -104,53 +104,53 @@ public class IdpDAOJPATest {
Assert.isTrue(4 == idp.getClaimTypesOffered().size(),
"Number of claims doesn't match");
}
-
+
@Test
public void testReadExistingIdpEmbeddedTrustedIdps() {
Idp idp = idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:realm-A",
Arrays.asList("trusted-idps"));
-
+
Assert.isTrue(1 == idp.getTrustedIdps().size(),
"Number of trusted IDPs doesn't match");
}
-
+
@Test
public void testReadExistingIdpEmbeddedClaims() {
Idp idp = idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:realm-A",
Arrays.asList("claims"));
-
+
Assert.isTrue(4 == idp.getClaimTypesOffered().size(),
"Number of claims doesn't match");
}
-
+
@Test
public void testReadExistingIdpEmbeddedApplications() {
Idp idp = idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:realm-A", Arrays.asList("applications"));
-
+
Assert.isTrue(2 == idp.getApplications().size(), "Number of applications doesn't match");
}
-
+
@Test
public void testReadExistingIdpEmbeddedNull() {
Idp idp = idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:realm-A",
null);
-
+
Assert.isTrue(0 == idp.getClaimTypesOffered().size(),
"Number of claims doesn't match");
Assert.isTrue(0 == idp.getApplications().size(),
"Number of applications doesn't match");
Assert.isTrue(0 == idp.getTrustedIdps().size(),
"Number of trusted IDPs doesn't match");
-
+
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryReadNonexistingIdp() {
idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:NOTEXIST", null);
}
-
-
+
+
@Test
public void testAddNewIdp() throws MalformedURLException {
Idp idp = new Idp();
@@ -175,11 +175,11 @@ public class IdpDAOJPATest {
tokenTypes.add(WSConstants.SAML_NS);
idp.setTokenTypesOffered(tokenTypes);
idp.setUseCurrentIdp(true);
-
+
idpDAO.addIdp(idp);
-
+
idp = idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:testadd", null);
-
+
Assert.isTrue("stsKeystoreA.properties".equals(idp.getCertificate()),
"Certificate doesn't match");
Assert.isTrue("realma".equals(idp.getCertificatePassword()),
@@ -189,7 +189,7 @@ public class IdpDAOJPATest {
Assert.isTrue("IDP of New Realm".equals(idp.getServiceDescription()),
"ServiceDescription doesn't match");
Assert.isTrue("NEW REALM".equals(idp.getServiceDisplayName()),
- "ServiceDisplayName doesn't match");
+ "ServiceDisplayName doesn't match");
Assert.isTrue(new URL("https://localhost:9443/fediz-idp/federation").equals(idp.getIdpUrl()),
"IdpUrl doesn't match");
Assert.isTrue(new URL("https://localhost:9443/fediz-idp-sts/REALMN").equals(idp.getStsUrl()),
@@ -214,39 +214,39 @@ public class IdpDAOJPATest {
"Number of claims doesn't match");
}
-
-
+
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingIdp() throws MalformedURLException {
Idp idp = createIdp("urn:org:apache:cxf:fediz:idp:realm-A");
idpDAO.addIdp(idp);
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryRemoveUnknownIdp() {
idpDAO.deleteIdp("urn:org:apache:cxf:fediz:idp:NOTEXIST");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testRemoveExistingIdp() throws MalformedURLException {
Idp idp = createIdp("urn:org:apache:cxf:fediz:idp:testdelete");
-
+
idpDAO.addIdp(idp);
-
+
idpDAO.deleteIdp("urn:org:apache:cxf:fediz:idp:testdelete");
-
+
idpDAO.getIdp("urn:org:apache:cxf:fediz:idp:testdelete", null);
}
-
+
@Test
public void testUpdateIdp() throws MalformedURLException {
String realm = "urn:org:apache:cxf:fediz:idp:testupdate";
//Prepare
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
//Testcase
idp = new Idp();
idp.setRealm(realm);
@@ -269,9 +269,9 @@ public class IdpDAOJPATest {
idp.setTokenTypesOffered(tokenTypes);
idp.setUseCurrentIdp(false);
idpDAO.updateIdp(realm, idp);
-
+
idp = idpDAO.getIdp(realm, null);
-
+
Assert.isTrue("UstsKeystoreA.properties".equals(idp.getCertificate()),
"Certificate doesn't match");
Assert.isTrue("Urealma".equals(idp.getCertificatePassword()),
@@ -281,7 +281,7 @@ public class IdpDAOJPATest {
Assert.isTrue("UIDP of New Realm".equals(idp.getServiceDescription()),
"ServiceDescription doesn't match");
Assert.isTrue("UNEW REALM".equals(idp.getServiceDisplayName()),
- "ServiceDisplayName doesn't match");
+ "ServiceDisplayName doesn't match");
Assert.isTrue(new URL("https://localhost:9443/fediz-idp/federationUU").equals(idp.getIdpUrl()),
"IdpUrl doesn't match");
Assert.isTrue(new URL("https://localhost:9443/fediz-idp-sts/REALMAUU").equals(idp.getStsUrl()),
@@ -304,17 +304,17 @@ public class IdpDAOJPATest {
"Number of trusted IDPs doesn't match");
Assert.isTrue(0 == idp.getClaimTypesOffered().size(),
"Number of claims doesn't match");
-
+
}
-
+
@Test(expected = EmptyResultDataAccessException.class)
public void testUpdateUnknownIdp() throws MalformedURLException {
String realm = "urn:org:apache:cxf:fediz:idp:testupdate2";
-
+
//Prepare
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
//Testcase
idp = new Idp();
idp.setRealm(realm);
@@ -338,277 +338,277 @@ public class IdpDAOJPATest {
idp.setUseCurrentIdp(false);
idpDAO.updateIdp("urn:UNKNOWN", idp);
}
-
+
@Test
public void testAddClaimToIdp() throws MalformedURLException {
String realm = "urn:org:apache:cxf:fediz:idp:testaddclaim";
-
+
//Prepare
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
//Testcase
Claim claim = new Claim();
claim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"));
-
+
idpDAO.addClaimToIdp(idp, claim);
-
+
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
-
+
Assert.isTrue(1 == idp.getClaimTypesOffered().size(), "claimTypesOffered size doesn't match");
}
-
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingClaimToIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Claim claim = new Claim();
claim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"));
-
+
idpDAO.addClaimToIdp(idp, claim);
}
-
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryAddUnknownClaimToIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Claim claim = new Claim();
claim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/UNKOWN"));
-
+
idpDAO.addClaimToIdp(idp, claim);
-
+
}
-
+
@Test
public void testRemoveClaimFromIdp() throws MalformedURLException {
String realm = "urn:org:apache:cxf:fediz:fedizhelloworld:testremoveclaim";
//Prepare step
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
Claim claim = new Claim();
claim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"));
idpDAO.addClaimToIdp(idp, claim);
-
+
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
Assert.isTrue(1 == idp.getClaimTypesOffered().size(),
"claimTypesOffered size doesn't match [" + idp.getClaimTypesOffered().size() + "]");
-
+
//Testcase
idpDAO.removeClaimFromIdp(idp, claim);
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
Assert.isTrue(0 == idp.getClaimTypesOffered().size(),
"claimTypesOffered size doesn't match [" + idp.getClaimTypesOffered().size() + "]");
}
-
+
@Test(expected = JpaObjectRetrievalFailureException.class)
public void testTryRemoveNotAssignedClaimFromIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Claim claim = new Claim();
claim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/city"));
-
+
idpDAO.removeClaimFromIdp(idp, claim);
}
-
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryRemoveUnknownClaimFromIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Claim claim = new Claim();
claim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/UNKNOWN"));
-
+
idpDAO.removeClaimFromIdp(idp, claim);
}
-
+
@Test
public void testAddApplicationToIdp() throws MalformedURLException {
String realm = "urn:org:apache:cxf:fediz:app:testaddApplication";
-
+
//Prepare
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
//Testcase
//Application app = createApplication(realm);
Application app = new Application();
app.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
idpDAO.addApplicationToIdp(idp, app);
-
+
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
-
+
Assert.isTrue(1 == idp.getApplications().size(), "applications size doesn't match");
}
-
-
+
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingApplicationToIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Application app = new Application();
app.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
-
+
idpDAO.addApplicationToIdp(idp, app);
}
-
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryAddUnknownApplicationToIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Application app = new Application();
app.setRealm("urn:org:apache:cxf:fediz:UNKNOWN");
-
+
idpDAO.addApplicationToIdp(idp, app);
-
+
}
-
+
@Test
public void testRemoveApplicationFromIdp() throws MalformedURLException {
String realm = "urn:org:apache:cxf:fediz:fedizhelloworld:testremoveapp";
//Prepare step
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
Application app = new Application();
app.setRealm("urn:org:apache:cxf:fediz:fedizhelloworld");
idpDAO.addApplicationToIdp(idp, app);
-
+
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
Assert.isTrue(1 == idp.getApplications().size(),
"applications size doesn't match [" + idp.getApplications().size() + "]");
-
+
//Testcase
idpDAO.removeApplicationFromIdp(idp, app);
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
Assert.isTrue(0 == idp.getApplications().size(),
"applications size doesn't match [" + idp.getApplications().size() + "]");
}
-
-
+
+
@Test(expected = JpaObjectRetrievalFailureException.class)
public void testTryRemoveNotAssignedApplicationFromIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Application app = new Application();
app.setRealm("myrealm2");
-
+
idpDAO.removeApplicationFromIdp(idp, app);
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryRemoveUnknownApplicationFromIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
Application app = new Application();
app.setRealm("urn:org:apache:cxf:fediz:UNKNOWN");
-
+
idpDAO.removeApplicationFromIdp(idp, app);
}
-
-
-
-
-
-
+
+
+
+
+
+
@Test
public void testAddTrustedIdpToIdp() throws MalformedURLException {
String realm = "urn:org:apache:cxf:fediz:trusted-idp:testaddTrustedIdp";
-
+
//Prepare
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
//Testcase
//Application app = createApplication(realm);
TrustedIdp trustedIdp = new TrustedIdp();
trustedIdp.setRealm("urn:org:apache:cxf:fediz:idp:realm-B");
idpDAO.addTrustedIdpToIdp(idp, trustedIdp);
-
+
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
-
+
Assert.isTrue(1 == idp.getTrustedIdps().size(), "applications size doesn't match");
}
-
+
/*
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingTrustedIdpToIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
TrustedIdp trustedIdp = new TrustedIdp();
trustedIdp.setRealm("urn:org:apache:cxf:fediz:idp:realm-B");
-
+
idpDAO.addTrustedIdpToIdp(idp, trustedIdp);
}
-
+
@Test(expected = NoResultException.class)
public void testTryAddUnknownTrustedIdpToIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
TrustedIdp trustedIdp = new TrustedIdp();
trustedIdp.setRealm("urn:org:apache:cxf:fediz:UNKNOWN");
-
+
idpDAO.addTrustedIdpToIdp(idp, trustedIdp);
}
-
+
@Test
public void testRemoveTrustedIdpFromIdp() {
String realm = "urn:org:apache:cxf:fediz:trustedidp:testremove";
//Prepare step
Idp idp = createIdp(realm);
idpDAO.addIdp(idp);
-
+
TrustedIdp trustedIdp = new TrustedIdp();
trustedIdp.setRealm("urn:org:apache:cxf:fediz:idp:realm-B");
idpDAO.addTrustedIdpToIdp(idp, trustedIdp);
-
+
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
Assert.isTrue(1 == idp.getTrustedIdps().size(),
"trustedIdps size doesn't match [" + idp.getTrustedIdps().size() + "]");
-
+
//Testcase
idpDAO.removeTrustedIdpFromIdp(idp, trustedIdp);
idp = idpDAO.getIdp(realm, Arrays.asList("all"));
Assert.isTrue(0 == idp.getTrustedIdps().size(),
"trustedIdps size doesn't match [" + idp.getTrustedIdps().size() + "]");
}
-
-
+
+
@Test(expected = EntityNotFoundException.class)
public void testTryRemoveNotAssignedTrustedIdpFromIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
TrustedIdp trustedIdp = new TrustedIdp();
trustedIdp.setRealm("trustedidp2realm");
-
+
idpDAO.removeTrustedIdpFromIdp(idp, trustedIdp);
}
-
-
+
+
@Test(expected = NoResultException.class)
public void testTryRemoveUnknownTrustedIdpFromIdp() {
Idp idp = new Idp();
idp.setRealm("urn:org:apache:cxf:fediz:idp:realm-A");
-
+
TrustedIdp trustedIdp = new TrustedIdp();
trustedIdp.setRealm("urn:org:apache:cxf:fediz:UNKNOWN");
-
+
idpDAO.removeTrustedIdpFromIdp(idp, trustedIdp);
}
*/
-
-
+
+
private static Idp createIdp(String realm) throws MalformedURLException {
Idp idp = new Idp();
idp.setRealm(realm);
@@ -648,6 +648,6 @@ public class IdpDAOJPATest {
return application;
}
*/
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TestDBLoader.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TestDBLoader.java b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TestDBLoader.java
index 222277a..b44a4bf 100644
--- a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TestDBLoader.java
+++ b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TestDBLoader.java
@@ -29,32 +29,32 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional
public class TestDBLoader implements DBLoader {
-
+
public static final String NAME = "UNITTESTDBLOADER";
-
+
private static final Logger LOG = LoggerFactory.getLogger(TestDBLoader.class);
-
+
private EntityManager em;
@PersistenceContext
public void setEntityManager(EntityManager entityManager) {
this.em = entityManager;
}
-
+
@Override
public String getName() {
return NAME;
}
-
+
public void load() {
-
+
try {
ClaimEntity claimEntity5 = new ClaimEntity();
claimEntity5.setClaimType("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/city");
claimEntity5.setDisplayName("city");
claimEntity5.setDescription("Description for city");
em.persist(claimEntity5);
-
+
ApplicationEntity entity2 = new ApplicationEntity();
entity2.setEncryptionCertificate("my encryption cert2");
entity2.setLifeTime(1800);
@@ -71,7 +71,7 @@ public class TestDBLoader implements DBLoader {
em.persist(ace5);
entity2.getRequestedClaims().add(ace5);
em.persist(entity2);
-
+
TrustedIdpEntity entity4 = new TrustedIdpEntity();
entity4.setCacheTokens(true);
entity4.setCertificate("trusted cert");
@@ -83,9 +83,9 @@ public class TestDBLoader implements DBLoader {
entity4.setTrustType(TrustType.PEER_TRUST);
entity4.setUrl("https://localhost:${realmB.port}/fediz-idp-remote/federation");
em.persist(entity4);
-
+
em.flush();
-
+
} catch (Exception ex) {
LOG.warn("Failed to initialize DB with data", ex);
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
index 2ebe5ba..9e65ed0 100644
--- a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
+++ b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPATest.java
@@ -43,20 +43,20 @@ public class TrustedIdpDAOJPATest {
@Autowired
private TrustedIdpDAO trustedIdpDAO;
-
-
+
+
@BeforeClass
public static void init() {
System.setProperty("spring.profiles.active", "jpa");
}
-
-
+
+
@Test
public void testReadAllTrustedIdps() {
List<TrustedIdp> trustedIdps = trustedIdpDAO.getTrustedIDPs(0, 999);
Assert.isTrue(2 <= trustedIdps.size(), "Size doesn't match");
}
-
+
@Test
public void testReadExistingTrustedIdp() {
TrustedIdp trustedIdp = trustedIdpDAO.getTrustedIDP("urn:org:apache:cxf:fediz:idp:realm-B");
@@ -65,62 +65,62 @@ public class TrustedIdpDAOJPATest {
Assert.isTrue("Realm B description".equals(trustedIdp.getDescription()),
"Description name doesn't match");
Assert.isTrue(FederationType.FEDERATE_IDENTITY.equals(trustedIdp.getFederationType()),
- "FederationType doesn't match");
+ "FederationType doesn't match");
Assert.isTrue("Realm B".equals(trustedIdp.getName()),
- "Name doesn't match");
+ "Name doesn't match");
Assert.isTrue("http://docs.oasis-open.org/wsfed/federation/200706".equals(trustedIdp.getProtocol()),
- "Protocol doesn't match");
+ "Protocol doesn't match");
Assert.isTrue("urn:org:apache:cxf:fediz:idp:realm-B".equals(trustedIdp.getRealm()),
- "Realm doesn't match");
+ "Realm doesn't match");
Assert.isTrue(TrustType.PEER_TRUST.equals(trustedIdp.getTrustType()),
"TrustType doesn't match");
Assert.isTrue("https://localhost:12443/fediz-idp-remote/federation".equals(trustedIdp.getUrl()),
- "Url doesn't match");
- Assert.isTrue(trustedIdp.isCacheTokens(), "CacheTokens doesn't match");
+ "Url doesn't match");
+ Assert.isTrue(trustedIdp.isCacheTokens(), "CacheTokens doesn't match");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryReadNonexistingTrustedIdp() {
trustedIdpDAO.getTrustedIDP("urn:org:apache:cxf:fediz:idp:NOTEXIST");
}
-
-
+
+
@Test
public void testAddNewTrustedIdp() {
String realm = "urn:org:apache:cxf:fediz:trusted-idp:testadd";
TrustedIdp trustedIdp = createTrustedIdp(realm);
trustedIdpDAO.addTrustedIDP(trustedIdp);
-
+
trustedIdp = trustedIdpDAO.getTrustedIDP(realm);
-
+
Assert.isTrue("realmb.cert".equals(trustedIdp.getCertificate()),
"Certificate name doesn't match");
Assert.isTrue("Realm B description".equals(trustedIdp.getDescription()),
"Description name doesn't match");
Assert.isTrue(FederationType.FEDERATE_IDENTITY.equals(trustedIdp.getFederationType()),
- "FederationType doesn't match");
+ "FederationType doesn't match");
Assert.isTrue("Realm B".equals(trustedIdp.getName()),
- "Name doesn't match");
+ "Name doesn't match");
Assert.isTrue("http://docs.oasis-open.org/wsfed/federation/200706".equals(trustedIdp.getProtocol()),
- "Protocol doesn't match");
+ "Protocol doesn't match");
Assert.isTrue(realm.equals(trustedIdp.getRealm()),
- "Realm doesn't match");
+ "Realm doesn't match");
Assert.isTrue(TrustType.PEER_TRUST.equals(trustedIdp.getTrustType()),
"TrustType doesn't match");
Assert.isTrue("https://localhost:12443/fediz-idp-remote/federation".equals(trustedIdp.getUrl()),
- "Url doesn't match");
- Assert.isTrue(!trustedIdp.isCacheTokens(), "CacheTokens doesn't match");
+ "Url doesn't match");
+ Assert.isTrue(!trustedIdp.isCacheTokens(), "CacheTokens doesn't match");
}
-
-
+
+
@Test
public void testUpdateTrustedIdp() {
String realm = "urn:org:apache:cxf:fediz:trusted-idp:testupdate";
//Prepare
TrustedIdp trustedIdp = createTrustedIdp(realm);
trustedIdpDAO.addTrustedIDP(trustedIdp);
-
+
//Testcase
trustedIdp = new TrustedIdp();
trustedIdp.setRealm(realm);
@@ -132,58 +132,58 @@ public class TrustedIdpDAOJPATest {
trustedIdp.setProtocol("http://docs.oasis-open.org/wsfed/federation/200706");
trustedIdp.setTrustType(TrustType.INDIRECT_TRUST);
trustedIdp.setUrl("Uhttps://localhost:12443/fediz-idp-remote/federation");
-
+
trustedIdpDAO.updateTrustedIDP(realm, trustedIdp);
-
+
trustedIdp = trustedIdpDAO.getTrustedIDP(realm);
-
+
Assert.isTrue("Utrusted cert".equals(trustedIdp.getCertificate()),
"Certificate name doesn't match");
Assert.isTrue("URealm B description".equals(trustedIdp.getDescription()),
"Description name doesn't match");
Assert.isTrue(FederationType.FEDERATE_CLAIMS.equals(trustedIdp.getFederationType()),
- "FederationType doesn't match");
+ "FederationType doesn't match");
Assert.isTrue("URealm B".equals(trustedIdp.getName()),
- "Name doesn't match");
+ "Name doesn't match");
Assert.isTrue("http://docs.oasis-open.org/wsfed/federation/200706".equals(trustedIdp.getProtocol()),
- "Protocol doesn't match");
+ "Protocol doesn't match");
Assert.isTrue(realm.equals(trustedIdp.getRealm()),
- "Realm doesn't match");
+ "Realm doesn't match");
Assert.isTrue(TrustType.INDIRECT_TRUST.equals(trustedIdp.getTrustType()),
"TrustType doesn't match");
Assert.isTrue("Uhttps://localhost:12443/fediz-idp-remote/federation".equals(trustedIdp.getUrl()),
- "Url doesn't match");
+ "Url doesn't match");
Assert.isTrue(trustedIdp.isCacheTokens(), "CacheTokens doesn't match");
-
+
}
-
-
+
+
@Test(expected = DataIntegrityViolationException.class)
public void testTryAddExistingTrustedIdp() {
TrustedIdp trustedIdp = createTrustedIdp("urn:org:apache:cxf:fediz:idp:realm-B");
trustedIdpDAO.addTrustedIDP(trustedIdp);
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testTryRemoveUnknownTrustedIdp() {
trustedIdpDAO.deleteTrustedIDP("urn:org:apache:cxf:fediz:trusted-idp:NOTEXIST");
}
-
-
+
+
@Test(expected = EmptyResultDataAccessException.class)
public void testRemoveExistingTrustedIdp() {
String realm = "urn:org:apache:cxf:fediz:trusted-idp:testdelete";
TrustedIdp trustedIdp = createTrustedIdp(realm);
-
+
trustedIdpDAO.addTrustedIDP(trustedIdp);
-
+
trustedIdpDAO.deleteTrustedIDP(realm);
-
+
trustedIdpDAO.getTrustedIDP(realm);
}
-
-
+
+
private static TrustedIdp createTrustedIdp(String realm) {
TrustedIdp trustedIdp = new TrustedIdp();
trustedIdp.setRealm(realm);
@@ -197,6 +197,6 @@ public class TrustedIdpDAOJPATest {
trustedIdp.setUrl("https://localhost:12443/fediz-idp-remote/federation");
return trustedIdp;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/util/MetadataWriterTest.java
----------------------------------------------------------------------
diff --git a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/util/MetadataWriterTest.java b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/util/MetadataWriterTest.java
index 85c369b..1b5929f 100644
--- a/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/util/MetadataWriterTest.java
+++ b/services/idp-core/src/test/java/org/apache/cxf/fediz/service/idp/util/MetadataWriterTest.java
@@ -33,25 +33,25 @@ import org.springframework.util.Assert;
public class MetadataWriterTest {
private static ApplicationContext applicationContext;
-
+
@BeforeClass
public static void init() {
applicationContext = new ClassPathXmlApplicationContext("/idp-config.xml");
}
-
+
@Test
public void testWriteIDPMetadata() {
ConfigService config = (ConfigService)applicationContext.getBean("config");
Assert.notNull(config, "ConfigService must not be null");
Idp idpConfig = config.getIDP("urn:org:apache:cxf:fediz:idp:realm-A");
Assert.notNull(idpConfig, "IDPConfig must not be null");
-
+
IdpMetadataWriter writer = new IdpMetadataWriter();
Document doc = writer.getMetaData(idpConfig);
Assert.notNull(doc, "doc must not be null");
-
+
System.out.println(DOM2Writer.nodeToString(doc));
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
----------------------------------------------------------------------
diff --git a/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java b/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
index 8c02d11..f8eee73 100644
--- a/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
+++ b/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
@@ -43,7 +43,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class RestITTest {
-
+
private static String idpHttpsPort;
private static String realm;
private static Bus bus;
@@ -63,26 +63,26 @@ public class RestITTest {
idpHttpsPort = System.getProperty("idp.https.port");
Assert.assertNotNull("Property 'idp.https.port' null", idpHttpsPort);
-
+
realm = System.getProperty("realm");
Assert.assertNotNull("Property 'realm' null", realm);
SpringBusFactory bf = new SpringBusFactory();
-
+
URL busFile = RestITTest.class.getResource("/rest-client.xml");
bus = bf.createBus(busFile.toString());
SpringBusFactory.setDefaultBus(bus);
SpringBusFactory.setThreadDefaultBus(bus);
-
+
}
-
+
@AfterClass
public static void cleanup() {
if (bus != null) {
bus.shutdown(true);
}
}
-
+
@Test
public void testGetAllIdps() throws UnsupportedEncodingException, MalformedURLException {
String address = "https://localhost:" + idpHttpsPort + "/" + getContextName() + "/services/rs";
@@ -91,7 +91,7 @@ public class RestITTest {
.request("application/xml").header("Authorization", getBasicAuthentication("admin", "password"))
.get(Idps.class);
Assert.assertEquals(1L, idps.getIdps().size());
-
+
Idp idp = idps.getIdps().iterator().next();
if ("realm-a".equals(realm)) {
Assert.assertEquals("Certificate doesn't match",
@@ -160,7 +160,7 @@ public class RestITTest {
public void testReadExistingIdpEmbeddedTrustedIdps() throws UnsupportedEncodingException {
String address = "https://localhost:" + idpHttpsPort + "/" + getContextName() + "/services/rs";
Client client = ClientBuilder.newClient();
-
+
if ("realm-a".equals(realm)) {
Idp idp = client.target(address).path("idps/").path("urn:org:apache:cxf:fediz:idp:realm-A")
.request("application/xml").header("Authorization", getBasicAuthentication("admin", "password"))
@@ -173,13 +173,13 @@ public class RestITTest {
Assert.assertEquals("", "urn:org:apache:cxf:fediz:idp:realm-B", idp.getRealm());
}
}
-
+
@Test
public void testAddClaimToApplication() throws UnsupportedEncodingException {
-
+
String address = "https://localhost:" + idpHttpsPort + "/" + getContextName() + "/services/rs";
Client client = ClientBuilder.newClient();
-
+
String realmToAdd = "urn:org:apache:cxf:fediz:fedizhelloworld:testaddclaim";
Application application = new Application();
application.setRealm(realmToAdd);
@@ -190,29 +190,29 @@ public class RestITTest {
application.setServiceDescription("Fedizhelloworld description");
application.setServiceDisplayName("Fedizhelloworld");
application.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0");
-
+
Response response = client.target(address).path("applications/")
.request("application/xml").header("Authorization", getBasicAuthentication("admin", "password"))
.post(Entity.entity(application, MediaType.APPLICATION_XML));
Assert.assertEquals(Status.CREATED.getStatusCode(), response.getStatus());
-
+
//Testcase
RequestClaim requestClaim = new RequestClaim();
requestClaim.setOptional(false);
requestClaim.setClaimType(URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"));
-
+
response = client.target(address).path("applications").path(realmToAdd).path("claims")
.request("application/xml").header("Authorization", getBasicAuthentication("admin", "password"))
.post(Entity.entity(requestClaim, MediaType.APPLICATION_XML));
Assert.assertEquals(Status.NO_CONTENT.getStatusCode(), response.getStatus());
-
+
application = client.target(address).path("applications").path(realmToAdd).queryParam("expand", "claims")
.request("application/xml").header("Authorization", getBasicAuthentication("admin", "password"))
.get(Application.class);
Assert.assertEquals("Claims size should be 1 instead of " + application.getRequestedClaims().size(),
1, application.getRequestedClaims().size());
}
-
+
private String getBasicAuthentication(String username, String password) throws UnsupportedEncodingException {
String token = username + ":" + password;
return "Basic " + Base64.encode(token.getBytes());
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/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 8511aca..527eb74 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
@@ -53,28 +53,28 @@ public class FedizSubjectCreator implements SubjectCreator {
private String issuer;
private long defaultTimeToLive = 3600L;
private Map<String, String> supportedClaims = Collections.emptyMap();
-
+
@Override
- public UserSubject createUserSubject(MessageContext mc,
+ public UserSubject createUserSubject(MessageContext mc,
MultivaluedMap<String, String> params) throws OAuthServiceException {
Principal principal = mc.getSecurityContext().getUserPrincipal();
-
+
if (!(principal instanceof FedizPrincipal)) {
throw new OAuthServiceException("Unsupported Principal");
}
- FedizPrincipal fedizPrincipal = (FedizPrincipal)principal;
-
+ FedizPrincipal fedizPrincipal = (FedizPrincipal)principal;
+
// In the future FedizPrincipal will likely have JWT claims already prepared,
- // with IdToken being initialized here from those claims
+ // with IdToken being initialized here from those claims
OidcUserSubject oidcSub = new OidcUserSubject();
oidcSub.setLogin(fedizPrincipal.getName());
-
+
// Subject ID - a locally unique and never reassigned identifier allocated to the end user
- // REVISIT:
+ // REVISIT:
// Can it be allocated on per-session basis or is it something that is supposed to be created
// by the authentication system (IDP/STS) once and reported every time a given user signs in ?
oidcSub.setId(Base64UrlUtility.encode(CryptoUtils.generateSecureRandomBytes(16)));
-
+
IdToken idToken = convertToIdToken(fedizPrincipal.getLoginToken(),
oidcSub.getLogin(),
oidcSub.getId(),
@@ -84,26 +84,26 @@ public class FedizSubjectCreator implements SubjectCreator {
oidcSub.setIdToken(idToken);
// UserInfo can be populated and set on OidcUserSubject too.
// UserInfoService will create it otherwise.
-
+
return oidcSub;
}
-
- private IdToken convertToIdToken(Element samlToken,
+
+ private IdToken convertToIdToken(Element samlToken,
String subjectName,
String subjectId,
ClaimCollection claims,
List<String> roles,
String requestedClaims) {
// The current SAML Assertion represents an authentication record.
- // It has to be translated into IdToken (JWT) so that it can be returned
+ // It has to be translated into IdToken (JWT) so that it can be returned
// to client applications participating in various OIDC flows.
-
+
IdToken idToken = new IdToken();
-
+
//TODO: make the mapping between the subject name and IdToken claim configurable
idToken.setPreferredUserName(subjectName);
idToken.setSubject(subjectId);
-
+
Assertion saml2Assertion = getSaml2Assertion(samlToken);
if (saml2Assertion != null) {
// issueInstant
@@ -111,7 +111,7 @@ public class FedizSubjectCreator implements SubjectCreator {
if (issueInstant != null) {
idToken.setIssuedAt(issueInstant.getMillis() / 1000);
}
-
+
// expiryTime
if (saml2Assertion.getConditions() != null) {
DateTime expires = saml2Assertion.getConditions().getNotOnOrAfter();
@@ -119,15 +119,15 @@ public class FedizSubjectCreator implements SubjectCreator {
idToken.setExpiryTime(expires.getMillis() / 1000);
}
}
-
+
// authInstant
if (!saml2Assertion.getAuthnStatements().isEmpty()) {
- DateTime authInstant =
+ DateTime authInstant =
saml2Assertion.getAuthnStatements().get(0).getAuthnInstant();
idToken.setAuthenticationTime(authInstant.getMillis() / 1000L);
}
}
- // Check if default issuer, issuedAt and expiryTime values have to be set
+ // Check if default issuer, issuedAt and expiryTime values have to be set
if (issuer != null) {
idToken.setIssuer(issuer);
} else if (saml2Assertion != null) {
@@ -136,7 +136,7 @@ public class FedizSubjectCreator implements SubjectCreator {
idToken.setIssuer(assertionIssuer.getValue());
}
}
-
+
long currentTimeInSecs = System.currentTimeMillis() / 1000;
if (idToken.getIssuedAt() == null) {
idToken.setIssuedAt(currentTimeInSecs);
@@ -144,13 +144,13 @@ public class FedizSubjectCreator implements SubjectCreator {
if (idToken.getExpiryTime() == null) {
idToken.setExpiryTime(currentTimeInSecs + defaultTimeToLive);
}
-
+
// Additional claims requested
List<String> requestedClaimsList = Collections.emptyList();
if (requestedClaims != null && !supportedClaims.isEmpty()) {
requestedClaimsList = Arrays.asList(requestedClaims.trim().split(" "));
}
-
+
// Map claims
if (claims != null) {
String firstName = null;
@@ -179,14 +179,14 @@ public class FedizSubjectCreator implements SubjectCreator {
&& requestedClaimsList.contains(supportedClaims.get(c.getClaimType().toString()))) {
idToken.setClaim(supportedClaims.get(c.getClaimType().toString()), (String)c.getValue());
}
-
+
}
if (firstName != null && lastName != null) {
idToken.setName(firstName + " " + lastName);
}
}
-
- if (roles != null && !roles.isEmpty()
+
+ if (roles != null && !roles.isEmpty()
&& supportedClaims.containsKey(FedizConstants.DEFAULT_ROLE_URI.toString())
&& requestedClaimsList.contains(supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI.toString()))) {
if (roles.size() == 1) {
@@ -195,7 +195,7 @@ public class FedizSubjectCreator implements SubjectCreator {
idToken.setClaim(supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI.toString()), roles);
}
}
-
+
return idToken;
}
@@ -208,15 +208,15 @@ public class FedizSubjectCreator implements SubjectCreator {
} catch (WSSecurityException ex) {
throw new OAuthServiceException("Error converting SAML token", ex);
}
-
+
}
public void setIdTokenIssuer(String idTokenIssuer) {
this.issuer = idTokenIssuer;
}
-
-
+
+
public void setIdTokenTimeToLive(long idTokenTimeToLive) {
this.defaultTimeToLive = idTokenTimeToLive;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/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 a14af3b..1882e0a 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
@@ -39,15 +39,15 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
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;
-
+
@Override
public Client getClient(String clientId) {
//TODO: push most of this code into the abstract class
@@ -55,11 +55,11 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
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
- // "client_credentials" can be difficult.
+ // 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
@@ -82,18 +82,18 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
// 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");
+ throw new OAuthServiceException("Required scopes are missing");
}
return super.convertScopeToPermissions(client, requestedScopes);
}
-
+
protected Client authenticateClient(String clientId, String clientSecret) {
if (contextName != null) {
try {
// Login using JAAS
- CallbackHandler callbackHandler =
+ CallbackHandler callbackHandler =
new NamePasswordCallbackHandler(clientId, clientSecret);
- LoginContext ctx = new LoginContext(contextName, null, callbackHandler, loginConfig);
+ LoginContext ctx = new LoginContext(contextName, null, callbackHandler, loginConfig);
ctx.login();
Client client = createClientCredClient(clientId, clientSecret);
ctx.logout();
@@ -109,7 +109,7 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
public void setCheckOnlyRegisteredClients(boolean checkOnlyRegisteredClients) {
this.checkOnlyRegisteredClients = checkOnlyRegisteredClients;
}
-
+
public void setContextName(String contextName) {
this.contextName = contextName;
}
@@ -121,7 +121,7 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
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));
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/PrivateKeyPasswordProviderImpl.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/PrivateKeyPasswordProviderImpl.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/PrivateKeyPasswordProviderImpl.java
index 0e0b9d3..98ff23e 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/PrivateKeyPasswordProviderImpl.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/PrivateKeyPasswordProviderImpl.java
@@ -25,7 +25,7 @@ import org.apache.cxf.rs.security.jose.common.PrivateKeyPasswordProvider;
public class PrivateKeyPasswordProviderImpl implements PrivateKeyPasswordProvider {
private String password = "password";
-
+
@Override
public char[] getPassword(Properties props) {
return password.toCharArray();
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
index af2b45f..eece486 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientCodeGrants.java
@@ -43,6 +43,6 @@ public class ClientCodeGrants {
public void setCodeGrants(List<ServerAuthorizationCodeGrant> codeGrants) {
this.codeGrants = codeGrants;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
index 3bdf1b9..3ace9ae 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientRegistrationService.java
@@ -73,14 +73,14 @@ public class ClientRegistrationService {
private Map<String, String> homeRealms = new LinkedHashMap<String, String>();
private boolean protectIdTokenWithClientSecret;
private Map<String, String> clientScopes;
-
+
private SecurityContext sc;
@Context
public void setSecurityContext(SecurityContext securityContext) {
this.sc = securityContext;
}
-
+
@GET
@Produces(MediaType.TEXT_HTML)
@Path("/register")
@@ -106,14 +106,14 @@ public class ClientRegistrationService {
}
return null;
}
-
-
+
+
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Produces(MediaType.TEXT_HTML)
@Path("/{id}/remove")
public RegisteredClients removeClient(@PathParam("id") String id) {
- Collection<Client> clients = getClientRegistrations();
+ Collection<Client> clients = getClientRegistrations();
for (Iterator<Client> it = clients.iterator(); it.hasNext();) {
Client c = it.next();
if (c.getClientId().equals(id)) {
@@ -140,7 +140,7 @@ public class ClientRegistrationService {
clientProvider.setClient(c);
return c;
}
-
+
@GET
@Produces(MediaType.TEXT_HTML)
@Path("/{id}/tokens")
@@ -148,14 +148,14 @@ public class ClientRegistrationService {
Client c = getRegisteredClient(id);
return doGetClientIssuedTokens(c);
}
-
+
protected ClientTokens doGetClientIssuedTokens(Client c) {
Comparator<ServerAccessToken> tokenComp = new TokenComparator();
UserSubject subject = new OidcUserSubject(getUserName());
- List<ServerAccessToken> accessTokens =
+ List<ServerAccessToken> accessTokens =
new ArrayList<ServerAccessToken>(dataProvider.getAccessTokens(c, subject));
Collections.sort(accessTokens, tokenComp);
- List<RefreshToken> refreshTokens =
+ List<RefreshToken> refreshTokens =
new ArrayList<RefreshToken>(dataProvider.getRefreshTokens(c, subject));
Collections.sort(refreshTokens, tokenComp);
return new ClientTokens(c, accessTokens, refreshTokens);
@@ -168,7 +168,7 @@ public class ClientRegistrationService {
@PathParam("tokenId") String tokenId) {
return doRevokeClientToken(clientId, tokenId, OAuthConstants.ACCESS_TOKEN);
}
-
+
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Produces(MediaType.TEXT_HTML)
@@ -177,7 +177,7 @@ public class ClientRegistrationService {
@PathParam("tokenId") String tokenId) {
return doRevokeClientToken(clientId, tokenId, OAuthConstants.REFRESH_TOKEN);
}
-
+
protected ClientTokens doRevokeClientToken(String clientId,
String tokenId,
String tokenType) {
@@ -185,7 +185,7 @@ public class ClientRegistrationService {
dataProvider.revokeToken(c, tokenId, tokenType);
return doGetClientIssuedTokens(c);
}
-
+
@GET
@Produces(MediaType.TEXT_HTML)
@Path("/{id}/codes")
@@ -200,7 +200,7 @@ public class ClientRegistrationService {
}
return null;
}
-
+
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Produces(MediaType.TEXT_HTML)
@@ -213,13 +213,13 @@ public class ClientRegistrationService {
}
return null;
}
-
+
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Produces(MediaType.TEXT_HTML)
@Path("/")
public Response registerForm(@FormParam("client_name") String appName,
- @FormParam("client_type") String appType,
+ @FormParam("client_type") String appType,
@FormParam("client_audience") String audience,
@FormParam("client_redirectURI") String redirectURI,
@FormParam("client_logoutURI") String logoutURI,
@@ -244,17 +244,17 @@ public class ClientRegistrationService {
String clientSecret = isConfidential
? generateClientSecret()
: null;
-
+
Client newClient = new Client(clientId, clientSecret, isConfidential, appName);
-
+
// User who registered this client
String userName = sc.getUserPrincipal().getName();
UserSubject userSubject = new OidcUserSubject(userName);
newClient.setResourceOwnerSubject(userSubject);
-
+
// Client Registration Time
newClient.setRegisteredAt(System.currentTimeMillis() / 1000);
-
+
// Client Realm
if (homeRealm != null) {
newClient.setHomeRealm(homeRealm);
@@ -262,7 +262,7 @@ public class ClientRegistrationService {
newClient.getProperties().put("homeRealmAlias", homeRealms.get(homeRealm));
}
}
-
+
// Client Redirect URIs
if (!StringUtils.isEmpty(redirectURI)) {
String[] allUris = redirectURI.trim().split(" ");
@@ -285,7 +285,7 @@ public class ClientRegistrationService {
//TODO: replace this code with newClient.setLogoutUri() once it becomes available
newClient.getProperties().put("client_logout_uri", logoutURI);
}
-
+
// Client Audience URIs
if (!StringUtils.isEmpty(audience)) {
String[] auds = audience.trim().split(" ");
@@ -300,7 +300,7 @@ public class ClientRegistrationService {
}
newClient.setRegisteredAudiences(registeredAuds);
}
-
+
// Client Scopes
if (clientScopes != null && !clientScopes.isEmpty()) {
newClient.setRegisteredScopes(new ArrayList<String>(clientScopes.keySet()));
@@ -311,16 +311,16 @@ public class ClientRegistrationService {
return Response.ok(new InvalidRegistration(ex.getMessage())).build();
}
}
-
-
+
+
private void throwInvalidRegistrationException(String error) {
throw new InvalidRegistrationException(error);
}
private boolean isValidURI(String uri, boolean requireHttps) {
-
+
UrlValidator urlValidator = null;
-
+
if (requireHttps) {
String[] schemes = {"https"};
urlValidator = new UrlValidator(schemes, UrlValidator.ALLOW_LOCAL_URLS);
@@ -328,11 +328,11 @@ public class ClientRegistrationService {
urlValidator = new UrlValidator(UrlValidator.ALLOW_LOCAL_URLS
+ UrlValidator.ALLOW_ALL_SCHEMES);
}
-
+
if (!urlValidator.isValid(uri)) {
return false;
}
-
+
// Do additional checks on the URI
try {
URI parsedURI = new URI(uri);
@@ -343,7 +343,7 @@ public class ClientRegistrationService {
} catch (URISyntaxException ex) {
return false;
}
-
+
return true;
}
@@ -381,7 +381,7 @@ public class ClientRegistrationService {
newClient.setApplicationName(newName + nextNumber);
}
names.add(newClient.getApplicationName());
-
+
clientProvider.setClient(newClient);
Collection<Client> clientRegistrations = getClientRegistrations();
clientRegistrations.add(newClient);
@@ -445,7 +445,7 @@ public class ClientRegistrationService {
public void setClientProvider(ClientRegistrationProvider clientProvider) {
this.clientProvider = clientProvider;
}
-
+
private static class ClientComparator implements Comparator<Client> {
@Override
@@ -454,7 +454,7 @@ public class ClientRegistrationService {
// example, Sort Clients By Name/Date/etc
return c1.getApplicationName().compareTo(c2.getApplicationName());
}
-
+
}
private static class TokenComparator implements Comparator<ServerAccessToken> {
@@ -462,7 +462,7 @@ public class ClientRegistrationService {
public int compare(ServerAccessToken t1, ServerAccessToken t2) {
return Long.compare(t1.getIssuedAt(), t2.getIssuedAt());
}
-
+
}
private static class CodeGrantComparator implements Comparator<ServerAuthorizationCodeGrant> {
@@ -470,6 +470,6 @@ public class ClientRegistrationService {
public int compare(ServerAuthorizationCodeGrant g1, ServerAuthorizationCodeGrant g2) {
return Long.compare(g1.getIssuedAt(), g2.getIssuedAt());
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java
index 32c2859..2932823 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/ClientTokens.java
@@ -29,7 +29,7 @@ public class ClientTokens {
private Client client;
private List<ServerAccessToken> accessTokens = new LinkedList<ServerAccessToken>();
private List<RefreshToken> refreshTokens = new LinkedList<RefreshToken>();
- public ClientTokens(Client c,
+ public ClientTokens(Client c,
List<ServerAccessToken> accessTokens,
List<RefreshToken> refreshTokens) {
this.client = c;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/InvalidRegistration.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/InvalidRegistration.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/InvalidRegistration.java
index c0f54ee..beaa524 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/InvalidRegistration.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/InvalidRegistration.java
@@ -27,5 +27,5 @@ public class InvalidRegistration {
public String getMessage() {
return message;
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisterClient.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisterClient.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisterClient.java
index b1409f4..2faf0bf 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisterClient.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisterClient.java
@@ -28,6 +28,6 @@ public class RegisterClient {
public Map<String, String> getHomeRealms() {
return homeRealms;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisteredClients.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisteredClients.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisteredClients.java
index 7fb35f3..36b71c6 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisteredClients.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/clients/RegisteredClients.java
@@ -30,6 +30,6 @@ public class RegisteredClients {
public Collection<Client> getClients() {
return clients;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/console/UserConsole.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/console/UserConsole.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/console/UserConsole.java
index 7eaa71e..b8f173c 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/console/UserConsole.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/console/UserConsole.java
@@ -29,5 +29,5 @@ public class UserConsole {
public void setUserName(String userName) {
this.userName = userName;
}
-
+
}