Author: ruchith
Date: Mon Apr 28 03:42:12 2008
New Revision: 16256
Log:
updated to the latest IS code
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASRegistryRealm.java
Mon Apr 28 03:42:12 2008
@@ -1,7 +1,5 @@
package org.wso2.mashup.realm.wsas;
-import javax.sql.DataSource;
-
import org.apache.commons.dbcp.BasicDataSource;
import org.wso2.authenticator.Authenticator;
import org.wso2.registry.users.AccessControlAdmin;
@@ -10,10 +8,10 @@
import org.wso2.registry.users.UserStoreAdmin;
import org.wso2.registry.users.UserStoreException;
import org.wso2.registry.users.UserStoreReader;
-import org.wso2.registry.users.def.DefaultAccessControlAdmin;
-import org.wso2.registry.users.def.DefaultAuthorizer;
-import org.wso2.registry.users.def.DefaultRealmConfig;
import org.wso2.registry.users.def.DefaultDataSupplier;
+import org.wso2.registry.users.def.DefaultRealmConfig;
+
+import javax.sql.DataSource;
public class WSASRegistryRealm implements UserRealm {
Modified:
trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java
==============================================================================
---
trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java
(original)
+++
trunk/mashup/java/modules/coreservices/sharingservice/src/org/wso2/mashup/share/service/MashupSharingService.java
Mon Apr 28 03:42:12 2008
@@ -30,10 +30,13 @@
import org.wso2.registry.users.UserStoreReader;
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.relyingparty.RelyingPartyException;
-import org.wso2.solutions.identity.relyingparty.
+import org.wso2.solutions.identity.relyingparty.TokenVerifierConstants;
+import org.wso2.solutions.identity.relyingparty.saml.SAMLTokenVerifier;
+import org.wso2.solutions.identity.relyingparty.servletfilter.RelyingPartyData;
import org.wso2.utils.ServerConfiguration;
import javax.activation.DataHandler;
+
import java.io.FileInputStream;
import java.io.IOException;
import java.security.KeyStore;
@@ -145,9 +148,12 @@
//Decrypting the InfoCard token
SAMLTokenVerifier verifier = new SAMLTokenVerifier();
+ RelyingPartyData rpData = new RelyingPartyData();
+ rpData.setPrivateKey(privateKey);
+ rpData.setValidatePolicy(TokenVerifierConstants.PROMISCUOUS);
Element decryptedToken = verifier.decryptToken(infoCardToken,
privateKey);
- if (verifier.verifyDecryptedToken(decryptedToken)) {
+ if (verifier.verifyDecryptedToken(decryptedToken, rpData)) {
//Getting the user PPID from the token
String userPPID = null;
Iterator propertyEntry =
verifier.getAttributeTable().entrySet()
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
