perfsonar development work

Author: rodriguez
Date: 2009-02-23 09:54:05 -0500 (Mon, 23 Feb 2009)
New Revision: 4983

Added:
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/UbCMDSTest.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/UbCSaslTest.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/X509TestClient.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AttrEERequestGenerator.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNDataFactory.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNEERequestGenerator.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNSAMLData.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNX509Data.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthREERequestGenerator.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/WSSAuthNSAMLData.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/WSSAuthNX509Data.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/edugain/
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/edugain/EduGAINFilterHelper.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/edugain/EduGAINMetadataService.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/SASLCAClient.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/SASLCAClientConfiguration.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/UserID.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/UserIDCallbackHandler.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchManager.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchProtocol.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchProtocolFactory.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchSOAPProtocol.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AttrRequest.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AttrResponse.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNRequest.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNResponse.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRRequest.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRResponse.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/AuthNComponent.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/DynamicCrypto.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/SOAPUtil.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/wssec/
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/wssec/WSSecAuthNComponent.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenManager.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenManagerFactory.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenSOAPManager.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecurityToken.java
Modified:
   branches/new-structure-with-base2/ps-mdm-base2/ant/build.xml
   branches/new-structure-with-base2/ps-mdm-base2/pom.xml
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
Log:
- Adding authN/authR support in base2

Modified: branches/new-structure-with-base2/ps-mdm-base2/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-base2/ant/build.xml        
2009-02-23 14:20:31 UTC (rev 4982)
+++ branches/new-structure-with-base2/ps-mdm-base2/ant/build.xml        
2009-02-23 14:54:05 UTC (rev 4983)
@@ -81,6 +81,17 @@
         <artifact:dependencies>
             <dependency groupId="commons-digester" 
artifactId="commons-digester" version="2.0"/>
             <dependency groupId="org.apache.axis2" artifactId="axis2-jaxws"  
    version="1.4.1"/>
+            <dependency groupId="opensaml" artifactId="opensaml1"            
           version="1.1"/>
+            <dependency groupId="wss4j" artifactId="wss4j"                   
                   version="1.5.1"/>
+            <dependency groupId="org.apache.rampart" 
artifactId="rampart-core"   version="1.4"/>
+            <dependency groupId="bouncycastle" artifactId="bcprov-jdk15"     
           version="124"/>
+            <dependency groupId="xml-security" artifactId="xmlsec"           
           version="1.3.0"/>
+            <dependency groupId="edugain" artifactId="edugain"               
                   version="1.0-RC2"/>
+            <dependency groupId="perfsonar" artifactId="perfsonar-authr"     
           version="0.5"/>
+            <dependency groupId="sasl-ca" artifactId="sasl-ca"               
                   version="1.0"/>
+            <dependency groupId="codec" artifactId="codec"                   
                   version="1.0"/>
+            <dependency groupId="opensaml" artifactId="opensaml"             
           version="2.2.3"/>
+            <dependency groupId="xmltooling" artifactId="xmltooling"         
           version="1.2.0"/>
             <localRepository  refid="local.repository"/>
             <remoteRepository refid="remote.repository"/>
         </artifact:dependencies>

Modified: branches/new-structure-with-base2/ps-mdm-base2/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-base2/pom.xml      2009-02-23 
14:20:31 UTC (rev 4982)
+++ branches/new-structure-with-base2/ps-mdm-base2/pom.xml      2009-02-23 
14:54:05 UTC (rev 4983)
@@ -24,8 +24,8 @@
     <name>Perfsonar Base2 package</name>
     <version>0.0.1</version>
     <description>
-        The perfSONAR base provides a number of common, shared classes which 
can be used by 
-        MA, MP and Clients. 
+        The perfSONAR base provides a number of common, shared classes which 
can be used by
+        MA, MP and Clients.
     </description>
     <url>
         http://wiki.perfsonar.net/
@@ -107,7 +107,6 @@
         </dependency>
 
     <!-- got for auth -->
-    <!--
     <dependency>
       <groupId>opensaml</groupId>
       <artifactId>opensaml1</artifactId>
@@ -126,7 +125,7 @@
     <dependency>
       <groupId>edugain</groupId>
       <artifactId>edugain</artifactId>
-      <version>0.7alpha</version>
+      <version>1.0-RC2</version>
     </dependency>
     <dependency>
       <groupId>perfsonar</groupId>
@@ -151,12 +150,12 @@
     <dependency>
       <groupId>opensaml</groupId>
       <artifactId>opensaml</artifactId>
-      <version>2.0-TP2-jdk-1.5</version>
+      <version>2.2.3</version>
     </dependency>
     <dependency>
       <groupId>xmltooling</groupId>
       <artifactId>xmltooling</artifactId>
-      <version>1.0-TP2-jdk-1.5</version>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>wss4j</groupId>
@@ -193,7 +192,6 @@
       <artifactId>sunxacml</artifactId>
       <version>1.2</version>
     </dependency>
-    -->
     </dependencies>
 
     <reporting>
@@ -243,7 +241,7 @@
                     <minimumTokens>100</minimumTokens>
                     <targetJdk>1.5</targetJdk>
                 </configuration>
-            </plugin>  
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
@@ -253,7 +251,7 @@
                     <xmlOutput>true</xmlOutput>
                 </configuration>
             </plugin>
-            <!-- 
+            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-changelog-plugin</artifactId>

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/UbCMDSTest.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/UbCSaslTest.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/X509TestClient.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AttrEERequestGenerator.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNDataFactory.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNEERequestGenerator.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNSAMLData.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthNX509Data.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/AuthREERequestGenerator.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/WSSAuthNSAMLData.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/WSSAuthNX509Data.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/edugain/EduGAINFilterHelper.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/edugain/EduGAINMetadataService.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/SASLCAClient.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/SASLCAClientConfiguration.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/UserID.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/client/authn/saslca/UserIDCallbackHandler.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchManager.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchProtocol.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchProtocolFactory.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchSOAPProtocol.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AttrRequest.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AttrResponse.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNRequest.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthNResponse.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRRequest.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/AuthRResponse.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/AuthNComponent.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/DynamicCrypto.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/SOAPUtil.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/component/wssec/WSSecAuthNComponent.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenManager.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenManagerFactory.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenSOAPManager.java

Added: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecurityToken.java

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-02-23 14:20:31 UTC (rev 4982)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-02-23 14:54:05 UTC (rev 4983)
@@ -10,8 +10,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-// TODO: Uncomment later !!!
-//import org.perfsonar.base2.service.authn.component.AuthNComponent;
+import org.perfsonar.base2.service.authn.component.AuthNComponent;
 import org.perfsonar.base2.service.configuration.Configuration;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
@@ -53,9 +52,6 @@
             return se;
     }
 
-
-// TODO: Uncomment later !!!
-/*
     protected void checkAuth(Configuration c, String messageType) throws 
PerfSONARException {
        String authR = "no";
        String authN = "no";
@@ -78,9 +74,7 @@
                authComponent.requestAuthN(messageType);
        }
     }
-*/
 
-
     public void execute(ServiceMessage request, ServiceMessage response)
         throws PerfSONARException {
 
@@ -96,15 +90,14 @@
 
             messageType = reqMessage.getType();
             Configuration c = 
ConfigurationManager.getInstance().getConfiguration();
-// TODO: Uncomment later!!!
-//            checkAuth(c, messageType);
+            checkAuth(c, messageType);
             serviceEngineClassName = c.getServiceEngineOption(messageType);
             serviceEngine = getServiceEngine(serviceEngineClassName);
             if (serviceEngine == null) throw new NullPointerException(
                     "Cannot Instantiate ServiceEngine class 
["+serviceEngineClassName+"]");
 
         } catch (Exception ex) {
-            
+
             String m = "Cannot find ServiceEngine ["+serviceEngineClassName +
                 "] for message type ["+messageType+"], nested exception 
was:"+
                 ex.toString();
@@ -115,7 +108,7 @@
              response.setElement(
                 ResultCodesUtil.generateResultMessage(null, pse));
              return; //finish when cannot execute ServiceEngine
-             
+
         }