Author: dimuthul
Date: Thu Jan 10 22:39:24 2008
New Revision: 12130
Log:
Fixing issues
- Storing PPID values for UserTrustedRP
- Adding the UserID-Hostname constraint
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/UploadRelyingPartyCertificateAction.java
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/KeystoreUtilAdmin.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/UserPersonalRelyingPartyDAO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserPersonalRelyingPartyIdentifier.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserTrustedRPDO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UploadRelyingPartyCertificateAction.java
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/UploadRelyingPartyCertificateAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/UploadRelyingPartyCertificateAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/UploadRelyingPartyCertificateAction.java
Thu Jan 10 22:39:24 2008
@@ -59,14 +59,9 @@
this.addErrorMessage(getText("cert-invalid"));
return ERROR;
}
-
- if (ksAdmin.isCertExists(cert)) {
- this.addErrorMessage(getText("relying-party-exists"));
- return ERROR;
- }
-
+
try {
- alias = ksAdmin.importCert(cert);
+ alias = ksAdmin.importCertToUserTrustStore(cert);
RelyingPartyDO rp = new RelyingPartyDO();
rp.setAlias(alias);
rp.setHostName(alias);
Modified:
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
(original)
+++
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
Thu Jan 10 22:39:24 2008
@@ -15,8 +15,19 @@
<generator class="native"/>
</id>
<property name="lastUpdatedTime" type="timestamp"
column="c_last_updated" not-null="true"/>
- <property name="userId" column="user_id" not-null="true"/>
- <property name="hostName" column="host_name" not-null="true"/>
+
+ <component name="identifier"
+
class="org.wso2.solutions.identity.persistence.dataobject.UserPersonalRelyingPartyIdentifier"
+ unique="true">
+ <property name="hostName" column="host_name" not-null="true"/>
+ <property name="userId" column="user_id" not-null="true"/>
+ </component>
+ <set name="ppidValues" inverse="true" cascade="all">
+ <key column="personal_rp_id"/>
+ <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.PPIDValueDO"/>
+ </set>
+
+
</class>
<!-- #################################################### -->
@@ -34,6 +45,8 @@
<property name="dateExpires" column="date_expires" not-null="true"/>
<many-to-one name="card" column="card" not-null="false"/>
</class>
+
+
<!-- #################################################### -->
<!-- #RegisteredInfoCardInfoDO(registered_info_card_info)# -->
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/KeystoreUtilAdmin.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/KeystoreUtilAdmin.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/KeystoreUtilAdmin.java
Thu Jan 10 22:39:24 2008
@@ -81,6 +81,13 @@
}
+ /**
+ * This method imports the Certificate to Trust store if it present
already.
+ *
+ * @param cert
+ * @return
+ * @throws IdentityProviderException
+ */
public String importCertToUserTrustStore(X509Certificate cert)
throws IdentityProviderException {
ServerConfiguration serverConfig = ServerConfiguration.getInstance();
@@ -135,7 +142,7 @@
}
/**
- * Removes the Certificat
+ * Removes the Certificate from default store
*
* @param alias
* @throws IdentityProviderException
@@ -165,7 +172,7 @@
}
/**
- * Removes the Certificat from User trusted RP
+ * Removes the Certificat from User trusted RP store
*
* @param alias
* @throws IdentityProviderException
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/UserPersonalRelyingPartyDAO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/UserPersonalRelyingPartyDAO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/UserPersonalRelyingPartyDAO.java
Thu Jan 10 22:39:24 2008
@@ -33,7 +33,7 @@
String userId) {
Session session = hbConfig.getCurrentSession();
Transaction tx = session.beginTransaction();
- String stmt = "from UserTrustedRPDO as utrp where utrp.userId = '"
+ String stmt = "from UserTrustedRPDO as utrp where
utrp.identifier.userId = '"
+ userId + "'";
UserTrustedRPDO[] rps = new UserTrustedRPDO[0];
@@ -59,8 +59,8 @@
String hostName) {
Session session = hbConfig.getCurrentSession();
Transaction tx = session.beginTransaction();
- String stmt = "from UserTrustedRPDO as utrp where utrp.userId = '"
- + userId + "' and utrp.hostName = '"+ hostName+"'";
+ String stmt = "from UserTrustedRPDO as utrp where
utrp.identifier.userId = '"
+ + userId + "' and utrp.identifier.hostName = '"+ hostName+"'";
UserTrustedRPDO rp = null;
try {
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserPersonalRelyingPartyIdentifier.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserPersonalRelyingPartyIdentifier.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserPersonalRelyingPartyIdentifier.java
Thu Jan 10 22:39:24 2008
@@ -17,7 +17,7 @@
package org.wso2.solutions.identity.persistence.dataobject;
public class UserPersonalRelyingPartyIdentifier {
-
+
private String hostName;
private String userId;
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserTrustedRPDO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserTrustedRPDO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/UserTrustedRPDO.java
Thu Jan 10 22:39:24 2008
@@ -1,27 +1,32 @@
package org.wso2.solutions.identity.persistence.dataobject;
-public class UserTrustedRPDO extends AbstractDataObject {
+import java.util.Set;
- private String userId = null;
+public class UserTrustedRPDO
+ extends AbstractDataObject {
+
+ private UserPersonalRelyingPartyIdentifier identifier = null;
+
+ private Set ppidValues;
- private String hostName = null;
+
- public String getUserId() {
- return userId;
+ public UserPersonalRelyingPartyIdentifier getIdentifier() {
+ return identifier;
}
- public void setUserId(String userId) {
- this.userId = userId;
+ public void setIdentifier(UserPersonalRelyingPartyIdentifier identifier) {
+ this.identifier = identifier;
}
- public String getHostName() {
- return hostName;
+ public Set getPpidValues() {
+ return ppidValues;
}
- public void setHostName(String hostName) {
- this.hostName = hostName;
+ public void setPpidValues(Set ppidValues) {
+ this.ppidValues = ppidValues;
}
-
-
+
+
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
Thu Jan 10 22:39:24 2008
@@ -525,7 +525,7 @@
UserTrustedRPDO userRp = dbman.getPersonalRelyingParty(
userIdentifier, host);
if (userRp != null) {
- alias = userRp.getHostName();
+ alias = userRp.getIdentifier().getHostName();
KeystoreUtilAdmin admin = new KeystoreUtilAdmin();
cert = admin.getCertificateFromUserTrustedRP(alias);
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
Thu Jan 10 22:39:24 2008
@@ -586,6 +586,7 @@
hostName = ppidValueDOs[i].getRelyingParty().getHostName();
} else if (ppidValueDOs[i].getPersonalRelyingParty() != null) {
hostName = ppidValueDOs[i].getPersonalRelyingParty()
+ .getIdentifier()
.getHostName();
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
Thu Jan 10 22:39:24 2008
@@ -15,8 +15,19 @@
<generator class="native"/>
</id>
<property name="lastUpdatedTime" type="timestamp"
column="c_last_updated" not-null="true"/>
- <property name="userId" column="user_id" not-null="true"/>
- <property name="hostName" column="host_name" not-null="true"/>
+
+ <component name="identifier"
+
class="org.wso2.solutions.identity.persistence.dataobject.UserPersonalRelyingPartyIdentifier"
+ unique="true">
+ <property name="hostName" column="host_name" not-null="true"/>
+ <property name="userId" column="user_id" not-null="true"/>
+ </component>
+ <set name="ppidValues" inverse="true" cascade="all">
+ <key column="personal_rp_id"/>
+ <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.PPIDValueDO"/>
+ </set>
+
+
</class>
<!-- #################################################### -->
@@ -34,6 +45,8 @@
<property name="dateExpires" column="date_expires" not-null="true"/>
<many-to-one name="card" column="card" not-null="false"/>
</class>
+
+
<!-- #################################################### -->
<!-- #RegisteredInfoCardInfoDO(registered_info_card_info)# -->
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UploadRelyingPartyCertificateAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UploadRelyingPartyCertificateAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UploadRelyingPartyCertificateAction.java
Thu Jan 10 22:39:24 2008
@@ -27,6 +27,7 @@
import org.wso2.solutions.identity.admin.RelyingPartyAdmin;
import org.wso2.solutions.identity.admin.ReportAdmin;
import org.wso2.solutions.identity.persistence.dataobject.ActionDO;
+import
org.wso2.solutions.identity.persistence.dataobject.UserPersonalRelyingPartyIdentifier;
import org.wso2.solutions.identity.persistence.dataobject.UserTrustedRPDO;
import org.wso2.solutions.identity.user.ui.UIConstants;
@@ -63,8 +64,10 @@
String alias = ksAdmin.importCertToUserTrustStore(cert);
UserTrustedRPDO rp = new UserTrustedRPDO();
- rp.setHostName(alias);
- rp.setUserId(user);
+ UserPersonalRelyingPartyIdentifier identifier = new
UserPersonalRelyingPartyIdentifier();
+ identifier.setHostName(alias);
+ identifier.setUserId(user);
+ rp.setIdentifier(identifier);
RelyingPartyAdmin admin = new RelyingPartyAdmin();
admin.create(rp);
Modified: trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp
==============================================================================
--- trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp
(original)
+++ trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/main.jsp
Thu Jan 10 22:39:24 2008
@@ -173,9 +173,9 @@
<table cellpadding="0" cellspacing="0" border="0"
class="data-table">
<s:iterator value="personalRPs">
<s:url id="removeRP" namespace="/"
action="RemoveRelyingParty">
- <s:param name="hostName" value="hostName" />
+ <s:param name="hostName"
value="identifier.hostName" />
</s:url>
- <tr><td><s:property
value="hostName"/></td><td><s:a href="%{removeRP}">Remove</s:a></td></tr>
+ <tr><td><s:property
value="identifier.hostName"/></td><td><s:a
href="%{removeRP}">Remove</s:a></td></tr>
</s:iterator>
</table>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
