Changeset 7296

Timestamp:

06/08/10 15:01:00 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 12: ESG Yadis identity service discovery

• Working code but needs Attribute Service callout stub to be filled

Location:

TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security

Files:

• openid2emailresolution/OpenId2EmailAddrResolution.java (modified) (4 diffs)
• yadis/YadisRetrieval.java (modified) (1 diff)

TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security/openid2emailresolution/OpenId2EmailAddrResolution.java

@@ -8 +8 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -27 +28 @@
         public static final String DEF_ATTRIBUTE_SERVICE_XRD_SERVICE_TYPE = "urn:esg:security:attribute-service";
         
-        OpenId2EmailAddrResolution(String attributeServiceType) {
+        public OpenId2EmailAddrResolution(String attributeServiceType) {
                 super();
                 if (this.attributeServiceType == null)
@@ -34 +35 @@
                         this.attributeServiceType = attributeServiceType;
 
+        }
+        
+        public OpenId2EmailAddrResolution() {
+                this(null);
         }
         
@@ -54 +59 @@
                 // Sort into Priority order making use of XrdsServiceElem's compareTo
                 // logic
+                // TODO: verify this is working correctly!
                 Collections.sort(serviceElems);
                 
-                // Get Attribute Service URI from service endpoint
-                for (XrdsServiceElem serviceEndpoint: serviceElems) {
-                        URL attributeServiceEndpoint = null;
-                        try {
-                                attributeServiceEndpoint = new URL(serviceEndpoint.getUri());
-                        } catch (MalformedURLException e) {
-                                throw new AttributeServiceQueryException("Attribute Service " +
-                                                "URI " + attributeServiceEndpoint + " is invalid", e);
-                        }
+                // Get Attribute Service URI from service element with the highest 
+                // priority
+                XrdsServiceElem priorityAttributeServiceElem = serviceElems.get(0);
+                URL attributeServiceEndpoint = null;
+                try {
+                        attributeServiceEndpoint = new URL(priorityAttributeServiceElem.getUri());
+                
+                } catch (MalformedURLException e) {
+                        throw new AttributeServiceQueryException("Attribute Service " +
+                                        "URI " + attributeServiceEndpoint + " is invalid", e);
+                }
                          
-                         // Call Attribute Service querying for e-mail address
-                         InternetAddress emailAddr = queryAttributeService(attributeServiceEndpoint);
-                         return emailAddr;
-                }
+                 // Call Attribute Service querying for e-mail address
+                 InternetAddress emailAddr = queryAttributeService(attributeServiceEndpoint);
+                 return emailAddr;
+        }
+        
+        /*
+         * Call Attribute Service to retrieve user's e-mail address
+         */
+        protected InternetAddress queryAttributeService(URL attributeServiceEndpoint)
+        {
+                // TODO: Add Attribute Service call here
                 return null;
         }
-        
-        protected InternetAddress queryAttributeService(URL attributeServiceEndpoint)
+        public static void main(String[] args) throws IOException, 
+                NoMatchingXrdsServiceException, 
+                XrdsParseException, 
+                YadisRetrievalException, 
+                AttributeServiceQueryException
         {
-                return null;
+                OpenId2EmailAddrResolution openid2EmailAddr = new OpenId2EmailAddrResolution();
+                
+//              URL yadisURL = new URL("https://ceda.ac.uk/openid/Philip.Kershaw");
+                URL yadisURL = new URL("https://localhost:7443/openid/PJKershaw");
+                InternetAddress emailAddr = null;
+                emailAddr = openid2EmailAddr.resolve(yadisURL);
         }
 }
+

TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security/yadis/YadisRetrieval.java

@@ -85 +85 @@
                 }
 
-                XrdsDoc xrdsDoc = new XrdsDoc();
+                Xrds xrdsDoc = new XrdsDoc();
                 List serviceElems = xrdsDoc.parse(yadisDocContent, targetTypes);
                 return serviceElems;