Author: prabath
Date: Tue Jan 29 00:24:34 2008
New Revision: 13113
Log:
removed unnecessary code
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
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
Tue Jan 29 00:24:34 2008
@@ -11,6 +11,7 @@
import javax.servlet.http.HttpSession;
import org.wso2.solutions.identity.UserStore;
+import org.openid4java.message.AuthFailure;
import org.openid4java.message.AuthRequest;
import org.openid4java.message.DirectError;
import org.openid4java.message.Message;
@@ -25,16 +26,10 @@
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.IdentityProviderConstants;
import org.wso2.solutions.identity.IdentityProviderException;
-import org.wso2.solutions.identity.admin.RegisteredInfoCardInfoAdmin;
-import
org.wso2.solutions.identity.persistence.dataobject.RegisteredInfoCardInfoDO;
import org.wso2.utils.ServerConfiguration;
public class OpenIDProvider {
- public final static String STATE_SUCCESS = "success";
- public final static String SERVLET_ATTR_STATE =
"org.wso2.solutions.identity.rp.State";
- public final static String ISSUER_INFO = "issuerInfo";
-
// Instantiate a ServerManager object.
public static ServerManager manager = new OpenIDServerManager();
private String authPage;
@@ -120,21 +115,26 @@
userId = getUserName(openId);
- if (httpReq.getParameter("oplogin")!=null &&
httpReq.getParameter("oplogin").equals("username")) {
+ if (httpReq.getParameter("authenticatedAndApproved") != null
+ && httpReq.getParameter("authenticatedAndApproved")
+ .equals("true")) {
authenticatedAndApproved = true;
}
- if (!authenticatedAndApproved) {
- if (!verifyInfoCardLogin(httpReq)) {
- // Not authenticated, redirect to the authentication
- // page.
- session.setAttribute(
- IdentityProviderConstants.OpenId.PARAM_LIST,
- request);
- return authPage;
- } else {
- authenticatedAndApproved = true;
- }
+ if (IdentityConstants.OpenId.CANCEL.equals(httpReq
+ .getParameter(IdentityConstants.OpenId.ACTION))) {
+
+ authenticatedAndApproved = false;
+
+ } else if (!authenticatedAndApproved) {
+
+ // Not authenticated, redirect to the authentication
+ // page.
+ session.setAttribute(
+ IdentityProviderConstants.OpenId.PARAM_LIST,
+ request);
+ return authPage;
+
}
// Process an authentication request.
@@ -146,15 +146,10 @@
message = manager.authResponse(request, opLocalId,
userSelectedClaimedId, authenticatedAndApproved);
- if (message instanceof DirectError)
- return directResponse(httpResp, message
- .keyValueFormEncoding());
- else if (IdentityConstants.OpenId.CANCEL.equals(httpReq
- .getParameter(IdentityConstants.OpenId.ACTION))) {
- // Error response.
- message = DirectError.createDirectError("User Denied");
- responseText = message.keyValueFormEncoding();
- } else {
+ if (message instanceof DirectError
+ || message instanceof AuthFailure)
+ return message.getDestinationUrl(true);
+ else {
if (authReq
.hasExtension(IdentityConstants.OpenId.ExchangeAttributes.NS_AX)) {
@@ -357,25 +352,6 @@
}
/**
- * Verify authentication.
- *
- * @param username
- * User name
- * @param password
- * Password
- * @return
- */
- private boolean doLogin(String username, String password) {
- try {
- UserStore userStore = UserStore.getInstance();
- return userStore.authenticate(username, password);
- } catch (Exception e) {
- return false;
- }
-
- }
-
- /**
* Send a direct response to the RP.
*
* @param httpResp
@@ -398,34 +374,4 @@
return null;
}
- /**
- *
- * @param request
- * @return
- */
- private boolean verifyInfoCardLogin(HttpServletRequest request) {
- String state = (String) request.getAttribute(SERVLET_ATTR_STATE);
-
- if (state == null || !STATE_SUCCESS.equals(state))
- return false;
-
- String ppid = (String) request
- .getAttribute(IdentityConstants.CLAIM_PPID);
- String issuerInfo = (String) request.getAttribute(ISSUER_INFO);
-
- RegisteredInfoCardInfoAdmin admin = new RegisteredInfoCardInfoAdmin();
- RegisteredInfoCardInfoDO info;
- try {
- info = admin.getInfo(ppid);
- } catch (IdentityProviderException e) {
- return false;
- }
-
- if (info != null && info.getIssuerInfo().equals(issuerInfo)) {
- return true;
- } else {
- return false;
- }
- }
-
}
\ No newline at end of file
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
