perfsonar-dev - perfsonar: r2929 - in branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar: base/ant client/base/authn/edugain client/testHarness
Subject: perfsonar development work
List archive
perfsonar: r2929 - in branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar: base/ant client/base/authn/edugain client/testHarness
Chronological Thread
- From:
- To:
- Subject: perfsonar: r2929 - in branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar: base/ant client/base/authn/edugain client/testHarness
- Date: Mon, 8 Oct 2007 16:11:03 -0400
Author: rodriguez
Date: 2007-10-08 16:11:03 -0400 (Mon, 08 Oct 2007)
New Revision: 2929
Added:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
Removed:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/mds/
Modified:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
Log:
Adding full support for the User behind a Client profile
Modified:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
===================================================================
---
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
2007-10-08 19:16:54 UTC (rev 2928)
+++
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
2007-10-08 20:11:03 UTC (rev 2929)
@@ -187,7 +187,7 @@
<dependency groupId="tomcat" artifactId="servlet-api"
version="5.0.28"/>
- <dependency groupId="log4j" artifactId="log4j"
version="1.2.9"/>
+ <dependency groupId="log4j" artifactId="log4j"
version="1.2.12"/>
<dependency groupId="exist" artifactId="exist-xmldb"
version="1.0rc"/>
<dependency groupId="exist" artifactId="exist-db"
version="1.0rc"/>
@@ -203,7 +203,7 @@
<dependency groupId="opensaml" artifactId="opensaml"
version="2.0-TP2-jdk-1.5"/>
<dependency groupId="xmltooling"
artifactId="xmltooling" version="1.0-TP2-jdk-1.5"/>
<dependency groupId="opensaml"
artifactId="opensaml1" version="1.1"/>
- <dependency groupId="edugain" artifactId="edugain"
version="0.5"/>
+ <dependency groupId="edugain" artifactId="edugain"
version="0.6"/>
<dependency groupId="sasl-ca" artifactId="sasl-ca"
version="1.0"/>
<dependency groupId="codec"
artifactId="codec" version="1.0"/>
@@ -687,7 +687,7 @@
<copy
file="${basedir}/lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/log4j/log4j/1.2.12/log4j-1.2.12.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/exist/exist-xmlrpc/1.0rc/exist-xmlrpc-1.0rc.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
@@ -701,7 +701,7 @@
<copy
file="${basedir}/lib/repository/opensaml/opensaml/2.0-TP2-jdk-1.5/opensaml-2.0-TP2-jdk-1.5.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/xmltooling/xmltooling/1.0-TP2-jdk-1.5/xmltooling-1.0-TP2-jdk-1.5.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/opensaml/opensaml1/1.1/opensaml1-1.1.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/edugain/edugain/0.5/edugain-0.5.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/edugain/edugain/0.6/edugain-0.6.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/sasl-ca/sasl-ca/1.0/sasl-ca-1.0.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
<copy file="${basedir}/lib/repository/codec/codec/1.0/codec-1.0.jar"
todir="@{dest-jars-path}/WEB-INF/lib"/>
Modified:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java
===================================================================
---
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java
2007-10-08 19:16:54 UTC (rev 2928)
+++
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java
2007-10-08 20:11:03 UTC (rev 2929)
@@ -1,26 +1,14 @@
package org.perfsonar.client.base.authn.edugain;
-import java.util.Date;
import java.util.Enumeration;
import java.util.Iterator;
import javax.servlet.http.HttpSession;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import org.opensaml.SAMLAssertion;
-import org.opensaml.SAMLAudienceRestrictionCondition;
import org.opensaml.SAMLAuthenticationStatement;
-import org.opensaml.SAMLCondition;
-import org.opensaml.SAMLConfig;
-import org.opensaml.SAMLException;
import org.opensaml.SAMLResponse;
import org.opensaml.SAMLStatement;
-import org.opensaml.SAMLSubject;
-import org.opensaml.XML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
public class EduGAINFilterHelper {
Modified:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
===================================================================
---
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
2007-10-08 19:16:54 UTC (rev 2928)
+++
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
2007-10-08 20:11:03 UTC (rev 2929)
@@ -1,48 +1,36 @@
package org.perfsonar.client.base.authn.edugain;
-import java.io.ByteArrayInputStream;
import java.net.URL;
+import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
+import net.geant.edugain.meta.metadata.BEMetaData;
+import net.geant.edugain.meta.metadata.FederationMetaData;
import net.geant.edugain.meta.query.MetaDataRequester;
+import org.opensaml.xml.XMLObject;
import org.perfsonar.base.exceptions.PerfSONARException;
-import org.perfsonar.client.base.authn.edugain.mds.BridgingElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
public class EduGAINMetadataService {
private static final String defaultUriMDS="http://mds.ladok.umu.se/";;
- public static List<BridgingElement> getOrganizationList(String
uriMds) throws PerfSONARException {
- List<BridgingElement> list=new LinkedList<BridgingElement>();
+ public static List<BEMetaData> getOrganizationList(String uriMds)
throws PerfSONARException {
+ List<BEMetaData> list=new LinkedList<BEMetaData>();
try {
MetaDataRequester requester=new MetaDataRequester();
- StringBuffer sb = requester.requestMetaData(new
URL(uriMds));
- DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
-
- DocumentBuilder builder =
factory.newDocumentBuilder();
- Document mdsInfo=builder.parse(new
ByteArrayInputStream(sb.toString().getBytes()));
+ XMLObject xo=requester.getXMLMetaData(new
URL(uriMds), "md:EntitiesDescriptor");
+ FederationMetaData fmd=requester.getFedMetaData(xo);
+ ArrayList<BEMetaData> listBEs=fmd.getBeMetaDataList();
+ list.addAll(listBEs);
- NodeList nodelist =
org.apache.xpath.XPathAPI.selectNodeList(mdsInfo,
"//md:EntityDescriptor[@entityID]");
- for (int i=0; i<nodelist.getLength(); i++) {
- Element hbe=(Element)nodelist.item(i);
- list.add(new BridgingElement(hbe));
- }
-
return list;
} catch (Exception e) {
throw new
PerfSONARException("error.as.mds_query","EduGAINMetadataService: a problem
querying the MDS: "+e.getMessage());
}
}
- public static List<BridgingElement> getOrganizationList() throws
PerfSONARException {
+ public static List<BEMetaData> getOrganizationList() throws
PerfSONARException {
return getOrganizationList(defaultUriMDS);
}
}
Modified:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
===================================================================
---
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
2007-10-08 19:16:54 UTC (rev 2928)
+++
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
2007-10-08 20:11:03 UTC (rev 2929)
@@ -21,7 +21,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.axis.Message;
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
import org.apache.axis.message.SOAPBodyElement;
@@ -39,11 +38,13 @@
import org.apache.xml.serialize.XMLSerializer;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.ggf.ns.nmwg.base.v2_0.Message;
import org.w3c.dom.Document;
import org.perfsonar.base.auxiliary.components.authn.DynamicCrypto;
import org.perfsonar.base.auxiliary.components.authn.SOAPUtil;
+import
org.perfsonar.client.base.requests.authService.AuthNEERequestGenerator;
/**
* Class which provides the basic web service (Doc/Lit) client capability
@@ -89,12 +90,14 @@
call.setOperationName(new
QName("http://soapinterop.org/","submit";));
// read the request into a org.w3c.DOM.Document
- Document request = null;
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
+ AuthNEERequestGenerator rg=new AuthNEERequestGenerator();
+ Message rm=rg.generateRequestMessage();
DocumentBuilder builder = factory.newDocumentBuilder();
- request = builder.parse(new File(inputFile));
+ Document request = builder.newDocument();
+ request = rm.getDOM(request);
// build a SOAPBodyElement from the document
SOAPBodyElement requestMessage =
@@ -152,7 +155,7 @@
// Signing the message
Document signedDoc = sec509.build(doc, crypto, secHeader);
- Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+ org.apache.axis.Message signedMsg = (org.apache.axis.Message)
SOAPUtil.toSOAPMessage(signedDoc);
envelope = signedMsg.getSOAPEnvelope();
// Saving SOAP message
Added:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
Added:
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
- perfsonar: r2929 - in branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar: base/ant client/base/authn/edugain client/testHarness, svnlog, 10/08/2007
Archive powered by MHonArc 2.6.16.