1 files changed, 22 insertions, 6 deletions
diff --git a/src/components/xriProtocolHandler.js b/src/components/xriProtocolHandler.js
index 1105874..3d27784 100755
--- a/src/components/xriProtocolHandler.js
+++ b/src/components/xriProtocolHandler.js
@@ -1,491 +1,507 @@
 /***********************************************************
  constants
 ***********************************************************/
 // The interface we implement - nsIProtocolHandler
 const nsIProtocolHandler = Components.interfaces.nsIProtocolHandler;
 // Interfaces that we require
        const nsISupports = Components.interfaces.nsISupports;
        const nsIIOService = Components.interfaces.nsIIOService;
        const nsIURI     = Components.interfaces.nsIURI;
        const nsIURL     = Components.interfaces.nsIURL;
        const nsIRequest = Components.interfaces.nsIRequest;
 const nsIRequestObserver = Components.interfaces.nsIRequestObserver;
        const nsIChannel = Components.interfaces.nsIChannel;
        const nsIHttpChannel = Components.interfaces.nsIHttpChannel;
        const nsIStreamListener = Components.interfaces.nsIStreamListener;
 // UUID uniquely identifying our component
 // You can get from: http://kruithof.xs4all.nl/uuid/uuidgen here
 const CLASS_ID = Components.ID("{ea00b610-215a-11db-a98b-0800200c9a66}");
 // textual unique identifier
 const CONTRACT_ID = "@mozilla.org/network/protocol;1?name=xri";
 // Components that we require
 const CID_URI = "@mozilla.org/network/simple-uri;1";
 const kIOSERVICE_CID_STR = "{9ac9e770-18bc-11d3-9337-00104ba0fd40}";
 const CID_URL = "@mozilla.org/network/standard-url;1";
 // description
 const CLASS_NAME = "XRI Protocol Handler";
 const PROXY_URI = "http://xri.net/";
 const XP_ANY_TYPE    = 0;
 const XP_NUMBER_TYPE = 1;
 const XP_STRING_TYPE = 2;
 const XP_BOOLEAN_TYPE = 3;
 const XP_UNORDERED_NODE_ITERATOR_TYPE = 4;
 const XP_ORDERED_NODE_ITERATOR_TYPE = 5;
 const XP_UNORDERED_NODE_SNAPSHOT_TYPE = 6;
 const XP_ORDERED_NODE_SNAPSHOT_TYPE = 7;
 const XP_ANY_UNORDERED_NODE_TYPE = 8;
 const XP_FIRST_ORDERED_NODE_TYPE = 9;
 var SERVICE_CLASSES = {
        'xri://+i-service*(+contact)*($v*1.0)': 'i-contact',
        'http://openid.net/signon/1.0': 'openid',
+        'http://openid.net/signon/1.1': 'openid',
+        'http://specs.openid.net/auth/2.0/signon': 'openid',
+        'http://specs.openid.net/auth/2.0/server': 'openid',
        'xri://$res*auth*($v*2.0)': 'res-auth',
        'xri://+i-service*(+authn)*(+saml)*($v*1.0)': 'authn-saml',
        'xri://+i-service*(+metadata)*(+saml)*($v*1.0)' : 'metadata-saml',
        'xri://+i-service*(+forwarding)*($v*1.0)': 'i-forwarding'
 };
 const HTML_HEAD = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n\
        <html xmlns=\"http://www.w3.org/1999/xhtml\">\n\
        <head>\n\
        <title>FoXRI Explorer - #QXRI#</title>\n\
        <link href=\"chrome://foxri/content/foxri_explorer.css\" rel=\"stylesheet\" type=\"text/css\" />\n\
        <body>\n\
        <h1>FoXRI Explorer</h1>\n\
        <div id=\"explorer_body\">\n";
        
 const HTML_FOOT = "</div>\n\
        </body>\n\
        </html>";
 /// Generic object method wrapper
 function methodWrapper(obj, method)
 {
        return (
                function() {
                        /* pass it this inner closure's arguments */
                        obj[method](arguments);
                }
        );
 }
 /// XRDS utility functions
 var nsResolver = {
        lookupNamespaceURI: function(prefix)
        {
                if (prefix == "xrds")
                        return "xri://$xrds";
                else if (prefix == "xrd")
                        return "xri://$xrd*($v*2.0)";
                return "";
        }
 };
 function runExpr(doc, context, expr, returnType)
 {
        if (!returnType)
                returnType = XP_ANY_TYPE;
        var res = doc.evaluate(expr, context, nsResolver, returnType, null);
        return res;
 }
 function getNumeric(doc, context, expr)
 {
        var res = runExpr(doc, context, expr, XP_NUMBER_TYPE);
        if (res)
                return res.numberValue;
        return null;
 }
 function getString(doc, context, expr)
 {
        // var res = runExpr(doc, context, expr, XPathResult.STRING_TYPE);
        var res = runExpr(doc, context, expr, XP_STRING_TYPE);
        if (res)
                return res.stringValue;
        return null;
 }
 function getNode(doc, context, expr)
 {
        var res = runExpr(doc, context, expr, XP_FIRST_ORDERED_NODE_TYPE);
        if (res)
                return res.singleNodeValue;
        return null;
 }
 function getFinalXRD(doc)
 {
        var lastNode = doc.firstChild;
        while (true) {
                var node = getNode(doc, lastNode, "xrds:XRDS[position()=last()]");
                if (!node)
                        break;
                lastNode = node;
        }
        return getNode(doc, lastNode, "xrd:XRD[position()=last()]");
 }
 function isIName(xri)
 {
        if (xri.match('^xri://.!', 'i')) {
                return false;
        }
        if (xri.match('^.!', 'i')) {
                return false;
        }
        return true;
 }
 function arraySearch(a, re)
 {
        var returnArr = new Array();
        var i;
        for (i = 0; i < a.length; i++) {
                if (a[i].match(re)) {
                        returnArr.push(a[i]);
                }
        }
        return returnArr;
 }
 function renderService(srv, doc, qxri)
 {
        var html_types = '';
        var html_paths = '';
        var html_mediatypes = '';
        var html_uris = '';
        var html_actions = '';
        var serviceName = friendlyServiceName(null);
        var serviceType; // the last non-null Type
        var knownServiceType; // first recognized service type
        // get the types
        var res = runExpr(doc, srv, "xrd:Type/text()");
        var t;
        while (t = res.iterateNext()) {
                if (t.nodeValue) {
                        if (!knownServiceType && isKnownServiceType(t.nodeValue)) {
                                knownServiceType = t.nodeValue;
                        }
                        serviceType = t.nodeValue;
                        html_types += "<strong>Type:</strong> " + t.nodeValue + "<br/>";
                }
        }
        // get the paths
        res = runExpr(doc, srv, "xrd:Path/text()");
        var p;
        var qxri_prefix = qxri;
        if (qxri_prefix.charAt(qxri_prefix.length - 1) != '/') {
                qxri_prefix += '/';
        }
        while (p = res.iterateNext()) {
                if (p.nodeValue) {
                        html_paths += "<strong>Path:</strong> " + p.nodeValue
                                + " [ <tt><a href=\"" + qxri_prefix + p.nodeValue + "\">"
                                        + qxri_prefix + p.nodeValue + "</a></tt> ]"
                                + "<br/>\n";
                }
        }
        // get the mediatypes
        mediaTypes = new Array();
        res = runExpr(doc, srv, "xrd:MediaType/text()");
        var m;
        while (m = res.iterateNext()) {
                if (!knownServiceType) {
                        var srvType = guessServiceTypeByMime(m.nodeValue);
                        knownServiceType = srvType? srvType : null;
                }
                mediaTypes.push(m.nodeValue);
                if (m.nodeValue) {
                        html_mediatypes += "<strong>Media Type:</strong> " + m.nodeValue + "<br/>";
                }
        }
-        res = runExpr(doc, srv, "xrd:URI/text()");
+        res = runExpr(doc, srv, "xrd:URI");
-        var u;
+        var uu;
-        while (u = res.iterateNext()) {
+        while (uu = res.iterateNext()) {
-                if (!u.nodeValue)
+                var u = uu.firstChild;
+                if (!(u.nodeValue && u.nodeType==3))
                        continue;
                var srvType = guessServiceTypeByURI(u.nodeValue);
                if (!knownServiceType) {
                        knownServiceType = srvType;
                }
                html_uris += "<div class=\"" + getServiceClass(srvType) + "\">";
                var linkContent = u.nodeValue;
                var uriParts = u.nodeValue.match('^(.*):(.*)$');
                if (!uriParts)
                        continue;
                if (uriParts[1] == 'data') {
                        uriParts = uriParts[2].match('^(.*/.*),(.*)');
                        if (uriParts && uriParts[1].match('^image/', 'i')) {
                                linkContent = "<img src=\"" + u.nodeValue + "\"/>";
                        }
                        else if (uriParts) {
                                linkContent = uriParts[1] + " data";
                        }
                }
                else if (uriParts[1] == 'skype') {
                        uriParts = uriParts[2].match('^(.*)\\?(.*)');
                        if (uriParts) {
                                if (uriParts[2] == "call") {
                                        linkContent = "<img src=\"chrome://foxri/content/skype_call_large.png\" alt=\"Call " + uriParts[1] + "\"/>";
                                }
                                else if (uriParts[2] == "chat") {
                                        linkContent = "<img src=\"chrome://foxri/content/skype_chat_large.png\" alt=\"Chat with " + uriParts[1] + "\"/>";
                                }
                                else if (uriParts[2] == "add") {
                                        linkContent = "<img src=\"chrome://foxri/content/skype_add_large.png\" alt=\"Add " + uriParts[1] + " to Skype\"/>";
                                }
                        }
                }
                else if (uriParts[1] == 'aim') {
                        uriParts = uriParts[2].match('^(.*)\\?.*screenname=([^&]*)', 'i');
                        if (uriParts) {
                                linkContent = "<img src=\"chrome://foxri/content/aim_logo.gif\" alt=\"Chat with " + uriParts[2] + "\"/> Chat with " + uriParts[2];
                        }
                }
-                html_uris += "<a href=\""+u.nodeValue+"\">"
+                var linkhref = u.nodeValue;
+                var xrap = uu.getAttribute('append');
+                if(xrap=='qxri') {
+                        linkhref += qxri.replace(/^xri:\/\//,'');
+                }else if(xrap!=null){
+                        dump("Unhandled @append: "+xrap+"\n");
+                }
+                html_uris += "<a href=\""+linkhref+"\">"
                        + linkContent + "</a>";
                html_uris += "</div>";
        }
        var html = "<div class=\"service srv_" + getServiceClass(knownServiceType) + "\">\n";
        html += html_types;
        html += html_paths;
        html += html_mediatypes;
        if (html_uris) {
                html +=  "<strong>URI(s):</strong><br/>\n";
                html += html_uris;
        }
        html += "</div>";
        return html;
 }
 function isKnownServiceType(type)
 {
        if (type.toLowerCase() in SERVICE_CLASSES) {
                return true;
        }
        return false;
 }
 function getServiceClass(type)
 {
        if (type && isKnownServiceType(type)) {
                return SERVICE_CLASSES[type.toLowerCase()];
        }
        return type;
 }
 function guessServiceTypeByURI(uri)
 {
        if (uri == null || uri == "") {
                return "unknown";
        }
        if (uri.match(/^https?:/i)) {
                return "www";
        }
        else if (uri.match(/^skype:/i)) {
                return "skype";
        }
        else if (uri.match(/^aim:/i)) {
                return "aim";
        }
        else if (uri.match(/^xmpp:/i)) {
                return "jabber";
        }
        else if (uri.match(/^tel:/i)) {
                return "tel";
        }
        else if (uri.match(/^callto:/i)) {
                return "callto";
        }
        else if (uri.match(/^telnet:/i)) {
                return "telnet";
        }
        else if (uri.match(/^news:/i)) {
                return "news";
        }
        else if (uri.match(/^nntp:/i)) {
                return "nntp";
        }
        else if (uri.match(/^ftp:/i)) {
                return "ftp";
        }
        else if (uri.match(/^mailto:/i)) {
                return "email";
        }
        else if (uri.match(/^urn:/i)) {
                return "urn";
        }
        else if (uri.match(/^data:/i)) {
                return "data";
        }
        else if (uri.match(/^feed:/i)) {
                return "feed";
        }
        return "unknown";
 }
 function guessServiceTypeByMime(mimeType)
 {
        if (mimeType.match(/^application\/(rss|atom)\+xml/i)) {
                dump("feed detected!\n");
                return "feed";
        }
        else if (mimeType.match(/^image\//i)) {
                return "image";
        }
        return null;
 }
 function friendlyServiceName(srvType, uri)
 {
        if (srvType && srvType == "xri://+i-service*(+contact)*($v*1.0)") {
                return "Contact Service";
        }
-        else if (srvType && srvType == "http://openid.net/signon/1.0") {
+        else if (srvType && (
+                             srvType == "http://openid.net/signon/1.0"
+                             || srvType == "http://openid.net/signon/1.1"
+                             || srvType == "http://specs.openid.net/auth/2.0/signon"
+                             || srcType == "http://specs.openid.net/auth/2.0/server"
+                            ) ) {
                return "OpenID Authentication Service";
        }
        else if (srvType && srvType == "xri://$res*auth*($v*2.0)") {
                return "Authority Resolution Service";
        }
        else {
                if (uri == null) {
                        return "Generic Service";
                }
                if (uri.match(/^https?:/i)) {
                        return "Web Link";
                }
                else if (uri.match(/^skype:/i)) {
                        var user = uri.substring("skype:".length, uri.indexOf('?'));
                        return "Skype <a href=\"" + uri + "\"><img src=\"chrome://foxri/content/skype_call.png\"></a>";
                }
                else if (uri.match(/^mailto:/i)) {
                        var qmark = uri.indexOf('?');
                        var email = (qmark == -1)?
                                uri.substr("mailto:".length) :
                                uri.substring("mailto:".length, qmark);
                        return "Email (address: " + email + ")";
                }
                else if (srvType != null) {
                        return srvType; // return verbatim
                }
                return "Generic Service";
        }
 }
 function subHTML(template, vars)
 {
        for (key in vars) {
                template = template.replace(key, vars[key], 'g');
        }
        return template;
 }
 /// Given the completed XMLHttpRequest object, renders the XRDS
 function renderXRDS(xmlDoc)
 {
        var x = xmlDoc;
        var qxri = getString(x, x, "/xrds:XRDS/@ref");
        var html = subHTML(HTML_HEAD, { '#QXRI#': qxri });
        // TODO: render parents as well
        var lastNode = getFinalXRD(x);
        if (lastNode) {
                var stat = getString(x, lastNode, "xrd:Status/@code");
                if (stat == "100") {
                        html += "<h3>Exploring <strong>" + qxri + "</strong></h3>";
                }
                else {
                        var msg = getString(x, lastNode, "xrd:Status/text()");
                        html += "<h3 class=\"error\"><strong>" + qxri + "</strong> failed to resolve (reason: " + stat + " - " + msg + ")</h3>";
                }
                html += "<br/>";
                var services = runExpr(x, lastNode, "xrd:Service");
                var s;
                var count = getNumeric(x, lastNode, "count(xrd:Service)");
                if (count > 0) {
                        while (s = services.iterateNext()) {
                                count++;
                                html += renderService(s, x, qxri);
                        }
                }
                else if (stat == '222') {
                        var xriType = isIName(qxri)? 'I-name' : 'I-number';
                        html += "<p class='error'>" + xriType + " does not exist.</p>\n";
                }
                else {
                        html += "<p>No service has been configured for this XRI</p>";
                }
        }
        html += "</html>";
        return html;
 }
 /***********************************************************
  XriServiceExplorer class definition