[jboss-cvs] Picketlink SVN: r678 - in federation/trunk: picketlink-web/src/main/java/org/picketlink/identity/federation/web/process and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-01-27 13:18:29 -0500 (Thu, 27 Jan 2011)
New Revision: 678

Modified:
   federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
   federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
   federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
   federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderBaseProcessor.java
Log:
PLFED-130: inject optional issuer id

Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java	2011-01-27 18:02:02 UTC (rev 677)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java	2011-01-27 18:18:29 UTC (rev 678)
@@ -69,6 +69,8 @@
    
    protected String serviceURL = null;
    protected String identityURL = null;
+   
+   protected String issuerID = null;
 
    protected String configFile = GeneralConstants.CONFIG_FILE_LOCATION;
    
@@ -114,6 +116,15 @@
    {
       this.saveRestoreRequest = saveRestoreRequest;
    }
+   
+   /**
+    * Set a separate issuer id
+    * @param issuerID
+    */
+   public void setIssuerID(String issuerID)
+   {
+      this.issuerID = issuerID;
+   }
 
    /**
     * Perform validation os the request object

Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java	2011-01-27 18:02:02 UTC (rev 677)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java	2011-01-27 18:18:29 UTC (rev 678)
@@ -125,6 +125,9 @@
          try
          {
             ServiceProviderBaseProcessor baseProcessor = new ServiceProviderBaseProcessor(true, serviceURL);
+            if( issuerID != null )
+               baseProcessor.setIssuer( issuerID );
+            
             baseProcessor.setIdentityURL( identityURL );
             
             saml2HandlerResponse = baseProcessor.process(httpContext, handlers, chainLock); 

Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java	2011-01-27 18:02:02 UTC (rev 677)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java	2011-01-27 18:18:29 UTC (rev 678)
@@ -119,7 +119,8 @@
          SAML2HandlerResponse saml2HandlerResponse = null;
          try
          {
-            ServiceProviderBaseProcessor baseProcessor = new ServiceProviderBaseProcessor(false, serviceURL);
+            ServiceProviderBaseProcessor baseProcessor = new ServiceProviderBaseProcessor(false, serviceURL); 
+            
             initializeSAMLProcessor(baseProcessor);
             
             saml2HandlerResponse = baseProcessor.process(httpContext, handlers, chainLock);
@@ -412,6 +413,9 @@
     */
    protected void initializeSAMLProcessor(ServiceProviderBaseProcessor processor)
    {  
+      if( issuerID != null )
+         processor.setIssuer( issuerID );
+      
       processor.setConfiguration(spConfiguration);
    }
    

Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderBaseProcessor.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderBaseProcessor.java	2011-01-27 18:02:02 UTC (rev 677)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderBaseProcessor.java	2011-01-27 18:18:29 UTC (rev 678)
@@ -65,6 +65,8 @@
    protected SPType spConfiguration;
    protected TrustKeyManager keyManager;
    
+   protected String issuer = null;
+   
    protected boolean supportSignatures = false;
 
    /**
@@ -112,6 +114,15 @@
    public void setSupportSignatures(boolean supportSignatures)
    {
       this.supportSignatures = supportSignatures;
+   }   
+   
+   /**
+    * Set a separate issuer that is different from the service url
+    * @param issuer
+    */
+   public void setIssuer(String issuer)
+   {
+      this.issuer = issuer;
    }
 
    public SAML2HandlerResponse process(HTTPContext httpContext,
@@ -175,7 +186,16 @@
    protected SAML2HandlerRequest getSAML2HandlerRequest(SAMLDocumentHolder documentHolder,
          HTTPContext httpContext)
    {
-      IssuerInfoHolder holder = new IssuerInfoHolder(this.serviceURL);  
+      IssuerInfoHolder holder = null;
+      
+      if( issuer == null )
+      {
+         holder = new IssuerInfoHolder(this.serviceURL);
+      }
+      else
+      {
+         holder = new IssuerInfoHolder( issuer );
+      } 
 
       return  new DefaultSAML2HandlerRequest(httpContext,
             holder.getIssuer(), documentHolder,