Author: prabath
Date: Fri Mar 7 09:47:54 2008
New Revision: 14589
Log:
code review fixes + interop testing fixes + added missing exception logging
Modified:
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDAuthenticationRequest.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDClaim.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDExtensionFactory.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDAttributeExchange.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/infocard/OpenIDInfoCardProviderData.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
Modified:
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
==============================================================================
---
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
(original)
+++
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
Fri Mar 7 09:47:54 2008
@@ -173,7 +173,7 @@
// below should be included in the Identity Provider's
// response when "openid.mode" is "id_res"
- public final static String NS_SREG =
"http://openid.net/extensions/sreg/1.1";;
+ public final static String NS_SREG =
"http://openid.net/sreg/1.0";;
public final static String SREG = "openid.sreg.";
public final static String OP_SREG = "openid.ns.sreg";
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
Fri Mar 7 09:47:54 2008
@@ -207,7 +207,7 @@
* @return A map of claims with their values.
* @throws IdentityProviderException
*/
- public Map getClaimValues(String username, List propertyNames)
+ public Map<String,String> getClaimValues(String username, List<String>
propertyNames)
throws IdentityProviderException {
try {
UserStoreReader usReader = realm.getUserStoreReader();
@@ -278,8 +278,8 @@
* @return
* @throws IdentityProviderException
*/
- public Map getClaimValues(String username, String profileName,
- List propertyNames) throws IdentityProviderException {
+ public Map<String,String> getClaimValues(String username, String
profileName,
+ List<String> propertyNames) throws IdentityProviderException {
try {
IdentityUserStoreReader usReader =
((IdentityDefaultRealm)realm).getIdentityUserStoreReader();
return usReader.getUserProperties(username, profileName);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDAuthenticationRequest.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDAuthenticationRequest.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDAuthenticationRequest.java
Fri Mar 7 09:47:54 2008
@@ -43,4 +43,4 @@
public void setAuthRequest(AuthRequest authRequest) {
this.authRequest = authRequest;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDClaim.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDClaim.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDClaim.java
Fri Mar 7 09:47:54 2008
@@ -32,4 +32,4 @@
public void setClaimValue(String claimValue) {
this.claimValue = claimValue;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDExtensionFactory.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDExtensionFactory.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDExtensionFactory.java
Fri Mar 7 09:47:54 2008
@@ -1,6 +1,5 @@
package org.wso2.solutions.identity.openid;
-import org.openid4java.message.AuthRequest;
import org.openid4java.message.ax.AxMessage;
import org.openid4java.message.pape.PapeMessage;
import org.openid4java.message.sreg.SRegMessage;
@@ -51,4 +50,4 @@
return null;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
Fri Mar 7 09:47:54 2008
@@ -109,6 +109,7 @@
}
} catch (Exception e) {
+ log.error(e.getMessage());
// Error response.
message = DirectError.createDirectError(e.getMessage());
responseText = message.keyValueFormEncoding();
@@ -118,6 +119,7 @@
// Return the result to the user.
return directResponse(httpResp, responseText);
} catch (IOException e) {
+ log.error(e.getMessage());
throw new IdentityProviderException(
IdentityConstants.ErrorCodes.OPENID_DIRECT_RESP_FAILED);
}
@@ -253,6 +255,8 @@
req.setAuthRequest(authReq);
for (Object alias : authReq.getExtensions()) {
+ if (log.isDebugEnabled())
+ log.info("Found extension in the OpenID request: " +
alias);
req.setExtensionAlias((String) alias);
extension = OpenIDExtensionFactory.getInstance().getExtension(
req);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
Fri Mar 7 09:47:54 2008
@@ -68,4 +68,4 @@
}
}
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
Fri Mar 7 09:47:54 2008
@@ -53,7 +53,7 @@
IdentityProviderException {
UserStore userStore = null;
- List users = null;
+ List<String> users = null;
userStore = UserStore.getInstance();
users = userStore.getAllUserNames();
@@ -62,14 +62,14 @@
throw new IdentityProviderException(
IdentityConstants.ErrorCodes.NO_USERS_FOUND);
- Map mapValues = null;
- Iterator iterator = null;
+ Map<String, String> mapValues = null;
+ Iterator<String> iterator = null;
iterator = users.iterator();
while (iterator.hasNext()) {
- String user = (String) iterator.next();
+ String user = iterator.next();
mapValues = userStore.getClaimValues(user, null);
if (mapValues != null && !mapValues.isEmpty()) {
@@ -131,6 +131,36 @@
}
/**
+ * Check whether the given user exists in the system.
+ * @param userName User name.
+ * @return
+ */
+ public static boolean isUserExist(String userName) {
+
+ UserStore userStore = null;
+ List<String> users = null;
+ Iterator<String> iterator = null;
+
+ try {
+ userStore = UserStore.getInstance();
+ users = userStore.getAllUserNames();
+ iterator = users.iterator();
+
+ String user = null;
+
+ while (iterator.hasNext()) {
+ user = iterator.next();
+ if (user.equals(userName))
+ return true;
+ }
+ } catch (IdentityProviderException e) {
+ return false;
+ }
+
+ return false;
+ }
+
+ /**
* @param text
* @return
*/
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/UserInfoServlet.java
Fri Mar 7 09:47:54 2008
@@ -2,17 +2,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.wso2.solutions.identity.IdentityProviderException;
-import org.wso2.solutions.identity.UserStore;
-
public class UserInfoServlet extends HttpServlet {
private static final long serialVersionUID = -2306630174647697559L;
@@ -31,7 +26,7 @@
caller = req.getRequestURI().substring(req.getServletPath().length());
- if (!isUserExist(caller.substring(1))) {
+ if (!OpenIDUtil.isUserExist(caller.substring(1))) {
resp.setContentType("text/html");
back = "<html><head>\n"
+ "</head><body><h1>You are trying to do something fishy
!!!</h1></body></html>";
@@ -60,34 +55,4 @@
PrintWriter out = resp.getWriter();
out.write(back);
}
-
- /**
- * Check whether the given user exists in the system.
- * @param userName User name.
- * @return
- */
- private boolean isUserExist(String userName) {
-
- UserStore userStore = null;
- List users = null;
- Iterator iterator = null;
-
- try {
- userStore = UserStore.getInstance();
- users = userStore.getAllUserNames();
- iterator = users.iterator();
-
- String user = null;
-
- while (iterator.hasNext()) {
- user = (String) iterator.next();
- if (user.equals(userName))
- return true;
- }
- } catch (IdentityProviderException e) {
- return false;
- }
-
- return false;
- }
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDAttributeExchange.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDAttributeExchange.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDAttributeExchange.java
Fri Mar 7 09:47:54 2008
@@ -53,15 +53,29 @@
if (extensions instanceof FetchRequest) {
Map required = null;
+ Map optional = null;
FetchRequest fetchRequest = null;
FetchResponse fetchResponse = null;
- Map claimValues = null;
+ Map<String, OpenIDClaim> claimValues = null;
fetchRequest = (FetchRequest) extensions;
// Get the required attributes as requested by the
// RP.
required = fetchRequest.getAttributes(true);
+ optional = fetchRequest.getAttributes();
+
+ if (optional != null && !optional.isEmpty()) {
+ Iterator iterator = optional.entrySet().iterator();
+ Entry entry = null;
+ while (iterator.hasNext()) {
+ entry = (Entry) iterator.next();
+ if (!required.containsKey(entry.getKey())) {
+ required.put(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+
fetchResponse = FetchResponse.createFetchResponse(fetchRequest,
new HashMap());
claimValues = populateAttributeValues(required, userId,
@@ -88,17 +102,18 @@
* @return A map, populated with required claim values.
* @throws IdentityProviderException
*/
- protected Map populateAttributeValues(Map requiredClaims, String userId,
+ protected Map<String, OpenIDClaim> populateAttributeValues(
+ Map<String, String> requiredClaims, String userId,
String profileName) throws IdentityProviderException {
- Map claims = null;
+ Map<String, ClaimDO> claims = null;
ClaimDO[] supportedClaims = null;
ClaimsAdmin claimsAdmin = null;
- Iterator iterator = null;
- Map map = null;
- Entry entry = null;
+ Iterator<Entry<String, String>> iterator = null;
+ Map<String, String> map = null;
+ Entry<String, String> entry = null;
- claims = new HashMap();
+ claims = new HashMap<String, ClaimDO>();
claimsAdmin = new ClaimsAdmin();
supportedClaims = claimsAdmin.getAllMappedEnabledClaims();
@@ -110,15 +125,15 @@
}
iterator = requiredClaims.entrySet().iterator();
- map = new HashMap();
+ map = new HashMap<String, String>();
- String key = null;
String val = null;
while (iterator.hasNext()) {
- entry = (Entry) iterator.next();
+ entry = iterator.next();
val = (String) entry.getValue();
- map.put(claimsAdmin.getMappedOpenIDTag(val), entry.getKey());
+ map.put(claimsAdmin.getMappedOpenIDTag(val), (String) entry
+ .getKey());
}
return populateAttributeValues(map.keySet(), userId, claims, map,
@@ -133,19 +148,19 @@
* @throws MessageException
*/
protected void setAttributeExchangeValues(FetchResponse response,
- Map claimValues) throws MessageException {
+ Map<String, OpenIDClaim> claimValues) throws MessageException {
- Iterator iterator = null;
- Entry entry = null;
+ Iterator<Entry<String, OpenIDClaim>> iterator = null;
+ Entry<String, OpenIDClaim> entry = null;
OpenIDClaim claim = null;
iterator = claimValues.entrySet().iterator();
while (iterator.hasNext()) {
- entry = (Entry) iterator.next();
+ entry = iterator.next();
claim = (OpenIDClaim) entry.getValue();
response.addAttribute(claim.getOpenIDTag(), claim.getTypeUri(),
claim.getClaimValue());
}
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
Fri Mar 7 09:47:54 2008
@@ -34,20 +34,21 @@
* is OpenID supported claims.
* @throws IdentityProviderException
*/
- protected Map populateAttributeValues(Collection requiredClaims,
- String userId, Map claims, Map openIDTagMapping, String
profileName)
- throws IdentityProviderException {
+ protected Map<String, OpenIDClaim> populateAttributeValues(
+ Collection<String> requiredClaims, String userId,
+ Map<String, ClaimDO> claims, Map<String, String> openIDTagMapping,
+ String profileName) throws IdentityProviderException {
UserStore connector = null;
- Map<String,OpenIDClaim> claimValues = null;
- Iterator iterator = null;
- List list = null;
+ Map<String, OpenIDClaim> claimValues = null;
+ Iterator<String> iterator = null;
+ List<String> list = null;
connector = UserStore.getInstance();
// Get the column names for the URIs
iterator = requiredClaims.iterator();
- list = new ArrayList();
+ list = new ArrayList<String>();
String tag = null;
ClaimDO claim = null;
@@ -64,7 +65,7 @@
}
}
- Map mapValues = null;
+ Map<String,String> mapValues = null;
OpenIDClaim openIDClaim = null;
String profile = null;
@@ -76,24 +77,22 @@
// Get the claims values corresponding to the user from the user store.
mapValues = connector.getClaimValues(userId, profile, list);
- claimValues = new HashMap<String,OpenIDClaim> ();
+ claimValues = new HashMap<String, OpenIDClaim>();
iterator = requiredClaims.iterator();
// Iterate through the claim values retrieved and requestedClaims will
// be populated with the corresponding values.
while (iterator.hasNext()) {
- tag = (String) iterator.next();
- claim = (ClaimDO) claims.get(tag);
-
+ tag = iterator.next();
+ claim = claims.get(tag);
if (claim != null && claim.isSupported()) {
openIDClaim = new OpenIDClaim();
- openIDClaim.setClaimValue((String) mapValues.get(claim
- .getAttrId()));
+ openIDClaim.setClaimValue(mapValues.get(claim.getAttrId()));
openIDClaim.setTypeUri(claim.getUri());
if (openIDTagMapping != null)
- openIDClaim.setOpenIDTag((String) openIDTagMapping
- .get(claim.getOpenIDTag()));
+ openIDClaim.setOpenIDTag(openIDTagMapping.get(claim
+ .getOpenIDTag()));
else
openIDClaim.setOpenIDTag(claim.getOpenIDTag());
if (openIDClaim.getClaimValue() != null)
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
Fri Mar 7 09:47:54 2008
@@ -1,7 +1,5 @@
package org.wso2.solutions.identity.openid.extensions;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.openid4java.message.AuthRequest;
@@ -39,9 +37,9 @@
String profileName) throws IdentityProviderException {
MessageExtension message = null;
- PapeRequest papeRequest = null;
+ //PapeRequest papeRequest = null;
PapeResponse papeResponse = null;
- List preferredPolicies = null;
+ //List preferredPolicies = null;
AuthRequest authRequest = null;
try {
@@ -49,11 +47,11 @@
message = authRequest.getExtension(PapeMessage.OPENID_NS_PAPE);
if (message instanceof PapeRequest) {
- papeRequest = (PapeRequest) message;
- preferredPolicies = papeRequest.getPreferredAuthPoliciesList();
+ //papeRequest = (PapeRequest) message;
+ //preferredPolicies =
papeRequest.getPreferredAuthPoliciesList();
papeResponse = PapeResponse.createPapeResponse();
papeResponse.setNistAuthLevel(1);
- papeResponse.setAuthAge(1);
+ //TODO: papeResponse.setAuthAge(1);
if (request.isPhishingResistanceLogin())
papeResponse
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.java
Fri Mar 7 09:47:54 2008
@@ -53,12 +53,19 @@
extension = authRequest
.getExtension(IdentityConstants.OpenId.SimpleRegAttributes.NS_SREG);
- if (extension instanceof SRegRequest) {
+ if (log.isDebugEnabled()) {
+ if (extension == null)
+ log.info("SReg extension is null");
+ else
+ log.info("SReg extension: " + extension.getTypeUri());
+ }
+ if (extension instanceof SRegRequest) {
SRegRequest sregReq = null;
List required = null;
+ List optional = null;
Map userDataSReg = null;
- Map claimValues = null;
+ Map<String, OpenIDClaim> claimValues = null;
SRegResponse response = null;
sregReq = (SRegRequest) extension;
@@ -66,6 +73,19 @@
// Get the required attributes as requested by the
// RP.
required = sregReq.getAttributes(true);
+ optional = sregReq.getAttributes();
+
+ if (optional != null && !optional.isEmpty()) {
+ for (Object attr : optional) {
+ if (!required.contains(attr)) {
+ required.add(attr);
+ }
+ }
+ }
+
+ if (log.isDebugEnabled())
+ log.info("Required attributes for SReg request: "
+ + required.toString());
userDataSReg = new HashMap();
response = SRegResponse.createSRegResponse(sregReq,
@@ -75,7 +95,6 @@
setSimpleAttributeRegistrationValues(response, claimValues);
return response;
-
} else {
log.error("Unsupported request type");
throw new UnsupportedOperationException("TODO");
@@ -96,17 +115,17 @@
* @throws MessageException
*/
protected void setSimpleAttributeRegistrationValues(SRegResponse response,
- Map claimValues) throws MessageException {
+ Map<String, OpenIDClaim> claimValues) throws MessageException {
- Iterator iterator = null;
+ Iterator<Entry<String, OpenIDClaim>> iterator = null;
OpenIDClaim claim = null;
- Entry entry = null;
+ Entry<String, OpenIDClaim> entry = null;
iterator = claimValues.entrySet().iterator();
while (iterator.hasNext()) {
- entry = (Entry) iterator.next();
- claim = (OpenIDClaim) entry.getValue();
+ entry = iterator.next();
+ claim = entry.getValue();
response.addAttribute(claim.getOpenIDTag(), claim.getClaimValue());
}
}
@@ -118,14 +137,15 @@
* @return A map, populated with required claim values.
* @throws IdentityProviderException
*/
- protected Map populateAttributeValues(List requiredClaims, String userId,
- String profileName) throws IdentityProviderException {
+ protected Map<String, OpenIDClaim> populateAttributeValues(
+ List<String> requiredClaims, String userId, String profileName)
+ throws IdentityProviderException {
- Map claims = null;
+ Map<String, ClaimDO> claims = null;
ClaimDO[] supportedClaims = null;
ClaimsAdmin claimsAdmin = null;
- claims = new HashMap();
+ claims = new HashMap<String, ClaimDO>();
claimsAdmin = new ClaimsAdmin();
supportedClaims = claimsAdmin.getAllMappedEnabledClaims();
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/infocard/OpenIDInfoCardProviderData.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/infocard/OpenIDInfoCardProviderData.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/infocard/OpenIDInfoCardProviderData.java
Fri Mar 7 09:47:54 2008
@@ -34,19 +34,20 @@
UserStore connector = null;
Iterator iterator = null;
- List list = null;
+ List<String> list = null;
OpenIDRequestedClaimData requestedClaimData = null;
String userId = null;
- Map mapValues = null;
+ Map<String, String> mapValues = null;
ClaimDO claimDO = null;
String attrId = null;
String claimVal = null;
ClaimDO claim = null;
connector = UserStore.getInstance();
+
// Get the column names for the URIs
iterator = requestedClaims.values().iterator();
- list = new ArrayList();
+ list = new ArrayList<String>();
// First we need to figure-out which attributed we need to retrieve
from
// the user store.
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
Fri Mar 7 09:47:54 2008
@@ -222,36 +222,6 @@
}
/**
- * Set the attributes in the structure required by the Simple Registration.
- * @param params Parameter list
- */
- protected void setSimpleAttributeParams(ParameterList params) {
-
- Iterator iterator = null;
- String key = null;
- OpenIDRequestedClaimData claim = null;
-
- params.set(new Parameter(
- IdentityConstants.OpenId.SimpleRegAttributes.OP_SREG,
- IdentityConstants.OpenId.SimpleRegAttributes.NS_SREG));
-
- iterator = ipData.requestedClaims.keySet().iterator();
-
- while (iterator.hasNext()) {
- key = (String) iterator.next();
- claim = (OpenIDRequestedClaimData) ipData.requestedClaims.get(key);
-
- if (claim.openIDTag != null)
- params.set(new Parameter(
- IdentityConstants.OpenId.SimpleRegAttributes.SREG
- + claim.openIDTag, claim.value));
- }
-
- if (log.isDebugEnabled())
- log.debug("OpenID simple attribute parameters set successfully");
- }
-
- /**
* Overrides the base functionality to cater OpenID related functionality.
*/
protected IdentityProviderData getIdentityProviderData(RahasData rahasData)
@@ -259,4 +229,4 @@
return new OpenIDInfoCardProviderData(rahasData);
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
Fri Mar 7 09:47:54 2008
@@ -44,7 +44,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public void setUserProperties(String userName, Map properties)
throws UserManagerException {
@@ -52,7 +52,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public void setUserProperties(String userName,
Map<String, String> properties, String profileName)
@@ -208,7 +208,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public void updateUserProperties(String userName,
Map<String, String> properties, String profileName)
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
Fri Mar 7 09:47:54 2008
@@ -44,7 +44,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public Map<String,String> getUserProperties(String userName) throws
UserManagerException {
@@ -96,7 +96,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public String[] getUserPropertyNames() throws UserManagerException {
@@ -148,7 +148,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public String getDefaultUserProfileName(String userName)
throws UserManagerException {
@@ -198,7 +198,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public List<String> getUserProfileNames(String userName)
throws UserManagerException {
@@ -248,7 +248,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public Map<String,String> getUserProperties(String userName, String
profileName)
throws UserManagerException {
@@ -301,7 +301,7 @@
}
/**
- *
+ * [EMAIL PROTECTED]
*/
public boolean isExistingUserProfile(String userName, String profileName)
throws UserManagerException {
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
Fri Mar 7 09:47:54 2008
@@ -6,6 +6,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.openid4java.OpenIDException;
import org.openid4java.consumer.ConsumerException;
import org.openid4java.consumer.ConsumerManager;
@@ -29,6 +31,8 @@
private ConsumerManager manager;
private static OpenIDConsumer consumer;
+ private static Log log = LogFactory.getLog(OpenIDConsumer.class);
+
/**
* Creates an instance of OpenIDConsumer
* @throws RelyingPartyException
@@ -39,6 +43,7 @@
try {
manager = new ConsumerManager();
} catch (ConsumerException e) {
+ log.error(e.getMessage());
// Present error to the user
throw new RelyingPartyException(
IdentityConstants.ErrorCodes.RP_INITIATION_FAILED, e);
@@ -111,9 +116,9 @@
request.setAttribute(IdentityConstants.OpenId.OPENID_IDENTIFIER,
authSuccess.getIdentity());
- for (Object alias : authSuccess.getExtensions()) {
+ for (Object alias : authSuccess.getExtensions()) {
extension = OpenIDExtensionFactory.getInstance().getExtension(
- (String)alias,authSuccess);
+ (String) alias, authSuccess);
if (extension != null)
extension.setSessionAttributes(request);
}
@@ -122,6 +127,7 @@
TokenVerifierConstants.STATE_SUCCESS);
} catch (OpenIDException e) {
+ log.error(e.getMessage());
// Present error to the user.
throw new RelyingPartyException(
IdentityConstants.ErrorCodes.OPENID_AUTHENTICATION_FAILED,
@@ -221,10 +227,12 @@
request.getReponse().sendRedirect(
authReq.getDestinationUrl(true));
} catch (IOException e) {
+ log.error(e.getMessage());
throw new RelyingPartyException(e.getMessage(), e);
}
} catch (OpenIDException e) {
+ log.error(e.getMessage());
// Present error to the user
throw new RelyingPartyException(
IdentityConstants.ErrorCodes.INVALID_OPENID, e);
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
Fri Mar 7 09:47:54 2008
@@ -56,7 +56,7 @@
} else {
// When RP does not set any required parameters we stick to
// the default parameter set.
- setDefaultRequestParams(sregReq);
+ //setDefaultRequestParams(sregReq);
}
return sregReq;
@@ -108,7 +108,7 @@
* default we set all the attributes.
* @param request Simple registration request
*/
- private void setDefaultRequestParams(SRegRequest request) {
+ protected void setDefaultRequestParams(SRegRequest request) {
request.addAttribute(
IdentityConstants.OpenId.SimpleRegAttributes.NICK_NAME, true);
request.addAttribute(
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
